638 files changed, 39549 insertions, 22765 deletions

diff --git a/.gitattributes b/.gitattributes
index 5e98806c6c..320e33c327 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,3 @@
 * whitespace=!indent,trail,space
-*.[ch] whitespace=indent,trail,space
+*.[ch] whitespace=indent,trail,space diff=cpp
 *.sh whitespace=indent,trail,space
diff --git a/.gitignore b/.gitignore
index 5087ce1eb7..05cb58a3d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -179,39 +179,6 @@
 /gitweb/gitweb.cgi
 /gitweb/static/gitweb.js
 /gitweb/static/gitweb.min.*
-/test-chmtime
-/test-ctype
-/test-config
-/test-date
-/test-delta
-/test-dump-cache-tree
-/test-dump-split-index
-/test-dump-untracked-cache
-/test-fake-ssh
-/test-scrap-cache-tree
-/test-genrandom
-/test-hashmap
-/test-index-version
-/test-line-buffer
-/test-match-trees
-/test-mergesort
-/test-mktemp
-/test-parse-options
-/test-path-utils
-/test-prio-queue
-/test-read-cache
-/test-regex
-/test-revision-walking
-/test-run-command
-/test-sha1
-/test-sha1-array
-/test-sigchain
-/test-string-list
-/test-submodule-config
-/test-subprocess
-/test-svn-fe
-/test-urlmatch-normalization
-/test-wildmatch
 /common-cmds.h
 *.tar.gz
 *.dsc
diff --git a/.mailmap b/.mailmap
index a9162c0095..9441a54b0d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -33,6 +33,7 @@ Cheng Renquan <crquan@gmail.com>
 Chris Shoemaker <c.shoemaker@cox.net>
 Chris Wright <chrisw@sous-sol.org> <chrisw@osdl.org>
 Cord Seele <cowose@gmail.com> <cowose@googlemail.com>
+Christian Couder <chriscool@tuxfamily.org> <christian.couder@gmail.com>
 Christian Stimming <stimming@tuhh.de> <chs@ckiste.goetheallee>
 Csaba Henk <csaba@gluster.com> <csaba@lowlife.hu>
 Dan Johnson <computerdruid@gmail.com>
@@ -46,6 +47,7 @@ David D. Kilzer <ddkilzer@kilzer.net>
 David KÃ¥gedal <davidk@lysator.liu.se>
 David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
 David S. Miller <davem@davemloft.net>
+David Turner <novalis@novalis.org> <dturner@twopensource.com>
 Deskin Miller <deskinm@umich.edu>
 Dirk Süsserott <newsletter@dirk.my1.cc>
 Eric Blake <eblake@redhat.com> <ebb9@byu.net>
diff --git a/.travis.yml b/.travis.yml
index adab5b89bb..477c3d2efb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,8 @@ addons:
   apt:
     packages:
     - language-pack-is
+    - git-svn
+    - apache2
 
 env:
   global:
@@ -30,6 +32,7 @@ env:
     - DEFAULT_TEST_TARGET=prove
     - GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
     - GIT_TEST_OPTS="--verbose --tee"
+    - GIT_TEST_HTTPD=true
     - GIT_TEST_CLONE_2GB=YesPlease
     # t9810 occasionally fails on Travis CI OS X
     # t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X
@@ -81,6 +84,8 @@ before_install:
       brew tap homebrew/binary --quiet
       brew_force_set_latest_binary_hash perforce
       brew_force_set_latest_binary_hash perforce-server
+      # Uncomment this if you want to run perf tests:
+      # brew install gnu-time
       brew install git-lfs perforce-server perforce gettext
       brew link --force gettext
       ;;
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index 0ddd36879a..4cd95da6b1 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -526,12 +526,20 @@ Writing Documentation:
  modifying paragraphs or option/command explanations that contain options
  or commands:
 
- Literal examples (e.g. use of command-line options, command names, and
- configuration variables) are typeset in monospace, and if you can use
- `backticks around word phrases`, do so.
+ 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):
    `--pretty=oneline`
    `git rev-list`
    `remote.pushDefault`
+   `GIT_DIR`
+   `HEAD`
+
+ An environment variable must be prefixed with "$" only when referring to its
+ value and not when referring to the variable itself, in this case there is
+ nothing to add except the backticks:
+   `GIT_DIR` is specified
+   `$GIT_DIR/hooks/pre-receive`
 
  Word phrases enclosed in `backtick characters` are rendered literally
  and will not be further expanded. The use of `backticks` to achieve the
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 3e39e2815b..b43d66eae6 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -76,6 +76,7 @@ TECH_DOCS += technical/protocol-common
 TECH_DOCS += technical/racy-git
 TECH_DOCS += technical/send-pack-pipeline
 TECH_DOCS += technical/shallow
+TECH_DOCS += technical/signature-format
 TECH_DOCS += technical/trivial-merge
 SP_ARTICLES += $(TECH_DOCS)
 SP_ARTICLES += technical/api-index
@@ -146,7 +147,7 @@ else
 	ASCIIDOC_EXTRA += -a git-asciidoc-no-roff
 	endif
 endif
-ifdef MAN_BOLD_LITERAL
+ifndef NO_MAN_BOLD_LITERAL
 XMLTO_EXTRA += -m manpage-bold-literal.xsl
 endif
 ifdef DOCBOOK_SUPPRESS_SP
@@ -204,6 +205,7 @@ ifndef V
 	QUIET_DBLATEX	= @echo '   ' DBLATEX $@;
 	QUIET_XSLTPROC	= @echo '   ' XSLTPROC $@;
 	QUIET_GEN	= @echo '   ' GEN $@;
+	QUIET_LINT	= @echo '   ' LINT $@;
 	QUIET_STDERR	= 2> /dev/null
 	QUIET_SUBDIR0	= +@subdir=
 	QUIET_SUBDIR1	= ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
@@ -427,4 +429,7 @@ quick-install-html: require-htmlrepo
 print-man1:
 	@for i in $(MAN1_TXT); do echo $$i; done
 
+lint-docs::
+	$(QUIET_LINT)$(PERL_PATH) lint-gitlink.perl
+
 .PHONY: FORCE
diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt
new file mode 100644
index 0000000000..179e5751d8
--- /dev/null
+++ b/Documentation/RelNotes/2.10.0.txt
@@ -0,0 +1,597 @@
+Git 2.10 Release Notes
+======================
+
+Backward compatibility notes
+----------------------------
+
+Updates since v2.9
+------------------
+
+UI, Workflows & Features
+
+ * "git pull --rebase --verify-signature" learned to warn the user
+   that "--verify-signature" is a no-op when rebasing.
+
+ * An upstream project can make a recommendation to shallowly clone
+   some submodules in the .gitmodules file it ships.
+
+ * "git worktree add" learned that '-' can be used as a short-hand for
+   "@{-1}", the previous branch.
+
+ * Update the funcname definition to support css files.
+
+ * The completion script (in contrib/) learned to complete "git
+   status" options.
+
+ * Messages that are generated by auto gc during "git push" on the
+   receiving end are now passed back to the sending end in such a way
+   that they are shown with "remote: " prefix to avoid confusing the
+   users.
+
+ * "git add -i/-p" learned to honor diff.compactionHeuristic
+   experimental knob, so that the user can work on the same hunk split
+   as "git diff" output.
+
+ * "upload-pack" allows a custom "git pack-objects" replacement when
+   responding to "fetch/clone" via the uploadpack.packObjectsHook.
+   (merge b738396 jk/upload-pack-hook later to maint).
+
+ * Teach format-patch and mailsplit (hence "am") how a line that
+   happens to begin with "From " in the e-mail message is quoted with
+   ">", so that these lines can be restored to their original shape.
+   (merge d9925d1 ew/mboxrd-format-am later to maint).
+
+ * "git repack" learned the "--keep-unreachable" option, which sends
+   loose unreachable objects to a pack instead of leaving them loose.
+   This helps heuristics based on the number of loose objects
+   (e.g. "gc --auto").
+   (merge e26a8c4 jk/repack-keep-unreachable later to maint).
+
+ * "log --graph --format=" learned that "%>|(N)" specifies the width
+   relative to the terminal's left edge, not relative to the area to
+   draw text that is to the right of the ancestry-graph section.  It
+   also now accepts negative N that means the column limit is relative
+   to the right border.
+
+ * A careless invocation of "git send-email directory/" after editing
+   0001-change.patch with an editor often ends up sending both
+   0001-change.patch and its backup file, 0001-change.patch~, causing
+   embarrassment and a minor confusion.  Detect such an input and
+   offer to skip the backup files when sending the patches out.
+   (merge 531220b jc/send-email-skip-backup later to maint).
+
+ * "git submodule update" that drives many "git clone" could
+   eventually hit flaky servers/network conditions on one of the
+   submodules; the command learned to retry the attempt.
+
+ * The output coloring scheme learned two new attributes, italic and
+   strike, in addition to existing bold, reverse, etc.
+
+ * "git log" learns log.showSignature configuration variable, and a
+   command line option "--no-show-signature" to countermand it.
+   (merge fce04c3 mj/log-show-signature-conf later to maint).
+
+ * More markings of messages for i18n, with updates to various tests
+   to pass GETTEXT_POISON tests.
+
+ * "git archive" learned to handle files that are larger than 8GB and
+   commits far in the future than expressible by the traditional US-TAR
+   format.
+   (merge 5caeeb8 jk/big-and-future-archive-tar later to maint).
+
+ * A new configuration variable core.sshCommand has been added to
+   specify what value for GIT_SSH_COMMAND to use per repository.
+
+ * "git worktree prune" protected worktrees that are marked as
+   "locked" by creating a file in a known location.  "git worktree"
+   command learned a dedicated command pair to create and remove such
+   a file, so that the users do not have to do this with editor.
+
+ * A handful of "git svn" updates.
+
+ * "git push" learned to accept and pass extra options to the
+   receiving end so that hooks can read and react to them.
+
+ * "git status" learned to suggest "merge --abort" during a conflicted
+   merge, just like it already suggests "rebase --abort" during a
+   conflicted rebase.
+
+ * "git jump" script (in contrib/) has been updated a bit.
+   (merge a91e692 jk/git-jump later to maint).
+
+ * "git push" and "git clone" learned to give better progress meters
+   to the end user who is waiting on the terminal.
+
+ * An entry "git log --decorate" for the tip of the current branch is
+   shown as "HEAD -> name" (where "name" is the name of the branch);
+   the arrow is now painted in the same color as "HEAD", not in the
+   color for commits.
+
+ * "git format-patch" learned format.from configuration variable to
+   specify the default settings for its "--from" option.
+
+ * "git am -3" calls "git merge-recursive" when it needs to fall back
+   to a three-way merge; this call has been turned into an internal
+   subroutine call instead of spawning a separate subprocess.
+
+ * The command line completion scripts (in contrib/) now knows about
+   "git branch --delete/--move [--remote]".
+   (merge 2703c22 vs/completion-branch-fully-spelled-d-m-r later to maint).
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * "git fast-import" learned the same performance trick to avoid
+   creating too small a packfile as "git fetch" and "git push" have,
+   using *.unpackLimit configuration.
+
+ * When "git daemon" is run without --[init-]timeout specified, a
+   connection from a client that silently goes offline can hang around
+   for a long time, wasting resources.  The socket-level KEEPALIVE has
+   been enabled to allow the OS to notice such failed connections.
+
+ * "git upload-pack" command has been updated to use the parse-options
+   API.
+
+ * The "git apply" standalone program is being libified; the first
+   step to move many state variables into a structure that can be
+   explicitly (re)initialized to make the machinery callable more
+   than once has been merged.
+
+ * HTTP transport gained an option to produce more detailed debugging
+   trace.
+   (merge 73e57aa ep/http-curl-trace later to maint).
+
+ * Instead of taking advantage of the fact that a struct string_list
+   that is allocated with all NULs happens to be the INIT_NODUP kind,
+   the users of string_list structures are taught to initialize them
+   explicitly as such, to document their behaviour better.
+   (merge 2721ce2 jk/string-list-static-init later to maint).
+
+ * HTTPd tests learned to show the server error log to help diagnosing
+   a failing tests.
+   (merge 44f243d nd/test-lib-httpd-show-error-log-in-verbose later to maint).
+
+ * The ownership rule for the piece of memory that hold references to
+   be fetched in "git fetch" was screwy, which has been cleaned up.
+
+ * "git bisect" makes an internal call to "git diff-tree" when
+   bisection finds the culprit, but this call did not initialize the
+   data structure to pass to the diff-tree API correctly.
+
+ * Further preparatory clean-up for "worktree" feature continues.
+   (merge 0409e0b nd/worktree-cleanup-post-head-protection later to maint).
+
+ * Formats of the various data (and how to validate them) where we use
+   GPG signature have been documented.
+
+ * A new run-command API function pipe_command() is introduced to
+   sanely feed data to the standard input while capturing data from
+   the standard output and the standard error of an external process,
+   which is cumbersome to hand-roll correctly without deadlocking.
+
+   The codepath to sign data in a prepared buffer with GPG has been
+   updated to use this API to read from the status-fd to check for
+   errors (instead of relying on GPG's exit status).
+   (merge efee955 jk/gpg-interface-cleanup later to maint).
+
+ * Allow t/perf framework to use the features from the most recent
+   version of Git even when testing an older installed version.
+
+ * The commands in the "log/diff" family have had an FILE* pointer in the
+   data structure they pass around for a long time, but some codepaths
+   used to always write to the standard output.  As a preparatory step
+   to make "git format-patch" available to the internal callers, these
+   codepaths have been updated to consistently write into that FILE*
+   instead.
+
+ * Conversion from unsigned char sha1[20] to struct object_id
+   continues.
+
+ * Improve the look of the way "git fetch" reports what happened to
+   each ref that was fetched.
+
+ * The .c/.h sources are marked as such in our .gitattributes file so
+   that "git diff -W" and friends would work better.
+
+ * Code clean-up to avoid using a variable string that compilers may
+   feel untrustable as printf-style format given to write_file()
+   helper function.
+
+ * "git p4" used a location outside $GIT_DIR/refs/ to place its
+   temporary branches, which has been moved to refs/git-p4-tmp/.
+
+ * Existing autoconf generated test for the need to link with pthread
+   library did not check all the functions from pthread libraries;
+   recent FreeBSD has some functions in libc but not others, and we
+   mistakenly thought linking with libc is enough when it is not.
+
+ * When "git fsck" reports a broken link (e.g. a tree object contains
+   a blob that does not exist), both containing object and the object
+   that is referred to were reported with their 40-hex object names.
+   The command learned the "--name-objects" option to show the path to
+   the containing object from existing refs (e.g. "HEAD~24^2:file.txt").
+
+ * Allow http daemon tests in Travis CI tests.
+
+ * Makefile assumed that -lrt is always available on platforms that
+   want to use clock_gettime() and CLOCK_MONOTONIC, which is not a
+   case for recent Mac OS X.  The necessary symbols are often found in
+   libc on many modern systems and having -lrt on the command line, as
+   long as the library exists, had no effect, but when the platform
+   removes librt.a that is a different matter--having -lrt will break
+   the linkage.
+
+   This change could be seen as a regression for those who do need to
+   specify -lrt, as they now specifically ask for NEEDS_LIBRT when
+   building. Hopefully they are in the minority these days.
+
+ * Further preparatory work on the refs API before the pluggable
+   backend series can land.
+
+ * Error handling in the codepaths that updates refs has been
+   improved.
+
+ * The API to iterate over all the refs (i.e. for_each_ref(), etc.)
+   has been revamped.
+
+ * The handling of the "text = auto" attribute has been updated.
+   $ echo "* text=auto eol=crlf" >.gitattributes
+   used to have the same effect as
+   $ echo "* text=auto eol=crlf" >.gitattributes
+   $ git config core.eol crlf
+   i.e. declaring all files are text; the combination now is
+   equivalent to doing
+   $ git config core.autocrlf true
+
+ * A few tests that specifically target "git rebase -i" have been
+   added.
+
+ * Dumb http transport on the client side has been optimized.
+   (merge ecba195 ew/http-walker later to maint).
+
+ * Users of the parse_options_concat() API function need to allocate
+   extra slots in advance and fill them with OPT_END() when they want
+   to decide the set of supported options dynamically, which makes the
+   code error-prone and hard to read.  This has been corrected by tweaking
+   the API to allocate and return a new copy of "struct option" array.
+
+ * "git fetch" exchanges batched have/ack messages between the sender
+   and the receiver, initially doubling every time and then falling
+   back to enlarge the window size linearly.  The "smart http"
+   transport, being an half-duplex protocol, outgrows the preset limit
+   too quickly and becomes inefficient when interacting with a large
+   repository.  The internal mechanism learned to grow the window size
+   more aggressively when working with the "smart http" transport.
+
+ * Tests for "git svn" have been taught to reuse the lib-httpd test
+   infrastructure when testing the subversion integration that
+   interacts with subversion repositories served over the http://
+   protocol.
+   (merge a8a5d25 ew/git-svn-http-tests later to maint).
+
+ * "git pack-objects" has a few options that tell it not to pack
+   objects found in certain packfiles, which require it to scan .idx
+   files of all available packs.  The codepaths involved in these
+   operations have been optimized for a common case of not having any
+   non-local pack and/or any .kept pack.
+
+ * The t3700 test about "add --chmod=-x" have been made a bit more
+   robust and generally cleaned up.
+   (merge 766cdc4 ib/t3700-add-chmod-x-updates later to maint).
+
+ * The build procedure learned PAGER_ENV knob that lists what default
+   environment variable settings to export for popular pagers.  This
+   mechanism is used to tweak the default settings to MORE on FreeBSD.
+   (merge 995bc22 ew/build-time-pager-tweaks later to maint).
+
+ * The http-backend (the server-side component of smart-http
+   transport) used to trickle the HTTP header one at a time.  Now
+   these write(2)s are batched.
+   (merge b36045c ew/http-backend-batch-headers later to maint).
+
+ * When "git rebase" tries to compare set of changes on the updated
+   upstream and our own branch, it computes patch-id for all of these
+   changes and attempts to find matches. This has been optimized by
+   lazily computing the full patch-id (which is expensive) to be
+   compared only for changes that touch the same set of paths.
+   (merge b3dfeeb kw/patch-ids-optim later to maint).
+
+
+Also contains various documentation updates and code clean-ups.
+
+
+Fixes since v2.9
+----------------
+
+Unless otherwise noted, all the fixes since v2.8 in the maintenance
+track are contained in this release (see the maintenance releases'
+notes for details).
+
+ * The commands in `git log` family take %C(auto) in a custom format
+   string.  This unconditionally turned the color on, ignoring
+   --no-color or with --color=auto when the output is not connected to
+   a tty; this was corrected to make the format truly behave as
+   "auto".
+
+ * "git rev-list --count" whose walk-length is limited with "-n"
+   option did not work well with the counting optimized to look at the
+   bitmap index.
+
+ * "git show -W" (extend hunks to cover the entire function, delimited
+   by lines that match the "funcname" pattern) used to show the entire
+   file when a change added an entire function at the end of the file,
+   which has been fixed.
+
+ * The documentation set has been updated so that literal commands,
+   configuration variables and environment variables are consistently
+   typeset in fixed-width font and bold in manpages.
+
+ * "git svn propset" subcommand that was added in 2.3 days is
+   documented now.
+
+ * The documentation tries to consistently spell "GPG"; when
+   referring to the specific program name, "gpg" is used.
+
+ * "git reflog" stopped upon seeing an entry that denotes a branch
+   creation event (aka "unborn"), which made it appear as if the
+   reflog was truncated.
+
+ * The git-prompt scriptlet (in contrib/) was not friendly with those
+   who uses "set -u", which has been fixed.
+
+ * compat/regex code did not cleanly compile.
+
+ * A codepath that used alloca(3) to place an unbounded amount of data
+   on the stack has been updated to avoid doing so.
+
+ * "git update-index --add --chmod=+x file" may be usable as an escape
+   hatch, but not a friendly thing to force for people who do need to
+   use it regularly.  "git add --chmod=+x file" can be used instead.
+
+ * Build improvements for gnome-keyring (in contrib/)
+
+ * "git status" used to say "working directory" when it meant "working
+   tree".
+
+ * Comments about misbehaving FreeBSD shells have been clarified with
+   the version number (9.x and before are broken, newer ones are OK).
+
+ * "git cherry-pick A" worked on an unborn branch, but "git
+   cherry-pick A..B" didn't.
+
+ * Fix an unintended regression in v2.9 that breaks "clone --depth"
+   that recurses down to submodules by forcing the submodules to also
+   be cloned shallowly, which many server instances that host upstream
+   of the submodules are not prepared for.
+
+ * Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
+   to set the default value, without enclosing it in double quotes.
+
+ * Some platform-specific code had non-ANSI strict declarations of C
+   functions that do not take any parameters, which has been
+   corrected.
+
+ * The internal code used to show local timezone offset is not
+   prepared to handle timestamps beyond year 2100, and gave a
+   bogus offset value to the caller.  Use a more benign looking
+   +0000 instead and let "git log" going in such a case, instead
+   of aborting.
+
+ * One among four invocations of readlink(1) in our test suite has
+   been rewritten so that the test can run on systems without the
+   command (others are in valgrind test framework and t9802).
+
+ * t/perf needs /usr/bin/time with GNU extension; the invocation of it
+   is updated to "gtime" on Darwin.
+
+ * A bug, which caused "git p4" while running under verbose mode to
+   report paths that are omitted due to branch prefix incorrectly, has
+   been fixed; the command said "Ignoring file outside of prefix" for
+   paths that are _inside_.
+
+ * The top level documentation "git help git" still pointed at the
+   documentation set hosted at now-defunct google-code repository.
+   Update it to point to https://git.github.io/htmldocs/git.html
+   instead.
+
+ * A helper function that takes the contents of a commit object and
+   finds its subject line did not ignore leading blank lines, as is
+   commonly done by other codepaths.  Make it ignore leading blank
+   lines to match.
+
+ * For a long time, we carried an in-code comment that said our
+   colored output would work only when we use fprintf/fputs on
+   Windows, which no longer is the case for the past few years.
+
+ * "gc.autoPackLimit" when set to 1 should not trigger a repacking
+   when there is only one pack, but the code counted poorly and did
+   so.
+
+ * Add a test to specify the desired behaviour that currently is not
+   available in "git rebase -Xsubtree=...".
+
+ * More mark-up updates to typeset strings that are expected to
+   literally typed by the end user in fixed-width font.
+
+ * "git commit --amend --allow-empty-message -S" for a commit without
+   any message body could have misidentified where the header of the
+   commit object ends.
+
+ * "git rebase -i --autostash" did not restore the auto-stashed change
+   when the operation was aborted.
+
+ * Git does not know what the contents in the index should be for a
+   path added with "git add -N" yet, so "git grep --cached" should not
+   show hits (or show lack of hits, with -L) in such a path, but that
+   logic does not apply to "git grep", i.e. searching in the working
+   tree files.  But we did so by mistake, which has been corrected.
+
+ * "git blame -M" missed a single line that was moved within the file.
+
+ * Fix recently introduced codepaths that are involved in parallel
+   submodule operations, which gave up on reading too early, and
+   could have wasted CPU while attempting to write under a corner
+   case condition.
+
+ * "git grep -i" has been taught to fold case in non-ascii locales
+   correctly.
+
+ * A test that unconditionally used "mktemp" learned that the command
+   is not necessarily available everywhere.
+
+ * There are certain house-keeping tasks that need to be performed at
+   the very beginning of any Git program, and programs that are not
+   built-in commands had to do them exactly the same way as "git"
+   potty does.  It was easy to make mistakes in one-off standalone
+   programs (like test helpers).  A common "main()" function that
+   calls cmd_main() of individual program has been introduced to
+   make it harder to make mistakes.
+   (merge de61ceb jk/common-main later to maint).
+
+ * The test framework learned a new helper test_match_signal to
+   check an exit code from getting killed by an expected signal.
+
+ * General code clean-up around a helper function to write a
+   single-liner to a file.
+   (merge 7eb6e10 jk/write-file later to maint).
+
+ * One part of "git am" had an oddball helper function that called
+   stuff from outside "his" as opposed to calling what we have "ours",
+   which was not gender-neutral and also inconsistent with the rest of
+   the system where outside stuff is usuall called "theirs" in
+   contrast to "ours".
+
+ * "git blame file" allowed the lineage of lines in the uncommitted,
+   unadded contents of "file" to be inspected, but it refused when
+   "file" did not appear in the current commit.  When "file" was
+   created by renaming an existing file (but the change has not been
+   committed), this restriction was unnecessarily tight.
+
+ * "git add -N dir/file && git write-tree" produced an incorrect tree
+   when there are other paths in the same directory that sorts after
+   "file".
+
+ * "git fetch http://user:pass@host/repo..." scrubbed the userinfo
+   part, but "git push" didn't.
+
+ * "git merge" with renormalization did not work well with
+   merge-recursive, due to "safer crlf" conversion kicking in when it
+   shouldn't.
+   (merge 1335d76 jc/renormalize-merge-kill-safer-crlf later to maint).
+
+ * The use of strbuf in "git rm" to build filename to remove was a bit
+   suboptimal, which has been fixed.
+
+ * An age old bug that caused "git diff --ignore-space-at-eol"
+   misbehave has been fixed.
+
+ * "git notes merge" had a code to see if a path exists (and fails if
+   it does) and then open the path for writing (when it doesn't).
+   Replace it with open with O_EXCL.
+
+ * "git pack-objects" and "git index-pack" mostly operate with off_t
+   when talking about the offset of objects in a packfile, but there
+   were a handful of places that used "unsigned long" to hold that
+   value, leading to an unintended truncation.
+
+ * Recent update to "git daemon" tries to enable the socket-level
+   KEEPALIVE, but when it is spawned via inetd, the standard input
+   file descriptor may not necessarily be connected to a socket.
+   Suppress an ENOTSOCK error from setsockopt().
+
+ * Recent FreeBSD stopped making perl available at /usr/bin/perl;
+   switch the default the built-in path to /usr/local/bin/perl on not
+   too ancient FreeBSD releases.
+
+ * "git commit --help" said "--no-verify" is only about skipping the
+   pre-commit hook, and failed to say that it also skipped the
+   commit-msg hook.
+
+ * "git merge" in Git v2.9 was taught to forbid merging an unrelated
+   lines of history by default, but that is exactly the kind of thing
+   the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
+   "git subtree" has been taught to use the "--allow-unrelated-histories"
+   option to override the default.
+
+ * The build procedure for "git persistent-https" helper (in contrib/)
+   has been updated so that it can be built with more recent versions
+   of Go.
+
+ * There is an optimization used in "git diff $treeA $treeB" to borrow
+   an already checked-out copy in the working tree when it is known to
+   be the same as the blob being compared, expecting that open/mmap of
+   such a file is faster than reading it from the object store, which
+   involves inflating and applying delta.  This however kicked in even
+   when the checked-out copy needs to go through the convert-to-git
+   conversion (including the clean filter), which defeats the whole
+   point of the optimization.  The optimization has been disabled when
+   the conversion is necessary.
+
+ * "git -c grep.patternType=extended log --basic-regexp" misbehaved
+   because the internal API to access the grep machinery was not
+   designed well.
+
+ * Windows port was failing some tests in t4130, due to the lack of
+   inum in the returned values by its lstat(2) emulation.
+
+ * The reflog output format is documented better, and a new format
+   --date=unix to report the seconds-since-epoch (without timezone)
+   has been added.
+   (merge 442f6fd jk/reflog-date later to maint).
+
+ * "git difftool <paths>..." started in a subdirectory failed to
+   interpret the paths relative to that directory, which has been
+   fixed.
+
+ * The characters in the label shown for tags/refs for commits in
+   "gitweb" output are now properly escaped for proper HTML output.
+
+ * FreeBSD can lie when asked mtime of a directory, which made the
+   untracked cache code to fall back to a slow-path, which in turn
+   caused tests in t7063 to fail because it wanted to verify the
+   behaviour of the fast-path.
+
+ * Squelch compiler warnings for netmalloc (in compat/) library.
+
+ * A small memory leak in the command line parsing of "git blame"
+   has been plugged.
+
+ * The API documentation for hashmap was unclear if hashmap_entry
+   can be safely discarded without any other consideration.  State
+   that it is safe to do so.
+
+ * Not-so-recent rewrite of "git am" that started making internal
+   calls into the commit machinery had an unintended regression, in
+   that no matter how many seconds it took to apply many patches, the
+   resulting committer timestamp for the resulting commits were all
+   the same.
+
+ * "git push --force-with-lease" already had enough logic to allow
+   ensuring that such a push results in creation of a ref (i.e. the
+   receiving end did not have another push from sideways that would be
+   discarded by our force-pushing), but didn't expose this possibility
+   to the users.  It does so now.
+   (merge 9eed4f3 jk/push-force-with-lease-creation later to maint).
+
+ * The mechanism to limit the pack window memory size, when packing is
+   done using multiple threads (which is the default), is per-thread,
+   but this was not documented clearly.
+   (merge 954176c ms/document-pack-window-memory-is-per-thread later to maint).
+
+ * "import-tars" fast-import script (in contrib/) used to ignore a
+   hardlink target and replaced it with an empty file, which has been
+   corrected to record the same blob as the other file the hardlink is
+   shared with.
+   (merge 04e0869 js/import-tars-hardlinks later to maint).
+
+ * "git mv dir non-existing-dir/" did not work in some environments
+   the same way as existing mainstream platforms.  The code now moves
+   "dir" to "non-existing-dir", without relying on rename("A", "B/")
+   that strips the trailing slash of '/'.
+   (merge 189d035 js/mv-dir-to-new-directory later to maint).
+
+ * Other minor clean-ups and documentation updates
+   (merge 02a8cfa rs/merge-add-strategies-simplification later to maint).
+   (merge af4941d rs/merge-recursive-string-list-init later to maint).
+   (merge 1eb47f1 rs/use-strbuf-add-unique-abbrev later to maint).
diff --git a/Documentation/RelNotes/2.3.10.txt b/Documentation/RelNotes/2.3.10.txt
index 9d425d814d..20c2d2cacc 100644
--- a/Documentation/RelNotes/2.3.10.txt
+++ b/Documentation/RelNotes/2.3.10.txt
@@ -7,7 +7,7 @@ Fixes since v2.3.9
  * xdiff code we use to generate diffs is not prepared to handle
    extremely large files.  It uses "int" in many places, which can
    overflow if we have a very large number of lines or even bytes in
-   our input files, for example.  Cap the input size to soemwhere
+   our input files, for example.  Cap the input size to somewhere
    around 1GB for now.
 
  * Some protocols (like git-remote-ext) can execute arbitrary code
diff --git a/Documentation/RelNotes/2.4.10.txt b/Documentation/RelNotes/2.4.10.txt
index 8621199bc6..702d8d4e22 100644
--- a/Documentation/RelNotes/2.4.10.txt
+++ b/Documentation/RelNotes/2.4.10.txt
@@ -7,7 +7,7 @@ Fixes since v2.4.9
  * xdiff code we use to generate diffs is not prepared to handle
    extremely large files.  It uses "int" in many places, which can
    overflow if we have a very large number of lines or even bytes in
-   our input files, for example.  Cap the input size to soemwhere
+   our input files, for example.  Cap the input size to somewhere
    around 1GB for now.
 
  * Some protocols (like git-remote-ext) can execute arbitrary code
diff --git a/Documentation/RelNotes/2.5.4.txt b/Documentation/RelNotes/2.5.4.txt
index a5e8477a4a..b8a2f93ee7 100644
--- a/Documentation/RelNotes/2.5.4.txt
+++ b/Documentation/RelNotes/2.5.4.txt
@@ -7,7 +7,7 @@ Fixes since v2.5.4
  * xdiff code we use to generate diffs is not prepared to handle
    extremely large files.  It uses "int" in many places, which can
    overflow if we have a very large number of lines or even bytes in
-   our input files, for example.  Cap the input size to soemwhere
+   our input files, for example.  Cap the input size to somewhere
    around 1GB for now.
 
  * Some protocols (like git-remote-ext) can execute arbitrary code
diff --git a/Documentation/RelNotes/2.6.1.txt b/Documentation/RelNotes/2.6.1.txt
index 1e51363e3c..f37ea89cda 100644
--- a/Documentation/RelNotes/2.6.1.txt
+++ b/Documentation/RelNotes/2.6.1.txt
@@ -7,7 +7,7 @@ Fixes since v2.6
  * xdiff code we use to generate diffs is not prepared to handle
    extremely large files.  It uses "int" in many places, which can
    overflow if we have a very large number of lines or even bytes in
-   our input files, for example.  Cap the input size to soemwhere
+   our input files, for example.  Cap the input size to somewhere
    around 1GB for now.
 
  * Some protocols (like git-remote-ext) can execute arbitrary code
diff --git a/Documentation/RelNotes/2.9.0.txt b/Documentation/RelNotes/2.9.0.txt
new file mode 100644
index 0000000000..b61d36712f
--- /dev/null
+++ b/Documentation/RelNotes/2.9.0.txt
@@ -0,0 +1,512 @@
+Git 2.9 Release Notes
+=====================
+
+Backward compatibility notes
+----------------------------
+
+The end-user facing Porcelain level commands in the "git diff" and
+"git log" family by default enable the rename detection; you can still
+use "diff.renames" configuration variable to disable this.
+
+Merging two branches that have no common ancestor with "git merge" is
+by default forbidden now to prevent creating such an unusual merge by
+mistake.
+
+The output formats of "git log" that indents the commit log message by
+4 spaces now expands HT in the log message by default.  You can use
+the "--no-expand-tabs" option to disable this.
+
+"git commit-tree" plumbing command required the user to always sign
+its result when the user sets the commit.gpgsign configuration
+variable, which was an ancient mistake, which this release corrects.
+A script that drives commit-tree, if it relies on this mistake, now
+needs to read commit.gpgsign and pass the -S option as necessary.
+
+
+Updates since v2.8
+------------------
+
+UI, Workflows & Features
+
+ * Comes with git-multimail 1.3.1 (in contrib/).
+
+ * The end-user facing commands like "git diff" and "git log"
+   now enable the rename detection by default.
+
+ * The credential.helper configuration variable is cumulative and
+   there is no good way to override it from the command line.  As
+   a special case, giving an empty string as its value now serves
+   as the signal to clear the values specified in various files.
+
+ * A new "interactive.diffFilter" configuration can be used to
+   customize the diff shown in "git add -i" sessions.
+
+ * "git p4" now allows P4 author names to be mapped to Git author
+   names.
+
+ * "git rebase -x" can be used without passing "-i" option.
+
+ * "git -c credential.<var>=<value> submodule" can now be used to
+   propagate configuration variables related to credential helper
+   down to the submodules.
+
+ * "git tag" can create an annotated tag without explicitly given an
+   "-a" (or "-s") option (i.e. when a tag message is given).  A new
+   configuration variable, tag.forceSignAnnotated, can be used to tell
+   the command to create signed tag in such a situation.
+
+ * "git merge" used to allow merging two branches that have no common
+   base by default, which led to a brand new history of an existing
+   project created and then get pulled by an unsuspecting maintainer,
+   which allowed an unnecessary parallel history merged into the
+   existing project.  The command has been taught not to allow this by
+   default, with an escape hatch "--allow-unrelated-histories" option
+   to be used in a rare event that merges histories of two projects
+   that started their lives independently.
+
+ * "git pull" has been taught to pass the "--allow-unrelated-histories"
+   option to underlying "git merge".
+
+ * "git apply -v" learned to report paths in the patch that were
+   skipped via --include/--exclude mechanism or being outside the
+   current working directory.
+
+ * Shell completion (in contrib/) updates.
+
+ * The commit object name reported when "rebase -i" stops has been
+   shortened.
+
+ * "git worktree add" can be given "--no-checkout" option to only
+   create an empty worktree without checking out the files.
+
+ * "git mergetools" learned to drive ExamDiff.
+
+ * "git pull --rebase" learned "--[no-]autostash" option, so that
+   the rebase.autostash configuration variable set to true can be
+   overridden from the command line.
+
+ * When "git log" shows the log message indented by 4-spaces, the
+   remainder of a line after a HT does not align in the way the author
+   originally intended.  The command now expands tabs by default to help
+   such a case, and allows the users to override it with a new option,
+   "--no-expand-tabs".
+
+ * "git send-email" now uses a more readable timestamps when
+   formulating a message ID.
+
+ * "git rerere" can encounter two or more files with the same conflict
+   signature that have to be resolved in different ways, but there was
+   no way to record these separate resolutions.
+
+ * "git p4" learned to record P4 jobs in Git commit that imports from
+   the history in Perforce.
+
+ * "git describe --contains" often made a hard-to-justify choice of
+   tag to name a given commit, because it tried to come up
+   with a name with smallest number of hops from a tag, causing an old
+   commit whose close descendant that is recently tagged were not
+   described with respect to an old tag but with a newer tag.  It did
+   not help that its computation of "hop" count was further tweaked to
+   penalize being on a side branch of a merge.  The logic has been
+   updated to favor using the tag with the oldest tagger date, which
+   is a lot easier to explain to the end users: "We describe a commit
+   in terms of the (chronologically) oldest tag that contains the
+   commit."
+
+ * "git clone" learned the "--shallow-submodules" option.
+
+ * HTTP transport clients learned to throw extra HTTP headers at the
+   server, specified via http.extraHeader configuration variable.
+
+ * The "--compaction-heuristic" option to "git diff" family of
+   commands enables a heuristic to make the patch output more readable
+   by using a blank line as a strong hint that the contents before and
+   after it belong to logically separate units.  It is still
+   experimental.
+
+ * A new configuration variable core.hooksPath allows customizing
+   where the hook directory is.
+
+ * An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
+   submodule honor -c credential.* from command line, 2016-02-29)
+   turned out to be a convoluted no-op; implement what it wanted to do
+   correctly, and stop filtering settings given via "git -c var=val".
+
+ * "git commit --dry-run" reported "No, no, you cannot commit." in one
+   case where "git commit" would have allowed you to commit, and this
+   improves it a little bit ("git commit --dry-run --short" still does
+   not give you the correct answer, for example).  This is a stop-gap
+   measure in that "commit --short --dry-run" still gives an incorrect
+   result.
+
+ * The experimental "multiple worktree" feature gains more safety to
+   forbid operations on a branch that is checked out or being actively
+   worked on elsewhere, by noticing that e.g. it is being rebased.
+
+ * "git format-patch" learned a new "--base" option to record what
+   (public, well-known) commit the original series was built on in
+   its output.
+
+ * "git commit" learned to pay attention to the "commit.verbose"
+   configuration variable and act as if the "--verbose" option
+   was given from the command line.
+
+ * Updated documentation gives hints to GMail users with two-factor
+   auth enabled that they need app-specific-password when using
+   "git send-email".
+
+ * The manpage output of our documentation did not render well in
+   terminal; typeset literals in bold by default to make them stand
+   out more.
+
+ * The mark-up in the top-level README.md file has been updated to
+   typeset CLI command names differently from the body text.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * The embedded args argv-array in the child process is used to build
+   the command line to run pack-objects instead of using a separate
+   array of strings.
+
+ * A test for tags has been restructured so that more parts of it can
+   easily be run on a platform without a working GnuPG.
+
+ * The startup_info data, which records if we are working inside a
+   repository (among other things), are now uniformly available to Git
+   subcommand implementations, and Git avoids attempting to touch
+   references when we are not in a repository.
+
+ * The command line argument parser for "receive-pack" has been
+   rewritten to use parse-options.
+
+ * A major part of "git submodule update" has been ported to C to take
+   advantage of the recently added framework to run download tasks in
+   parallel.  Other updates to "git submodule" that move pieces of
+   logic to C continues.
+
+ * Rename bunch of tests on "git clone" for better organization.
+
+ * The tests that involve running httpd leaked the system-wide
+   configuration in /etc/gitconfig to the tested environment.
+
+ * Build updates for MSVC.
+
+ * The repository set-up sequence has been streamlined (the biggest
+   change is that there is no longer git_config_early()), so that we
+   do not attempt to look into refs/* when we know we do not have a
+   Git repository.
+
+ * Code restructuring around the "refs" API to prepare for pluggable
+   refs backends.
+
+ * Sources to many test helper binaries and the generated helpers
+   have been moved to t/helper/ subdirectory to reduce clutter at the
+   top level of the tree.
+
+ * Unify internal logic between "git tag -v" and "git verify-tag"
+   commands by making one directly call into the other.
+
+ * "merge-recursive" strategy incorrectly checked if a path that is
+   involved in its internal merge exists in the working tree.
+
+ * The test scripts for "git p4" (but not "git p4" implementation
+   itself) has been updated so that they would work even on a system
+   where the installed version of Python is python 3.
+
+ * As nobody maintains our in-tree git.spec.in and distros use their
+   own spec file, we stopped pretending that we support "make rpm".
+
+ * Move from "unsigned char[20]" to "struct object_id" continues.
+
+ * The code for warning_errno/die_errno has been refactored and a new
+   error_errno() reporting helper is introduced.
+   (merge 1da045f nd/error-errno later to maint).
+
+ * Running tests with '-x' option to trace the individual command
+   executions is a useful way to debug test scripts, but some tests
+   that capture the standard error stream and check what the command
+   said can be broken with the trace output mixed in.  When running
+   our tests under "bash", however, we can redirect the trace output
+   to another file descriptor to keep the standard error of programs
+   being tested intact.
+
+ * t0040 had too many unnecessary repetitions in its test data.  Teach
+   test-parse-options program so that a caller can tell what it
+   expects in its output, so that these repetitions can be cleaned up.
+
+ * Add perf test for "rebase -i".
+
+ * Common mistakes when writing gitlink: in our documentation are
+   found by "make check-docs".
+
+ * t9xxx series has been updated primarily for readability, while
+   fixing small bugs in it.  A few scripted Porcelain commands have
+   also been updated to fix possible bugs around their use of
+   "test -z" and "test -n".
+
+ * CI test was taught to run git-svn tests.
+
+ * "git cat-file --batch-all" has been sped up, by taking advantage
+   of the fact that it does not have to read a list of objects, in two
+   ways.
+
+ * test updates to make it more readable and maintainable.
+   (merge e6273f4 es/t1500-modernize later to maint).
+
+ * "make DEVELOPER=1" worked as expected; setting DEVELOPER=1 in
+   config.mak didn't.
+   (merge 51dd3e8 mm/makefile-developer-can-be-in-config-mak later to maint).
+
+ * The way how "submodule--helper list" signals unmatch error to its
+   callers has been updated.
+
+ * A bash-ism "local" has been removed from "git submodule" scripted
+   Porcelain.
+
+
+Also contains various documentation updates and code clean-ups.
+
+
+Fixes since v2.8
+----------------
+
+Unless otherwise noted, all the fixes since v2.8 in the maintenance
+track are contained in this release (see the maintenance releases'
+notes for details).
+
+ * "git config --get-urlmatch", unlike other variants of the "git
+   config --get" family, did not signal error with its exit status
+   when there was no matching configuration.
+
+ * The "--local-env-vars" and "--resolve-git-dir" options of "git
+   rev-parse" failed to work outside a repository when the command's
+   option parsing was rewritten in 1.8.5 era.
+
+ * "git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.
+
+ * Fetching of history by naming a commit object name directly didn't
+   work across remote-curl transport.
+
+ * A small memory leak in an error codepath has been plugged in xdiff
+   code.
+
+ * strbuf_getwholeline() did not NUL-terminate the buffer on certain
+   corner cases in its error codepath.
+
+ * "git mergetool" did not work well with conflicts that both sides
+   deleted.
+
+ * "git send-email" had trouble parsing alias file in mailrc format
+   when lines in it had trailing whitespaces on them.
+
+ * When "git merge --squash" stopped due to conflict, the concluding
+   "git commit" failed to read in the SQUASH_MSG that shows the log
+   messages from all the squashed commits.
+
+ * "git merge FETCH_HEAD" dereferenced NULL pointer when merging
+   nothing into an unborn history (which is arguably unusual usage,
+   which perhaps was the reason why nobody noticed it).
+
+ * When "git worktree" feature is in use, "git branch -d" allowed
+   deletion of a branch that is checked out in another worktree,
+   which was wrong.
+
+ * When "git worktree" feature is in use, "git branch -m" renamed a
+   branch that is checked out in another worktree without adjusting
+   the HEAD symbolic ref for the worktree.
+
+ * "git diff -M" used to work better when two originally identical
+   files A and B got renamed to X/A and X/B by pairing A to X/A and B
+   to X/B, but this was broken in the 2.0 timeframe.
+
+ * "git send-pack --all <there>" was broken when its command line
+   option parsing was written in the 2.6 timeframe.
+
+ * "git format-patch --help" showed `-s` and `--no-patch` as if these
+   are valid options to the command.  We already hide `--patch` option
+   from the documentation, because format-patch is about showing the
+   diff, and the documentation now hides these options as well.
+
+ * When running "git blame $path" with unnormalized data in the index
+   for the path, the data in the working tree was blamed, even though
+   "git add" would not have changed what is already in the index, due
+   to "safe crlf" that disables the line-end conversion.  It has been
+   corrected.
+
+ * A change back in version 2.7 to "git branch" broke display of a
+   symbolic ref in a non-standard place in the refs/ hierarchy (we
+   expect symbolic refs to appear in refs/remotes/*/HEAD to point at
+   the primary branch the remote has, and as .git/HEAD to point at the
+   branch we locally checked out).
+
+ * A partial rewrite of "git submodule" in the 2.7 timeframe changed
+   the way the gitdir: pointer in the submodules point at the real
+   repository location to use absolute paths by accident.  This has
+   been corrected.
+
+ * "git commit" misbehaved in a few minor ways when an empty message
+   is given via -m '', all of which has been corrected.
+
+ * Support for CRAM-MD5 authentication method in "git imap-send" did
+   not work well.
+
+ * Upcoming OpenSSL 1.1.0 will break compilation by updating a few API
+   elements we use in imap-send, which has been adjusted for the change.
+
+ * The socks5:// proxy support added back in 2.6.4 days was not aware
+   that socks5h:// proxies behave differently from socks5:// proxies.
+
+ * "git config" had a codepath that tried to pass a NULL to
+   printf("%s"), which nobody seems to have noticed.
+
+ * On Cygwin, object creation uses the "create a temporary and then
+   rename it to the final name" pattern, not "create a temporary,
+   hardlink it to the final name and then unlink the temporary"
+   pattern.
+
+   This is necessary to use Git on Windows shared directories, and is
+   already enabled for the MinGW and plain Windows builds.  It also
+   has been used in Cygwin packaged versions of Git for quite a while.
+   See http://thread.gmane.org/gmane.comp.version-control.git/291853
+
+ * "merge-octopus" strategy did not ensure that the index is clean
+   when merge begins.
+
+ * When "git merge" notices that the merge can be resolved purely at
+   the tree level (without having to merge blobs) and the resulting
+   tree happens to already exist in the object store, it forgot to
+   update the index, which left an inconsistent state that would
+   break later operations.
+
+ * "git submodule" reports the paths of submodules the command
+   recurses into, but these paths were incorrectly reported when
+   the command was not run from the root level of the superproject.
+
+ * The "user.useConfigOnly" configuration variable makes it an error
+   if users do not explicitly set user.name and user.email.  However,
+   its check was not done early enough and allowed another error to
+   trigger, reporting that the default value we guessed from the
+   system setting was unusable.  This was a suboptimal end-user
+   experience as we want the users to set user.name/user.email without
+   relying on the auto-detection at all.
+
+ * "git mv old new" did not adjust the path for a submodule that lives
+   as a subdirectory inside old/ directory correctly.
+
+ * "git replace -e" did not honour "core.editor" configuration.
+
+ * "git push" from a corrupt repository that attempts to push a large
+   number of refs deadlocked; the thread to relay rejection notices
+   for these ref updates blocked on writing them to the main thread,
+   after the main thread at the receiving end notices that the push
+   failed and decides not to read these notices and return a failure.
+
+ * mmap emulation on Windows has been optimized and work better without
+   consuming paging store when not needed.
+
+ * A question by "git send-email" to ask the identity of the sender
+   has been updated.
+
+ * UI consistency improvements for "git mergetool".
+
+ * "git rebase -m" could be asked to rebase an entire branch starting
+   from the root, but failed by assuming that there always is a parent
+   commit to the first commit on the branch.
+
+ * Fix a broken "p4 lfs" test.
+
+ * Recent update to Git LFS broke "git p4" by changing the output from
+   its "lfs pointer" subcommand.
+
+ * "git fetch" test t5510 was flaky while running a (forced) automagic
+   garbage collection.
+
+ * Documentation updates to help contributors setting up Travis CI
+   test for their patches.
+
+ * Some multi-byte encoding can have a backslash byte as a later part
+   of one letter, which would confuse "highlight" filter used in
+   gitweb.
+
+ * "git commit-tree" plumbing command required the user to always sign
+   its result when the user sets the commit.gpgsign configuration
+   variable, which was an ancient mistake.  Rework "git rebase" that
+   relied on this mistake so that it reads commit.gpgsign and pass (or
+   not pass) the -S option to "git commit-tree" to keep the end-user
+   expectation the same, while teaching "git commit-tree" to ignore
+   the configuration variable.  This will stop requiring the users to
+   sign commit objects used internally as an implementation detail of
+   "git stash".
+
+ * "http.cookieFile" configuration variable clearly wants a pathname,
+   but we forgot to treat it as such by e.g. applying tilde expansion.
+
+ * Consolidate description of tilde-expansion that is done to
+   configuration variables that take pathname to a single place.
+
+ * Correct faulty recommendation to use "git submodule deinit ." when
+   de-initialising all submodules, which would result in a strange
+   error message in a pathological corner case.
+
+ * Many 'linkgit:<git documentation page>' references were broken,
+   which are all fixed with this.
+
+ * "git rerere" can get confused by conflict markers deliberately left
+   by the inner merge step, because they are indistinguishable from
+   the real conflict markers left by the outermost merge which are
+   what the end user and "rerere" need to look at.  This was fixed by
+   making the conflict markers left by the inner merges a bit longer.
+   (merge 0f9fd5c jc/ll-merge-internal later to maint).
+
+ * CI test was taught to build documentation pages.
+
+ * "git fsck" learned to catch NUL byte in a commit object as
+   potential error and warn.
+
+ * Portability enhancement for "rebase -i" to help platforms whose
+   shell does not like "for i in <empty>" (which is not POSIX-kosher).
+
+ * On Windows, .git and optionally any files whose name starts with a
+   dot are now marked as hidden, with a core.hideDotFiles knob to
+   customize this behaviour.
+
+ * Documentation for "git merge --verify-signatures" has been updated
+   to clarify that the signature of only the commit at the tip is
+   verified.  Also the phrasing used for signature and key validity is
+   adjusted to align with that used by OpenPGP.
+
+ * A couple of bugs around core.autocrlf have been fixed.
+
+ * Many commands normalize command line arguments from NFD to NFC
+   variant of UTF-8 on OSX, but commands in the "diff" family did
+   not, causing "git diff $path" to complain that no such path is
+   known to Git.  They have been taught to do the normalization.
+
+ * "git difftool" learned to handle unmerged paths correctly in
+   dir-diff mode.
+
+ * The "are we talking with TTY, doing an interactive session?"
+   detection has been updated to work better for "Git for Windows".
+
+ * We forgot to add "git log --decorate=auto" to documentation when we
+   added the feature back in v2.1.0 timeframe.
+   (merge 462cbb4 rj/log-decorate-auto later to maint).
+
+ * "git fast-import --export-marks" would overwrite the existing marks
+   file even when it makes a dump from its custom die routine.
+   Prevent it from doing so when we have an import-marks file but
+   haven't finished reading it.
+   (merge f4beed6 fc/fast-import-broken-marks-file later to maint).
+
+ * "git rebase -i", after it fails to auto-resolve the conflict, had
+   an unnecessary call to "git rerere" from its very early days, which
+   was spotted recently; the call has been removed.
+   (merge 7063693 js/rebase-i-dedup-call-to-rerere later to maint).
+
+ * Other minor clean-ups and documentation updates
+   (merge cd82b7a pa/cherry-pick-doc-typo later to maint).
+   (merge 2bb73ae rs/patch-id-use-skip-prefix later to maint).
+   (merge aa20cbc rs/apply-name-terminate later to maint).
+   (merge fe17fc0 jc/t2300-setup later to maint).
+   (merge e256eec jk/shell-portability later to maint).
diff --git a/Documentation/RelNotes/2.9.1.txt b/Documentation/RelNotes/2.9.1.txt
new file mode 100644
index 0000000000..338394097e
--- /dev/null
+++ b/Documentation/RelNotes/2.9.1.txt
@@ -0,0 +1,117 @@
+Git v2.9.1 Release Notes
+========================
+
+Fixes since v2.9
+----------------
+
+ * When "git daemon" is run without --[init-]timeout specified, a
+   connection from a client that silently goes offline can hang around
+   for a long time, wasting resources.  The socket-level KEEPALIVE has
+   been enabled to allow the OS to notice such failed connections.
+
+ * The commands in `git log` family take %C(auto) in a custom format
+   string.  This unconditionally turned the color on, ignoring
+   --no-color or with --color=auto when the output is not connected to
+   a tty; this was corrected to make the format truly behave as
+   "auto".
+
+ * "git rev-list --count" whose walk-length is limited with "-n"
+   option did not work well with the counting optimized to look at the
+   bitmap index.
+
+ * "git show -W" (extend hunks to cover the entire function, delimited
+   by lines that match the "funcname" pattern) used to show the entire
+   file when a change added an entire function at the end of the file,
+   which has been fixed.
+
+ * The documentation set has been updated so that literal commands,
+   configuration variables and environment variables are consistently
+   typeset in fixed-width font and bold in manpages.
+
+ * "git svn propset" subcommand that was added in 2.3 days is
+   documented now.
+
+ * The documentation tries to consistently spell "GPG"; when
+   referring to the specific program name, "gpg" is used.
+
+ * "git reflog" stopped upon seeing an entry that denotes a branch
+   creation event (aka "unborn"), which made it appear as if the
+   reflog was truncated.
+
+ * The git-prompt scriptlet (in contrib/) was not friendly with those
+   who uses "set -u", which has been fixed.
+
+ * A codepath that used alloca(3) to place an unbounded amount of data
+   on the stack has been updated to avoid doing so.
+
+ * "git update-index --add --chmod=+x file" may be usable as an escape
+   hatch, but not a friendly thing to force for people who do need to
+   use it regularly.  "git add --chmod=+x file" can be used instead.
+
+ * Build improvements for gnome-keyring (in contrib/)
+
+ * "git status" used to say "working directory" when it meant "working
+   tree".
+
+ * Comments about misbehaving FreeBSD shells have been clarified with
+   the version number (9.x and before are broken, newer ones are OK).
+
+ * "git cherry-pick A" worked on an unborn branch, but "git
+   cherry-pick A..B" didn't.
+
+ * "git add -i/-p" learned to honor diff.compactionHeuristic
+   experimental knob, so that the user can work on the same hunk split
+   as "git diff" output.
+
+ * "log --graph --format=" learned that "%>|(N)" specifies the width
+   relative to the terminal's left edge, not relative to the area to
+   draw text that is to the right of the ancestry-graph section.  It
+   also now accepts negative N that means the column limit is relative
+   to the right border.
+
+ * The ownership rule for the piece of memory that hold references to
+   be fetched in "git fetch" was screwy, which has been cleaned up.
+
+ * "git bisect" makes an internal call to "git diff-tree" when
+   bisection finds the culprit, but this call did not initialize the
+   data structure to pass to the diff-tree API correctly.
+
+ * Formats of the various data (and how to validate them) where we use
+   GPG signature have been documented.
+
+ * Fix an unintended regression in v2.9 that breaks "clone --depth"
+   that recurses down to submodules by forcing the submodules to also
+   be cloned shallowly, which many server instances that host upstream
+   of the submodules are not prepared for.
+
+ * Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
+   to set the default value, without enclosing it in double quotes.
+
+ * Some platform-specific code had non-ANSI strict declarations of C
+   functions that do not take any parameters, which has been
+   corrected.
+
+ * The internal code used to show local timezone offset is not
+   prepared to handle timestamps beyond year 2100, and gave a
+   bogus offset value to the caller.  Use a more benign looking
+   +0000 instead and let "git log" going in such a case, instead
+   of aborting.
+
+ * One among four invocations of readlink(1) in our test suite has
+   been rewritten so that the test can run on systems without the
+   command (others are in valgrind test framework and t9802).
+
+ * t/perf needs /usr/bin/time with GNU extension; the invocation of it
+   is updated to "gtime" on Darwin.
+
+ * A bug, which caused "git p4" while running under verbose mode to
+   report paths that are omitted due to branch prefix incorrectly, has
+   been fixed; the command said "Ignoring file outside of prefix" for
+   paths that are _inside_.
+
+ * The top level documentation "git help git" still pointed at the
+   documentation set hosted at now-defunct google-code repository.
+   Update it to point to https://git.github.io/htmldocs/git.html
+   instead.
+
+Also contains minor documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.9.2.txt b/Documentation/RelNotes/2.9.2.txt
new file mode 100644
index 0000000000..2620003dcf
--- /dev/null
+++ b/Documentation/RelNotes/2.9.2.txt
@@ -0,0 +1,13 @@
+Git v2.9.2 Release Notes
+========================
+
+Fixes since v2.9.1
+------------------
+
+ * A fix merged to v2.9.1 had a few tests that are not meant to be
+   run on platforms without 64-bit long, which caused unnecessary
+   test failures on them because we didn't detect the platform and
+   skip them.  These tests are now skipped on platforms that they
+   are not applicable to.
+
+No other change is included in this update.
diff --git a/Documentation/RelNotes/2.9.3.txt b/Documentation/RelNotes/2.9.3.txt
new file mode 100644
index 0000000000..695b86f612
--- /dev/null
+++ b/Documentation/RelNotes/2.9.3.txt
@@ -0,0 +1,170 @@
+Git v2.9.3 Release Notes
+========================
+
+Fixes since v2.9.2
+------------------
+
+ * A helper function that takes the contents of a commit object and
+   finds its subject line did not ignore leading blank lines, as is
+   commonly done by other codepaths.  Make it ignore leading blank
+   lines to match.
+
+ * Git does not know what the contents in the index should be for a
+   path added with "git add -N" yet, so "git grep --cached" should not
+   show hits (or show lack of hits, with -L) in such a path, but that
+   logic does not apply to "git grep", i.e. searching in the working
+   tree files.  But we did so by mistake, which has been corrected.
+
+ * "git rebase -i --autostash" did not restore the auto-stashed change
+   when the operation was aborted.
+
+ * "git commit --amend --allow-empty-message -S" for a commit without
+   any message body could have misidentified where the header of the
+   commit object ends.
+
+ * More mark-up updates to typeset strings that are expected to
+   literally typed by the end user in fixed-width font.
+
+ * For a long time, we carried an in-code comment that said our
+   colored output would work only when we use fprintf/fputs on
+   Windows, which no longer is the case for the past few years.
+
+ * "gc.autoPackLimit" when set to 1 should not trigger a repacking
+   when there is only one pack, but the code counted poorly and did
+   so.
+
+ * One part of "git am" had an oddball helper function that called
+   stuff from outside "his" as opposed to calling what we have "ours",
+   which was not gender-neutral and also inconsistent with the rest of
+   the system where outside stuff is usuall called "theirs" in
+   contrast to "ours".
+
+ * The test framework learned a new helper test_match_signal to
+   check an exit code from getting killed by an expected signal.
+
+ * "git blame -M" missed a single line that was moved within the file.
+
+ * Fix recently introduced codepaths that are involved in parallel
+   submodule operations, which gave up on reading too early, and
+   could have wasted CPU while attempting to write under a corner
+   case condition.
+
+ * "git grep -i" has been taught to fold case in non-ascii locales
+   correctly.
+
+ * A test that unconditionally used "mktemp" learned that the command
+   is not necessarily available everywhere.
+
+ * "git blame file" allowed the lineage of lines in the uncommitted,
+   unadded contents of "file" to be inspected, but it refused when
+   "file" did not appear in the current commit.  When "file" was
+   created by renaming an existing file (but the change has not been
+   committed), this restriction was unnecessarily tight.
+
+ * "git add -N dir/file && git write-tree" produced an incorrect tree
+   when there are other paths in the same directory that sorts after
+   "file".
+
+ * "git fetch http://user:pass@host/repo..." scrubbed the userinfo
+   part, but "git push" didn't.
+
+ * An age old bug that caused "git diff --ignore-space-at-eol"
+   misbehave has been fixed.
+
+ * "git notes merge" had a code to see if a path exists (and fails if
+   it does) and then open the path for writing (when it doesn't).
+   Replace it with open with O_EXCL.
+
+ * "git pack-objects" and "git index-pack" mostly operate with off_t
+   when talking about the offset of objects in a packfile, but there
+   were a handful of places that used "unsigned long" to hold that
+   value, leading to an unintended truncation.
+
+ * Recent update to "git daemon" tries to enable the socket-level
+   KEEPALIVE, but when it is spawned via inetd, the standard input
+   file descriptor may not necessarily be connected to a socket.
+   Suppress an ENOTSOCK error from setsockopt().
+
+ * Recent FreeBSD stopped making perl available at /usr/bin/perl;
+   switch the default the built-in path to /usr/local/bin/perl on not
+   too ancient FreeBSD releases.
+
+ * "git status" learned to suggest "merge --abort" during a conflicted
+   merge, just like it already suggests "rebase --abort" during a
+   conflicted rebase.
+
+ * The .c/.h sources are marked as such in our .gitattributes file so
+   that "git diff -W" and friends would work better.
+
+ * Existing autoconf generated test for the need to link with pthread
+   library did not check all the functions from pthread libraries;
+   recent FreeBSD has some functions in libc but not others, and we
+   mistakenly thought linking with libc is enough when it is not.
+
+ * Allow http daemon tests in Travis CI tests.
+
+ * Users of the parse_options_concat() API function need to allocate
+   extra slots in advance and fill them with OPT_END() when they want
+   to decide the set of supported options dynamically, which makes the
+   code error-prone and hard to read.  This has been corrected by tweaking
+   the API to allocate and return a new copy of "struct option" array.
+
+ * The use of strbuf in "git rm" to build filename to remove was a bit
+   suboptimal, which has been fixed.
+
+ * "git commit --help" said "--no-verify" is only about skipping the
+   pre-commit hook, and failed to say that it also skipped the
+   commit-msg hook.
+
+ * "git merge" in Git v2.9 was taught to forbid merging an unrelated
+   lines of history by default, but that is exactly the kind of thing
+   the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
+   "git subtree" has been taught to use the "--allow-unrelated-histories"
+   option to override the default.
+
+ * The build procedure for "git persistent-https" helper (in contrib/)
+   has been updated so that it can be built with more recent versions
+   of Go.
+
+ * There is an optimization used in "git diff $treeA $treeB" to borrow
+   an already checked-out copy in the working tree when it is known to
+   be the same as the blob being compared, expecting that open/mmap of
+   such a file is faster than reading it from the object store, which
+   involves inflating and applying delta.  This however kicked in even
+   when the checked-out copy needs to go through the convert-to-git
+   conversion (including the clean filter), which defeats the whole
+   point of the optimization.  The optimization has been disabled when
+   the conversion is necessary.
+
+ * "git -c grep.patternType=extended log --basic-regexp" misbehaved
+   because the internal API to access the grep machinery was not
+   designed well.
+
+ * Windows port was failing some tests in t4130, due to the lack of
+   inum in the returned values by its lstat(2) emulation.
+
+ * The characters in the label shown for tags/refs for commits in
+   "gitweb" output are now properly escaped for proper HTML output.
+
+ * FreeBSD can lie when asked mtime of a directory, which made the
+   untracked cache code to fall back to a slow-path, which in turn
+   caused tests in t7063 to fail because it wanted to verify the
+   behaviour of the fast-path.
+
+ * Squelch compiler warnings for netmalloc (in compat/) library.
+
+ * The API documentation for hashmap was unclear if hashmap_entry
+   can be safely discarded without any other consideration.  State
+   that it is safe to do so.
+
+ * Not-so-recent rewrite of "git am" that started making internal
+   calls into the commit machinery had an unintended regression, in
+   that no matter how many seconds it took to apply many patches, the
+   resulting committer timestamp for the resulting commits were all
+   the same.
+
+ * "git difftool <paths>..." started in a subdirectory failed to
+   interpret the paths relative to that directory, which has been
+   fixed.
+
+Also contains minor documentation updates and code clean-ups.
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 02696208c9..0bcb6790d6 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -140,7 +140,7 @@ boolean::
        false;; Boolean false can be spelled as `no`, `off`,
 		`false`, or `0`.
 +
-When converting value to the canonical form using '--bool' type
+When converting value to the canonical form using `--bool` type
 specifier; 'git config' will ensure that the output is "true" or
 "false" (spelled in lowercase).
 
@@ -150,27 +150,34 @@ integer::
        1024", "by 1024x1024", etc.
 
 color::
-       The value for a variables that takes a color is a list of
-       colors (at most two) and attributes (at most one), separated
-       by spaces.  The colors accepted are `normal`, `black`,
-       `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and
-       `white`; the attributes are `bold`, `dim`, `ul`, `blink` and
-       `reverse`.  The first color given is the foreground; the
-       second is the background.  The position of the attribute, if
-       any, doesn't matter. Attributes may be turned off specifically
-       by prefixing them with `no` (e.g., `noreverse`, `noul`, etc).
-+
-Colors (foreground and background) may also be given as numbers between
-0 and 255; these use ANSI 256-color mode (but note that not all
-terminals may support this).  If your terminal supports it, you may also
-specify 24-bit RGB values as hex, like `#ff0ab3`.
-+
-The attributes are meant to be reset at the beginning of each item
-in the colored output, so setting color.decorate.branch to `black`
-will paint that branch name in a plain `black`, even if the previous
-thing on the same output line (e.g. opening parenthesis before the
-list of branch names in `log --decorate` output) is set to be
-painted with `bold` or some other attribute.
+       The value for a variable that takes a color is a list of
+       colors (at most two, one for foreground and one for background)
+       and attributes (as many as you want), separated by spaces.
++
+The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`,
+`blue`, `magenta`, `cyan` and `white`.  The first color given is the
+foreground; the second is the background.
++
+Colors may also be given as numbers between 0 and 255; these use ANSI
+256-color mode (but note that not all terminals may support this).  If
+your terminal supports it, you may also specify 24-bit RGB values as
+hex, like `#ff0ab3`.
++
+The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`,
+`italic`, and `strike` (for crossed-out or "strikethrough" letters).
+The position of any attributes with respect to the colors
+(before, after, or in between), doesn't matter. Specific attributes may
+be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`,
+`no-ul`, etc).
++
+For git's pre-defined color slots, the attributes are meant to be reset
+at the beginning of each item in the colored output. So setting
+`color.decorate.branch` to `black` will paint that branch name in a
+plain `black`, even if the previous thing on the same output line (e.g.
+opening parenthesis before the list of branch names in `log --decorate`
+output) is set to be painted with `bold` or some other attribute.
+However, custom log formats may do more complicated and layered
+coloring, and the negated forms may be useful there.
 
 pathname::
 	A variable that takes a pathname value can be given a
@@ -405,13 +412,11 @@ file with mixed line endings would be reported by the `core.safecrlf`
 mechanism.
 
 core.autocrlf::
-	Setting this variable to "true" is almost the same as setting
-	the `text` attribute to "auto" on all files except that text
-	files are not guaranteed to be normalized: files that contain
-	`CRLF` in the repository will not be touched.  Use this
-	setting if you want to have `CRLF` line endings in your
-	working directory even though the repository does not have
-	normalized line endings.  This variable can be set to 'input',
+	Setting this variable to "true" is the same as setting
+	the `text` attribute to "auto" on all files and core.eol to "crlf".
+	Set to true if you want to have `CRLF` line endings in your
+	working directory and the repository has LF line endings.
+	This variable can be set to 'input',
 	in which case no output conversion is performed.
 
 core.symlinks::
@@ -434,7 +439,7 @@ core.gitProxy::
 	may be set multiple times and is matched in the given order;
 	the first match wins.
 +
-Can be overridden by the 'GIT_PROXY_COMMAND' environment variable
+Can be overridden by the `GIT_PROXY_COMMAND` environment variable
 (which always applies universally, without the special "for"
 handling).
 +
@@ -443,6 +448,13 @@ specify that no proxy be used for a given domain pattern.
 This is useful for excluding servers inside a firewall from
 proxy use, while defaulting to a common proxy for external domains.
 
+core.sshCommand::
+	If this variable is set, `git fetch` and `git push` will
+	use the specified command instead of `ssh` when they need to
+	connect to a remote system. The command is in the same form as
+	the `GIT_SSH_COMMAND` environment variable and is overridden
+	when the environment variable is set.
+
 core.ignoreStat::
 	If true, Git will avoid using lstat() calls to detect if files have
 	changed by setting the "assume-unchanged" bit for those tracked files
@@ -478,10 +490,10 @@ false), while all other repositories are assumed to be bare (bare
 
 core.worktree::
 	Set the path to the root of the working tree.
-	If GIT_COMMON_DIR environment variable is set, core.worktree
+	If `GIT_COMMON_DIR` environment variable is set, core.worktree
 	is ignored and not used for determining the root of working tree.
-	This can be overridden by the GIT_WORK_TREE environment
-	variable and the '--work-tree' command-line option.
+	This can be overridden by the `GIT_WORK_TREE` environment
+	variable and the `--work-tree` command-line option.
 	The value can be an absolute path or relative to the path to
 	the .git directory, which is either specified by --git-dir
 	or GIT_DIR, or automatically discovered.
@@ -545,7 +557,7 @@ core.compression::
 	-1 is the zlib default. 0 means no compression,
 	and 1..9 are various speed/size tradeoffs, 9 being slowest.
 	If set, this provides a default to other compression variables,
-	such as 'core.looseCompression' and 'pack.compression'.
+	such as `core.looseCompression` and `pack.compression`.
 
 core.looseCompression::
 	An integer -1..9, indicating the compression level for objects that
@@ -619,9 +631,9 @@ core.excludesFile::
 core.askPass::
 	Some commands (e.g. svn and http interfaces) that interactively
 	ask for a password can be told to use an external program given
-	via the value of this variable. Can be overridden by the 'GIT_ASKPASS'
+	via the value of this variable. Can be overridden by the `GIT_ASKPASS`
 	environment variable. If not set, fall back to the value of the
-	'SSH_ASKPASS' environment variable or, failing that, a simple password
+	`SSH_ASKPASS` environment variable or, failing that, a simple password
 	prompt. The external program shall be given a suitable prompt as
 	command-line argument and write the password on its STDOUT.
 
@@ -633,6 +645,23 @@ core.attributesFile::
 	`$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either not
 	set or empty, `$HOME/.config/git/attributes` is used instead.
 
+core.hooksPath::
+	By default Git will look for your hooks in the
+	'$GIT_DIR/hooks' directory. Set this to different path,
+	e.g. '/etc/git/hooks', and Git will try to find your hooks in
+	that directory, e.g. '/etc/git/hooks/pre-receive' instead of
+	in '$GIT_DIR/hooks/pre-receive'.
++
+The path can be either absolute or relative. A relative path is
+taken as relative to the directory where the hooks are run (see
+the "DESCRIPTION" section of linkgit:githooks[5]).
++
+This configuration variable is useful in cases where you'd like to
+centrally configure your Git hooks instead of configuring them on a
+per-repository basis, or as a more flexible and centralized
+alternative to having an `init.templateDir` where you've changed
+default hooks.
+
 core.editor::
 	Commands such as `commit` and `tag` that lets you edit
 	messages by launching an editor uses the value of this
@@ -747,7 +776,7 @@ core.notesRef::
 	notes should be printed.
 +
 This setting defaults to "refs/notes/commits", and it can be overridden by
-the 'GIT_NOTES_REF' environment variable.  See linkgit:git-notes[1].
+the `GIT_NOTES_REF` environment variable.  See linkgit:git-notes[1].
 
 core.sparseCheckout::
 	Enable "sparse checkout" feature. See section "Sparse checkout" in
@@ -762,7 +791,7 @@ core.abbrev::
 add.ignoreErrors::
 add.ignore-errors (deprecated)::
 	Tells 'git add' to continue adding files when some files cannot be
-	added due to indexing errors. Equivalent to the '--ignore-errors'
+	added due to indexing errors. Equivalent to the `--ignore-errors`
 	option of linkgit:git-add[1].  `add.ignore-errors` is deprecated,
 	as it does not follow the usual naming convention for configuration
 	variables.
@@ -783,14 +812,14 @@ it will be treated as a shell command.  For example, defining
 "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].
 
 am.keepcr::
 	If true, git-am will call git-mailsplit for patches in mbox format
-	with parameter '--keep-cr'. In this case git-mailsplit will
+	with parameter `--keep-cr`. In this case git-mailsplit will
 	not remove `\r` from lines ending with `\r\n`. Can be overridden
-	by giving '--no-keep-cr' from the command line.
+	by giving `--no-keep-cr` from the command line.
 	See linkgit:git-am[1], linkgit:git-mailsplit[1].
 
 am.threeWay::
@@ -803,7 +832,7 @@ am.threeWay::
 
 apply.ignoreWhitespace::
 	When set to 'change', tells 'git apply' to ignore changes in
-	whitespace, in the same way as the '--ignore-space-change'
+	whitespace, in the same way as the `--ignore-space-change`
 	option.
 	When set to one of: no, none, never, false tells 'git apply' to
 	respect all whitespace differences.
@@ -811,7 +840,7 @@ apply.ignoreWhitespace::
 
 apply.whitespace::
 	Tells 'git apply' how to handle whitespaces, in the same way
-	as the '--whitespace' option. See linkgit:git-apply[1].
+	as the `--whitespace` option. See linkgit:git-apply[1].
 
 branch.autoSetupMerge::
 	Tells 'git branch' and 'git checkout' to set up new branches
@@ -913,7 +942,7 @@ browser.<tool>.cmd::
 
 browser.<tool>.path::
 	Override the path for the given tool that may be used to
-	browse HTML help (see '-w' option in linkgit:git-help[1]) or a
+	browse HTML help (see `-w` option in linkgit:git-help[1]) or a
 	working repository in gitweb (see linkgit:git-instaweb[1]).
 
 clean.requireForce::
@@ -1124,11 +1153,16 @@ commit.template::
 	Specify the pathname of a file to use as the template for
 	new commit messages.
 
+commit.verbose::
+	A boolean or int to specify the level of verbose with `git commit`.
+	See linkgit:git-commit[1].
+
 credential.helper::
 	Specify an external helper to be called when a username or
 	password credential is needed; the helper may consult external
-	storage to avoid prompting the user for the credentials. See
-	linkgit:gitcredentials[7] for details.
+	storage to avoid prompting the user for the credentials. Note
+	that multiple helpers may be defined. See linkgit:gitcredentials[7]
+	for details.
 
 credential.useHttpPath::
 	When acquiring credentials, consider the "path" component of an http
@@ -1167,6 +1201,15 @@ difftool.<tool>.cmd::
 difftool.prompt::
 	Prompt before each invocation of the diff tool.
 
+fastimport.unpackLimit::
+	If the number of objects imported by linkgit:git-fast-import[1]
+	is below this limit, then the objects will be unpacked into
+	loose object files.  However if the number of imported objects
+	equals or exceeds this limit then the pack will be stored as a
+	pack.  Storing the pack from a fast-import can make the import
+	operation complete faster, especially on slow filesystems.  If
+	not set, the value of `transfer.unpackLimit` is used instead.
+
 fetch.recurseSubmodules::
 	This option can be either set to a boolean value or to 'on-demand'.
 	Setting it to a boolean changes the behavior of fetch and pull to
@@ -1198,6 +1241,11 @@ fetch.prune::
 	If true, fetch will automatically behave as if the `--prune`
 	option was given on the command line.  See also `remote.<name>.prune`.
 
+fetch.output::
+	Control how ref update status is printed. Valid values are
+	`full` and `compact`. Default value is `full`. See section
+	OUTPUT in linkgit:git-fetch[1] for detail.
+
 format.attach::
 	Enable multipart/mixed attachments as the default for
 	'format-patch'.  The value can also be a double quoted string
@@ -1205,6 +1253,16 @@ format.attach::
 	value as the boundary.  See the --attach option in
 	linkgit:git-format-patch[1].
 
+format.from::
+	Provides the default value for the `--from` option to format-patch.
+	Accepts a boolean value, or a name and email address.  If false,
+	format-patch defaults to `--no-from`, using commit authors directly in
+	the "From:" field of patch mails.  If true, format-patch defaults to
+	`--from`, using your committer identity in the "From:" field of patch
+	mails and including a "From:" field in the body of the patch mail if
+	different.  If set to a non-boolean value, format-patch uses that
+	value instead of your committer identity.  Defaults to false.
+
 format.numbered::
 	A boolean which can enable or disable sequence numbers in patch
 	subjects.  It defaults to "auto" which enables it only if there
@@ -1272,6 +1330,10 @@ format.outputDirectory::
 	Set a custom directory to store the resulting files instead of the
 	current working directory.
 
+format.useAutoBase::
+	A boolean value which lets you enable the `--base=auto` option of
+	format-patch by default.
+
 filter.<driver>.clean::
 	The command which is used to convert the content of a worktree
 	file to a blob upon checkin.  See linkgit:gitattributes[5] for
@@ -1394,24 +1456,24 @@ gitcvs.logFile::
 
 gitcvs.usecrlfattr::
 	If true, the server will look up the end-of-line conversion
-	attributes for files to determine the '-k' modes to use. If
+	attributes for files to determine the `-k` modes to use. If
 	the attributes force Git to treat a file as text,
-	the '-k' mode will be left blank so CVS clients will
+	the `-k` mode will be left blank so CVS clients will
 	treat it as text. If they suppress text conversion, the file
 	will be set with '-kb' mode, which suppresses any newline munging
 	the client might otherwise do. If the attributes do not allow
-	the file type to be determined, then 'gitcvs.allBinary' is
+	the file type to be determined, then `gitcvs.allBinary` is
 	used. See linkgit:gitattributes[5].
 
 gitcvs.allBinary::
-	This is used if 'gitcvs.usecrlfattr' does not resolve
+	This is used if `gitcvs.usecrlfattr` does not resolve
 	the correct '-kb' mode to use. If true, all
 	unresolved files are sent to the client in
 	mode '-kb'. This causes the client to treat them
 	as binary files, which suppresses any newline munging it
 	otherwise might do. Alternatively, if it is set to "guess",
 	then the contents of the file are examined to decide if
-	it is binary, similar to 'core.autocrlf'.
+	it is binary, similar to `core.autocrlf`.
 
 gitcvs.dbName::
 	Database used by git-cvsserver to cache revision information
@@ -1430,7 +1492,7 @@ gitcvs.dbDriver::
 	See linkgit:git-cvsserver[1].
 
 gitcvs.dbUser, gitcvs.dbPass::
-	Database user and password. Only useful if setting 'gitcvs.dbDriver',
+	Database user and password. Only useful if setting `gitcvs.dbDriver`,
 	since SQLite has no concept of database users and/or passwords.
 	'gitcvs.dbUser' supports variable substitution (see
 	linkgit:git-cvsserver[1] for details).
@@ -1442,8 +1504,8 @@ gitcvs.dbTableNamePrefix::
 	linkgit:git-cvsserver[1] for details).  Any non-alphabetic
 	characters will be replaced with underscores.
 
-All gitcvs variables except for 'gitcvs.usecrlfattr' and
-'gitcvs.allBinary' can also be specified as
+All gitcvs variables except for `gitcvs.usecrlfattr` and
+`gitcvs.allBinary` can also be specified as
 'gitcvs.<access_method>.<varname>' (where 'access_method'
 is one of "ext" and "pserver") to make them apply only for the given
 access method.
@@ -1466,17 +1528,17 @@ gitweb.snapshot::
 	See linkgit:gitweb.conf[5] for description.
 
 grep.lineNumber::
-	If set to true, enable '-n' option by default.
+	If set to true, enable `-n` option by default.
 
 grep.patternType::
 	Set the default matching behavior. Using a value of 'basic', 'extended',
-	'fixed', or 'perl' will enable the '--basic-regexp', '--extended-regexp',
-	'--fixed-strings', or '--perl-regexp' option accordingly, while the
+	'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`,
+	`--fixed-strings`, or `--perl-regexp` option accordingly, while the
 	value 'default' will return to the default matching behavior.
 
 grep.extendedRegexp::
-	If set to true, enable '--extended-regexp' option by default. This
-	option is ignored when the 'grep.patternType' option is set to a value
+	If set to true, enable `--extended-regexp` option by default. This
+	option is ignored when the `grep.patternType` option is set to a value
 	other than 'default'.
 
 grep.threads::
@@ -1561,7 +1623,7 @@ guitool.<name>.cmd::
 	of the linkgit:git-gui[1] `Tools` menu is invoked. This option is
 	mandatory for every tool. The command is executed from the root of
 	the working directory, and in the environment it receives the name of
-	the tool as 'GIT_GUITOOL', the name of the currently selected file as
+	the tool as `GIT_GUITOOL`, the name of the currently selected file as
 	'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if
 	the head is detached, 'CUR_BRANCH' is empty).
 
@@ -1582,7 +1644,7 @@ guitool.<name>.confirm::
 
 guitool.<name>.argPrompt::
 	Request a string argument from the user, and pass it to the tool
-	through the 'ARGS' environment variable. Since requesting an
+	through the `ARGS` environment variable. Since requesting an
 	argument implies confirmation, the 'confirm' option has no effect
 	if this is enabled. If the option is set to 'true', 'yes', or '1',
 	the dialog uses a built-in generic prompt; otherwise the exact
@@ -1590,7 +1652,7 @@ guitool.<name>.argPrompt::
 
 guitool.<name>.revPrompt::
 	Request a single valid revision from the user, and set the
-	'REVISION' environment variable. In other aspects this option
+	`REVISION` environment variable. In other aspects this option
 	is similar to 'argPrompt', and can be used together with it.
 
 guitool.<name>.revUnmerged::
@@ -1646,7 +1708,7 @@ http.proxyAuthMethod::
 	only takes effect if the configured proxy string contains a user name part
 	(i.e. is of the form 'user@host' or 'user@host:port'). This can be
 	overridden on a per-remote basis; see `remote.<name>.proxyAuthMethod`.
-	Both can be overridden by the 'GIT_HTTP_PROXY_AUTHMETHOD' environment
+	Both can be overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment
 	variable.  Possible values are:
 +
 --
@@ -1668,6 +1730,12 @@ http.emptyAuth::
 	a username in the URL, as libcurl normally requires a username for
 	authentication.
 
+http.extraHeader::
+	Pass an additional HTTP header when communicating with a server.  If
+	more than one such entry exists, all of them are added as extra
+	headers.  To allow overriding the settings inherited from the system
+	config, an empty value will reset the extra headers to the empty list.
+
 http.cookieFile::
 	The pathname of a file containing previously stored cookie lines,
 	which should be used
@@ -1699,9 +1767,9 @@ http.sslVersion::
 	- tlsv1.2
 
 +
-Can be overridden by the 'GIT_SSL_VERSION' environment variable.
+Can be overridden by the `GIT_SSL_VERSION` environment variable.
 To force git to use libcurl's default ssl version and ignore any
-explicit http.sslversion option, set 'GIT_SSL_VERSION' to the
+explicit http.sslversion option, set `GIT_SSL_VERSION` to the
 empty string.
 
 http.sslCipherList::
@@ -1712,41 +1780,41 @@ http.sslCipherList::
   option; see the libcurl documentation for more details on the format
   of this list.
 +
-Can be overridden by the 'GIT_SSL_CIPHER_LIST' environment variable.
+Can be overridden by the `GIT_SSL_CIPHER_LIST` environment variable.
 To force git to use libcurl's default cipher list and ignore any
-explicit http.sslCipherList option, set 'GIT_SSL_CIPHER_LIST' to the
+explicit http.sslCipherList option, set `GIT_SSL_CIPHER_LIST` to the
 empty string.
 
 http.sslVerify::
 	Whether to verify the SSL certificate when fetching or pushing
-	over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment
+	over HTTPS. Can be overridden by the `GIT_SSL_NO_VERIFY` environment
 	variable.
 
 http.sslCert::
 	File containing the SSL certificate when fetching or pushing
-	over HTTPS. Can be overridden by the 'GIT_SSL_CERT' environment
+	over HTTPS. Can be overridden by the `GIT_SSL_CERT` environment
 	variable.
 
 http.sslKey::
 	File containing the SSL private key when fetching or pushing
-	over HTTPS. Can be overridden by the 'GIT_SSL_KEY' environment
+	over HTTPS. Can be overridden by the `GIT_SSL_KEY` environment
 	variable.
 
 http.sslCertPasswordProtected::
 	Enable Git's password prompt for the SSL certificate.  Otherwise
 	OpenSSL will prompt the user, possibly many times, if the
 	certificate or private key is encrypted.  Can be overridden by the
-	'GIT_SSL_CERT_PASSWORD_PROTECTED' environment variable.
+	`GIT_SSL_CERT_PASSWORD_PROTECTED` environment variable.
 
 http.sslCAInfo::
 	File containing the certificates to verify the peer with when
 	fetching or pushing over HTTPS. Can be overridden by the
-	'GIT_SSL_CAINFO' environment variable.
+	`GIT_SSL_CAINFO` environment variable.
 
 http.sslCAPath::
 	Path containing files with the CA certificates to verify the peer
 	with when fetching or pushing over HTTPS. Can be overridden
-	by the 'GIT_SSL_CAPATH' environment variable.
+	by the `GIT_SSL_CAPATH` environment variable.
 
 http.pinnedpubkey::
 	Public key of the https service. It may either be the filename of
@@ -1766,7 +1834,7 @@ http.sslTry::
 
 http.maxRequests::
 	How many HTTP requests to launch in parallel. Can be overridden
-	by the 'GIT_HTTP_MAX_REQUESTS' environment variable. Default is 5.
+	by the `GIT_HTTP_MAX_REQUESTS` environment variable. Default is 5.
 
 http.minSessions::
 	The number of curl sessions (counted across slots) to be kept across
@@ -1785,13 +1853,13 @@ http.postBuffer::
 http.lowSpeedLimit, http.lowSpeedTime::
 	If the HTTP transfer speed is less than 'http.lowSpeedLimit'
 	for longer than 'http.lowSpeedTime' seconds, the transfer is aborted.
-	Can be overridden by the 'GIT_HTTP_LOW_SPEED_LIMIT' and
-	'GIT_HTTP_LOW_SPEED_TIME' environment variables.
+	Can be overridden by the `GIT_HTTP_LOW_SPEED_LIMIT` and
+	`GIT_HTTP_LOW_SPEED_TIME` environment variables.
 
 http.noEPSV::
 	A boolean which disables using of EPSV ftp command by curl.
 	This can helpful with some "poor" ftp servers which don't
-	support EPSV mode. Can be overridden by the 'GIT_CURL_FTP_NO_EPSV'
+	support EPSV mode. Can be overridden by the `GIT_CURL_FTP_NO_EPSV`
 	environment variable. Default is false (curl will use EPSV).
 
 http.userAgent::
@@ -1801,7 +1869,7 @@ http.userAgent::
 	such as Mozilla/4.0.  This may be necessary, for instance, if
 	connecting through a firewall that restricts HTTP connections to a set
 	of common USER_AGENT strings (but not including those like git/1.7.1).
-	Can be overridden by the 'GIT_HTTP_USER_AGENT' environment variable.
+	Can be overridden by the `GIT_HTTP_USER_AGENT` environment variable.
 
 http.<url>.*::
 	Any of the http.* options above can be applied selectively to some URLs.
@@ -1901,6 +1969,14 @@ interactive.singleKey::
 	setting is silently ignored if portable keystroke input
 	is not available; requires the Perl module Term::ReadKey.
 
+interactive.diffFilter::
+	When an interactive command (such as `git add --patch`) shows
+	a colorized diff, git will pipe the diff through the shell
+	command defined by this configuration variable. The command may
+	mark up the diff further for human consumption, provided that it
+	retains a one-to-one correspondence with the lines in the
+	original diff. Defaults to disabled (no filtering).
+
 log.abbrevCommit::
 	If true, makes linkgit:git-log[1], linkgit:git-show[1], and
 	linkgit:git-whatchanged[1] assume `--abbrev-commit`. You may
@@ -1916,7 +1992,10 @@ log.decorate::
 	command. If 'short' is specified, the ref name prefixes 'refs/heads/',
 	'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is
 	specified, the full ref name (including prefix) will be printed.
-	This is the same as the log commands '--decorate' option.
+	If 'auto' is specified, then if the output is going to a terminal,
+	the ref names are shown as if 'short' were given, otherwise no ref
+	names are shown. This is the same as the `--decorate` option
+	of the `git log`.
 
 log.follow::
 	If `true`, `git log` will act as if the `--follow` option was used when
@@ -2298,16 +2377,16 @@ new default).
 --
 
 push.followTags::
-	If set to true enable '--follow-tags' option by default.  You
+	If set to true enable `--follow-tags` option by default.  You
 	may override this configuration at time of push by specifying
-	'--no-follow-tags'.
+	`--no-follow-tags`.
 
 push.gpgSign::
 	May be set to a boolean value, or the string 'if-asked'. A true
-	value causes all pushes to be GPG signed, as if '--signed' is
+	value causes all pushes to be GPG signed, as if `--signed` is
 	passed to linkgit:git-push[1]. The string 'if-asked' causes
 	pushes to be signed if the server supports it, as if
-	'--signed=if-asked' is passed to 'git push'. A false value may
+	`--signed=if-asked` is passed to 'git push'. A false value may
 	override a value from a lower-priority config file. An explicit
 	command-line flag always overrides this config option.
 
@@ -2330,7 +2409,7 @@ rebase.stat::
 	rebase. False by default.
 
 rebase.autoSquash::
-	If set to true enable '--autosquash' option by default.
+	If set to true enable `--autosquash` option by default.
 
 rebase.autoStash::
 	When set to true, automatically create a temporary stash
@@ -2358,8 +2437,13 @@ rebase.instructionFormat
 
 receive.advertiseAtomic::
 	By default, git-receive-pack will advertise the atomic push
-	capability to its clients. If you don't want to this capability
-	to be advertised, set this variable to false.
+	capability to its clients. If you don't want to advertise this
+	capability, set this variable to false.
+
+receive.advertisePushOptions::
+	By default, git-receive-pack will advertise the push options
+	capability to its clients. If you don't want to advertise this
+	capability, set this variable to false.
 
 receive.autogc::
 	By default, git-receive-pack will run "git-gc --auto" after
@@ -2414,6 +2498,15 @@ receive.fsck.skipList::
 	can be safely ignored such as invalid committer email addresses.
 	Note: corrupt objects cannot be skipped with this setting.
 
+receive.keepAlive::
+	After receiving the pack from the client, `receive-pack` may
+	produce no output (if `--quiet` was specified) while processing
+	the pack, causing some networks to drop the TCP connection.
+	With this option set, if `receive-pack` does not transmit
+	any data in this phase for `receive.keepAlive` seconds, it will
+	send a short keepalive packet.  The default is 5 seconds; set
+	to 0 to disable keepalives entirely.
+
 receive.unpackLimit::
 	If the number of objects received in a push is below this
 	limit then the objects will be unpacked into loose object
@@ -2587,7 +2680,7 @@ sendemail.identity::
 	A configuration identity. When given, causes values in the
 	'sendemail.<identity>' subsection to take precedence over
 	values in the 'sendemail' section. The default identity is
-	the value of 'sendemail.identity'.
+	the value of `sendemail.identity`.
 
 sendemail.smtpEncryption::
 	See linkgit:git-send-email[1] for description.  Note that this
@@ -2604,7 +2697,7 @@ sendemail.<identity>.*::
 	Identity-specific versions of the 'sendemail.*' parameters
 	found below, taking precedence over those when the this
 	identity is selected, through command-line or
-	'sendemail.identity'.
+	`sendemail.identity`.
 
 sendemail.aliasesFile::
 sendemail.aliasFileType::
@@ -2634,7 +2727,7 @@ sendemail.xmailer::
 	See linkgit:git-send-email[1] for description.
 
 sendemail.signedoffcc (deprecated)::
-	Deprecated alias for 'sendemail.signedoffbycc'.
+	Deprecated alias for `sendemail.signedoffbycc`.
 
 showbranch.default::
 	The default set of branches for linkgit:git-show-branch[1].
@@ -2748,6 +2841,17 @@ submodule.<name>.ignore::
 	"--ignore-submodules" option. The 'git submodule' commands are not
 	affected by this setting.
 
+submodule.fetchJobs::
+	Specifies how many submodules are fetched/cloned at the same time.
+	A positive integer allows up to that number of submodules fetched
+	in parallel. A value of 0 will give some reasonable default.
+	If unset, it defaults to 1.
+
+tag.forceSignAnnotated::
+	A boolean to specify whether annotated tags created should be GPG signed.
+	If `--annotate` is specified on the command line, it takes
+	precedence over this option.
+
 tag.sort::
 	This variable controls the sort ordering of tags when displayed by
 	linkgit:git-tag[1]. Without the "--sort=<value>" option provided, the
@@ -2829,6 +2933,21 @@ uploadpack.keepAlive::
 	`uploadpack.keepAlive` seconds. Setting this option to 0
 	disables keepalive packets entirely. The default is 5 seconds.
 
+uploadpack.packObjectsHook::
+	If this option is set, when `upload-pack` would run
+	`git pack-objects` to create a packfile for a client, it will
+	run this shell command instead.  The `pack-objects` command and
+	arguments it _would_ have run (including the `git pack-objects`
+	at the beginning) are appended to the shell command. The stdin
+	and stdout of the hook are treated as if `pack-objects` itself
+	was run. I.e., `upload-pack` will feed input intended for
+	`pack-objects` to the hook, and expects a completed packfile on
+	stdout.
++
+Note that this configuration variable is ignored if it is seen in the
+repository-level config (this is a safety measure against fetching from
+untrusted repositories).
+
 url.<base>.insteadOf::
 	Any URL that starts with this value will be rewritten to
 	start, instead, with <base>. In cases where some site serves a
@@ -2855,17 +2974,17 @@ url.<base>.pushInsteadOf::
 
 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].
+	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'
+	Can be overridden by the `GIT_AUTHOR_NAME` and `GIT_COMMITTER_NAME`
 	environment variables.  See linkgit:git-commit-tree[1].
 
 user.useConfigOnly::
-	Instruct Git to avoid trying to guess defaults for 'user.email'
-	and 'user.name', and instead retrieve the values only from the
+	Instruct Git to avoid trying to guess defaults for `user.email`
+	and `user.name`, and instead retrieve the values only from the
 	configuration. For example, if you have multiple email addresses
 	and would like to use a different one for each repository, then
 	with this configuration option set to `true` in the global config
diff --git a/Documentation/date-formats.txt b/Documentation/date-formats.txt
index ccd1fc8122..35e8da2010 100644
--- a/Documentation/date-formats.txt
+++ b/Documentation/date-formats.txt
@@ -1,7 +1,7 @@
 DATE FORMATS
 ------------
 
-The GIT_AUTHOR_DATE, GIT_COMMITTER_DATE environment variables
+The `GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE` environment variables
 ifdef::git-commit[]
 and the `--date` option
 endif::git-commit[]
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 6eaa45271c..d5a5b17d50 100644
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -75,7 +75,7 @@ diff.ignoreSubmodules::
 	commands such as 'git diff-files'. 'git checkout' also honors
 	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
+	and 'git status' when `status.submoduleSummary` is set unless it is
 	overridden by using the --ignore-submodules command-line option.
 	The 'git submodule' commands are not affected by this setting.
 
@@ -105,12 +105,16 @@ diff.orderFile::
 
 diff.renameLimit::
 	The number of files to consider when performing the copy/rename
-	detection; equivalent to the 'git diff' option '-l'.
+	detection; equivalent to the 'git diff' option `-l`.
 
 diff.renames::
-	Tells Git to detect renames.  If set to any boolean value, it
-	will enable basic rename detection.  If set to "copies" or
-	"copy", it will detect copies, as well.
+	Whether and how Git detects renames.  If set to "false",
+	rename detection is disabled. If set to "true", basic rename
+	detection is enabled.  If set to "copies" or "copy", Git will
+	detect copies, as well.  Defaults to true.  Note that this
+	affects only 'git diff' Porcelain like linkgit:git-diff[1] and
+	linkgit:git-log[1], and not lower level commands such as
+	linkgit:git-diff-files[1].
 
 diff.suppressBlankEmpty::
 	A boolean to inhibit the standard behavior of printing a space
@@ -166,6 +170,11 @@ diff.tool::
 
 include::mergetools-diff.txt[]
 
+diff.compactionHeuristic::
+	Set this option to `true` to enable an experimental heuristic that
+	shifts the hunk boundary in an attempt to make the resulting
+	patch easier to read.
+
 diff.algorithm::
 	Choose a diff algorithm.  The variants are as follows:
 +
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 85b08909ce..cf5262622f 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -46,11 +46,11 @@ That is, from the left to the right:
 . sha1 for "dst"; 0\{40\} if creation, unmerged or "look at work tree".
 . a space.
 . status, followed by optional "score" number.
-. a tab or a NUL when '-z' option is used.
+. a tab or a NUL when `-z` option is used.
 . path for "src"
-. a tab or a NUL when '-z' option is used; only exists for C or R.
+. a tab or a NUL when `-z` option is used; only exists for C or R.
 . path for "dst"; only exists for C or R.
-. an LF or a NUL when '-z' option is used, to terminate the record.
+. an LF or a NUL when `-z` option is used, to terminate the record.
 
 Possible status letters are:
 
@@ -86,7 +86,7 @@ diff format for merges
 ----------------------
 
 "git-diff-tree", "git-diff-files" and "git-diff --raw"
-can take '-c' or '--cc' option
+can take `-c` or `--cc` option
 to generate diff output also for merge commits.  The output differs
 from the format described above in the following way:
 
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index bcf54da82a..d2a7ff56e8 100644
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -2,11 +2,11 @@ Generating patches with -p
 --------------------------
 
 When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
-with a '-p' option, "git diff" without the '--raw' option, or
+with a `-p` option, "git diff" without the `--raw` option, or
 "git log" with the "-p" option, they
 do not produce the output described above; instead they produce a
 patch file.  You can customize the creation of such patches via the
-GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.
+`GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables.
 
 What the -p option produces is slightly different from the traditional
 diff format:
@@ -114,11 +114,11 @@ index fabadb8,cc95eb0..4866510
 ------------
 
 1.   It is preceded with a "git diff" header, that looks like
-     this (when '-c' option is used):
+     this (when `-c` option is used):
 
        diff --combined file
 +
-or like this (when '--cc' option is used):
+or like this (when `--cc` option is used):
 
        diff --cc file
 
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 3cb301556e..705a873942 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -63,6 +63,13 @@ ifndef::git-format-patch[]
 	Synonym for `-p --raw`.
 endif::git-format-patch[]
 
+--compaction-heuristic::
+--no-compaction-heuristic::
+	These are to help debugging and tuning an experimental
+	heuristic (which is off by default) that shifts the hunk
+	boundary in an attempt to make the resulting patch easier
+	to read.
+
 --minimal::
 	Spend extra time to make sure the smallest possible
 	diff is produced.
@@ -412,6 +419,9 @@ ifndef::git-format-patch[]
 	paths are selected if there is any file that matches
 	other criteria in the comparison; if there is no file
 	that matches other criteria, nothing is selected.
++
+Also, these upper-case letters can be downcased to exclude.  E.g.
+`--diff-filter=ad` excludes added and deleted paths.
 
 -S<string>::
 	Look for differences that change the number of occurrences of
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 036edfb099..9eab1f5fa4 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -52,7 +52,7 @@ ifndef::git-pull[]
 
 -p::
 --prune::
-	After fetching, remove any remote-tracking references that no
+	Before fetching, remove any remote-tracking references that no
 	longer exist on the remote.  Tags are not subject to pruning
 	if they are fetched only because of the default tag
 	auto-following or due to a --tags option.  However, if tags
@@ -88,7 +88,7 @@ ifndef::git-pull[]
 	to whatever else would otherwise be fetched.  Using this
 	option alone does not subject tags to pruning, even if --prune
 	is used (though tags may be pruned anyway if they are also the
-	destination of an explicit refspec; see '--prune').
+	destination of an explicit refspec; see `--prune`).
 
 --recurse-submodules[=yes|on-demand|no]::
 	This option controls if and under what conditions new commits of
@@ -110,7 +110,7 @@ ifndef::git-pull[]
 
 --no-recurse-submodules::
 	Disable recursive fetching of submodules (this has the same effect as
-	using the '--recurse-submodules=no' option).
+	using the `--recurse-submodules=no` option).
 
 --submodule-prefix=<path>::
 	Prepend <path> to paths printed in informative messages
@@ -137,7 +137,7 @@ endif::git-pull[]
 
 --upload-pack <upload-pack>::
 	When given, and the repository to fetch from is handled
-	by 'git fetch-pack', '--exec=<upload-pack>' is passed to
+	by 'git fetch-pack', `--exec=<upload-pack>` is passed to
 	the command to specify non-default path for the command
 	run on the other end.
 
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 13cdd7f3b6..12879e4029 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -116,7 +116,8 @@ default.   You can use `--no-utf8` to override this.
 	By default the command will try to detect the patch format
 	automatically. This option allows the user to bypass the automatic
 	detection and specify the patch format that the patch(es) should be
-	interpreted as. Valid formats are mbox, stgit, stgit-series and hg.
+	interpreted as. Valid formats are mbox, mboxrd,
+	stgit, stgit-series and hg.
 
 -i::
 --interactive::
@@ -198,12 +199,12 @@ When initially invoking `git am`, you give it the names of the mailboxes
 to process.  Upon seeing the first patch that does not apply, it
 aborts in the middle.  You can recover from this in one of two ways:
 
-. skip the current patch by re-running the command with the '--skip'
+. skip the current patch by re-running the command with the `--skip`
   option.
 
 . hand resolve the conflict in the working directory, and update
   the index file to bring it into a state that the patch should
-  have produced.  Then run the command with the '--continue' option.
+  have produced.  Then run the command with the `--continue` option.
 
 The command refuses to process new mailboxes until the current
 operation is finished, so if you decide to start over from scratch,
diff --git a/Documentation/git-bisect-lk2009.txt b/Documentation/git-bisect-lk2009.txt
index c06efbd42a..e015f5b3cc 100644
--- a/Documentation/git-bisect-lk2009.txt
+++ b/Documentation/git-bisect-lk2009.txt
@@ -366,7 +366,7 @@ skip" to do the same thing. (In fact the special exit code 125 makes
 
 Or if you want more control, you can inspect the current state using
 for example "git bisect visualize". It will launch gitk (or "git log"
-if the DISPLAY environment variable is not set) to help you find a
+if the `DISPLAY` environment variable is not set) to help you find a
 better bisection point.
 
 Either way, if you have a string of untestable commits, it might
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 7e79aaedeb..2bb9a577a2 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@ -205,7 +205,7 @@ $ git bisect visualize
 
 `view` may also be used as a synonym for `visualize`.
 
-If the 'DISPLAY' environment variable is not set, 'git log' is used
+If the `DISPLAY` environment variable is not set, 'git log' is used
 instead.  You can also give command-line options such as `-p` and
 `--stat`.
 
@@ -358,7 +358,7 @@ OPTIONS
 --no-checkout::
 +
 Do not checkout the new working tree at each iteration of the bisection
-process. Instead just update a special reference named 'BISECT_HEAD' to make
+process. Instead just update a special reference named `BISECT_HEAD` to make
 it point to the commit that should be tested.
 +
 This option may be useful when the test you would perform in each step
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 4a7037f1c8..1fe73448f3 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -39,10 +39,10 @@ named commit).  With `--merged`, only branches merged into the named
 commit (i.e. the branches whose tip commits are reachable from the named
 commit) will be listed.  With `--no-merged` only branches not merged into
 the named commit will be listed.  If the <commit> argument is missing it
-defaults to 'HEAD' (i.e. the tip of the current branch).
+defaults to `HEAD` (i.e. the tip of the current 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.
 
 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
@@ -172,7 +172,7 @@ This option is only applicable in non-verbose mode.
 +
 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 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.
 
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index eb3d6945a9..18d03d8e8b 100644
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -15,8 +15,8 @@ SYNOPSIS
 DESCRIPTION
 -----------
 In its first form, the command provides the content or the type of an object in
-the repository. The type is required unless '-t' or '-p' is used to find the
-object type, or '-s' is used to find the object size, or '--textconv' is used
+the repository. The type is required unless `-t` or `-p` is used to find the
+object type, or `-s` is used to find the object size, or `--textconv` is used
 (which implies type "blob").
 
 In the second form, a list of objects (separated by linefeeds) is provided on
@@ -144,13 +144,13 @@ respectively print:
 
 OUTPUT
 ------
-If '-t' is specified, one of the <type>.
+If `-t` is specified, one of the <type>.
 
-If '-s' is specified, the size of the <object> in bytes.
+If `-s` is specified, the size of the <object> in bytes.
 
-If '-e' is specified, no output.
+If `-e` is specified, no output.
 
-If '-p' is specified, the contents of <object> are pretty-printed.
+If `-p` is specified, the contents of <object> are pretty-printed.
 
 If <type> is specified, the raw (though uncompressed) contents of the <object>
 will be returned.
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 5e5273e073..7a2201b051 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -157,7 +157,7 @@ of it").
 	When creating a new branch, set up "upstream" configuration. See
 	"--track" in linkgit:git-branch[1] for details.
 +
-If no '-b' option is given, the name of the new branch will be
+If no `-b` 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 "*".
@@ -165,7 +165,7 @@ 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.
+explicitly give a name with `-b` in such a case.
 
 --no-track::
 	Do not set up "upstream" configuration, even if the
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 6154e57238..d35d771fc8 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -47,7 +47,7 @@ OPTIONS
 	For a more complete list of ways to spell commits, see
 	linkgit:gitrevisions[7].
 	Sets of commits can be passed but no traversal is done by
-	default, as if the '--no-walk' option was specified, see
+	default, as if the `--no-walk` option was specified, see
 	linkgit:git-rev-list[1]. Note that specifying a range will
 	feed all <commit>... arguments to a single revision walk
 	(see a later example that uses 'maint master..next').
@@ -128,7 +128,7 @@ effect to your index in a row.
 
 --allow-empty-message::
 	By default, cherry-picking a commit with an empty message will fail.
-	This option overrides that behaviour, allowing commits with empty
+	This option overrides that behavior, allowing commits with empty
 	messages to be cherry picked.
 
 --keep-redundant-commits::
diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
index 51a7e26a8e..03056dad0d 100644
--- a/Documentation/git-clean.txt
+++ b/Documentation/git-clean.txt
@@ -16,7 +16,7 @@ DESCRIPTION
 Cleans the working tree by recursively removing files that are not
 under version control, starting from the current directory.
 
-Normally, only files unknown to Git are removed, but if the '-x'
+Normally, only files unknown to Git are removed, but if the `-x`
 option is specified, ignored files are also removed. This can, for
 example, be useful to remove all build products.
 
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index b7c467a001..ec41d3d698 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -14,8 +14,8 @@ SYNOPSIS
 	  [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
 	  [--dissociate] [--separate-git-dir <git dir>]
 	  [--depth <depth>] [--[no-]single-branch]
-	  [--recursive | --recurse-submodules] [--] <repository>
-	  [<directory>]
+	  [--recursive | --recurse-submodules] [--[no-]shallow-submodules]
+	  [--jobs <n>] [--] <repository> [<directory>]
 
 DESCRIPTION
 -----------
@@ -191,7 +191,8 @@ objects from the source repository into a pack in the cloned repository.
 	Create a 'shallow' clone with a history truncated to the
 	specified number of commits. Implies `--single-branch` unless
 	`--no-single-branch` is given to fetch the histories near the
-	tips of all branches.
+	tips of all branches. If you want to clone submodules shallowly,
+	also pass `--shallow-submodules`.
 
 --[no-]single-branch::
 	Clone only the history leading to the tip of a single branch,
@@ -212,6 +213,9 @@ objects from the source repository into a pack in the cloned repository.
 	repository does not have a worktree/checkout (i.e. if any of
 	`--no-checkout`/`-n`, `--bare`, or `--mirror` is given)
 
+--[no-]shallow-submodules::
+	All submodules which are cloned will be shallow with a depth of 1.
+
 --separate-git-dir=<git dir>::
 	Instead of placing the cloned repository where it is supposed
 	to be, place the cloned repository at the specified directory,
@@ -219,6 +223,10 @@ objects from the source repository into a pack in the cloned repository.
 	The result is Git repository can be separated from working
 	tree.
 
+-j <n>::
+--jobs <n>::
+	The number of submodules fetched at the same time.
+	Defaults to the `submodule.fetchJobs` option.
 
 <repository>::
 	The (possibly remote) repository to clone from.  See the
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index 48c33d7ed7..002dae625e 100644
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -44,7 +44,7 @@ OPTIONS
 	An existing tree object
 
 -p <parent>::
-	Each '-p' indicates the id of a parent commit object.
+	Each `-p` indicates the id of a parent commit object.
 
 -m <message>::
 	A paragraph in the commit log message. This can be given more than
@@ -61,8 +61,8 @@ OPTIONS
 	stuck to the option without a space.
 
 --no-gpg-sign::
-	Countermand `commit.gpgSign` configuration variable that is
-	set to force each and every commit to be signed.
+	Do not GPG-sign commit, to countermand a `--gpg-sign` option
+	given earlier on the command line.
 
 
 Commit Information
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 9ec6b3cc17..b0a294d3b5 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -75,7 +75,7 @@ OPTIONS
 
 -c <commit>::
 --reedit-message=<commit>::
-	Like '-C', but with '-c' the editor is invoked, so that
+	Like '-C', but with `-c` the editor is invoked, so that
 	the user can further edit the commit message.
 
 --fixup=<commit>::
@@ -201,7 +201,7 @@ default::
 	Otherwise `whitespace`.
 --
 +
-The default can be changed by the 'commit.cleanup' configuration
+The default can be changed by the `commit.cleanup` configuration
 variable (see linkgit:git-config[1]).
 
 -e::
@@ -260,7 +260,7 @@ FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
 	staged for other paths. This is the default mode of operation of
 	'git commit' if any paths are given on the command line,
 	in which case this option can be omitted.
-	If this option is specified together with '--amend', then
+	If this option is specified together with `--amend`, then
 	no paths need to be specified, which can be used to amend
 	the last commit without committing changes that have
 	already been staged.
@@ -290,7 +290,8 @@ configuration variable documented in linkgit:git-config[1].
 	what changes the commit has.
 	Note that this diff output doesn't have its
 	lines prefixed with '#'. This diff will not be a part
-	of the commit message.
+	of the commit message. See the `commit.verbose` configuration
+	variable in linkgit:git-config[1].
 +
 If specified twice, show in addition the unified diff between
 what would be committed and the worktree files, i.e. the unstaged
@@ -449,8 +450,8 @@ include::i18n.txt[]
 ENVIRONMENT AND CONFIGURATION VARIABLES
 ---------------------------------------
 The editor used to edit the commit log message will be chosen from the
-GIT_EDITOR environment variable, the core.editor configuration variable, the
-VISUAL environment variable, or the EDITOR environment variable (in that
+`GIT_EDITOR` environment variable, the core.editor configuration variable, the
+`VISUAL` environment variable, or the `EDITOR` environment variable (in that
 order).  See linkgit:git-var[1] for details.
 
 HOOKS
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 6843114fc0..f163113a6f 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -31,29 +31,29 @@ You can query/set/replace/unset options with this command. The name is
 actually the section and the key separated by a dot, and the value will be
 escaped.
 
-Multiple lines can be added to an option by using the '--add' option.
+Multiple lines can be added to an option by using the `--add` option.
 If you want to update or unset an option which can occur on multiple
 lines, a POSIX regexp `value_regex` needs to be given.  Only the
 existing values that match the regexp are updated or unset.  If
 you want to handle the lines that do *not* match the regex, just
 prepend a single exclamation mark in front (see also <<EXAMPLES>>).
 
-The type specifier can be either '--int' or '--bool', to make
+The type specifier can be either `--int` or `--bool`, to make
 'git config' ensure that the variable(s) are of the given type and
 convert the value to the canonical form (simple decimal number for int,
-a "true" or "false" string for bool), or '--path', which does some
-path expansion (see '--path' below).  If no type specifier is passed, no
+a "true" or "false" string for bool), or `--path`, which does some
+path expansion (see `--path` below).  If no type specifier is passed, no
 checks or transformations are performed on the value.
 
 When reading, the values are read from the system, global and
 repository local configuration files by default, and options
-'--system', '--global', '--local' and '--file <filename>' can be
+`--system`, `--global`, `--local` and `--file <filename>` can be
 used to tell the command to read from only that location (see <<FILES>>).
 
 When writing, the new value is written to the repository local
-configuration file by default, and options '--system', '--global',
-'--file <filename>' can be used to tell the command to write to
-that location (you can say '--local' but that is the default).
+configuration file by default, and options `--system`, `--global`,
+`--file <filename>` can be used to tell the command to write to
+that location (you can say `--local` but that is the default).
 
 This command will fail with non-zero status upon error.  Some exit
 codes are:
@@ -138,7 +138,7 @@ See also <<FILES>>.
 	Use the given config file instead of the one specified by GIT_CONFIG.
 
 --blob blob::
-	Similar to '--file' but use the given blob instead of a file. E.g.
+	Similar to `--file` but use the given blob instead of a file. E.g.
 	you can use 'master:.gitmodules' to read values from the file
 	'.gitmodules' in the master branch. See "SPECIFYING REVISIONS"
 	section in linkgit:gitrevisions[7] for a more complete list of
@@ -220,7 +220,7 @@ See also <<FILES>>.
 -e::
 --edit::
 	Opens an editor to modify the specified config file; either
-	'--system', '--global', or repository (default).
+	`--system`, `--global`, or repository (default).
 
 --[no-]includes::
 	Respect `include.*` directives in config files when looking up
@@ -232,7 +232,7 @@ See also <<FILES>>.
 FILES
 -----
 
-If not set explicitly with '--file', there are four files where
+If not set explicitly with `--file`, there are four files where
 'git config' will search for configuration options:
 
 $(prefix)/etc/gitconfig::
@@ -264,12 +264,12 @@ precedence over values read earlier.  When multiple values are taken then all
 values of a key from all files will be used.
 
 All writing options will per default write to the repository specific
-configuration file. Note that this also affects options like '--replace-all'
-and '--unset'. *'git config' will only ever change one file at a time*.
+configuration file. Note that this also affects options like `--replace-all`
+and `--unset`. *'git config' will only ever change one file at a time*.
 
 You can override these rules either by command-line options or by environment
-variables. The '--global' and the '--system' options will limit the file used
-to the global or system-wide file respectively. The GIT_CONFIG environment
+variables. The `--global` and the `--system` options will limit the file used
+to the global or system-wide file respectively. The `GIT_CONFIG` environment
 variable has a similar effect, but you can specify any filename you want.
 
 
diff --git a/Documentation/git-credential-store.txt b/Documentation/git-credential-store.txt
index e3c8f276b1..25fb963f4b 100644
--- a/Documentation/git-credential-store.txt
+++ b/Documentation/git-credential-store.txt
@@ -44,7 +44,7 @@ OPTIONS
 FILES
 -----
 
-If not set explicitly with '--file', there are two files where
+If not set explicitly with `--file`, there are two files where
 git-credential-store will search for credentials in order of precedence:
 
 ~/.git-credentials::
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 00a0679a28..41207a24b0 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -74,10 +74,10 @@ OPTIONS
 	akin to the way 'git clone' uses 'origin' by default.
 
 -o <branch-for-HEAD>::
-	When no remote is specified (via -r) the 'HEAD' branch
+	When no remote is specified (via -r) the `HEAD` branch
 	from CVS is imported to the 'origin' branch within the Git
-	repository, as 'HEAD' already has a special meaning for Git.
-	When a remote is specified the 'HEAD' branch is named
+	repository, as `HEAD` already has a special meaning for Git.
+	When a remote is specified the `HEAD` branch is named
 	remotes/<remote>/master mirroring 'git clone' behaviour.
 	Use this option if you want to import into a different
 	branch.
@@ -103,7 +103,7 @@ the old cvs2git tool.
 
 -p <options-for-cvsps>::
 	Additional options for cvsps.
-	The options '-u' and '-A' are implicit and should not be used here.
+	The options `-u` and '-A' are implicit and should not be used here.
 +
 If you need to pass multiple options, separate them with a comma.
 
@@ -122,7 +122,7 @@ If you need to pass multiple options, separate them with a comma.
 
 -M <regex>::
 	Attempt to detect merges based on the commit message with a custom
-	regex. It can be used with '-m' to enable the default regexes
+	regex. It can be used with `-m` to enable the default regexes
 	as well. You must escape forward slashes.
 +
 The regex must capture the source branch name in $1.
@@ -186,7 +186,7 @@ messages, bug-tracking systems, email archives, and the like.
 
 OUTPUT
 ------
-If '-v' is specified, the script reports what it is doing.
+If `-v` is specified, the script reports what it is doing.
 
 Otherwise, success is indicated the Unix way, i.e. by simply exiting with
 a zero exit status.
diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index db4d7a917c..a336ae5f6f 100644
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -54,7 +54,7 @@ Print usage information and exit
 You can specify a list of allowed directories. If no directories
 are given, all are allowed. This is an additional restriction, gitcvs
 access still needs to be enabled by the `gitcvs.enabled` config option
-unless '--export-all' was given, too.
+unless `--export-all` was given, too.
 
 
 DESCRIPTION
@@ -332,7 +332,7 @@ To get a checkout with the Eclipse CVS client:
 3. Browse the 'modules' available. It will give you a list of the heads in
    the repository. You will not be able to browse the tree from there. Only
    the heads.
-4. Pick 'HEAD' when it asks what branch/tag to check out. Untick the
+4. Pick `HEAD` when it asks what branch/tag to check out. Untick the
    "launch commit wizard" to avoid committing the .project file.
 
 Protocol notes: If you are using anonymous access via pserver, just select that.
@@ -402,12 +402,12 @@ Exports and tagging (tags and branches) are not supported at this stage.
 CRLF Line Ending Conversions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-By default the server leaves the '-k' mode blank for all files,
+By default the server leaves the `-k` mode blank for all files,
 which causes the CVS client to treat them as a text files, subject
 to end-of-line conversion on some platforms.
 
 You can make the server use the end-of-line conversion attributes to
-set the '-k' modes for files by setting the `gitcvs.usecrlfattr`
+set the `-k` modes for files by setting the `gitcvs.usecrlfattr`
 config variable.  See linkgit:gitattributes[5] for more information
 about end-of-line conversion.
 
@@ -415,9 +415,9 @@ Alternatively, if `gitcvs.usecrlfattr` config is not enabled
 or the attributes do not allow automatic detection for a filename, then
 the server uses the `gitcvs.allBinary` config for the default setting.
 If `gitcvs.allBinary` is set, then file not otherwise
-specified will default to '-kb' mode. Otherwise the '-k' mode
+specified will default to '-kb' mode. Otherwise the `-k` mode
 is left blank. But if `gitcvs.allBinary` is set to "guess", then
-the correct '-k' mode will be guessed based on the contents of
+the correct `-k` mode will be guessed based on the contents of
 the file.
 
 For best consistency with 'cvs', it is probably best to override the
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index a69b3616ec..3c91db7bed 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -30,7 +30,7 @@ that service if it is enabled.
 
 It verifies that the directory has the magic file "git-daemon-export-ok", and
 it will refuse to export any Git directory that hasn't explicitly been marked
-for export this way (unless the '--export-all' parameter is specified). If you
+for export this way (unless the `--export-all` parameter is specified). If you
 pass some directory paths as 'git daemon' arguments, you can further restrict
 the offers to a whitelist comprising of those.
 
@@ -90,10 +90,10 @@ OPTIONS
 	is not supported, then --listen=hostname is also not supported and
 	--listen must be given an IPv4 address.
 	Can be given more than once.
-	Incompatible with '--inetd' option.
+	Incompatible with `--inetd` option.
 
 --port=<n>::
-	Listen on an alternative port.  Incompatible with '--inetd' option.
+	Listen on an alternative port.  Incompatible with `--inetd` option.
 
 --init-timeout=<n>::
 	Timeout (in seconds) between the moment the connection is established
@@ -188,7 +188,7 @@ Git configuration files in that directory are readable by `<user>`.
 	arguments. The external command can decide to decline the
 	service by exiting with a non-zero status (or to allow it by
 	exiting with a zero status).  It can also look at the $REMOTE_ADDR
-	and $REMOTE_PORT environment variables to learn about the
+	and `$REMOTE_PORT` environment variables to learn about the
 	requestor when making this decision.
 +
 The external command can optionally write a single line to its
@@ -296,7 +296,7 @@ they correspond to these IP addresses.
 selectively enable/disable services per repository::
 	To enable 'git archive --remote' and disable 'git fetch' against
 	a repository, have the following in the configuration file in the
-	repository (that is the file 'config' next to 'HEAD', 'refs' and
+	repository (that is the file 'config' next to `HEAD`, 'refs' and
 	'objects').
 +
 ----------------------------------------------------------------
diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index c8f28c8c86..e4ac448ff5 100644
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@ -154,7 +154,7 @@ is found, its name will be output and searching will stop.
 If an exact match was not found, 'git describe' will walk back
 through the commit history to locate an ancestor commit which
 has been tagged.  The ancestor's tag will be output along with an
-abbreviation of the input commit-ish's SHA-1. If '--first-parent' was
+abbreviation of the input commit-ish's SHA-1. If `--first-parent` was
 specified then the walk will only consider the first parent of each
 commit.
 
diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt
index a86cf62e68..a171506952 100644
--- a/Documentation/git-diff-index.txt
+++ b/Documentation/git-diff-index.txt
@@ -40,13 +40,13 @@ include::diff-format.txt[]
 Operating Modes
 ---------------
 You can choose whether you want to trust the index file entirely
-(using the '--cached' flag) or ask the diff logic to show any files
+(using the `--cached` flag) or ask the diff logic to show any files
 that don't match the stat state as being "tentatively changed".  Both
 of these operations are very useful indeed.
 
 Cached Mode
 -----------
-If '--cached' is specified, it allows you to ask:
+If `--cached` is specified, it allows you to ask:
 
 	show me the differences between HEAD and the current index
 	contents (the ones I'd write using 'git write-tree')
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 1439486e40..7870e175b7 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -43,11 +43,11 @@ include::diff-options.txt[]
 	show tree entry itself as well as subtrees.  Implies -r.
 
 --root::
-	When '--root' is specified the initial commit will be shown as a big
+	When `--root` is specified the initial commit will be shown as a big
 	creation event. This is equivalent to a diff against the NULL tree.
 
 --stdin::
-	When '--stdin' is specified, the command does not take
+	When `--stdin` is specified, the command does not take
 	<tree-ish> arguments from the command line.  Instead, it
 	reads lines containing either two <tree>, one <commit>, or a
 	list of <commit> from its standard input.  (Use a single space
@@ -70,13 +70,13 @@ commits (but not trees).
 	By default, 'git diff-tree --stdin' does not show
 	differences for merge commits.  With this flag, it shows
 	differences to that commit from all of its parents. See
-	also '-c'.
+	also `-c`.
 
 -s::
 	By default, 'git diff-tree --stdin' shows differences,
-	either in machine-readable form (without '-p') or in patch
-	form (with '-p').  This output can be suppressed.  It is
-	only useful with '-v' flag.
+	either in machine-readable form (without `-p`) or in patch
+	form (with `-p`).  This output can be suppressed.  It is
+	only useful with `-v` flag.
 
 -v::
 	This flag causes 'git diff-tree --stdin' to also show
@@ -91,17 +91,17 @@ include::pretty-options.txt[]
 -c::
 	This flag changes the way a merge commit is displayed
 	(which means it is useful only when the command is given
-	one <tree-ish>, or '--stdin').  It shows the differences
+	one <tree-ish>, or `--stdin`).  It shows the differences
 	from each of the parents to the merge result simultaneously
 	instead of showing pairwise diff between a parent and the
-	result one at a time (which is what the '-m' option does).
+	result one at a time (which is what the `-m` option does).
 	Furthermore, it lists only files which were modified
 	from all parents.
 
 --cc::
 	This flag changes the way a merge commit patch is displayed,
-	in a similar way to the '-c' option. It implies the '-c'
-	and '-p' options and further compresses the patch output
+	in a similar way to the `-c` option. It implies the `-c`
+	and `-p` options and further compresses the patch output
 	by omitting uninteresting hunks whose the contents in the parents
 	have only two variants and the merge result picks one of them
 	without modification.  When all hunks are uninteresting, the commit
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 333cf6ff91..224fb3090b 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -98,7 +98,7 @@ instead.  `--no-symlinks` is the default on Windows.
 	invoked diff tool returns a non-zero exit code.
 +
 'git-difftool' will forward the exit code of the invoked tool when
-'--trust-exit-code' is used.
+`--trust-exit-code` is used.
 
 See linkgit:git-diff[1] for the full list of supported options.
 
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 66910aa2fa..2b762654bf 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -136,6 +136,8 @@ Performance and Compression Tuning
 	Maximum size of each output packfile.
 	The default is unlimited.
 
+fastimport.unpackLimit::
+	See linkgit:git-config[1]
 
 Performance
 -----------
@@ -1054,7 +1056,7 @@ relative-marks::
 no-relative-marks::
 force::
 	Act as though the corresponding command-line option with
-	a leading '--' was passed on the command line
+	a leading `--` was passed on the command line
 	(see OPTIONS, above).
 
 import-marks::
@@ -1105,7 +1107,7 @@ options the user may specify to git fast-import itself.
 
 The `<option>` part of the command may contain any of the options
 listed in the OPTIONS section that do not change import semantics,
-without the leading '--' and is treated in the same way.
+without the leading `--` and is treated in the same way.
 
 Option commands must be the first commands on the input (not counting
 feature commands), to give an option command after any non-option
diff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt
index 239623cc24..24417ee3a6 100644
--- a/Documentation/git-fetch-pack.txt
+++ b/Documentation/git-fetch-pack.txt
@@ -41,13 +41,13 @@ OPTIONS
 	option, then the refs from stdin are processed after those
 	on the command line.
 +
-If '--stateless-rpc' is specified together with this option then
+If `--stateless-rpc` is specified together with this option then
 the list of refs must be in packet format (pkt-line). Each ref must
 be in a separate packet, and the list must end with a flush packet.
 
 -q::
 --quiet::
-	Pass '-q' flag to 'git unpack-objects'; this makes the
+	Pass `-q` flag to 'git unpack-objects'; this makes the
 	cloning process less verbose.
 
 -k::
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index efe56e0808..9e4216999d 100644
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -99,6 +99,57 @@ The latter use of the `remote.<repository>.fetch` values can be
 overridden by giving the `--refmap=<refspec>` parameter(s) on the
 command line.
 
+OUTPUT
+------
+
+The output of "git fetch" depends on the transport method used; this
+section describes the output when fetching over the Git protocol
+(either locally or via ssh) and Smart HTTP protocol.
+
+The status of the fetch is output in tabular form, with each line
+representing the status of a single ref. Each line is of the form:
+
+-------------------------------
+ <flag> <summary> <from> -> <to> [<reason>]
+-------------------------------
+
+The status of up-to-date refs is shown only if the --verbose option is
+used.
+
+In compact output mode, specified with configuration variable
+fetch.output, if either entire `<from>` or `<to>` is found in the
+other string, it will be substituted with `*` in the other string. For
+example, `master -> origin/master` becomes `master -> origin/*`.
+
+flag::
+	A single character indicating the status of the ref:
+(space);; for a successfully fetched fast-forward;
+`+`;; for a successful forced update;
+`-`;; for a successfully pruned ref;
+`t`;; for a successful tag update;
+`*`;; for a successfully fetched new ref;
+`!`;; for a ref that was rejected or failed to update; and
+`=`;; for a ref that was up to date and did not need fetching.
+
+summary::
+	For a successfully fetched ref, the summary shows the old and new
+	values of the ref in a form suitable for using as an argument to
+	`git log` (this is `<old>..<new>` in most cases, and
+	`<old>...<new>` for forced non-fast-forward updates).
+
+from::
+	The name of the remote ref being fetched from, minus its
+	`refs/<type>/` prefix. In the case of deletion, the name of
+	the remote ref is "(none)".
+
+to::
+	The name of the local ref being updated, minus its
+	`refs/<type>/` prefix.
+
+reason::
+	A human-readable explanation. In the case of successfully fetched
+	refs, no explanation is needed. For a failed ref, the reason for
+	failure is described.
 
 EXAMPLES
 --------
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 003731f6a9..0a09698c03 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -52,7 +52,7 @@ if different from the rewritten ones, will be stored in the namespace
 
 Note that since this operation is very I/O expensive, it might
 be a good idea to redirect the temporary directory off-disk with the
-'-d' option, e.g. on tmpfs.  Reportedly the speedup is very noticeable.
+`-d` option, e.g. on tmpfs.  Reportedly the speedup is very noticeable.
 
 
 Filters
@@ -61,7 +61,7 @@ Filters
 The filters are applied in the order as listed below.  The <command>
 argument is always evaluated in the shell context using the 'eval' command
 (with the notable exception of the commit filter, for technical reasons).
-Prior to that, the $GIT_COMMIT environment variable will be set to contain
+Prior to that, the `$GIT_COMMIT` environment variable will be set to contain
 the id of the commit being rewritten.  Also, GIT_AUTHOR_NAME,
 GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL,
 and GIT_COMMITTER_DATE are taken from the current commit and exported to
@@ -171,7 +171,7 @@ to other tags will be rewritten to point to the underlying commit.
 	untouched.  This switch allow git-filter-branch to ignore such
 	commits.  Though, this switch only applies for commits that have one
 	and only one parent, it will hence keep merges points. Also, this
-	option is not compatible with the use of '--commit-filter'. Though you
+	option is not compatible with the use of `--commit-filter`. Though you
 	just need to use the function 'git_commit_non_empty_tree "$@"' instead
 	of the `git commit-tree "$@"` idiom in your commit filter to make that
 	happen.
@@ -197,7 +197,7 @@ to other tags will be rewritten to point to the underlying commit.
 <rev-list options>...::
 	Arguments for 'git rev-list'.  All positive refs included by
 	these options are rewritten.  You may also specify options
-	such as '--all', but you must use '--' to separate them from
+	such as `--all`, but you must use `--` to separate them from
 	the 'git filter-branch' options. Implies <<Remap_to_ancestor>>.
 
 
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index d9d406dcfb..f57e69bc83 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -142,7 +142,7 @@ align::
 	<width> and <position> used instead.  For instance,
 	`%(align:<width>,<position>)`. If the contents length is more
 	than the width then no alignment is performed. If used with
-	'--quote' everything in between %(align:...) and %(end) is
+	`--quote` everything in between %(align:...) and %(end) is
 	quoted, but if nested then only the topmost level performs
 	quoting.
 
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 6821441d7d..9624c84a65 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -58,7 +58,7 @@ output, unless the `--stdout` option is specified.
 
 If `-o` is specified, output files are created in <dir>.  Otherwise
 they are created in the current working directory. The default path
-can be set with the 'format.outputDirectory' configuration option.
+can be set with the `format.outputDirectory` configuration option.
 The `-o` option takes precedence over `format.outputDirectory`.
 To store patches in the current working directory even when
 `format.outputDirectory` points elsewhere, use `-o .`.
@@ -146,9 +146,9 @@ series, where the head is chosen from the cover letter, the
 `--in-reply-to`, and the first patch mail, in this order.  'deep'
 threading makes every mail a reply to the previous one.
 +
-The default is `--no-thread`, unless the 'format.thread' configuration
+The default is `--no-thread`, unless the `format.thread` configuration
 is set.  If `--thread` is specified without a style, it defaults to the
-style specified by 'format.thread' if any, or else `shallow`.
+style specified by `format.thread` if any, or else `shallow`.
 +
 Beware that the default for 'git send-email' is to thread emails
 itself.  If you want `git format-patch` to take care of threading, you
@@ -265,6 +265,11 @@ you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`.
   Output an all-zero hash in each patch's From header instead
   of the hash of the commit.
 
+--base=<commit>::
+	Record the base tree information to identify the state the
+	patch series applies to.  See the BASE TREE INFORMATION section
+	below for details.
+
 --root::
 	Treat the revision argument as a <revision range>, even if it
 	is just a single commit (that would normally be treated as a
@@ -520,6 +525,61 @@ This should help you to submit patches inline using KMail.
 5. Back in the compose window: add whatever other text you wish to the
    message, complete the addressing and subject fields, and press send.
 
+BASE TREE INFORMATION
+---------------------
+
+The base tree information block is used for maintainers or third party
+testers to know the exact state the patch series applies to. It consists
+of the 'base commit', which is a well-known commit that is part of the
+stable part of the project history everybody else works off of, and zero
+or more 'prerequisite patches', which are well-known patches in flight
+that is not yet part of the 'base commit' that need to be applied on top
+of 'base commit' in topological order before the patches can be applied.
+
+The 'base commit' is shown as "base-commit: " followed by the 40-hex of
+the commit object name.  A 'prerequisite patch' is shown as
+"prerequisite-patch-id: " followed by the 40-hex 'patch id', which can
+be obtained by passing the patch through the `git patch-id --stable`
+command.
+
+Imagine that on top of the public commit P, you applied well-known
+patches X, Y and Z from somebody else, and then built your three-patch
+series A, B, C, the history would be like:
+
+................................................
+---P---X---Y---Z---A---B---C
+................................................
+
+With `git format-patch --base=P -3 C` (or variants thereof, e.g. with
+`--cover-letter` of using `Z..C` instead of `-3 C` to specify the
+range), the base tree information block is shown at the end of the
+first message the command outputs (either the first patch, or the
+cover letter), like this:
+
+------------
+base-commit: P
+prerequisite-patch-id: X
+prerequisite-patch-id: Y
+prerequisite-patch-id: Z
+------------
+
+For non-linear topology, such as
+
+................................................
+---P---X---A---M---C
+    \         /
+     Y---Z---B
+................................................
+
+You can also use `git format-patch --base=P -3 C` to generate patches
+for A, B and C, and the identifiers for P, X, Y, Z are appended at the
+end of the first message.
+
+If set `--base=auto` in cmdline, it will track base commit automatically,
+the base commit will be the merge base of tip commit of the remote-tracking
+branch and revision-range specified in cmdline.
+For a local branch, you need to track a remote branch by `git branch
+--set-upstream-to` before using this option.
 
 EXAMPLES
 --------
diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt
index 84ee92e158..b9f060e3b2 100644
--- a/Documentation/git-fsck.txt
+++ b/Documentation/git-fsck.txt
@@ -11,7 +11,8 @@ SYNOPSIS
 [verse]
 'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
 	 [--[no-]full] [--strict] [--verbose] [--lost-found]
-	 [--[no-]dangling] [--[no-]progress] [--connectivity-only] [<object>*]
+	 [--[no-]dangling] [--[no-]progress] [--connectivity-only]
+	 [--[no-]name-objects] [<object>*]
 
 DESCRIPTION
 -----------
@@ -82,6 +83,12 @@ index file, all SHA-1 references in `refs` namespace, and all reflogs
 	a blob, the contents are written into the file, rather than
 	its object name.
 
+--name-objects::
+	When displaying names of reachable objects, in addition to the
+	SHA-1 also display a name that describes *how* they are reachable,
+	compatible with linkgit:git-rev-parse[1], e.g.
+	`HEAD@{1234567890}~25^2:src/`.
+
 --[no-]progress::
 	Progress status is reported on the standard error stream by
 	default when it is attached to a terminal, unless
@@ -95,7 +102,7 @@ DISCUSSION
 git-fsck tests SHA-1 and general object sanity, and it does full tracking
 of the resulting reachability and everything else. It prints out any
 corruption it finds (missing or bad objects), and if you use the
-'--unreachable' flag it will also print out objects that exist but that
+`--unreachable` flag it will also print out objects that exist but that
 aren't reachable from any of the specified head nodes (or the default
 set, as mentioned above).
 
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index fa1510480a..bed60f471c 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -82,13 +82,13 @@ automatic consolidation of packs.
 Configuration
 -------------
 
-The optional configuration variable 'gc.reflogExpire' can be
+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 optional configuration variable 'gc.reflogExpireUnreachable'
+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
@@ -107,30 +107,30 @@ branches:
 	reflogExpireUnreachable = 3 days
 ------------
 
-The optional configuration variable 'gc.rerereResolved' indicates
+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
+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
+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.aggressiveWindow' controls how
+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'
+Similarly, the optional configuration variable `gc.aggressiveDepth`
 controls --depth option in linkgit:git-repack[1]. This defaults to 250.
 
-The optional configuration variable 'gc.pruneExpire' controls how old
+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".
 
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index cb0f6cf678..0ecea6e491 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -41,17 +41,17 @@ CONFIGURATION
 -------------
 
 grep.lineNumber::
-	If set to true, enable '-n' option by default.
+	If set to true, enable `-n` option by default.
 
 grep.patternType::
 	Set the default matching behavior. Using a value of 'basic', 'extended',
-	'fixed', or 'perl' will enable the '--basic-regexp', '--extended-regexp',
-	'--fixed-strings', or '--perl-regexp' option accordingly, while the
+	'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`,
+	`--fixed-strings`, or `--perl-regexp` option accordingly, while the
 	value 'default' will return to the default matching behavior.
 
 grep.extendedRegexp::
-	If set to true, enable '--extended-regexp' option by default. This
-	option is ignored when the 'grep.patternType' option is set to a value
+	If set to true, enable `--extended-regexp` option by default. This
+	option is ignored when the `grep.patternType` option is set to a value
 	other than 'default'.
 
 grep.threads::
@@ -59,7 +59,7 @@ grep.threads::
 	8 threads are used by default (for now).
 
 grep.fullName::
-	If set to true, enable '--full-name' option by default.
+	If set to true, enable `--full-name` option by default.
 
 grep.fallbackToNoIndex::
 	If set to true, fall back to git grep --no-index if git grep
diff --git a/Documentation/git-gui.txt b/Documentation/git-gui.txt
index 8144527ae0..c1a3e8bf07 100644
--- a/Documentation/git-gui.txt
+++ b/Documentation/git-gui.txt
@@ -35,7 +35,7 @@ blame::
 
 browser::
 	Start a tree browser showing all files in the specified
-	commit (or 'HEAD' by default).  Files selected through the
+	commit (or `HEAD` by default).  Files selected through the
 	browser are opened in the blame viewer.
 
 citool::
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index 3956525218..40d328a4b3 100644
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -18,10 +18,10 @@ With no options and no COMMAND or GUIDE given, the synopsis of the 'git'
 command and a list of the most commonly used Git commands are printed
 on the standard output.
 
-If the option '--all' or '-a' is given, all available commands are
+If the option `--all` or `-a` is given, all available commands are
 printed on the standard output.
 
-If the option '--guide' or '-g' is given, a list of the useful
+If the option `--guide` or `-g` is given, a list of the useful
 Git guides is also printed on the standard output.
 
 If a command, or a guide, is given, a manual page for that command or
@@ -57,10 +57,10 @@ OPTIONS
 --man::
 	Display manual page for the command in the 'man' format. This
 	option may be used to override a value set in the
-	'help.format' configuration variable.
+	`help.format` configuration variable.
 +
 By default the 'man' program will be used to display the manual page,
-but the 'man.viewer' configuration variable may be used to choose
+but the `man.viewer` configuration variable may be used to choose
 other display programs (see below).
 
 -w::
@@ -69,7 +69,7 @@ other display programs (see below).
 	format. A web browser will be used for that purpose.
 +
 The web browser can be specified using the configuration variable
-'help.browser', or 'web.browser' if the former is not set. If none of
+`help.browser`, or `web.browser` if the former is not set. If none of
 these config variables is set, the 'git web{litdd}browse' helper script
 (called by 'git help') will pick a suitable default. See
 linkgit:git-web{litdd}browse[1] for more information about this.
@@ -80,7 +80,7 @@ CONFIGURATION VARIABLES
 help.format
 ~~~~~~~~~~~
 
-If no command-line option is passed, the 'help.format' configuration
+If no command-line option is passed, the `help.format` configuration
 variable will be checked. The following values are supported for this
 variable; they make 'git help' behave as their corresponding command-
 line option:
@@ -92,7 +92,7 @@ line option:
 help.browser, web.browser and browser.<tool>.path
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The 'help.browser', 'web.browser' and 'browser.<tool>.path' will also
+The `help.browser`, `web.browser` and `browser.<tool>.path` will also
 be checked if the 'web' format is chosen (either by command-line
 option or configuration variable). See '-w|--web' in the OPTIONS
 section above and linkgit:git-web{litdd}browse[1].
@@ -100,7 +100,7 @@ section above and linkgit:git-web{litdd}browse[1].
 man.viewer
 ~~~~~~~~~~
 
-The 'man.viewer' configuration variable will be checked if the 'man'
+The `man.viewer` configuration variable will be checked if the 'man'
 format is chosen. The following values are currently supported:
 
 * "man": use the 'man' program as usual,
@@ -110,9 +110,9 @@ format is chosen. The following values are currently supported:
 tab (see 'Note about konqueror' below).
 
 Values for other tools can be used if there is a corresponding
-'man.<tool>.cmd' configuration entry (see below).
+`man.<tool>.cmd` configuration entry (see below).
 
-Multiple values may be given to the 'man.viewer' configuration
+Multiple values may be given to the `man.viewer` configuration
 variable. Their corresponding programs will be tried in the order
 listed in the configuration file.
 
@@ -128,14 +128,14 @@ will try to use konqueror first. But this may fail (for example, if
 DISPLAY is not set) and in that case emacs' woman mode will be tried.
 
 If everything fails, or if no viewer is configured, the viewer specified
-in the GIT_MAN_VIEWER environment variable will be tried.  If that
+in the `GIT_MAN_VIEWER` environment variable will be tried.  If that
 fails too, the 'man' program will be tried anyway.
 
 man.<tool>.path
 ~~~~~~~~~~~~~~~
 
 You can explicitly provide a full path to your preferred man viewer by
-setting the configuration variable 'man.<tool>.path'. For example, you
+setting the configuration variable `man.<tool>.path`. For example, you
 can configure the absolute path to konqueror by setting
 'man.konqueror.path'. Otherwise, 'git help' assumes the tool is
 available in PATH.
@@ -143,9 +143,9 @@ available in PATH.
 man.<tool>.cmd
 ~~~~~~~~~~~~~~
 
-When the man viewer, specified by the 'man.viewer' configuration
+When the man viewer, specified by the `man.viewer` configuration
 variables, is not among the supported ones, then the corresponding
-'man.<tool>.cmd' configuration variable will be looked up. If this
+`man.<tool>.cmd` configuration variable will be looked up. If this
 variable exists then the specified tool will be treated as a custom
 command and a shell eval will be used to run the command with the man
 page passed as arguments.
@@ -153,7 +153,7 @@ page passed as arguments.
 Note about konqueror
 ~~~~~~~~~~~~~~~~~~~~
 
-When 'konqueror' is specified in the 'man.viewer' configuration
+When 'konqueror' is specified in the `man.viewer` configuration
 variable, we launch 'kfmclient' to try to open the man page on an
 already opened konqueror in a new tab if possible.
 
@@ -176,7 +176,7 @@ Note about git config --global
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Note that all these configuration variables should probably be set
-using the '--global' flag, for example like this:
+using the `--global` flag, for example like this:
 
 ------------------------------------------------
 $ git config --global help.format web
diff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.txt
index 9268fb6b1e..bb0db195ce 100644
--- a/Documentation/git-http-backend.txt
+++ b/Documentation/git-http-backend.txt
@@ -21,7 +21,7 @@ pushing using the smart HTTP protocol.
 It verifies that the directory has the magic file
 "git-daemon-export-ok", and it will refuse to export any Git directory
 that hasn't explicitly been marked for export this way (unless the
-GIT_HTTP_EXPORT_ALL environmental variable is set).
+`GIT_HTTP_EXPORT_ALL` environmental variable is set).
 
 By default, only the `upload-pack` service is enabled, which serves
 'git fetch-pack' and 'git ls-remote' clients, which are invoked from
@@ -241,7 +241,7 @@ $HTTP["url"] =~ "^/git/private" {
 
 ENVIRONMENT
 -----------
-'git http-backend' relies upon the CGI environment variables set
+'git http-backend' relies upon the `CGI` environment variables set
 by the invoking web server, including:
 
 * PATH_INFO (if GIT_PROJECT_ROOT is set, otherwise PATH_TRANSLATED)
@@ -251,7 +251,7 @@ by the invoking web server, including:
 * QUERY_STRING
 * REQUEST_METHOD
 
-The GIT_HTTP_EXPORT_ALL environmental variable may be passed to
+The `GIT_HTTP_EXPORT_ALL` environmental variable may be passed to
 'git-http-backend' to bypass the check for the "git-daemon-export-ok"
 file in each repository before allowing export of that repository.
 
@@ -269,7 +269,7 @@ GIT_COMMITTER_EMAIL to '$\{REMOTE_USER}@http.$\{REMOTE_ADDR\}',
 ensuring that any reflogs created by 'git-receive-pack' contain some
 identifying information of the remote user who performed the push.
 
-All CGI environment variables are available to each of the hooks
+All `CGI` environment variables are available to each of the hooks
 invoked by the 'git-receive-pack'.
 
 GIT
diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt
index 2e67362bd4..2aceb6f26d 100644
--- a/Documentation/git-http-push.txt
+++ b/Documentation/git-http-push.txt
@@ -81,13 +81,13 @@ destination side.
      exist in the set of remote refs; the ref matched <src>
      locally is used as the name of the destination.
 
-Without '--force', the <src> ref is stored at the remote only if
+Without `--force`, the <src> ref is stored at the remote only if
 <dst> does not exist, or <dst> is a proper subset (i.e. an
 ancestor) of <src>.  This check, known as "fast-forward check",
 is performed in order to avoid accidentally overwriting the
 remote ref and lose other peoples' commits from there.
 
-With '--force', the fast-forward check is disabled for all refs.
+With `--force`, the fast-forward check is disabled for all refs.
 
 Optionally, a <ref> parameter can be prefixed with a plus '+' sign
 to disable the fast-forward check only on that ref.
diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
index 8174d27efd..9d27197de8 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -47,7 +47,7 @@ Only print error and warning messages; all other output will be suppressed.
 
 --bare::
 
-Create a bare repository. If GIT_DIR environment is not set, it is set to the
+Create a bare repository. If `GIT_DIR` environment is not set, it is set to the
 current working directory.
 
 --template=<template_directory>::
@@ -130,7 +130,12 @@ The template directory will be one of the following (in order):
  - the default template directory: `/usr/share/git-core/templates`.
 
 The default template directory includes some directory structure, suggested
-"exclude patterns" (see linkgit:gitignore[5]), and sample hook files (see linkgit:githooks[5]).
+"exclude patterns" (see linkgit:gitignore[5]), and sample hook files.
+
+The sample hooks are all disabled by default, To enable one of the
+sample hooks rename it by removing its `.sample` suffix.
+
+See linkgit:githooks[5] for more general info on hook execution.
 
 EXAMPLES
 --------
diff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt
index cc75b25022..e8ecdbf927 100644
--- a/Documentation/git-instaweb.txt
+++ b/Documentation/git-instaweb.txt
@@ -80,8 +80,8 @@ You may specify configuration in your .git/config
 
 -----------------------------------------------------------------------
 
-If the configuration variable 'instaweb.browser' is not set,
-'web.browser' will be used instead if it is defined. See
+If the configuration variable `instaweb.browser` is not set,
+`web.browser` will be used instead if it is defined. See
 linkgit:git-web{litdd}browse[1] for more information about this.
 
 SEE ALSO
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index a77b901f1d..93d1db6528 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -219,7 +219,7 @@ Signed-off-by: Alice <alice@example.com>
 Signed-off-by: Bob <bob@example.com>
 ------------
 
-* Use the '--in-place' option to edit a message file in place:
+* Use the `--in-place` option to edit a message file in place:
 +
 ------------
 $ cat msg.txt
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 03f958029a..32246fdb00 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -29,12 +29,14 @@ OPTIONS
 	(works only for a single file).
 
 --no-decorate::
---decorate[=short|full|no]::
+--decorate[=short|full|auto|no]::
 	Print out the ref names of any commits that are shown. If 'short' is
 	specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and
 	'refs/remotes/' will not be printed. If 'full' is specified, the
-	full ref name (including prefix) will be printed. The default option
-	is 'short'.
+	full ref name (including prefix) will be printed. If 'auto' is
+	specified, then if the output is going to a terminal, the ref names
+	are shown as if 'short' were given, otherwise no ref names are
+	shown. The default option is 'short'.
 
 --source::
 	Print out the ref name given on the command line by which each
@@ -196,12 +198,16 @@ log.showRoot::
 	`git log -p` output would be shown without a diff attached.
 	The default is `true`.
 
+log.showSignature::
+	If `true`, `git log` and related commands will act as if the
+	`--show-signature` option was passed to them.
+
 mailmap.*::
 	See linkgit:git-shortlog[1].
 
 notes.displayRef::
 	Which refs, in addition to the default set by `core.notesRef`
-	or 'GIT_NOTES_REF', to read notes from when showing commit
+	or `GIT_NOTES_REF`, to read notes from when showing commit
 	messages with the `log` family of commands.  See
 	linkgit:git-notes[1].
 +
@@ -210,7 +216,7 @@ multiple times.  A warning will be issued for refs that do not exist,
 but a glob that does not match any refs is silently ignored.
 +
 This setting can be disabled by the `--no-notes` option,
-overridden by the 'GIT_NOTES_DISPLAY_REF' environment variable,
+overridden by the `GIT_NOTES_DISPLAY_REF` environment variable,
 and overridden by the `--notes=<ref>` option.
 
 GIT
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 75c3f4157d..078b556665 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -175,7 +175,7 @@ followed by the  ("attr/<eolattr>").
 
 Output
 ------
-'git ls-files' just outputs the filenames unless '--stage' is specified in
+'git ls-files' just outputs the filenames unless `--stage` is specified in
 which case it outputs:
 
         [<tag> ]<mode> <object> <stage> <file>
diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt
index 16e87fd6dd..dbc91f98ff 100644
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@ -20,16 +20,16 @@ in the current working directory.  Note that:
 
  - the behaviour is slightly different from that of "/bin/ls" in that the
    '<path>' denotes just a list of patterns to match, e.g. so specifying
-   directory name (without '-r') will behave differently, and order of the
+   directory name (without `-r`) will behave differently, and order of the
    arguments does not matter.
 
  - the behaviour is similar to that of "/bin/ls" in that the '<path>' is
    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.
 
@@ -46,7 +46,7 @@ OPTIONS
 
 -t::
 	Show tree entries even when going to recurse them. Has no effect
-	if '-r' was not passed. '-d' implies '-t'.
+	if `-r` was not passed. `-d` implies `-t`.
 
 -l::
 --long::
diff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt
index 4d1b871d96..e3b2a88c4b 100644
--- a/Documentation/git-mailsplit.txt
+++ b/Documentation/git-mailsplit.txt
@@ -8,7 +8,8 @@ git-mailsplit - Simple UNIX mbox splitter program
 SYNOPSIS
 --------
 [verse]
-'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] -o<directory> [--] [(<mbox>|<Maildir>)...]
+'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]
+		-o<directory> [--] [(<mbox>|<Maildir>)...]
 
 DESCRIPTION
 -----------
@@ -47,6 +48,10 @@ OPTIONS
 --keep-cr::
 	Do not remove `\r` from lines ending with `\r\n`.
 
+--mboxrd::
+	Input is of the "mboxrd" format and "^>+From " line escaping is
+	reversed.
+
 GIT
 ---
 Part of the linkgit:git[1] suite
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 07f7295ec8..b758d5556c 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -11,6 +11,7 @@ SYNOPSIS
 [verse]
 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
 	[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
+	[--[no-]allow-unrelated-histories]
 	[--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]
 'git merge' <msg> HEAD <commit>...
 'git merge' --abort
diff --git a/Documentation/git-mktree.txt b/Documentation/git-mktree.txt
index 5c6ebdfad9..c3616e7711 100644
--- a/Documentation/git-mktree.txt
+++ b/Documentation/git-mktree.txt
@@ -32,7 +32,7 @@ OPTIONS
 --batch::
 	Allow building of more than one tree object before exiting.  Each
 	tree is separated by as single blank line. The final new-line is
-	optional.  Note - if the '-z' option is used, lines are terminated
+	optional.  Note - if the `-z` option is used, lines are terminated
 	with NUL.
 
 GIT
diff --git a/Documentation/git-mv.txt b/Documentation/git-mv.txt
index e4531325cd..79449bf98f 100644
--- a/Documentation/git-mv.txt
+++ b/Documentation/git-mv.txt
@@ -32,10 +32,10 @@ OPTIONS
 --force::
 	Force renaming or moving of a file even if the target exists
 -k::
-        Skip move or rename actions which would lead to an error
+	Skip move or rename actions which would lead to an error
 	condition. An error happens when a source is neither existing nor
 	controlled by Git, or when it would overwrite an existing
-        file unless '-f' is given.
+	file unless `-f` is given.
 -n::
 --dry-run::
 	Do nothing; only show what would happen
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index 9c4fd6812c..be7db3048d 100644
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -152,7 +152,7 @@ OPTIONS
 
 -c <object>::
 --reedit-message=<object>::
-	Like '-C', but with '-c' the editor is invoked, so that
+	Like '-C', but with `-c` the editor is invoked, so that
 	the user can further edit the note message.
 
 --allow-empty::
@@ -161,7 +161,7 @@ OPTIONS
 
 --ref <ref>::
 	Manipulate the notes tree in <ref>.  This overrides
-	'GIT_NOTES_REF' and the "core.notesRef" configuration.  The ref
+	`GIT_NOTES_REF` and the "core.notesRef" configuration.  The ref
 	specifies the full refname when it begins with `refs/notes/`; when it
 	begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed
 	to form a full name of the ref.
@@ -333,10 +333,10 @@ notes.<name>.mergeStrategy::
 notes.displayRef::
 	Which ref (or refs, if a glob or specified more than once), in
 	addition to the default set by `core.notesRef` or
-	'GIT_NOTES_REF', to read notes from when showing commit
+	`GIT_NOTES_REF`, to read notes from when showing commit
 	messages with the 'git log' family of commands.
 	This setting can be overridden on the command line or by the
-	'GIT_NOTES_DISPLAY_REF' environment variable.
+	`GIT_NOTES_DISPLAY_REF` environment variable.
 	See linkgit:git-log[1].
 
 notes.rewrite.<command>::
@@ -345,7 +345,7 @@ notes.rewrite.<command>::
 	notes from the original to the rewritten commit.  Defaults to
 	`true`.  See also "`notes.rewriteRef`" below.
 +
-This setting can be overridden by the 'GIT_NOTES_REWRITE_REF'
+This setting can be overridden by the `GIT_NOTES_REWRITE_REF`
 environment variable.
 
 notes.rewriteMode::
@@ -366,33 +366,33 @@ notes.rewriteRef::
 Does not have a default value; you must configure this variable to
 enable note rewriting.
 +
-Can be overridden with the 'GIT_NOTES_REWRITE_REF' environment variable.
+Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable.
 
 
 ENVIRONMENT
 -----------
 
-'GIT_NOTES_REF'::
+`GIT_NOTES_REF`::
 	Which ref to manipulate notes from, instead of `refs/notes/commits`.
 	This overrides the `core.notesRef` setting.
 
-'GIT_NOTES_DISPLAY_REF'::
+`GIT_NOTES_DISPLAY_REF`::
 	Colon-delimited list of refs or globs indicating which refs,
 	in addition to the default from `core.notesRef` or
-	'GIT_NOTES_REF', to read notes from when showing commit
+	`GIT_NOTES_REF`, to read notes from when showing commit
 	messages.
 	This overrides the `notes.displayRef` setting.
 +
 A warning will be issued for refs that do not exist, but a glob that
 does not match any refs is silently ignored.
 
-'GIT_NOTES_REWRITE_MODE'::
+`GIT_NOTES_REWRITE_MODE`::
 	When copying notes during a rewrite, what to do if the target
 	commit already has a note.
 	Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`.
 	This overrides the `core.rewriteMode` setting.
 
-'GIT_NOTES_REWRITE_REF'::
+`GIT_NOTES_REWRITE_REF`::
 	When rewriting commits, which notes to copy from the original
 	to the rewritten commit.  Must be a colon-delimited list of
 	refs or globs.
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 35e3170918..c83aaf39c3 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -104,7 +104,7 @@ $ git p4 sync //path/in/your/perforce/depot
 ------------
 This imports the specified depot into
 'refs/remotes/p4/master' in an existing Git repository.  The
-'--branch' option can be used to specify a different branch to
+`--branch` option can be used to specify a different branch to
 be used for the p4 content.
 
 If a Git repository includes branches 'refs/remotes/origin/p4', these
@@ -114,7 +114,7 @@ from a Git remote, this can be useful in a multi-developer environment.
 
 If there are multiple branches, doing 'git p4 sync' will automatically
 use the "BRANCH DETECTION" algorithm to try to partition new changes
-into the right branch.  This can be overridden with the '--branch'
+into the right branch.  This can be overridden with the `--branch`
 option to specify just a single branch to update.
 
 
@@ -134,7 +134,7 @@ Submit
 ~~~~~~
 Submitting changes from a Git repository back to the p4 repository
 requires a separate p4 client workspace.  This should be specified
-using the 'P4CLIENT' environment variable or the Git configuration
+using the `P4CLIENT` environment variable or the Git configuration
 variable 'git-p4.client'.  The p4 client must exist, but the client root
 will be created and populated if it does not already exist.
 
@@ -150,10 +150,10 @@ $ git p4 submit topicbranch
 ------------
 
 The upstream reference is generally 'refs/remotes/p4/master', but can
-be overridden using the '--origin=' command-line option.
+be overridden using the `--origin=` command-line option.
 
 The p4 changes will be created as the user invoking 'git p4 submit'. The
-'--preserve-user' option will cause ownership to be modified
+`--preserve-user` option will cause ownership to be modified
 according to the author of the Git commit.  This option requires admin
 privileges in p4, which can be granted using 'p4 protect'.
 
@@ -166,7 +166,7 @@ General options
 All commands except clone accept these options.
 
 --git-dir <dir>::
-	Set the 'GIT_DIR' environment variable.  See linkgit:git[1].
+	Set the `GIT_DIR` environment variable.  See linkgit:git[1].
 
 -v::
 --verbose::
@@ -221,7 +221,7 @@ Git repository:
 	where they will be treated as remote-tracking branches by
 	linkgit:git-branch[1] and other commands.  This option instead
 	puts p4 branches in 'refs/heads/p4/'.  Note that future
-	sync operations must specify '--import-local' as well so that
+	sync operations must specify `--import-local` as well so that
 	they can find the p4 branches in refs/heads.
 
 --max-changes <n>::
@@ -245,7 +245,7 @@ Git repository:
 	default, involves removing the entire depot path.  With this
 	option, the full p4 depot path is retained in Git.  For example,
 	path '//depot/main/foo/bar.c', when imported from
-	'//depot/main/', becomes 'foo/bar.c'.  With '--keep-path', the
+	'//depot/main/', becomes 'foo/bar.c'.  With `--keep-path`, the
 	Git path is instead 'depot/main/foo/bar.c'.
 
 --use-client-spec::
@@ -275,7 +275,7 @@ These options can be used to modify 'git p4 submit' behavior.
 --origin <commit>::
 	Upstream location from which commits are identified to submit to
 	p4.  By default, this is the most recent p4 commit reachable
-	from 'HEAD'.
+	from `HEAD`.
 
 -M::
 	Detect renames.  See linkgit:git-diff[1].  Renames will be
@@ -341,7 +341,7 @@ p4 revision specifier on the end:
     Import all changes from both named depot paths into a single
     repository.  Only files below these directories are included.
     There is not a subdirectory in Git for each "proj1" and "proj2".
-    You must use the '--destination' option when specifying more
+    You must use the `--destination` option when specifying more
     than one depot path.  The revision specifier must be specified
     identically on each depot path.  If there are files in the
     depot paths with the same name, the path with the most recently
@@ -355,7 +355,7 @@ CLIENT SPEC
 The p4 client specification is maintained with the 'p4 client' command
 and contains among other fields, a View that specifies how the depot
 is mapped into the client repository.  The 'clone' and 'sync' commands
-can consult the client spec when given the '--use-client-spec' option or
+can consult the client spec when given the `--use-client-spec` option or
 when the useClientSpec variable is true.  After 'git p4 clone', the
 useClientSpec variable is automatically set in the repository
 configuration file.  This allows future 'git p4 submit' commands to
@@ -390,7 +390,7 @@ different areas in the tree, and indicate related content.  'git p4'
 can use these mappings to determine branch relationships.
 
 If you have a repository where all the branches of interest exist as
-subdirectories of a single depot path, you can use '--detect-branches'
+subdirectories of a single depot path, you can use `--detect-branches`
 when cloning or syncing to have 'git p4' automatically find
 subdirectories in p4, and to generate these as branches in Git.
 
@@ -507,7 +507,7 @@ git-p4.labelImportRegexp::
 git-p4.useClientSpec::
 	Specify that the p4 client spec should be used to identify p4
 	depot paths of interest.  This is equivalent to specifying the
-	option '--use-client-spec'.  See the "CLIENT SPEC" section above.
+	option `--use-client-spec`.  See the "CLIENT SPEC" section above.
 	This variable is a boolean, not the name of a p4 client.
 
 git-p4.pathEncoding::
@@ -551,6 +551,17 @@ git-p4.keepEmptyCommits::
 	A changelist that contains only excluded files will be imported
 	as an empty commit if this boolean option is set to true.
 
+git-p4.mapUser::
+	Map a P4 user to a name and email address in Git. Use a string
+	with the following format to create a mapping:
++
+-------------
+git config --add git-p4.mapUser "p4user = First Last <mail@address.com>"
+-------------
++
+A mapping will override any user information from P4. Mappings for
+multiple P4 user can be defined.
+
 Submit variables
 ~~~~~~~~~~~~~~~~
 git-p4.detectRenames::
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index 19cdcd0341..8973510a41 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -104,8 +104,8 @@ base-name::
 	out of memory with a large window, but still be able to take
 	advantage of the large window for the smaller objects.  The
 	size can be suffixed with "k", "m", or "g".
-	`--window-memory=0` makes memory usage unlimited, which is the
-	default.
+	`--window-memory=0` makes memory usage unlimited.  The default
+	is taken from the `pack.windowMemory` configuration variable.
 
 --max-pack-size=<n>::
 	Maximum size of each output pack file. The size can be suffixed with
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index a62a2a615d..d033b258e5 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -128,6 +128,15 @@ unless you have read linkgit:git-rebase[1] carefully.
 --no-rebase::
 	Override earlier --rebase.
 
+--autostash::
+--no-autostash::
+	Before starting rebase, stash local modifications away (see
+	linkgit:git-stash[1]) if needed, and apply the stash when
+	done. `--no-autostash` is useful to override the `rebase.autoStash`
+	configuration variable (see linkgit:git-config[1]).
++
+This option is only valid when "--rebase" is used.
+
 Options related to fetching
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index cf6ee4a4df..47b77e693b 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 [verse]
 'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
 	   [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]
-	   [-u | --set-upstream]
+	   [-u | --set-upstream] [--push-option=<string>]
 	   [--[no-]signed|--sign=(true|false|if-asked)]
 	   [--force-with-lease[=<refname>[:<expect>]]]
 	   [--no-verify] [<repository> [<refspec>...]]
@@ -137,8 +137,8 @@ already exists on the remote side.
 	and also push annotated tags in `refs/tags` that are missing
 	from the remote but are pointing at commit-ish that are
 	reachable from the refs being pushed.  This can also be specified
-	with configuration variable 'push.followTags'.  For more
-	information, see 'push.followTags' in linkgit:git-config[1].
+	with configuration variable `push.followTags`.  For more
+	information, see `push.followTags` in linkgit:git-config[1].
 
 --[no-]signed::
 --sign=(true|false|if-asked)::
@@ -156,6 +156,12 @@ already exists on the remote side.
 	Either all refs are updated, or on error, no refs are updated.
 	If the server does not support atomic pushes the push will fail.
 
+-o::
+--push-option::
+	Transmit the given string to the server, which passes them to
+	the pre-receive as well as the post-receive hook. The given string
+	must not contain a NUL or LF character.
+
 --receive-pack=<git-receive-pack>::
 --exec=<git-receive-pack>::
 	Path to the 'git-receive-pack' program on the remote
@@ -198,10 +204,11 @@ branch we have for it.
 +
 `--force-with-lease=<refname>:<expect>` will protect the named ref (alone),
 if it is going to be updated, by requiring its current value to be
-the same as the specified value <expect> (which is allowed to be
+the same as the specified value `<expect>` (which is allowed to be
 different from the remote-tracking branch we have for the refname,
 or we do not even have to have such a remote-tracking branch when
-this form is used).
+this form is used).  If `<expect>` is the empty string, then the named ref
+must not already exist.
 +
 Note that all forms other than `--force-with-lease=<refname>:<expect>`
 that specifies the expected current value of the ref explicitly are
@@ -240,7 +247,7 @@ origin +master` to force a push to the `master` branch). See the
 	For every branch that is up to date or successfully pushed, add
 	upstream (tracking) reference, used by argument-less
 	linkgit:git-pull[1] and other commands. For more information,
-	see 'branch.<name>.merge' in linkgit:git-config[1].
+	see `branch.<name>.merge` in linkgit:git-config[1].
 
 --[no-]thin::
 	These options are passed to linkgit:git-send-pack[1]. A thin transfer
@@ -275,7 +282,7 @@ origin +master` to force a push to the `master` branch). See the
 	all submodules that changed in the revisions to be pushed will be
 	pushed. If on-demand was not able to push all necessary revisions
 	it will also be aborted and exit with non-zero status. A value of
-	'no' or using '--no-recurse-submodules' can be used to override the
+	'no' or using `--no-recurse-submodules` can be used to override the
 	push.recurseSubmodules configuration variable when no submodule
 	recursion is required.
 
diff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.txt
index ff633b0db7..8cf952b4de 100644
--- a/Documentation/git-quiltimport.txt
+++ b/Documentation/git-quiltimport.txt
@@ -46,14 +46,14 @@ OPTIONS
 	The directory to find the quilt patches.
 +
 The default for the patch directory is patches
-or the value of the $QUILT_PATCHES environment
+or the value of the `$QUILT_PATCHES` environment
 variable.
 
 --series <file>::
 	The quilt series file.
 +
 The default for the series file is <patches>/series
-or the value of the $QUILT_SERIES environment
+or the value of the `$QUILT_SERIES` environment
 variable.
 
 GIT
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 6ed610a031..de222c81af 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -208,10 +208,10 @@ rebase.stat::
 	rebase. False by default.
 
 rebase.autoSquash::
-	If set to true enable '--autosquash' option by default.
+	If set to true enable `--autosquash` option by default.
 
 rebase.autoStash::
-	If set to true enable '--autostash' option by default.
+	If set to true enable `--autostash` option by default.
 
 rebase.missingCommitsCheck::
 	If set to "warn", print warnings about removed commits in
@@ -220,7 +220,7 @@ rebase.missingCommitsCheck::
 	done. "ignore" by default.
 
 rebase.instructionFormat::
-	Custom commit list format to use during an '--interactive' rebase.
+	Custom commit list format to use during an `--interactive` rebase.
 
 OPTIONS
 -------
@@ -391,9 +391,6 @@ idea unless you know what you are doing (see BUGS below).
 	final history. <cmd> will be interpreted as one or more shell
 	commands.
 +
-This option can only be used with the `--interactive` option
-(see INTERACTIVE MODE below).
-+
 You may execute several commands by either using one instance of `--exec`
 with several commands:
 +
@@ -406,6 +403,9 @@ or by giving more than one `--exec`:
 If `--autosquash` is used, "exec" lines will not be appended for
 the intermediate commits, and will only appear at the end of each
 squash/fixup series.
++
+This uses the `--interactive` machinery internally, but it can be run
+without an explicit `--interactive`.
 
 --root::
 	Rebase all commits reachable from <branch>, instead of
@@ -428,9 +428,9 @@ squash/fixup series.
 	"fixup! " or "squash! " after the first, in case you referred to an
 	earlier fixup/squash with `git commit --fixup/--squash`.
 +
-This option is only valid when the '--interactive' option is used.
+This option is only valid when the `--interactive` option is used.
 +
-If the '--autosquash' option is enabled by default using the
+If the `--autosquash` option is enabled by default using the
 configuration variable `rebase.autoSquash`, this option can be
 used to override and disable this setting.
 
diff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.txt
index e700bafa47..80afca866c 100644
--- a/Documentation/git-remote-fd.txt
+++ b/Documentation/git-remote-fd.txt
@@ -17,7 +17,7 @@ fetch, push or archive.
 
 If only <infd> is given, it is assumed to be a bidirectional socket connected
 to remote Git server (git-upload-pack, git-receive-pack or
-git-upload-achive). If both <infd> and <outfd> are given, they are assumed
+git-upload-archive). If both <infd> and <outfd> are given, they are assumed
 to be pipes connected to a remote Git server (<infd> being the inbound pipe
 and <outfd> being the outbound pipe.
 
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 1d7eceaa93..577b969c1b 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -137,9 +137,9 @@ branches, adds to that list.
 Retrieves the URLs for a remote. Configurations for `insteadOf` and
 `pushInsteadOf` are expanded here. By default, only the first URL is listed.
 +
-With '--push', push URLs are queried rather than fetch URLs.
+With `--push`, push URLs are queried rather than fetch URLs.
 +
-With '--all', all URLs for the remote will be listed.
+With `--all`, all URLs for the remote will be listed.
 
 'set-url'::
 
@@ -147,11 +147,11 @@ Changes URLs for the remote. Sets first URL for remote <name> that matches
 regex <oldurl> (first URL if no <oldurl> is given) to <newurl>. If
 <oldurl> doesn't match any URL, an error occurs and nothing is changed.
 +
-With '--push', push URLs are manipulated instead of fetch URLs.
+With `--push`, push URLs are manipulated instead of fetch URLs.
 +
-With '--add', instead of changing existing URLs, new URL is added.
+With `--add`, instead of changing existing URLs, new URL is added.
 +
-With '--delete', instead of changing existing URLs, all URLs matching
+With `--delete`, instead of changing existing URLs, all URLs matching
 regex <url> are deleted for remote <name>.  Trying to delete all
 non-push URLs is an error.
 +
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index b9c02ce481..26afe6ed54 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -33,7 +33,7 @@ OPTIONS
 	pack everything referenced into a single pack.
 	Especially useful when packing a repository that is used
 	for private development. Use
-	with '-d'.  This will clean up the objects that `git prune`
+	with `-d`.  This will clean up the objects that `git prune`
 	leaves behind, but `git fsck --full --dangling` shows as
 	dangling.
 +
@@ -42,7 +42,7 @@ whole new pack in order to get any contained object, no matter how many
 other objects in that pack they already have locally.
 
 -A::
-	Same as `-a`, unless '-d' is used.  Then any unreachable
+	Same as `-a`, unless `-d` is used.  Then any unreachable
 	objects in a previous pack become loose, unpacked objects,
 	instead of being left in the old pack.  Unreachable objects
 	are never intentionally added to a pack, even when repacking.
@@ -100,8 +100,10 @@ other objects in that pack they already have locally.
 	out of memory with a large window, but still be able to take
 	advantage of the large window for the smaller objects.  The
 	size can be suffixed with "k", "m", or "g".
-	`--window-memory=0` makes memory usage unlimited, which is the
-	default.
+	`--window-memory=0` makes memory usage unlimited.  The default
+	is taken from the `pack.windowMemory` configuration variable.
+	Note that the actual memory usage will be the limit multiplied
+	by the number of threads used by linkgit:git-pack-objects[1].
 
 --max-pack-size=<n>::
 	Maximum size of each output pack file. The size can be suffixed with
@@ -128,6 +130,19 @@ other objects in that pack they already have locally.
 	with `-b` or `repack.writeBitmaps`, as it ensures that the
 	bitmapped packfile has the necessary objects.
 
+--unpack-unreachable=<when>::
+	When loosening unreachable objects, do not bother loosening any
+	objects older than `<when>`. This can be used to optimize out
+	the write of any objects that would be immediately pruned by
+	a follow-up `git prune`.
+
+-k::
+--keep-unreachable::
+	When used with `-ad`, any unreachable objects from existing
+	packs will be appended to the end of the packfile instead of
+	being removed. In addition, any unreachable loose objects will
+	be packed (and their loose counterparts removed).
+
 Configuration
 -------------
 
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index 8fff598fd6..e5c57ae6ef 100644
--- a/Documentation/git-replace.txt
+++ b/Documentation/git-replace.txt
@@ -51,7 +51,7 @@ $ git cat-file commit foo
 
 shows information about commit 'bar'.
 
-The 'GIT_NO_REPLACE_OBJECTS' environment variable can be set to
+The `GIT_NO_REPLACE_OBJECTS` environment variable can be set to
 achieve the same effect as the `--no-replace-objects` option.
 
 OPTIONS
diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 573616a04a..837707a8fd 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -24,7 +24,7 @@ from the HEAD commit).
 Note: 'git revert' is used to record some new commits to reverse the
 effect of some earlier commits (often only a faulty one).  If you want to
 throw away all uncommitted changes in your working directory, you
-should see linkgit:git-reset[1], particularly the '--hard' option.  If
+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
@@ -37,7 +37,7 @@ OPTIONS
 	For a more complete list of ways to spell commit names, see
 	linkgit:gitrevisions[7].
 	Sets of commits can also be given but no traversal is done by
-	default, see linkgit:git-rev-list[1] and its '--no-walk'
+	default, see linkgit:git-rev-list[1] and its `--no-walk`
 	option.
 
 -e::
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 771a7b5b09..642d0ef199 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -47,18 +47,18 @@ Composing
 
 --annotate::
 	Review and edit each patch you're about to send. Default is the value
-	of 'sendemail.annotate'. See the CONFIGURATION section for
-	'sendemail.multiEdit'.
+	of `sendemail.annotate`. See the CONFIGURATION section for
+	`sendemail.multiEdit`.
 
 --bcc=<address>,...::
 	Specify a "Bcc:" value for each email. Default is the value of
-	'sendemail.bcc'.
+	`sendemail.bcc`.
 +
 This option may be specified multiple times.
 
 --cc=<address>,...::
 	Specify a starting "Cc:" value for each email.
-	Default is the value of 'sendemail.cc'.
+	Default is the value of `sendemail.cc`.
 +
 This option may be specified multiple times.
 
@@ -66,7 +66,7 @@ This option may be specified multiple times.
 	Invoke a text editor (see GIT_EDITOR in linkgit:git-var[1])
 	to edit an introductory message for the patch series.
 +
-When '--compose' is used, git send-email will use the From, Subject, and
+When `--compose` is used, git send-email will use the From, Subject, and
 In-Reply-To headers specified in the message. If the body of the message
 (what you type after the headers and a blank line) only contains blank
 (or Git: prefixed) lines, the summary won't be sent, but From, Subject,
@@ -74,12 +74,12 @@ and In-Reply-To headers will be used unless they are removed.
 +
 Missing From or In-Reply-To headers will be prompted for.
 +
-See the CONFIGURATION section for 'sendemail.multiEdit'.
+See the CONFIGURATION section for `sendemail.multiEdit`.
 
 --from=<address>::
 	Specify the sender of the emails.  If not specified on the command line,
-	the value of the 'sendemail.from' configuration option is used.  If
-	neither the command-line option nor 'sendemail.from' are set, then the
+	the value of the `sendemail.from` configuration option is used.  If
+	neither the command-line option nor `sendemail.from` are set, then the
 	user will be prompted for the value.  The default for the prompt will be
 	the value of GIT_AUTHOR_IDENT, or GIT_COMMITTER_IDENT if that is not
 	set, as returned by "git var -l".
@@ -114,7 +114,7 @@ is not set, this will be prompted for.
 --to=<address>,...::
 	Specify the primary recipient of the emails generated. Generally, this
 	will be the upstream maintainer of the project involved. Default is the
-	value of the 'sendemail.to' configuration value; if that is unspecified,
+	value of the `sendemail.to` configuration value; if that is unspecified,
 	and --to-cmd is not specified, this will be prompted for.
 +
 This option may be specified multiple times.
@@ -138,7 +138,7 @@ Note that no attempts whatsoever are made to validate the encoding.
 	can be useful when the repository contains files that contain carriage
 	returns, but makes the raw patch email file (as saved from a MUA) much
 	harder to inspect manually.  base64 is even more fool proof, but also
-	even more opaque.  Default is the value of the 'sendemail.transferEncoding'
+	even more opaque.  Default is the value of the `sendemail.transferEncoding`
 	configuration value; if that is unspecified, git will use 8bit and not
 	add a Content-Transfer-Encoding header.
 
@@ -157,20 +157,20 @@ Sending
 	subscribed to a list. In order to use the 'From' address, set the
 	value to "auto". If you use the sendmail binary, you must have
 	suitable privileges for the -f parameter.  Default is the value of the
-	'sendemail.envelopeSender' configuration variable; if that is
+	`sendemail.envelopeSender` configuration variable; if that is
 	unspecified, choosing the envelope sender is left to your MTA.
 
 --smtp-encryption=<encryption>::
 	Specify the encryption to use, either 'ssl' or 'tls'.  Any other
 	value reverts to plain SMTP.  Default is the value of
-	'sendemail.smtpEncryption'.
+	`sendemail.smtpEncryption`.
 
 --smtp-domain=<FQDN>::
 	Specifies the Fully Qualified Domain Name (FQDN) used in the
 	HELO/EHLO command to the SMTP server.  Some servers require the
 	FQDN to match your IP address.  If not set, git send-email attempts
 	to determine your FQDN automatically.  Default is the value of
-	'sendemail.smtpDomain'.
+	`sendemail.smtpDomain`.
 
 --smtp-auth=<mechanisms>::
 	Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting
@@ -182,19 +182,19 @@ $ git send-email --smtp-auth="PLAIN LOGIN GSSAPI" ...
 +
 If at least one of the specified mechanisms matches the ones advertised by the
 SMTP server and if it is supported by the utilized SASL library, the mechanism
-is used for authentication. If neither 'sendemail.smtpAuth' nor '--smtp-auth'
+is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth`
 is specified, all mechanisms supported by the SASL library can be used.
 
 --smtp-pass[=<password>]::
 	Password for SMTP-AUTH. The argument is optional: If no
 	argument is specified, then the empty string is used as
-	the password. Default is the value of 'sendemail.smtpPass',
-	however '--smtp-pass' always overrides this value.
+	the password. Default is the value of `sendemail.smtpPass`,
+	however `--smtp-pass` always overrides this value.
 +
 Furthermore, passwords need not be specified in configuration files
 or on the command line. If a username has been specified (with
-'--smtp-user' or a 'sendemail.smtpUser'), but no password has been
-specified (with '--smtp-pass' or 'sendemail.smtpPass'), then
+`--smtp-user` or a `sendemail.smtpUser`), but no password has been
+specified (with `--smtp-pass` or `sendemail.smtpPass`), then
 a password is obtained using 'git-credential'.
 
 --smtp-server=<host>::
@@ -202,7 +202,7 @@ a password is obtained using 'git-credential'.
 	`smtp.example.com` or a raw IP address).  Alternatively it can
 	specify a full pathname of a sendmail-like program instead;
 	the program must support the `-i` option.  Default value can
-	be specified by the 'sendemail.smtpServer' configuration
+	be specified by the `sendemail.smtpServer` configuration
 	option; the built-in default is `/usr/sbin/sendmail` or
 	`/usr/lib/sendmail` if such program is available, or
 	`localhost` otherwise.
@@ -213,11 +213,11 @@ a password is obtained using 'git-credential'.
 	submission port 587, or the common SSL smtp port 465);
 	symbolic port names (e.g. "submission" instead of 587)
 	are also accepted. The port can also be set with the
-	'sendemail.smtpServerPort' configuration variable.
+	`sendemail.smtpServerPort` configuration variable.
 
 --smtp-server-option=<option>::
 	If set, specifies the outgoing SMTP server option to use.
-	Default value can be specified by the 'sendemail.smtpServerOption'
+	Default value can be specified by the `sendemail.smtpServerOption`
 	configuration option.
 +
 The --smtp-server-option option must be repeated for each option you want
@@ -234,13 +234,13 @@ must be used for each option.
 	certificates concatenated together: see verify(1) -CAfile and
 	-CApath for more information on these). Set it to an empty string
 	to disable certificate verification. Defaults to the value of the
-	'sendemail.smtpsslcertpath' configuration variable, if set, or the
+	`sendemail.smtpsslcertpath` configuration variable, if set, or the
 	backing SSL library's compiled-in default otherwise (which should
 	be the best choice on most platforms).
 
 --smtp-user=<user>::
-	Username for SMTP-AUTH. Default is the value of 'sendemail.smtpUser';
-	if a username is not specified (with '--smtp-user' or 'sendemail.smtpUser'),
+	Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`;
+	if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`),
 	then authentication is not attempted.
 
 --smtp-debug=0|1::
@@ -261,25 +261,25 @@ Automating
 	Specify a command to execute once per patch file which
 	should generate patch file specific "Cc:" entries.
 	Output of this command must be single email address per line.
-	Default is the value of 'sendemail.ccCmd' configuration value.
+	Default is the value of `sendemail.ccCmd` configuration value.
 
 --[no-]chain-reply-to::
 	If this is set, each email will be sent as a reply to the previous
 	email sent.  If disabled with "--no-chain-reply-to", all emails after
 	the first will be sent as replies to the first email sent.  When using
 	this, it is recommended that the first file given be an overview of the
-	entire patch series. Disabled by default, but the 'sendemail.chainReplyTo'
+	entire patch series. Disabled by default, but the `sendemail.chainReplyTo`
 	configuration variable can be used to enable it.
 
 --identity=<identity>::
 	A configuration identity. When given, causes values in the
 	'sendemail.<identity>' subsection to take precedence over
 	values in the 'sendemail' section. The default identity is
-	the value of 'sendemail.identity'.
+	the value of `sendemail.identity`.
 
 --[no-]signed-off-by-cc::
 	If this is set, add emails found in Signed-off-by: or Cc: lines to the
-	cc list. Default is the value of 'sendemail.signedoffbycc' configuration
+	cc list. Default is the value of `sendemail.signedoffbycc` configuration
 	value; if that is unspecified, default to --signed-off-by-cc.
 
 --[no-]cc-cover::
@@ -312,13 +312,13 @@ Automating
 - 'all' will suppress all auto cc values.
 --
 +
-Default is the value of 'sendemail.suppresscc' configuration value; if
+Default is the value of `sendemail.suppresscc` configuration value; if
 that is unspecified, default to 'self' if --suppress-from is
 specified, as well as 'body' if --no-signed-off-cc is specified.
 
 --[no-]suppress-from::
 	If this is set, do not add the From: address to the cc: list.
-	Default is the value of 'sendemail.suppressFrom' configuration
+	Default is the value of `sendemail.suppressFrom` configuration
 	value; if that is unspecified, default to --no-suppress-from.
 
 --[no-]thread::
@@ -330,7 +330,7 @@ specified, as well as 'body' if --no-signed-off-cc is specified.
 +
 If disabled with "--no-thread", those headers will not be added
 (unless specified with --in-reply-to).  Default is the value of the
-'sendemail.thread' configuration value; if that is unspecified,
+`sendemail.thread` configuration value; if that is unspecified,
 default to --thread.
 +
 It is up to the user to ensure that no In-Reply-To header already
@@ -355,7 +355,7 @@ Administering
 - 'auto' is equivalent to 'cc' + 'compose'
 --
 +
-Default is the value of 'sendemail.confirm' configuration value; if that
+Default is the value of `sendemail.confirm` configuration value; if that
 is unspecified, default to 'auto' unless any of the suppress options
 have been specified, in which case default to 'compose'.
 
@@ -364,8 +364,8 @@ have been specified, in which case default to 'compose'.
 
 --[no-]format-patch::
 	When an argument may be understood either as a reference or as a file name,
-	choose to understand it as a format-patch argument ('--format-patch')
-	or as a file name ('--no-format-patch'). By default, when such a conflict
+	choose to understand it as a format-patch argument (`--format-patch`)
+	or as a file name (`--no-format-patch`). By default, when such a conflict
 	occurs, git send-email will fail.
 
 --quiet::
@@ -381,8 +381,8 @@ have been specified, in which case default to 'compose'.
 			is due to SMTP limits as described by http://www.ietf.org/rfc/rfc2821.txt.
 --
 +
-Default is the value of 'sendemail.validate'; if this is not set,
-default to '--validate'.
+Default is the value of `sendemail.validate`; if this is not set,
+default to `--validate`.
 
 --force::
 	Send emails even if safety checks would prevent it.
@@ -403,7 +403,7 @@ CONFIGURATION
 
 sendemail.aliasesFile::
 	To avoid typing long email addresses, point this to one or more
-	email aliases files.  You must also supply 'sendemail.aliasFileType'.
+	email aliases files.  You must also supply `sendemail.aliasFileType`.
 
 sendemail.aliasFileType::
 	Format of the file(s) specified in sendemail.aliasesFile. Must be
@@ -428,13 +428,13 @@ sendmail;;
 
 sendemail.multiEdit::
 	If true (default), a single editor instance will be spawned to edit
-	files you have to edit (patches when '--annotate' is used, and the
-	summary when '--compose' is used). If false, files will be edited one
+	files you have to edit (patches when `--annotate` is used, and the
+	summary when `--compose` is used). If false, files will be edited one
 	after the other, spawning a new editor each time.
 
 sendemail.confirm::
 	Sets the default for whether to confirm before sending. Must be
-	one of 'always', 'never', 'cc', 'compose', or 'auto'. See '--confirm'
+	one of 'always', 'never', 'cc', 'compose', or 'auto'. See `--confirm`
 	in the previous section for the meaning of these values.
 
 EXAMPLE
@@ -450,6 +450,19 @@ edit ~/.gitconfig to specify your account settings:
 		smtpUser = yourname@gmail.com
 		smtpServerPort = 587
 
+If you have multifactor authentication setup on your gmail account, you will
+need to generate an app-specific password for use with 'git send-email'. Visit
+https://security.google.com/settings/security/apppasswords to setup an
+app-specific password.  Once setup, you can store it with the credentials
+helper:
+
+	$ git credential fill
+	protocol=smtp
+	host=smtp.gmail.com
+	username=youname@gmail.com
+	password=app-password
+
+
 Once your commits are ready to be sent to the mailing list, run the
 following commands:
 
diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt
index 6aa91e830c..a831dd0288 100644
--- a/Documentation/git-send-pack.txt
+++ b/Documentation/git-send-pack.txt
@@ -44,7 +44,7 @@ OPTIONS
 	option, then the refs from stdin are processed after those
 	on the command line.
 +
-If '--stateless-rpc' is specified together with this option then
+If `--stateless-rpc` is specified together with this option then
 the list of refs must be in packet format (pkt-line). Each ref must
 be in a separate packet, and the list must end with a flush packet.
 
@@ -99,11 +99,11 @@ Specifying the Refs
 There are three ways to specify which refs to update on the
 remote end.
 
-With '--all' flag, all refs that exist locally are transferred to
+With `--all` flag, all refs that exist locally are transferred to
 the remote side.  You cannot specify any '<ref>' if you use
 this flag.
 
-Without '--all' and without any '<ref>', the heads that exist
+Without `--all` and without any '<ref>', the heads that exist
 both on the local side and on the remote side are updated.
 
 When one or more '<ref>' are specified explicitly (whether on the
@@ -134,13 +134,13 @@ name. See linkgit:git-rev-parse[1].
      exist in the set of remote refs; the ref matched <src>
      locally is used as the name of the destination.
 
-Without '--force', the <src> ref is stored at the remote only if
+Without `--force`, the <src> ref is stored at the remote only if
 <dst> does not exist, or <dst> is a proper subset (i.e. an
 ancestor) of <src>.  This check, known as "fast-forward check",
 is performed in order to avoid accidentally overwriting the
 remote ref and lose other peoples' commits from there.
 
-With '--force', the fast-forward check is disabled for all refs.
+With `--force`, the fast-forward check is disabled for all refs.
 
 Optionally, a <ref> parameter can be prefixed with a plus '+' sign
 to disable the fast-forward check only on that ref.
diff --git a/Documentation/git-sh-setup.txt b/Documentation/git-sh-setup.txt
index 4f67c4cde6..8632612c31 100644
--- a/Documentation/git-sh-setup.txt
+++ b/Documentation/git-sh-setup.txt
@@ -41,7 +41,7 @@ usage::
 	die with the usage message.
 
 set_reflog_action::
-	Set GIT_REFLOG_ACTION environment to a given string (typically
+	Set `GIT_REFLOG_ACTION` environment to a given string (typically
 	the name of the program) unless it is already set.  Whenever
 	the script runs a `git` command that updates refs, a reflog
 	entry is created using the value of this string to leave the
diff --git a/Documentation/git-shell.txt b/Documentation/git-shell.txt
index e4bdd2235c..2e30a3e42d 100644
--- a/Documentation/git-shell.txt
+++ b/Documentation/git-shell.txt
@@ -24,7 +24,7 @@ named `git-shell-commands` in the user's home directory.
 COMMANDS
 --------
 
-'git shell' accepts the following commands after the '-c' option:
+'git shell' accepts the following commands after the `-c` option:
 
 'git receive-pack <argument>'::
 'git upload-pack <argument>'::
@@ -43,7 +43,7 @@ directory.
 INTERACTIVE USE
 ---------------
 
-By default, the commands above can be executed only with the '-c'
+By default, the commands above can be executed only with the `-c`
 option; the shell is not interactive.
 
 If a `~/git-shell-commands` directory is present, 'git shell'
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index b91d4e545b..7818e0f098 100644
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -60,7 +60,7 @@ OPTIONS
         are shown before their parents).
 
 --date-order::
-	This option is similar to '--topo-order' in the sense that no
+	This option is similar to `--topo-order` in the sense that no
 	parent comes before all of its children, but otherwise commits
 	are ordered according to their commit date.
 
diff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt
index 3a32451984..c0aa871c9e 100644
--- a/Documentation/git-show-ref.txt
+++ b/Documentation/git-show-ref.txt
@@ -60,7 +60,7 @@ OPTIONS
 
 	Enable stricter reference checking by requiring an exact ref path.
 	Aside from returning an error code of 1, it will also print an error
-	message if '--quiet' was not specified.
+	message if `--quiet` was not specified.
 
 --abbrev[=<n>]::
 
@@ -70,7 +70,7 @@ OPTIONS
 -q::
 --quiet::
 
-	Do not print any results to stdout. When combined with '--verify' this
+	Do not print any results to stdout. When combined with `--verify` this
 	can be used to silently check if a reference exists.
 
 --exclude-existing[=<pattern>]::
@@ -134,7 +134,7 @@ use:
 This will show "refs/heads/master" but also "refs/remote/other-repo/master",
 if such references exists.
 
-When using the '--verify' flag, the command requires an exact path:
+When using the `--verify` flag, the command requires an exact path:
 
 -----------------------------------------------------------------------------
 	git show-ref --verify refs/heads/master
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index ad851838cc..bf3bb372ee 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -15,8 +15,9 @@ SYNOPSIS
 'git submodule' [--quiet] init [--] [<path>...]
 'git submodule' [--quiet] deinit [-f|--force] (--all|[--] <path>...)
 'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch]
-	      [-f|--force] [--rebase|--merge] [--reference <repository>]
-	      [--depth <depth>] [--recursive] [--] [<path>...]
+	      [--[no-]recommend-shallow] [-f|--force] [--rebase|--merge]
+	      [--reference <repository>] [--depth <depth>] [--recursive]
+	      [--jobs <n>] [--] [<path>...]
 'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) <n>]
 	      [commit] [--] [<path>...]
 'git submodule' [--quiet] foreach [--recursive] <command>
@@ -384,6 +385,17 @@ for linkgit:git-clone[1]'s `--reference` and `--shared` options carefully.
 	clone with a history truncated to the specified number of revisions.
 	See linkgit:git-clone[1]
 
+--[no-]recommend-shallow::
+	This option is only valid for the update command.
+	The initial clone of a submodule will use the recommended
+	`submodule.<name>.shallow` as provided by the .gitmodules file
+	by default. To ignore the suggestions use `--no-recommend-shallow`.
+
+-j <n>::
+--jobs <n>::
+	This option is only valid for the update command.
+	Clone new submodules in parallel with as many jobs.
+	Defaults to the `submodule.fetchJobs` option.
 
 <path>...::
 	Paths to submodule(s). When specified this will restrict the command
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index fb23a98a17..5f9e65b0c4 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -98,11 +98,11 @@ your Perl's Getopt::Long is < v2.37).
 --ignore-paths=<regex>;;
 	When passed to 'init' or 'clone' this regular expression will
 	be preserved as a config key.  See 'fetch' for a description
-	of '--ignore-paths'.
+	of `--ignore-paths`.
 --include-paths=<regex>;;
 	When passed to 'init' or 'clone' this regular expression will
 	be preserved as a config key.  See 'fetch' for a description
-	of '--include-paths'.
+	of `--include-paths`.
 --no-minimize-url;;
 	When tracking multiple directories (using --stdlayout,
 	--branches, or --tags options), git svn will attempt to connect
@@ -110,7 +110,7 @@ your Perl's Getopt::Long is < v2.37).
 	repository.  This default allows better tracking of history if
 	entire projects are moved within a repository, but may cause
 	issues on repositories where read access restrictions are in
-	place.  Passing '--no-minimize-url' will allow git svn to
+	place.  Passing `--no-minimize-url` will allow git svn to
 	accept URLs as-is without attempting to connect to a higher
 	level directory.  This option is off by default when only
 	one URL/branch is tracked (it would do little good).
@@ -141,7 +141,7 @@ the same local time zone.
 --ignore-paths=<regex>;;
 	This allows one to specify a Perl regular expression that will
 	cause skipping of all matching paths from checkout from SVN.
-	The '--ignore-paths' option should match for every 'fetch'
+	The `--ignore-paths` option should match for every 'fetch'
 	(including automatic fetches due to 'clone', 'dcommit',
 	'rebase', etc) on a given repository.
 +
@@ -170,10 +170,10 @@ Skip "branches" and "tags" of first level directories;;
 --include-paths=<regex>;;
 	This allows one to specify a Perl regular expression that will
 	cause the inclusion of only matching paths from checkout from SVN.
-	The '--include-paths' option should match for every 'fetch'
+	The `--include-paths` option should match for every 'fetch'
 	(including automatic fetches due to 'clone', 'dcommit',
-	'rebase', etc) on a given repository. '--ignore-paths' takes
-	precedence over '--include-paths'.
+	'rebase', etc) on a given repository. `--ignore-paths` takes
+	precedence over `--include-paths`.
 +
 [verse]
 config key: svn-remote.<name>.include-paths
@@ -191,7 +191,7 @@ config key: svn-remote.<name>.include-paths
 	or if a second argument is passed; it will create a directory
 	and work within that.  It accepts all arguments that the
 	'init' and 'fetch' commands accept; with the exception of
-	'--fetch-all' and '--parent'.  After a repository is cloned,
+	`--fetch-all` and `--parent`.  After a repository is cloned,
 	the 'fetch' command will be able to update revisions without
 	affecting the working tree; and the 'rebase' command will be
 	able to update the working tree with the latest changes.
@@ -216,7 +216,7 @@ it preserves linear history with 'git rebase' instead of
 'git merge' for ease of dcommitting with 'git svn'.
 +
 This accepts all options that 'git svn fetch' and 'git rebase'
-accept.  However, '--fetch-all' only fetches from the current
+accept.  However, `--fetch-all` only fetches from the current
 [svn-remote], and not all [svn-remote] definitions.
 +
 Like 'git rebase'; this requires that the working tree be clean
@@ -459,6 +459,20 @@ Any other arguments are passed directly to 'git log'
 	Gets the Subversion property given as the first argument, for a
 	file.  A specific revision can be specified with -r/--revision.
 
+'propset'::
+	Sets the Subversion property given as the first argument, to the
+	value given as the second argument for the file given as the
+	third argument.
++
+Example:
++
+------------------------------------------------------------------------
+git svn propset svn:keywords "FreeBSD=%H" devel/py-tipper/Makefile
+------------------------------------------------------------------------
++
+This will set the property 'svn:keywords' to 'FreeBSD=%H' for the file
+'devel/py-tipper/Makefile'.
+
 'show-externals'::
 	Shows the Subversion externals.  Use -r/--revision to specify a
 	specific revision.
@@ -611,6 +625,9 @@ config key: svn.authorsfile
 	with the committer name as the first argument.  The program is
 	expected to return a single line of the form "Name <email>",
 	which will be treated as if included in the authors file.
++
+[verse]
+config key: svn.authorsProg
 
 -q::
 --quiet::
@@ -748,7 +765,7 @@ svn-remote.<name>.rewriteUUID::
 
 svn-remote.<name>.pushurl::
 
-	Similar to Git's 'remote.<name>.pushurl', this key is designed
+	Similar to Git's `remote.<name>.pushurl`, this key is designed
 	to be used in cases where 'url' points to an SVN repository
 	via a read-only transport, to provide an alternate read/write
 	transport. It is assumed that both keys point to the same
@@ -905,7 +922,7 @@ parent of the branch. However, it is possible that there is no suitable
 Git commit to serve as parent.  This will happen, among other reasons,
 if the SVN branch is a copy of a revision that was not fetched by 'git
 svn' (e.g. because it is an old revision that was skipped with
-'--revision'), or if in SVN a directory was copied that is not tracked
+`--revision`), or if in SVN a directory was copied that is not tracked
 by 'git svn' (such as a branch that is not tracked at all, or a
 subdirectory of a tracked branch). In these cases, 'git svn' will still
 create a Git branch, but instead of using an existing Git commit as the
@@ -982,12 +999,12 @@ directories in the working copy.  While this is the easiest way to get a
 copy of a complete repository, for projects with many branches it will
 lead to a working copy many times larger than just the trunk. Thus for
 projects using the standard directory structure (trunk/branches/tags),
-it is recommended to clone with option '--stdlayout'. If the project
+it is recommended to clone with option `--stdlayout`. If the project
 uses a non-standard structure, and/or if branches and tags are not
 required, it is easiest to only clone one directory (typically trunk),
 without giving any repository layout options.  If the full history with
-branches and tags is required, the options '--trunk' / '--branches' /
-'--tags' must be used.
+branches and tags is required, the options `--trunk` / `--branches` /
+`--tags` must be used.
 
 When using multiple --branches or --tags, 'git svn' does not automatically
 handle name collisions (for example, if two branches from different paths have
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index abab4814ec..7ecca8e247 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -78,7 +78,7 @@ OPTIONS
 
 -v::
 --verify::
-	Verify the gpg signature of the given tag names.
+	Verify the GPG signature of the given tag names.
 
 -n<num>::
 	<num> specifies how many lines from the annotation, if any,
@@ -104,7 +104,7 @@ OPTIONS
 	order can also be affected by the
 	"versionsort.prereleaseSuffix" configuration variable.
 	The keys supported are the same as those in `git for-each-ref`.
-	Sort order defaults to the value configured for the 'tag.sort'
+	Sort order defaults to the value configured for the `tag.sort`
 	variable if it exists, or lexicographic order otherwise. See
 	linkgit:git-config[1].
 
@@ -167,7 +167,7 @@ This option is only applicable when listing tags without annotation lines.
 
 --[no-]merged [<commit>]::
 	Only list tags whose tips are reachable, or not reachable
-	if '--no-merged' is used, from the specified commit ('HEAD'
+	if `--no-merged` is used, from the specified commit (`HEAD`
 	if not specified).
 
 CONFIGURATION
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index c6cbed189c..7386c93162 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -102,7 +102,7 @@ thus, in case the assumed-untracked file is changed upstream,
 you will need to handle the situation manually.
 
 --really-refresh::
-	Like '--refresh', but checks stat information unconditionally,
+	Like `--refresh`, but checks stat information unconditionally,
 	without regard to the "assume unchanged" setting.
 
 --[no-]skip-worktree::
@@ -211,7 +211,7 @@ will remove the intended effect of the option.
 
 Using --refresh
 ---------------
-'--refresh' does not calculate a new sha1 file or bring the index
+`--refresh` does not calculate a new sha1 file or bring the index
 up-to-date for mode/content changes. But what it *does* do is to
 "re-match" the stat information of a file with the index, so that you
 can refresh the index for a file that hasn't been changed but where
@@ -222,7 +222,7 @@ up the stat index details with the proper files.
 
 Using --cacheinfo or --info-only
 --------------------------------
-'--cacheinfo' is used to register a file that is not in the
+`--cacheinfo` is used to register a file that is not in the
 current working directory.  This is useful for minimum-checkout
 merging.
 
@@ -232,12 +232,12 @@ To pretend you have a file with mode and sha1 at path, say:
 $ git update-index --cacheinfo <mode>,<sha1>,<path>
 ----------------
 
-'--info-only' is used to register files without placing them in the object
+`--info-only` is used to register files without placing them in the object
 database.  This is useful for status-only repositories.
 
-Both '--cacheinfo' and '--info-only' behave similarly: the index is updated
-but the object database isn't.  '--cacheinfo' is useful when the object is
-in the database but the file isn't available locally.  '--info-only' is
+Both `--cacheinfo` and `--info-only` behave similarly: the index is updated
+but the object database isn't.  `--cacheinfo` is useful when the object is
+in the database but the file isn't available locally.  `--info-only` is
 useful when the file is available, but you do not wish to update the
 object database.
 
diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt
index 0abc806ea9..822ad593af 100644
--- a/Documentation/git-upload-pack.txt
+++ b/Documentation/git-upload-pack.txt
@@ -9,8 +9,8 @@ git-upload-pack - Send objects packed back to git-fetch-pack
 SYNOPSIS
 --------
 [verse]
-'git-upload-pack' [--strict] [--timeout=<n>] <directory>
-
+'git-upload-pack' [--[no-]strict] [--timeout=<n>] [--stateless-rpc]
+		  [--advertise-refs] <directory>
 DESCRIPTION
 -----------
 Invoked by 'git fetch-pack', learns what
@@ -25,12 +25,22 @@ repository.  For push operations, see 'git send-pack'.
 OPTIONS
 -------
 
---strict::
+--[no-]strict::
 	Do not try <directory>/.git/ if <directory> is no Git directory.
 
 --timeout=<n>::
 	Interrupt transfer after <n> seconds of inactivity.
 
+--stateless-rpc::
+	Perform only a single read-write cycle with stdin and stdout.
+	This fits with the HTTP POST request processing model where
+	a program may read the request, write a response, and must exit.
+
+--advertise-refs::
+	Only the initial ref advertisement is output, and the program exits
+	immediately. This fits with the HTTP GET request model, where
+	no request content is received but a response must be produced.
+
 <directory>::
 	The repository to sync from.
 
diff --git a/Documentation/git-verify-commit.txt b/Documentation/git-verify-commit.txt
index ecf4da16cf..92097f6673 100644
--- a/Documentation/git-verify-commit.txt
+++ b/Documentation/git-verify-commit.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-Validates the gpg signature created by 'git commit -S'.
+Validates the GPG signature created by 'git commit -S'.
 
 OPTIONS
 -------
diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt
index 16ede5b4c3..2d6b09a43c 100644
--- a/Documentation/git-web--browse.txt
+++ b/Documentation/git-web--browse.txt
@@ -62,14 +62,14 @@ CONF.VAR (from -c option) and web.browser
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The web browser can be specified using a configuration variable passed
-with the -c (or --config) command-line option, or the 'web.browser'
+with the -c (or --config) command-line option, or the `web.browser`
 configuration variable if the former is not used.
 
 browser.<tool>.path
 ~~~~~~~~~~~~~~~~~~~
 
 You can explicitly provide a full path to your preferred browser by
-setting the configuration variable 'browser.<tool>.path'. For example,
+setting the configuration variable `browser.<tool>.path`. For example,
 you can configure the absolute path to firefox by setting
 'browser.firefox.path'. Otherwise, 'git web{litdd}browse' assumes the tool
 is available in PATH.
@@ -79,7 +79,7 @@ browser.<tool>.cmd
 
 When the browser, specified by options or configuration variables, is
 not among the supported ones, then the corresponding
-'browser.<tool>.cmd' configuration variable will be looked up. If this
+`browser.<tool>.cmd` configuration variable will be looked up. If this
 variable exists then 'git web{litdd}browse' will treat the specified tool
 as a custom command and will use a shell eval to run the command with
 the URLs passed as arguments.
@@ -110,7 +110,7 @@ Note about git-config --global
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Note that these configuration variables should probably be set using
-the '--global' flag, for example like this:
+the `--global` flag, for example like this:
 
 ------------------------------------------------
 $ git config --global web.browser firefox
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 62c76c1c89..0aeb020d02 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -9,9 +9,11 @@ git-worktree - Manage multiple working trees
 SYNOPSIS
 --------
 [verse]
-'git worktree add' [-f] [--detach] [-b <new-branch>] <path> [<branch>]
-'git worktree prune' [-n] [-v] [--expire <expire>]
+'git worktree add' [-f] [--detach] [--checkout] [-b <new-branch>] <path> [<branch>]
 'git worktree list' [--porcelain]
+'git worktree lock' [--reason <string>] <worktree>
+'git worktree prune' [-n] [-v] [--expire <expire>]
+'git worktree unlock' <worktree>
 
 DESCRIPTION
 -----------
@@ -38,9 +40,8 @@ section "DETAILS" for more information.
 
 If a linked working tree is stored on a portable device or network share
 which is not always mounted, you can prevent its administrative files from
-being pruned by creating a file named 'locked' alongside the other
-administrative files, optionally containing a plain text reason that
-pruning should be suppressed. See section "DETAILS" for more information.
+being pruned by issuing the `git worktree lock` command, optionally
+specifying `--reason` to explain why the working tree is locked.
 
 COMMANDS
 --------
@@ -48,16 +49,13 @@ add <path> [<branch>]::
 
 Create `<path>` and checkout `<branch>` into it. The new working directory
 is linked to the current repository, sharing everything except working
-directory specific files such as HEAD, index, etc.
+directory specific files such as HEAD, index, etc. `-` may also be
+specified as `<branch>`; it is synonymous with `@{-1}`.
 +
 If `<branch>` is omitted and neither `-b` nor `-B` nor `--detached` used,
 then, as a convenience, a new branch based at HEAD is created automatically,
 as if `-b $(basename <path>)` was specified.
 
-prune::
-
-Prune working tree information in $GIT_DIR/worktrees.
-
 list::
 
 List details of each worktree.  The main worktree is listed first, followed by
@@ -65,6 +63,22 @@ each of the linked worktrees.  The output details include if the worktree is
 bare, the revision currently checked out, and the branch currently checked out
 (or 'detached HEAD' if none).
 
+lock::
+
+If a working tree is on a portable device or network share which
+is not always mounted, lock it to prevent its administrative
+files from being pruned automatically. This also prevents it from
+being moved or deleted. Optionally, specify a reason for the lock
+with `--reason`.
+
+prune::
+
+Prune working tree information in $GIT_DIR/worktrees.
+
+unlock::
+
+Unlock a working tree, allowing it to be pruned, moved or deleted.
+
 OPTIONS
 -------
 
@@ -87,6 +101,12 @@ OPTIONS
 	With `add`, detach HEAD in the new working tree. See "DETACHED HEAD"
 	in linkgit:git-checkout[1].
 
+--[no-]checkout::
+	By default, `add` checks out `<branch>`, however, `--no-checkout` can
+	be used to suppress checkout in order to make customizations,
+	such as configuring sparse-checkout. See "Sparse checkout"
+	in linkgit:git-read-tree[1].
+
 -n::
 --dry-run::
 	With `prune`, do not remove anything; just report what it would
@@ -104,6 +124,18 @@ OPTIONS
 --expire <time>::
 	With `prune`, only expire unused working trees older than <time>.
 
+--reason <string>::
+	With `lock`, an explanation why the working tree is locked.
+
+<worktree>::
+	Working trees can be identified by path, either relative or
+	absolute.
++
+If the last path components in the working tree's path is unique among
+working trees, it can be used to identify worktrees. For example if
+you only have to working trees at "/abc/def/ghi" and "/abc/def/ggg",
+then "ghi" or "def/ghi" is enough to point to the former working tree.
+
 DETAILS
 -------
 Each linked working tree has a private sub-directory in the repository's
@@ -144,7 +176,8 @@ instead.
 
 To prevent a $GIT_DIR/worktrees entry from being pruned (which
 can be useful in some situations, such as when the
-entry's working tree is stored on a portable device), add a file named
+entry's working tree is stored on a portable device), use the
+`git worktree lock` command, which adds a file named
 'locked' to the entry's directory. The file contains the reason in
 plain text. For example, if a linked working tree's `.git` file points
 to `/path/main/.git/worktrees/test-next` then a file named
@@ -220,8 +253,6 @@ performed manually, such as:
 - `remove` to remove a linked working tree and its administrative files (and
   warn if the working tree is dirty)
 - `mv` to move or rename a working tree and update its administrative files
-- `lock` to prevent automatic pruning of administrative files (for instance,
-  for a working tree on a portable device)
 
 GIT
 ---
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 5a10e9b4a0..bd659c4471 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -31,8 +31,8 @@ page to learn what commands Git offers.  You can learn more about
 individual Git commands with "git help command".  linkgit:gitcli[7]
 manual page gives you an overview of the command-line command syntax.
 
-Formatted and hyperlinked version of the latest Git documentation
-can be viewed at `http://git-htmldocs.googlecode.com/git/git.html`.
+A formatted and hyperlinked copy of the latest Git documentation
+can be viewed at `https://git.github.io/htmldocs/git.html`.
 
 ifdef::stalenotes[]
 [NOTE]
@@ -43,6 +43,14 @@ unreleased) version of Git, that is available from the 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
+* link:v2.9.3/git.html[documentation for release 2.9.3]
+
+* release notes for
+  link:RelNotes/2.9.3.txt[2.9.3],
+  link:RelNotes/2.9.2.txt[2.9.2],
+  link:RelNotes/2.9.1.txt[2.9.1],
+  link:RelNotes/2.9.0.txt[2.9].
+
 * link:v2.8.4/git.html[documentation for release 2.8.4]
 
 * release notes for
@@ -508,7 +516,7 @@ OPTIONS
 
 --help::
 	Prints the synopsis and a list of the most commonly used
-	commands. If the option '--all' or '-a' is given then all
+	commands. If the option `--all` or `-a` is given then all
 	available commands are printed. If a Git command is named this
 	option will bring up the manual page for that command.
 +
@@ -572,7 +580,7 @@ foo.bar= ...`) sets `foo.bar` to the empty string.
 
 --git-dir=<path>::
 	Set the path to the repository. This can also be controlled by
-	setting the GIT_DIR environment variable. It can be an absolute
+	setting the `GIT_DIR` environment variable. It can be an absolute
 	path or relative path to current working directory.
 
 --work-tree=<path>::
@@ -822,46 +830,46 @@ These environment variables apply to 'all' core Git commands. Nb: it
 is worth noting that they may be used/overridden by SCMS sitting above
 Git so take care if using a foreign front-end.
 
-'GIT_INDEX_FILE'::
+`GIT_INDEX_FILE`::
 	This environment allows the specification of an alternate
 	index file. If not specified, the default of `$GIT_DIR/index`
 	is used.
 
-'GIT_INDEX_VERSION'::
+`GIT_INDEX_VERSION`::
 	This environment variable allows the specification of an index
 	version for new repositories.  It won't affect existing index
 	files.  By default index file version 2 or 3 is used. See
 	linkgit:git-update-index[1] for more information.
 
-'GIT_OBJECT_DIRECTORY'::
+`GIT_OBJECT_DIRECTORY`::
 	If the object storage directory is specified via this
 	environment variable then the sha1 directories are created
 	underneath - otherwise the default `$GIT_DIR/objects`
 	directory is used.
 
-'GIT_ALTERNATE_OBJECT_DIRECTORIES'::
+`GIT_ALTERNATE_OBJECT_DIRECTORIES`::
 	Due to the immutable nature of Git objects, old objects can be
 	archived into shared, read-only directories. This variable
 	specifies a ":" separated (on Windows ";" separated) list
 	of Git object directories which can be used to search for Git
 	objects. New objects will not be written to these directories.
 
-'GIT_DIR'::
-	If the 'GIT_DIR' environment variable is set then it
+`GIT_DIR`::
+	If the `GIT_DIR` environment variable is set then it
 	specifies a path to use instead of the default `.git`
 	for the base of the repository.
-	The '--git-dir' command-line option also sets this value.
+	The `--git-dir` command-line option also sets this value.
 
-'GIT_WORK_TREE'::
+`GIT_WORK_TREE`::
 	Set the path to the root of the working tree.
-	This can also be controlled by the '--work-tree' command-line
+	This can also be controlled by the `--work-tree` command-line
 	option and the core.worktree configuration variable.
 
-'GIT_NAMESPACE'::
+`GIT_NAMESPACE`::
 	Set the Git namespace; see linkgit:gitnamespaces[7] for details.
-	The '--namespace' command-line option also sets this value.
+	The `--namespace` command-line option also sets this value.
 
-'GIT_CEILING_DIRECTORIES'::
+`GIT_CEILING_DIRECTORIES`::
 	This should be a colon-separated list of absolute paths.  If
 	set, it is a list of directories that Git should not chdir up
 	into while looking for a repository directory (useful for
@@ -874,19 +882,19 @@ Git so take care if using a foreign front-end.
 	can add an empty entry to the list to tell Git that the
 	subsequent entries are not symlinks and needn't be resolved;
 	e.g.,
-	'GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink'.
+	`GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`.
 
-'GIT_DISCOVERY_ACROSS_FILESYSTEM'::
+`GIT_DISCOVERY_ACROSS_FILESYSTEM`::
 	When run in a directory that does not have ".git" repository
 	directory, Git tries to find such a directory in the parent
 	directories to find the top of the working tree, but by default it
 	does not cross filesystem boundaries.  This environment variable
 	can be set to true to tell Git not to stop at filesystem
-	boundaries.  Like 'GIT_CEILING_DIRECTORIES', this will not affect
-	an explicit repository directory set via 'GIT_DIR' or on the
+	boundaries.  Like `GIT_CEILING_DIRECTORIES`, this will not affect
+	an explicit repository directory set via `GIT_DIR` or on the
 	command line.
 
-'GIT_COMMON_DIR'::
+`GIT_COMMON_DIR`::
 	If this variable is set to a path, non-worktree files that are
 	normally in $GIT_DIR will be taken from this path
 	instead. Worktree-specific files such as HEAD or index are
@@ -897,28 +905,28 @@ Git so take care if using a foreign front-end.
 
 Git Commits
 ~~~~~~~~~~~
-'GIT_AUTHOR_NAME'::
-'GIT_AUTHOR_EMAIL'::
-'GIT_AUTHOR_DATE'::
-'GIT_COMMITTER_NAME'::
-'GIT_COMMITTER_EMAIL'::
-'GIT_COMMITTER_DATE'::
+`GIT_AUTHOR_NAME`::
+`GIT_AUTHOR_EMAIL`::
+`GIT_AUTHOR_DATE`::
+`GIT_COMMITTER_NAME`::
+`GIT_COMMITTER_EMAIL`::
+`GIT_COMMITTER_DATE`::
 'EMAIL'::
 	see linkgit:git-commit-tree[1]
 
 Git Diffs
 ~~~~~~~~~
-'GIT_DIFF_OPTS'::
+`GIT_DIFF_OPTS`::
 	Only valid setting is "--unified=??" or "-u??" to set the
 	number of context lines shown when a unified diff is created.
 	This takes precedence over any "-U" or "--unified" option
 	value passed on the Git diff command line.
 
-'GIT_EXTERNAL_DIFF'::
-	When the environment variable 'GIT_EXTERNAL_DIFF' is set, the
+`GIT_EXTERNAL_DIFF`::
+	When the environment variable `GIT_EXTERNAL_DIFF` is set, the
 	program named by it is called, instead of the diff invocation
 	described above.  For a path that is added, removed, or modified,
-        'GIT_EXTERNAL_DIFF' is called with 7 parameters:
+	`GIT_EXTERNAL_DIFF` is called with 7 parameters:
 
 	path old-file old-hex old-mode new-file new-hex new-mode
 +
@@ -932,49 +940,49 @@ where:
 The file parameters can point at the user's working file
 (e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file`
 when a new file is added), or a temporary file (e.g. `old-file` in the
-index).  'GIT_EXTERNAL_DIFF' should not worry about unlinking the
-temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits.
+index).  `GIT_EXTERNAL_DIFF` should not worry about unlinking the
+temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits.
 +
-For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1
+For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1
 parameter, <path>.
 +
-For each path 'GIT_EXTERNAL_DIFF' is called, two environment variables,
-'GIT_DIFF_PATH_COUNTER' and 'GIT_DIFF_PATH_TOTAL' are set.
+For each path `GIT_EXTERNAL_DIFF` is called, two environment variables,
+`GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set.
 
-'GIT_DIFF_PATH_COUNTER'::
+`GIT_DIFF_PATH_COUNTER`::
 	A 1-based counter incremented by one for every path.
 
-'GIT_DIFF_PATH_TOTAL'::
+`GIT_DIFF_PATH_TOTAL`::
 	The total number of paths.
 
 other
 ~~~~~
-'GIT_MERGE_VERBOSITY'::
+`GIT_MERGE_VERBOSITY`::
 	A number controlling the amount of output shown by
 	the recursive merge strategy.  Overrides merge.verbosity.
 	See linkgit:git-merge[1]
 
-'GIT_PAGER'::
+`GIT_PAGER`::
 	This environment variable overrides `$PAGER`. If it is set
 	to an empty string or to the value "cat", Git will not launch
 	a pager.  See also the `core.pager` option in
 	linkgit:git-config[1].
 
-'GIT_EDITOR'::
+`GIT_EDITOR`::
 	This environment variable overrides `$EDITOR` and `$VISUAL`.
 	It is used by several Git commands when, on interactive mode,
 	an editor is to be launched. See also linkgit:git-var[1]
 	and the `core.editor` option in linkgit:git-config[1].
 
-'GIT_SSH'::
-'GIT_SSH_COMMAND'::
+`GIT_SSH`::
+`GIT_SSH_COMMAND`::
 	If either of these environment variables is set then 'git fetch'
 	and 'git push' will use the specified command instead of 'ssh'
 	when they need to connect to a remote system.
 	The command will be given exactly two or four arguments: the
 	'username@host' (or just 'host') from the URL and the shell
 	command to execute on that remote system, optionally preceded by
-	'-p' (literally) and the 'port' from the URL when it specifies
+	`-p` (literally) and the 'port' from the URL when it specifies
 	something other than the default SSH port.
 +
 `$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted
@@ -987,18 +995,18 @@ Usually it is easier to configure any desired options through your
 personal `.ssh/config` file.  Please consult your ssh documentation
 for further details.
 
-'GIT_ASKPASS'::
+`GIT_ASKPASS`::
 	If this environment variable is set, then Git commands which need to
 	acquire passwords or passphrases (e.g. for HTTP or IMAP authentication)
 	will call this program with a suitable prompt as command-line argument
-	and read the password from its STDOUT. See also the 'core.askPass'
+	and read the password from its STDOUT. See also the `core.askPass`
 	option in linkgit:git-config[1].
 
-'GIT_TERMINAL_PROMPT'::
+`GIT_TERMINAL_PROMPT`::
 	If this environment variable is set to `0`, git will not prompt
 	on the terminal (e.g., when asking for HTTP authentication).
 
-'GIT_CONFIG_NOSYSTEM'::
+`GIT_CONFIG_NOSYSTEM`::
 	Whether to skip reading settings from the system-wide
 	`$(prefix)/etc/gitconfig` file.  This environment variable can
 	be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a
@@ -1006,7 +1014,7 @@ for further details.
 	temporarily to avoid using a buggy `/etc/gitconfig` file while
 	waiting for someone with sufficient permissions to fix it.
 
-'GIT_FLUSH'::
+`GIT_FLUSH`::
 	If this environment variable is set to "1", then commands such
 	as 'git blame' (in incremental mode), 'git rev-list', 'git log',
 	'git check-attr' and 'git check-ignore' will
@@ -1017,7 +1025,7 @@ for further details.
 	not set, Git will choose buffered or record-oriented flushing
 	based on whether stdout appears to be redirected to a file or not.
 
-'GIT_TRACE'::
+`GIT_TRACE`::
 	Enables general trace messages, e.g. alias expansion, built-in
 	command execution and external command execution.
 +
@@ -1038,21 +1046,21 @@ into it.
 Unsetting the variable, or setting it to empty, "0" or
 "false" (case insensitive) disables trace messages.
 
-'GIT_TRACE_PACK_ACCESS'::
+`GIT_TRACE_PACK_ACCESS`::
 	Enables trace messages for all accesses to any packs. For each
 	access, the pack file name and an offset in the pack is
 	recorded. This may be helpful for troubleshooting some
 	pack-related performance problems.
-	See 'GIT_TRACE' for available trace output options.
+	See `GIT_TRACE` for available trace output options.
 
-'GIT_TRACE_PACKET'::
+`GIT_TRACE_PACKET`::
 	Enables trace messages for all packets coming in or out of a
 	given program. This can help with debugging object negotiation
 	or other protocol issues. Tracing is turned off at a packet
-	starting with "PACK" (but see 'GIT_TRACE_PACKFILE' below).
-	See 'GIT_TRACE' for available trace output options.
+	starting with "PACK" (but see `GIT_TRACE_PACKFILE` below).
+	See `GIT_TRACE` for available trace output options.
 
-'GIT_TRACE_PACKFILE'::
+`GIT_TRACE_PACKFILE`::
 	Enables tracing of packfiles sent or received by a
 	given program. Unlike other trace output, this trace is
 	verbatim: no headers, and no quoting of binary data. You almost
@@ -1063,22 +1071,30 @@ Unsetting the variable, or setting it to empty, "0" or
 Note that this is currently only implemented for the client side
 of clones and fetches.
 
-'GIT_TRACE_PERFORMANCE'::
+`GIT_TRACE_PERFORMANCE`::
 	Enables performance related trace messages, e.g. total execution
 	time of each Git command.
-	See 'GIT_TRACE' for available trace output options.
+	See `GIT_TRACE` for available trace output options.
 
-'GIT_TRACE_SETUP'::
+`GIT_TRACE_SETUP`::
 	Enables trace messages printing the .git, working tree and current
 	working directory after Git has completed its setup phase.
-	See 'GIT_TRACE' for available trace output options.
+	See `GIT_TRACE` for available trace output options.
 
-'GIT_TRACE_SHALLOW'::
+`GIT_TRACE_SHALLOW`::
 	Enables trace messages that can help debugging fetching /
 	cloning of shallow repositories.
-	See 'GIT_TRACE' for available trace output options.
+	See `GIT_TRACE` for available trace output options.
+
+`GIT_TRACE_CURL`::
+	Enables a curl full trace dump of all incoming and outgoing data,
+	including descriptive information, of the git transport protocol.
+	This is similar to doing curl `--trace-ascii` on the command line.
+	This option overrides setting the `GIT_CURL_VERBOSE` environment
+	variable.
+	See `GIT_TRACE` for available trace output options.
 
-'GIT_LITERAL_PATHSPECS'::
+`GIT_LITERAL_PATHSPECS`::
 	Setting this variable to `1` will cause Git to treat all
 	pathspecs literally, rather than as glob patterns. For example,
 	running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search
@@ -1087,19 +1103,19 @@ of clones and fetches.
 	literal paths to Git (e.g., paths previously given to you by
 	`git ls-tree`, `--raw` diff output, etc).
 
-'GIT_GLOB_PATHSPECS'::
+`GIT_GLOB_PATHSPECS`::
 	Setting this variable to `1` will cause Git to treat all
 	pathspecs as glob patterns (aka "glob" magic).
 
-'GIT_NOGLOB_PATHSPECS'::
+`GIT_NOGLOB_PATHSPECS`::
 	Setting this variable to `1` will cause Git to treat all
 	pathspecs as literal (aka "literal" magic).
 
-'GIT_ICASE_PATHSPECS'::
+`GIT_ICASE_PATHSPECS`::
 	Setting this variable to `1` will cause Git to treat all
 	pathspecs as case-insensitive.
 
-'GIT_REFLOG_ACTION'::
+`GIT_REFLOG_ACTION`::
 	When a ref is updated, reflog entries are created to keep
 	track of the reason why the ref was updated (which is
 	typically the name of the high-level command that updated
@@ -1109,7 +1125,7 @@ of clones and fetches.
 	variable when it is invoked as the top level command by the
 	end user, to be recorded in the body of the reflog.
 
-'GIT_REF_PARANOIA'::
+`GIT_REF_PARANOIA`::
 	If set to `1`, include broken or badly named refs when iterating
 	over lists of refs. In a normal, non-corrupted repository, this
 	does nothing. However, enabling it may help git to detect and
@@ -1120,7 +1136,7 @@ of clones and fetches.
 	an operation has touched every ref (e.g., because you are
 	cloning a repository to make a backup).
 
-'GIT_ALLOW_PROTOCOL'::
+`GIT_ALLOW_PROTOCOL`::
 	If set, provide a colon-separated list of protocols which are
 	allowed to be used with fetch/push/clone. This is useful to
 	restrict recursive submodule initialization from an untrusted
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index e3b1de8033..807577a59f 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -115,6 +115,7 @@ text file is normalized, its line endings are converted to LF in the
 repository.  To control what line ending style is used in the working
 directory, use the `eol` attribute for a single file and the
 `core.eol` configuration variable for all text files.
+Note that `core.autocrlf` overrides `core.eol`
 
 Set::
 
@@ -130,8 +131,9 @@ Unset::
 Set to string value "auto"::
 
 	When `text` is set to "auto", the path is marked for automatic
-	end-of-line normalization.  If Git decides that the content is
-	text, its line endings are normalized to LF on checkin.
+	end-of-line conversion.  If Git decides that the content is
+	text, its line endings are converted to LF on checkin.
+	When the file has been committed with CRLF, no conversion is done.
 
 Unspecified::
 
@@ -146,7 +148,7 @@ unspecified.
 ^^^^^
 
 This attribute sets a specific line-ending style to be used in the
-working directory.  It enables end-of-line normalization without any
+working directory.  It enables end-of-line conversion without any
 content checks, effectively setting the `text` attribute.
 
 Set to string value "crlf"::
@@ -186,9 +188,10 @@ the working directory, and prevent .jpg files from being normalized
 regardless of their content.
 
 ------------------------
+*               text=auto
 *.txt		text
-*.vcproj	eol=crlf
-*.sh		eol=lf
+*.vcproj	text eol=crlf
+*.sh		text eol=lf
 *.jpg		-text
 ------------------------
 
@@ -198,7 +201,7 @@ normalization in Git.
 
 If you simply want to have CRLF line endings in your working directory
 regardless of the repository you are working with, you can set the
-config variable "core.autocrlf" without changing any attributes.
+config variable "core.autocrlf" without using any attributes.
 
 ------------------------
 [core]
@@ -374,6 +377,11 @@ substitution.  For example:
 	smudge = git-p4-filter --smudge %f
 ------------------------
 
+Note that "%f" is the name of the path that is being worked on. Depending
+on the version that is being filtered, the corresponding file on disk may
+not exist, or may have different contents. So, smudge and clean commands
+should not try to access the file on disk, but only act as filters on the
+content provided to them on standard input.
 
 Interaction between checkin/checkout attributes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -525,6 +533,8 @@ patterns are available:
 
 - `csharp` suitable for source code in the C# language.
 
+- `css` suitable for cascading style sheets.
+
 - `fortran` suitable for source code in the Fortran language.
 
 - `fountain` suitable for Fountain documents.
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index 15b3bfa8db..4546fa0d75 100644
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -949,7 +949,7 @@ for details.
 [NOTE]
 If there were more commits on the 'master' branch after the merge, the
 merge commit itself would not be shown by 'git show-branch' by
-default.  You would need to provide '--sparse' option to make the
+default.  You would need to provide `--sparse` option to make the
 merge commit visible in this case.
 
 Now, let's pretend you are the one who did all the work in
diff --git a/Documentation/gitcredentials.txt b/Documentation/gitcredentials.txt
index 1c75be0803..f3a75d1ce1 100644
--- a/Documentation/gitcredentials.txt
+++ b/Documentation/gitcredentials.txt
@@ -106,6 +106,11 @@ variable, each helper will be tried in turn, and may provide a username,
 password, or nothing. Once Git has acquired both a username and a
 password, no more helpers will be tried.
 
+If `credential.helper` is configured to the empty string, this resets
+the helper list to empty (so you may override a helper set by a
+lower-priority config file by configuring the empty-string helper,
+followed by whatever set of helpers you would like).
+
 
 CREDENTIAL CONTEXTS
 -------------------
diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt
index c579593e55..08cf62278e 100644
--- a/Documentation/gitdiffcore.txt
+++ b/Documentation/gitdiffcore.txt
@@ -28,8 +28,8 @@ The 'git diff-{asterisk}' family works by first comparing two sets of
 files:
 
  - 'git diff-index' compares contents of a "tree" object and the
-   working directory (when '--cached' flag is not used) or a
-   "tree" object and the index file (when '--cached' flag is
+   working directory (when `--cached` flag is not used) or a
+   "tree" object and the index file (when `--cached` flag is
    used);
 
  - 'git diff-files' compares contents of the index file and the
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index a2f59b194c..9565dc3fda 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -7,24 +7,35 @@ githooks - Hooks used by Git
 
 SYNOPSIS
 --------
-$GIT_DIR/hooks/*
+$GIT_DIR/hooks/* (or \`git config core.hooksPath`/*)
 
 
 DESCRIPTION
 -----------
 
-Hooks are little scripts you can place in `$GIT_DIR/hooks`
-directory to trigger action at certain points.  When
-'git init' is run, a handful of example hooks are copied into the
-`hooks` directory of the new repository, but by default they are
-all disabled.  To enable a hook, rename it by removing its `.sample`
-suffix.
+Hooks are programs you can place in a hooks directory to trigger
+actions at certain points in git's execution. Hooks that don't have
+the executable bit set are ignored.
 
-NOTE: It is also a requirement for a given hook to be executable.
-However - in a freshly initialized repository - the `.sample` files are
-executable by default.
+By default the hooks directory is `$GIT_DIR/hooks`, but that can be
+changed via the `core.hooksPath` configuration variable (see
+linkgit:git-config[1]).
 
-This document describes the currently defined hooks.
+Before Git invokes a hook, it changes its working directory to either
+the root of the working tree in a non-bare repository, or to the
+$GIT_DIR in a bare repository.
+
+Hooks can get their arguments via the environment, command-line
+arguments, and stdin. See the documentation for each hook below for
+details.
+
+'git init' may copy hooks to the new repository, depending on its
+configuration. See the "TEMPLATE DIRECTORY" section in
+linkgit:git-init[1] for details. When the rest of this document refers
+to "default hooks" it's talking about the default template shipped
+with Git.
+
+The currently supported hooks are described below.
 
 HOOKS
 -----
@@ -32,15 +43,15 @@ HOOKS
 applypatch-msg
 ~~~~~~~~~~~~~~
 
-This hook is invoked by 'git am' script.  It takes a single
+This hook is invoked by 'git am'.  It takes a single
 parameter, the name of the file that holds the proposed commit
-log message.  Exiting with non-zero status causes
-'git am' to abort before applying the patch.
+log message.  Exiting with a non-zero status causes 'git am' to abort
+before applying the patch.
 
 The hook is allowed to edit the message file in place, and can
 be used to normalize the message into some project standard
-format (if the project has one). It can also be used to refuse
-the commit after inspecting the message file.
+format. It can also be used to refuse the commit after inspecting
+the message file.
 
 The default 'applypatch-msg' hook, when enabled, runs the
 'commit-msg' hook, if the latter is enabled.
@@ -73,10 +84,10 @@ pre-commit
 ~~~~~~~~~~
 
 This hook is invoked by 'git commit', and can be bypassed
-with `--no-verify` option.  It takes no parameter, and is
+with the `--no-verify` option.  It takes no parameters, and is
 invoked before obtaining the proposed commit log message and
-making a commit.  Exiting with non-zero status from this script
-causes the 'git commit' to abort.
+making a commit.  Exiting with a non-zero status from this script
+causes the 'git commit' command to abort before creating a commit.
 
 The default 'pre-commit' hook, when enabled, catches introduction
 of lines with trailing whitespaces and aborts the commit when
@@ -115,15 +126,15 @@ commit-msg
 ~~~~~~~~~~
 
 This hook is invoked by 'git commit', and can be bypassed
-with `--no-verify` option.  It takes a single parameter, the
+with the `--no-verify` option.  It takes a single parameter, the
 name of the file that holds the proposed commit log message.
-Exiting with non-zero status causes the 'git commit' to
+Exiting with a non-zero status causes the 'git commit' to
 abort.
 
-The hook is allowed to edit the message file in place, and can
-be used to normalize the message into some project standard
-format (if the project has one). It can also be used to refuse
-the commit after inspecting the message file.
+The hook is allowed to edit the message file in place, and can be used
+to normalize the message into some project standard format. It
+can also be used to refuse the commit after inspecting the message
+file.
 
 The default 'commit-msg' hook, when enabled, detects duplicate
 "Signed-off-by" lines, and aborts the commit if one is found.
@@ -131,8 +142,8 @@ The default 'commit-msg' hook, when enabled, detects duplicate
 post-commit
 ~~~~~~~~~~~
 
-This hook is invoked by 'git commit'.  It takes no
-parameter, and is invoked after a commit is made.
+This hook is invoked by 'git commit'. It takes no parameters, and is
+invoked after a commit is made.
 
 This hook is meant primarily for notification, and cannot affect
 the outcome of 'git commit'.
@@ -236,6 +247,15 @@ Both standard output and standard error output are forwarded to
 'git send-pack' on the other end, so you can simply `echo` messages
 for the user.
 
+The number of push options given on the command line of
+`git push --push-option=...` can be read from the environment
+variable `GIT_PUSH_OPTION_COUNT`, and the options themselves are
+found in `GIT_PUSH_OPTION_0`, `GIT_PUSH_OPTION_1`,...
+If it is negotiated to not use the push options phase, the
+environment variables will not be set. If the client selects
+to use push options, but doesn't transmit any, the count variable
+will be set to zero, `GIT_PUSH_OPTION_COUNT=0`.
+
 [[update]]
 update
 ~~~~~~
@@ -267,9 +287,11 @@ does not know the entire set of branches, so it would end up
 firing one e-mail per ref when used naively, though.  The
 <<post-receive,'post-receive'>> hook is more suited to that.
 
-Another use suggested on the mailing list is to use this hook to
-implement access control which is finer grained than the one
-based on filesystem group.
+In an environment that restricts the users' access only to git
+commands over the wire, this hook can be used to implement access
+control without relying on filesystem ownership and group
+membership. See linkgit:git-shell[1] for how you might use the login
+shell to restrict the user's access to only git commands.
 
 Both standard output and standard error output are forwarded to
 'git send-pack' on the other end, so you can simply `echo` messages
@@ -309,6 +331,15 @@ a sample script `post-receive-email` provided in the `contrib/hooks`
 directory in Git distribution, which implements sending commit
 emails.
 
+The number of push options given on the command line of
+`git push --push-option=...` can be read from the environment
+variable `GIT_PUSH_OPTION_COUNT`, and the options themselves are
+found in `GIT_PUSH_OPTION_0`, `GIT_PUSH_OPTION_1`,...
+If it is negotiated to not use the push options phase, the
+environment variables will not be set. If the client selects
+to use push options, but doesn't transmit any, the count variable
+will be set to zero, `GIT_PUSH_OPTION_COUNT=0`.
+
 [[post-update]]
 post-update
 ~~~~~~~~~~~
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 473623d631..63260f0056 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -38,7 +38,7 @@ precedence, the last matching pattern decides the outcome):
  * Patterns read from `$GIT_DIR/info/exclude`.
 
  * Patterns read from the file specified by the configuration
-   variable 'core.excludesFile'.
+   variable `core.excludesFile`.
 
 Which file to place a pattern in depends on how the pattern is meant to
 be used.
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 6ade002176..a68d860fa3 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -82,7 +82,7 @@ linkgit:git-rev-list[1] for a complete list.
 
 --simplify-merges::
 
-	Additional option to '--full-history' to remove some needless
+	Additional option to `--full-history` to remove some needless
 	merges from the resulting history, as there are no selected
 	commits contributing to this merge.  (See "History
 	simplification" in linkgit:git-log[1] for a more detailed
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index ac70eca321..10dcc08ff9 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -19,7 +19,7 @@ of linkgit:git-config[1].
 
 The file contains one subsection per submodule, and the subsection value
 is the name of the submodule. The name is set to the path where the
-submodule has been added unless it was customized with the '--name'
+submodule has been added unless it was customized with the `--name`
 option of 'git submodule add'. Each submodule section also contains the
 following required keys:
 
@@ -79,6 +79,11 @@ submodule.<name>.ignore::
 	"--ignore-submodule" option. The 'git submodule' commands are not
 	affected by this setting.
 
+submodule.<name>.shallow::
+	When set to true, a clone of this submodule will be performed as a
+	shallow clone unless the user explicitly asks for a non-shallow
+	clone.
+
 
 EXAMPLES
 --------
diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
index 78e0b27c18..a4de50ad22 100644
--- a/Documentation/gitremote-helpers.txt
+++ b/Documentation/gitremote-helpers.txt
@@ -43,7 +43,7 @@ arguments. The first argument specifies a remote repository as in Git;
 it is either the name of a configured remote or a URL. The second
 argument specifies a URL; it is usually of the form
 '<transport>://<address>', but any arbitrary string is possible.
-The 'GIT_DIR' environment variable is set up for the remote helper
+The `GIT_DIR` environment variable is set up for the remote helper
 and can be used to determine where to store additional data or from
 which directory to invoke auxiliary Git commands.
 
@@ -61,10 +61,10 @@ argument. If such a URL is encountered directly on the command line,
 the first argument is '<address>', and if it is encountered in a
 configured remote, the first argument is the name of that remote.
 
-Additionally, when a configured remote has 'remote.<name>.vcs' set to
+Additionally, when a configured remote has `remote.<name>.vcs` set to
 '<transport>', Git explicitly invokes 'git remote-<transport>' with
 '<name>' as the first argument. If set, the second argument is
-'remote.<name>.url'; otherwise, the second argument is omitted.
+`remote.<name>.url`; otherwise, the second argument is omitted.
 
 INPUT FORMAT
 ------------
@@ -210,17 +210,17 @@ the remote repository.
 'export-marks' <file>::
 	This modifies the 'export' capability, instructing Git to dump the
 	internal marks table to <file> when complete. For details,
-	read up on '--export-marks=<file>' in linkgit:git-fast-export[1].
+	read up on `--export-marks=<file>` in linkgit:git-fast-export[1].
 
 'import-marks' <file>::
 	This modifies the 'export' capability, instructing Git to load the
 	marks specified in <file> before processing any input. For details,
-	read up on '--import-marks=<file>' in linkgit:git-fast-export[1].
+	read up on `--import-marks=<file>` in linkgit:git-fast-export[1].
 
 'signed-tags'::
 	This modifies the 'export' capability, instructing Git to pass
-	'--signed-tags=verbatim' to linkgit:git-fast-export[1].  In the
-	absence of this capability, Git will use '--signed-tags=warn-strip'.
+	`--signed-tags=verbatim` to linkgit:git-fast-export[1].  In the
+	absence of this capability, Git will use `--signed-tags=warn-strip`.
 
 
 
@@ -298,7 +298,7 @@ Supported if the helper has the "fetch" capability.
 	is followed by a blank line). For example, the following would
 	be two batches of 'push', the first asking the remote-helper
 	to push the local ref 'master' to the remote ref 'master' and
-	the local 'HEAD' to the remote 'branch', and the second
+	the local `HEAD` to the remote 'branch', and the second
 	asking to push ref 'foo' to ref 'bar' (forced update requested
 	by the '+').
 +
diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt
index 8a42270074..a79e350246 100644
--- a/Documentation/gitweb.conf.txt
+++ b/Documentation/gitweb.conf.txt
@@ -376,7 +376,7 @@ $site_name::
 	Name of your site or organization, to appear in page titles.  Set it
 	to something descriptive for clearer bookmarks etc.  If this variable
 	is not set or is, then gitweb uses the value of the `SERVER_NAME`
-	CGI environment variable, setting site name to "$SERVER_NAME Git",
+	`CGI` environment variable, setting site name to "$SERVER_NAME Git",
 	or "Untitled Git" if this variable is not set (e.g. if running gitweb
 	as standalone script).
 +
diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt
index cd9c8951b2..96156e5e1f 100644
--- a/Documentation/gitweb.txt
+++ b/Documentation/gitweb.txt
@@ -206,8 +206,8 @@ $export_auth_hook = sub {
 Per-repository gitweb configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 You can configure individual repositories shown in gitweb by creating file
-in the 'GIT_DIR' of Git repository, or by setting some repo configuration
-variable (in 'GIT_DIR/config', see linkgit:git-config[1]).
+in the `GIT_DIR` of Git repository, or by setting some repo configuration
+variable (in `GIT_DIR/config`, see linkgit:git-config[1]).
 
 You can use the following files in repository:
 
diff --git a/Documentation/howto/new-command.txt b/Documentation/howto/new-command.txt
index 6d772bd927..15a4c8031f 100644
--- a/Documentation/howto/new-command.txt
+++ b/Documentation/howto/new-command.txt
@@ -94,7 +94,7 @@ your language, document it in the INSTALL file.
 6. There is a file command-list.txt in the distribution main directory
 that categorizes commands by type, so they can be listed in appropriate
 subsections in the documentation's summary command list.  Add an entry
-for yours.  To understand the categories, look at git-commands.txt
+for yours.  To understand the categories, look at command-list.txt
 in the main directory.  If the new command is part of the typical Git
 workflow and you believe it common enough to be mentioned in 'git help',
 map this command to a common group in the column [common].
diff --git a/Documentation/lint-gitlink.perl b/Documentation/lint-gitlink.perl
new file mode 100755
index 0000000000..476cc30b83
--- /dev/null
+++ b/Documentation/lint-gitlink.perl
@@ -0,0 +1,71 @@
+#!/usr/bin/perl
+
+use File::Find;
+use Getopt::Long;
+
+my $basedir = ".";
+GetOptions("basedir=s" => \$basedir)
+	or die("Cannot parse command line arguments\n");
+
+my $found_errors = 0;
+
+sub report {
+	my ($where, $what, $error) = @_;
+	print "$where: $error: $what\n";
+	$found_errors = 1;
+}
+
+sub grab_section {
+	my ($page) = @_;
+	open my $fh, "<", "$basedir/$page.txt";
+	my $firstline = <$fh>;
+	chomp $firstline;
+	close $fh;
+	my ($section) = ($firstline =~ /.*\((\d)\)$/);
+	return $section;
+}
+
+sub lint {
+	my ($file) = @_;
+	open my $fh, "<", $file
+		or return;
+	while (<$fh>) {
+		my $where = "$file:$.";
+		while (s/linkgit:((.*?)\[(\d)\])//) {
+			my ($target, $page, $section) = ($1, $2, $3);
+
+			# De-AsciiDoc
+			$page =~ s/{litdd}/--/g;
+
+			if ($page !~ /^git/) {
+				report($where, $target, "nongit link");
+				next;
+			}
+			if (! -f "$basedir/$page.txt") {
+				report($where, $target, "no such source");
+				next;
+			}
+			$real_section = grab_section($page);
+			if ($real_section != $section) {
+				report($where, $target,
+					"wrong section (should be $real_section)");
+				next;
+			}
+		}
+	}
+	close $fh;
+}
+
+sub lint_it {
+	lint($File::Find::name) if -f && /\.txt$/;
+}
+
+if (!@ARGV) {
+	find({ wanted => \&lint_it, no_chdir => 1 }, $basedir);
+} else {
+	for (@ARGV) {
+		lint($_);
+	}
+}
+
+exit $found_errors;
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 002ca58c21..df3ea3779b 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -61,7 +61,7 @@ merge.verbosity::
 	message if conflicts were detected. Level 1 outputs only
 	conflicts, 2 outputs conflicts and file changes.  Level 5 and
 	above outputs debugging information.  The default is level 2.
-	Can be overridden by the 'GIT_MERGE_VERBOSITY' environment variable.
+	Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable.
 
 merge.<driver>.name::
 	Defines a human-readable name for a custom low-level
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 30808a01e7..5b4a62e936 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -117,3 +117,11 @@ ifndef::git-pull[]
 	reporting.
 
 endif::git-pull[]
+
+--allow-unrelated-histories::
+	By default, `git merge` command refuses to merge histories
+	that do not share a common ancestor.  This option can be
+	used to override this safety when merging histories of two
+	projects that started their lives independently. As that is
+	a very rare occasion, no configuration variable to enable
+	this by default exists and will not be added.
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 29b19b992f..b95d67ec01 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -147,8 +147,14 @@ endif::git-rev-list[]
   "U" for a good signature with unknown validity and "N" for no signature
 - '%GS': show the name of the signer for a signed commit
 - '%GK': show the key used to sign a signed commit
-- '%gD': reflog selector, e.g., `refs/stash@{1}`
-- '%gd': shortened reflog selector, e.g., `stash@{1}`
+- '%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])
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index 54b88b6dca..e44fc8f738 100644
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -26,7 +26,7 @@ people using 80-column terminals.
 --no-abbrev-commit::
 	Show the full 40-byte hexadecimal commit object name. This negates
 	`--abbrev-commit` and those options which imply it such as
-	"--oneline". It also overrides the 'log.abbrevCommit' variable.
+	"--oneline". It also overrides the `log.abbrevCommit` variable.
 
 --oneline::
 	This is a shorthand for "--pretty=oneline --abbrev-commit"
@@ -42,6 +42,20 @@ people using 80-column terminals.
 	verbatim; this means that invalid sequences in the original
 	commit may be copied to the output.
 
+--expand-tabs=<n>::
+--expand-tabs::
+--no-expand-tabs::
+	Perform a tab expansion (replace each tab with enough spaces
+	to fill to the next display column that is multiple of '<n>')
+	in the log message before showing it in the output.
+	`--expand-tabs` is a short-hand for `--expand-tabs=8`, and
+	`--no-expand-tabs` is a short-hand for `--expand-tabs=0`,
+	which disables tab expansion.
++
+By default, tabs are expanded in pretty formats that indent the log
+message by 4 spaces (i.e.  'medium', which is the default, 'full',
+and 'fuller').
+
 ifndef::git-rev-list[]
 --notes[=<treeish>]::
 	Show the notes (see linkgit:git-notes[1]) that annotate the
@@ -51,7 +65,7 @@ ifndef::git-rev-list[]
 	on the command line.
 +
 By default, the notes shown are from the notes refs listed in the
-'core.notesRef' and 'notes.displayRef' variables (or corresponding
+`core.notesRef` and `notes.displayRef` variables (or corresponding
 environment overrides). See linkgit:git-config[1] for more details.
 +
 With an optional '<treeish>' argument, use the treeish to find the notes
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 4f009d4424..a779c9dfec 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -193,7 +193,7 @@ endif::git-rev-list[]
 
 --stdin::
 	In addition to the '<commit>' listed on the command
-	line, read them from the standard input. If a '--' separator is
+	line, read them from the standard input. If a `--` separator is
 	seen, stop reading commits and start reading paths to limit the
 	result.
 
@@ -252,10 +252,25 @@ list.
 +
 With `--pretty` format other than `oneline` (for obvious reasons),
 this causes the output to have two extra lines of information
-taken from the reflog.  By default, 'commit@\{Nth}' notation is
-used in the output.  When the starting commit is specified as
-'commit@\{now}', output also uses 'commit@\{timestamp}' notation
-instead.  Under `--pretty=oneline`, the commit message is
+taken from the reflog.  The reflog designator in the output may be shown
+as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the
+reflog) or as `ref@{timestamp}` (with the timestamp for that entry),
+depending on a few rules:
++
+--
+1. If the starting point is specified as `ref@{Nth}`, show the index
+format.
++
+2. If the starting point was specified as `ref@{now}`, show the
+timestamp format.
++
+3. If neither was used, but `--date` was given on the command line, show
+the timestamp in the format requested by `--date`.
++
+4. Otherwise, show the index format.
+--
++
+Under `--pretty=oneline`, the commit message is
 prefixed with this information on the same line.
 This option cannot be combined with `--reverse`.
 See also linkgit:git-reflog[1].
@@ -274,6 +289,10 @@ ifdef::git-rev-list[]
 	Try to speed up the traversal using the pack bitmap index (if
 	one is available). Note that when traversing with `--objects`,
 	trees and blobs will not have their associated path printed.
+
+--progress=<header>::
+	Show progress reports on stderr as objects are considered. The
+	`<header>` text will be printed with each progress update.
 endif::git-rev-list[]
 
 --
@@ -710,8 +729,8 @@ include::pretty-options.txt[]
 	`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 cannot be used with
-`--raw` or `--relative`.
+e.g. ``2 hours ago''. The `-local` option has no effect for
+`--date=relative`.
 +
 `--date=local` is an alias for `--date=default-local`.
 +
@@ -731,7 +750,18 @@ 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 in the internal raw Git format `%s %z` 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
+the second two are minutes). I.e., as if the timestamp were formatted
+with `strftime("%s %z")`).
+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=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`.
 Use `--date=format:%c` to show the date in your system locale's
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 19314e3b7f..abae363983 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -28,8 +28,8 @@ blobs contained in a commit.
   first match in the following rules:
 
   . If '$GIT_DIR/<refname>' exists, that is what you mean (this is usually
-    useful only for 'HEAD', 'FETCH_HEAD', 'ORIG_HEAD', 'MERGE_HEAD'
-    and 'CHERRY_PICK_HEAD');
+    useful only for `HEAD`, `FETCH_HEAD`, `ORIG_HEAD`, `MERGE_HEAD`
+    and `CHERRY_PICK_HEAD`);
 
   . otherwise, 'refs/<refname>' if it exists;
 
@@ -41,16 +41,16 @@ blobs contained in a commit.
 
   . otherwise, 'refs/remotes/<refname>/HEAD' if it exists.
 +
-'HEAD' names the commit on which you based the changes in the working tree.
-'FETCH_HEAD' records the branch which you fetched from a remote repository
+`HEAD` names the commit on which you based the changes in the working tree.
+`FETCH_HEAD` records the branch which you fetched from a remote repository
 with your last `git fetch` invocation.
-'ORIG_HEAD' is created by commands that move your 'HEAD' in a drastic
-way, to record the position of the 'HEAD' before their operation, so that
+`ORIG_HEAD` is created by commands that move your `HEAD` in a drastic
+way, to record the position of the `HEAD` before their operation, so that
 you can easily change the tip of the branch back to the state before you ran
 them.
-'MERGE_HEAD' records the commit(s) which you are merging into your branch
+`MERGE_HEAD` records the commit(s) which you are merging into your branch
 when you run `git merge`.
-'CHERRY_PICK_HEAD' records the commit which you are cherry-picking
+`CHERRY_PICK_HEAD` records the commit which you are cherry-picking
 when you run `git cherry-pick`.
 +
 Note that any of the 'refs/*' cases above may come either from
@@ -59,7 +59,7 @@ 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'.
+  '@' alone is a shortcut for `HEAD`.
 
 '<refname>@{<date>}', e.g. 'master@\{yesterday\}', 'HEAD@{5 minutes ago}'::
   A ref followed by the suffix '@' with a date specification
@@ -71,7 +71,7 @@ some output processing may assume ref names in UTF-8.
   existing log ('$GIT_DIR/logs/<ref>'). Note that this looks up the state
   of your *local* ref at a given time; e.g., what was in your local
   'master' branch last week. If you want to look at commits made during
-  certain times, see '--since' and '--until'.
+  certain times, see `--since` and `--until`.
 
 '<refname>@{<n>}', e.g. 'master@\{1\}'::
   A ref followed by the suffix '@' with an ordinal specification
@@ -101,7 +101,7 @@ some output processing may assume ref names in UTF-8.
 '<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
+  `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/').
 +
@@ -283,12 +283,12 @@ To summarize:
 '<rev1>..<rev2>'::
 	Include commits that are reachable from <rev2> but exclude
 	those that are reachable from <rev1>.  When either <rev1> or
-	<rev2> is omitted, it defaults to 'HEAD'.
+	<rev2> is omitted, it defaults to `HEAD`.
 
 '<rev1>\...<rev2>'::
 	Include commits that are reachable from either <rev1> or
 	<rev2> but exclude those that are reachable from both.  When
-	either <rev1> or <rev2> is omitted, it defaults to 'HEAD'.
+	either <rev1> or <rev2> is omitted, it defaults to `HEAD`.
 
 '<rev>{caret}@', e.g. 'HEAD{caret}@'::
   A suffix '{caret}' followed by an at sign is the same as listing
diff --git a/Documentation/technical/api-hashmap.txt b/Documentation/technical/api-hashmap.txt
index ad7a5bddd2..28f5a8b715 100644
--- a/Documentation/technical/api-hashmap.txt
+++ b/Documentation/technical/api-hashmap.txt
@@ -104,6 +104,11 @@ If `free_entries` is true, each hashmap_entry in the map is freed as well
 `entry` points to the entry to initialize.
 +
 `hash` is the hash code of the entry.
++
+The hashmap_entry structure does not hold references to external resources,
+and it is safe to just discard it once you are done with it (i.e. if
+your structure was allocated with xmalloc(), you can just free(3) it,
+and if it is on stack, you can just let it go out of scope).
 
 `void *hashmap_get(const struct hashmap *map, const void *key, const void *keydata)`::
 
diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt
index 695bd4bf43..27bd701c0d 100644
--- a/Documentation/technical/api-parse-options.txt
+++ b/Documentation/technical/api-parse-options.txt
@@ -144,8 +144,12 @@ There are some macros to easily define options:
 
 `OPT_COUNTUP(short, long, &int_var, description)`::
 	Introduce a count-up option.
-	`int_var` is incremented on each use of `--option`, and
-	reset to zero with `--no-option`.
+	Each use of `--option` increments `int_var`, starting from zero
+	(even if initially negative), and `--no-option` resets it to
+	zero. To determine if `--option` or `--no-option` was encountered at
+	all, initialize `int_var` to a negative value, and if it is still
+	negative after parse_options(), then neither `--option` nor
+	`--no-option` was seen.
 
 `OPT_BIT(short, long, &int_var, description, mask)`::
 	Introduce a boolean option.
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index 8b36343802..736f3894a8 100644
--- a/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@ -307,7 +307,7 @@ In multi_ack mode:
     ready to make a packfile, it will blindly ACK all 'have' obj-ids
     back to the client.
 
-  * the server will then send a 'NACK' and then wait for another response
+  * the server will then send a 'NAK' and then wait for another response
     from the client - either a 'done' or another list of 'have' lines.
 
 In multi_ack_detailed mode:
@@ -454,7 +454,8 @@ The reference discovery phase is done nearly the same way as it is in the
 fetching protocol. Each reference obj-id and name on the server is sent
 in packet-line format to the client, followed by a flush-pkt.  The only
 real difference is that the capability listing is different - the only
-possible values are 'report-status', 'delete-refs' and 'ofs-delta'.
+possible values are 'report-status', 'delete-refs', 'ofs-delta' and
+'push-options'.
 
 Reference Update Request and Packfile Transfer
 ----------------------------------------------
@@ -465,9 +466,10 @@ that it wants to update, it sends a line listing the obj-id currently on
 the server, the obj-id the client would like to update it to and the name
 of the reference.
 
-This list is followed by a flush-pkt and then the packfile that should
-contain all the objects that the server will need to complete the new
-references.
+This list is followed by a flush-pkt. Then the push options are transmitted
+one per packet followed by another flush-pkt. After that the packfile that
+should contain all the objects that the server will need to complete the new
+references will be sent.
 
 ----
   update-request    =  *shallow ( command-list | push-cert ) [packfile]
diff --git a/Documentation/technical/protocol-capabilities.txt b/Documentation/technical/protocol-capabilities.txt
index eaab6b4ac7..4c28d3a8ae 100644
--- a/Documentation/technical/protocol-capabilities.txt
+++ b/Documentation/technical/protocol-capabilities.txt
@@ -253,6 +253,15 @@ atomic pushes. If the pushing client requests this capability, the server
 will update the refs in one atomic transaction. Either all refs are
 updated or none.
 
+push-options
+------------
+
+If the server sends the 'push-options' capability it is able to accept
+push options after the update commands have been sent, but before the
+packfile is streamed. If the pushing client requests this capability,
+the server will pass the options to the pre- and post- receive hooks
+that process this push request.
+
 allow-tip-sha1-in-want
 ----------------------
 
diff --git a/Documentation/technical/signature-format.txt b/Documentation/technical/signature-format.txt
new file mode 100644
index 0000000000..2c9406a56a
--- /dev/null
+++ b/Documentation/technical/signature-format.txt
@@ -0,0 +1,186 @@
+Git signature format
+====================
+
+== Overview
+
+Git uses cryptographic signatures in various places, currently objects (tags,
+commits, mergetags) and transactions (pushes). In every case, the command which
+is about to create an object or transaction determines a payload from that,
+calls gpg to obtain a detached signature for the payload (`gpg -bsa`) and
+embeds the signature into the object or transaction.
+
+Signatures always begin with `-----BEGIN PGP SIGNATURE-----`
+and end with `-----END PGP SIGNATURE-----`, unless gpg is told to
+produce RFC1991 signatures which use `MESSAGE` instead of `SIGNATURE`.
+
+The signed payload and the way the signature is embedded depends
+on the type of the object resp. transaction.
+
+== Tag signatures
+
+- created by: `git tag -s`
+- payload: annotated tag object
+- embedding: append the signature to the unsigned tag object
+- example: tag `signedtag` with subject `signed tag`
+
+----
+object 04b871796dc0420f8e7561a895b52484b701d51a
+type commit
+tag signedtag
+tagger C O Mitter <committer@example.com> 1465981006 +0000
+
+signed tag
+
+signed tag message body
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJXYRhOAAoJEGEJLoW3InGJklkIAIcnhL7RwEb/+QeX9enkXhxn
+rxfdqrvWd1K80sl2TOt8Bg/NYwrUBw/RWJ+sg/hhHp4WtvE1HDGHlkEz3y11Lkuh
+8tSxS3qKTxXUGozyPGuE90sJfExhZlW4knIQ1wt/yWqM+33E9pN4hzPqLwyrdods
+q8FWEqPPUbSJXoMbRPw04S5jrLtZSsUWbRYjmJCHzlhSfFWW4eFd37uquIaLUBS0
+rkC3Jrx7420jkIpgFcTI2s60uhSQLzgcCwdA2ukSYIRnjg/zDkj8+3h/GaROJ72x
+lZyI6HWixKJkWw8lE9aAOD9TmTW9sFJwcVAzmAuFX2kUreDUKMZduGcoRYGpD7E=
+=jpXa
+-----END PGP SIGNATURE-----
+----
+
+- verify with: `git verify-tag [-v]` or `git tag -v`
+
+----
+gpg: Signature made Wed Jun 15 10:56:46 2016 CEST using RSA key ID B7227189
+gpg: Good signature from "Eris Discordia <discord@example.net>"
+gpg: WARNING: This key is not certified with a trusted signature!
+gpg:          There is no indication that the signature belongs to the owner.
+Primary key fingerprint: D4BE 2231 1AD3 131E 5EDA  29A4 6109 2E85 B722 7189
+object 04b871796dc0420f8e7561a895b52484b701d51a
+type commit
+tag signedtag
+tagger C O Mitter <committer@example.com> 1465981006 +0000
+
+signed tag
+
+signed tag message body
+----
+
+== Commit signatures
+
+- created by: `git commit -S`
+- payload: commit object
+- embedding: header entry `gpgsig`
+  (content is preceded by a space)
+- example: commit with subject `signed commit`
+
+----
+tree eebfed94e75e7760540d1485c740902590a00332
+parent 04b871796dc0420f8e7561a895b52484b701d51a
+author A U Thor <author@example.com> 1465981137 +0000
+committer C O Mitter <committer@example.com> 1465981137 +0000
+gpgsig -----BEGIN PGP SIGNATURE-----
+ Version: GnuPG v1
+
+ iQEcBAABAgAGBQJXYRjRAAoJEGEJLoW3InGJ3IwIAIY4SA6GxY3BjL60YyvsJPh/
+ HRCJwH+w7wt3Yc/9/bW2F+gF72kdHOOs2jfv+OZhq0q4OAN6fvVSczISY/82LpS7
+ DVdMQj2/YcHDT4xrDNBnXnviDO9G7am/9OE77kEbXrp7QPxvhjkicHNwy2rEflAA
+ zn075rtEERDHr8nRYiDh8eVrefSO7D+bdQ7gv+7GsYMsd2auJWi1dHOSfTr9HIF4
+ HJhWXT9d2f8W+diRYXGh4X0wYiGg6na/soXc+vdtDYBzIxanRqjg8jCAeo1eOTk1
+ EdTwhcTZlI0x5pvJ3H0+4hA2jtldVtmPM4OTB0cTrEWBad7XV6YgiyuII73Ve3I=
+ =jKHM
+ -----END PGP SIGNATURE-----
+
+signed commit
+
+signed commit message body
+----
+
+- verify with: `git verify-commit [-v]` (or `git show --show-signature`)
+
+----
+gpg: Signature made Wed Jun 15 10:58:57 2016 CEST using RSA key ID B7227189
+gpg: Good signature from "Eris Discordia <discord@example.net>"
+gpg: WARNING: This key is not certified with a trusted signature!
+gpg:          There is no indication that the signature belongs to the owner.
+Primary key fingerprint: D4BE 2231 1AD3 131E 5EDA  29A4 6109 2E85 B722 7189
+tree eebfed94e75e7760540d1485c740902590a00332
+parent 04b871796dc0420f8e7561a895b52484b701d51a
+author A U Thor <author@example.com> 1465981137 +0000
+committer C O Mitter <committer@example.com> 1465981137 +0000
+
+signed commit
+
+signed commit message body
+----
+
+== Mergetag signatures
+
+- created by: `git merge` on signed tag
+- payload/embedding: the whole signed tag object is embedded into
+  the (merge) commit object as header entry `mergetag`
+- example: merge of the signed tag `signedtag` as above
+
+----
+tree c7b1cff039a93f3600a1d18b82d26688668c7dea
+parent c33429be94b5f2d3ee9b0adad223f877f174b05d
+parent 04b871796dc0420f8e7561a895b52484b701d51a
+author A U Thor <author@example.com> 1465982009 +0000
+committer C O Mitter <committer@example.com> 1465982009 +0000
+mergetag object 04b871796dc0420f8e7561a895b52484b701d51a
+ type commit
+ tag signedtag
+ tagger C O Mitter <committer@example.com> 1465981006 +0000
+
+ signed tag
+
+ signed tag message body
+ -----BEGIN PGP SIGNATURE-----
+ Version: GnuPG v1
+
+ iQEcBAABAgAGBQJXYRhOAAoJEGEJLoW3InGJklkIAIcnhL7RwEb/+QeX9enkXhxn
+ rxfdqrvWd1K80sl2TOt8Bg/NYwrUBw/RWJ+sg/hhHp4WtvE1HDGHlkEz3y11Lkuh
+ 8tSxS3qKTxXUGozyPGuE90sJfExhZlW4knIQ1wt/yWqM+33E9pN4hzPqLwyrdods
+ q8FWEqPPUbSJXoMbRPw04S5jrLtZSsUWbRYjmJCHzlhSfFWW4eFd37uquIaLUBS0
+ rkC3Jrx7420jkIpgFcTI2s60uhSQLzgcCwdA2ukSYIRnjg/zDkj8+3h/GaROJ72x
+ lZyI6HWixKJkWw8lE9aAOD9TmTW9sFJwcVAzmAuFX2kUreDUKMZduGcoRYGpD7E=
+ =jpXa
+ -----END PGP SIGNATURE-----
+
+Merge tag 'signedtag' into downstream
+
+signed tag
+
+signed tag message body
+
+# gpg: Signature made Wed Jun 15 08:56:46 2016 UTC using RSA key ID B7227189
+# gpg: Good signature from "Eris Discordia <discord@example.net>"
+# gpg: WARNING: This key is not certified with a trusted signature!
+# gpg:          There is no indication that the signature belongs to the owner.
+# Primary key fingerprint: D4BE 2231 1AD3 131E 5EDA  29A4 6109 2E85 B722 7189
+----
+
+- verify with: verification is embedded in merge commit message by default,
+  alternatively with `git show --show-signature`:
+
+----
+commit 9863f0c76ff78712b6800e199a46aa56afbcbd49
+merged tag 'signedtag'
+gpg: Signature made Wed Jun 15 10:56:46 2016 CEST using RSA key ID B7227189
+gpg: Good signature from "Eris Discordia <discord@example.net>"
+gpg: WARNING: This key is not certified with a trusted signature!
+gpg:          There is no indication that the signature belongs to the owner.
+Primary key fingerprint: D4BE 2231 1AD3 131E 5EDA  29A4 6109 2E85 B722 7189
+Merge: c33429b 04b8717
+Author: A U Thor <author@example.com>
+Date:   Wed Jun 15 09:13:29 2016 +0000
+
+    Merge tag 'signedtag' into downstream
+
+    signed tag
+
+    signed tag message body
+
+    # gpg: Signature made Wed Jun 15 08:56:46 2016 UTC using RSA key ID B7227189
+    # gpg: Good signature from "Eris Discordia <discord@example.net>"
+    # gpg: WARNING: This key is not certified with a trusted signature!
+    # gpg:          There is no indication that the signature belongs to the owner.
+    # Primary key fingerprint: D4BE 2231 1AD3 131E 5EDA  29A4 6109 2E85 B722 7189
+----
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index ba8b8cf3c6..eea85c3404 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.8.4
+DEF_VER=v2.10.0-rc0
 
 LF='
 '
diff --git a/Makefile b/Makefile
index e11e626d05..d96ecb7141 100644
--- a/Makefile
+++ b/Makefile
@@ -351,9 +351,12 @@ all::
 # Define GMTIME_UNRELIABLE_ERRORS if your gmtime() function does not
 # return NULL when it receives a bogus time_t.
 #
-# Define HAVE_CLOCK_GETTIME if your platform has clock_gettime in librt.
+# Define HAVE_CLOCK_GETTIME if your platform has clock_gettime.
 #
-# Define HAVE_CLOCK_MONOTONIC if your platform has CLOCK_MONOTONIC in librt.
+# Define HAVE_CLOCK_MONOTONIC if your platform has CLOCK_MONOTONIC.
+#
+# Define NEEDS_LIBRT if your platform requires linking with librt (glibc version
+# before 2.17) for clock_gettime and CLOCK_MONOTONIC.
 #
 # Define USE_PARENS_AROUND_GETTEXT_N to "yes" if your compiler happily
 # compiles the following initialization:
@@ -367,6 +370,14 @@ all::
 # Define HAVE_BSD_SYSCTL if your platform has a BSD-compatible sysctl function.
 #
 # Define HAVE_GETDELIM if your system has the getdelim() function.
+#
+# 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.
+#
+#    PAGER_ENV = LESS=FRX LV=-c
+#
+# to say "export LESS=FRX (and LV=-c) if the environment variable
+# LESS (and LV) is not set, respectively".
 
 GIT-VERSION-FILE: FORCE
 	@$(SHELL_PATH) ./GIT-VERSION-GEN
@@ -375,13 +386,7 @@ GIT-VERSION-FILE: FORCE
 # CFLAGS and LDFLAGS are for the users to override from the command line.
 
 CFLAGS = -g -O2 -Wall
-LDFLAGS =
-ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
-ALL_LDFLAGS = $(LDFLAGS)
-STRIP ?= strip
-
-ifdef DEVELOPER
-CFLAGS += -Werror \
+DEVELOPER_CFLAGS = -Werror \
 	-Wdeclaration-after-statement \
 	-Wno-format-zero-length \
 	-Wold-style-definition \
@@ -390,7 +395,10 @@ CFLAGS += -Werror \
 	-Wstrict-prototypes \
 	-Wunused \
 	-Wvla
-endif
+LDFLAGS =
+ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
+ALL_LDFLAGS = $(LDFLAGS)
+STRIP ?= strip
 
 # Create as necessary, replace existing, make ranlib unneeded.
 ARFLAGS = rcs
@@ -440,7 +448,6 @@ DIFF = diff
 TAR = tar
 FIND = find
 INSTALL = install
-RPMBUILD = rpmbuild
 TCL_PATH = tclsh
 TCLTK_PATH = wish
 XGETTEXT = xgettext
@@ -621,7 +628,7 @@ TEST_PROGRAMS_NEED_X += test-svn-fe
 TEST_PROGRAMS_NEED_X += test-urlmatch-normalization
 TEST_PROGRAMS_NEED_X += test-wildmatch
 
-TEST_PROGRAMS = $(patsubst %,%$X,$(TEST_PROGRAMS_NEED_X))
+TEST_PROGRAMS = $(patsubst %,t/helper/%$X,$(TEST_PROGRAMS_NEED_X))
 
 # List built-in command $C whose implementation cmd_$C() is not in
 # builtin/$C.o but is linked in as part of some other command.
@@ -722,6 +729,7 @@ LIB_OBJS += diff-lib.o
 LIB_OBJS += diff-no-index.o
 LIB_OBJS += diff.o
 LIB_OBJS += dir.o
+LIB_OBJS += dir-iterator.o
 LIB_OBJS += editor.o
 LIB_OBJS += entry.o
 LIB_OBJS += environment.o
@@ -755,6 +763,7 @@ LIB_OBJS += merge.o
 LIB_OBJS += merge-blobs.o
 LIB_OBJS += merge-recursive.o
 LIB_OBJS += mergesort.o
+LIB_OBJS += mru.o
 LIB_OBJS += name-hash.o
 LIB_OBJS += notes.o
 LIB_OBJS += notes-cache.o
@@ -786,6 +795,7 @@ LIB_OBJS += read-cache.o
 LIB_OBJS += reflog-walk.o
 LIB_OBJS += refs.o
 LIB_OBJS += refs/files-backend.o
+LIB_OBJS += refs/iterator.o
 LIB_OBJS += ref-filter.o
 LIB_OBJS += remote.o
 LIB_OBJS += replace_object.o
@@ -943,7 +953,7 @@ BUILTIN_OBJS += builtin/verify-tag.o
 BUILTIN_OBJS += builtin/worktree.o
 BUILTIN_OBJS += builtin/write-tree.o
 
-GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
+GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB)
 EXTLIBS =
 
 GIT_USER_AGENT = git/$(GIT_VERSION)
@@ -952,6 +962,10 @@ include config.mak.uname
 -include config.mak.autogen
 -include config.mak
 
+ifdef DEVELOPER
+CFLAGS += $(DEVELOPER_CFLAGS)
+endif
+
 ifndef sysconfdir
 ifeq ($(prefix),/usr)
 sysconfdir = /etc
@@ -1465,13 +1479,16 @@ endif
 
 ifdef HAVE_CLOCK_GETTIME
 	BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME
-	EXTLIBS += -lrt
 endif
 
 ifdef HAVE_CLOCK_MONOTONIC
 	BASIC_CFLAGS += -DHAVE_CLOCK_MONOTONIC
 endif
 
+ifdef NEEDS_LIBRT
+	EXTLIBS += -lrt
+endif
+
 ifdef HAVE_BSD_SYSCTL
 	BASIC_CFLAGS += -DHAVE_BSD_SYSCTL
 endif
@@ -1492,6 +1509,10 @@ ifeq ($(PYTHON_PATH),)
 NO_PYTHON = NoThanks
 endif
 
+ifndef PAGER_ENV
+PAGER_ENV = LESS=FRX LV=-c
+endif
+
 QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir
 QUIET_SUBDIR1  =
 
@@ -1572,7 +1593,15 @@ TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
 DIFF_SQ = $(subst ','\'',$(DIFF))
 PERLLIB_EXTRA_SQ = $(subst ','\'',$(PERLLIB_EXTRA))
 
-LIBS = $(GITLIBS) $(EXTLIBS)
+# We must filter out any object files from $(GITLIBS),
+# as it is typically used like:
+#
+#   foo: foo.o $(GITLIBS)
+#	$(CC) $(filter %.o,$^) $(LIBS)
+#
+# where we use it as a dependency. Since we also pull object files
+# from the dependency list, that would make each entry appear twice.
+LIBS = $(filter-out %.o, $(GITLIBS)) $(EXTLIBS)
 
 BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
 	$(COMPAT_CFLAGS)
@@ -1613,6 +1642,11 @@ ifdef DEFAULT_HELP_FORMAT
 BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
 endif
 
+PAGER_ENV_SQ = $(subst ','\'',$(PAGER_ENV))
+PAGER_ENV_CQ = "$(subst ",\",$(subst \,\\,$(PAGER_ENV)))"
+PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
+BASIC_CFLAGS += -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
+
 ALL_CFLAGS += $(BASIC_CFLAGS)
 ALL_LDFLAGS += $(BASIC_LDFLAGS)
 
@@ -1708,8 +1742,8 @@ git.sp git.s git.o: EXTRA_CPPFLAGS = \
 	'-DGIT_INFO_PATH="$(infodir_relative_SQ)"'
 
 git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS)
-	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) git.o \
-		$(BUILTIN_OBJS) $(LIBS)
+	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
+		$(filter %.o,$^) $(LIBS)
 
 help.sp help.s help.o: common-cmds.h
 
@@ -1737,7 +1771,7 @@ common-cmds.h: $(wildcard Documentation/git-*.txt)
 
 SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
 	$(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
-	$(gitwebdir_SQ):$(PERL_PATH_SQ):$(SANE_TEXT_GREP)
+	$(gitwebdir_SQ):$(PERL_PATH_SQ):$(SANE_TEXT_GREP):$(PAGER_ENV)
 define cmd_munge_script
 $(RM) $@ $@+ && \
 sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
@@ -1750,6 +1784,7 @@ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
     -e 's|@@GITWEBDIR@@|$(gitwebdir_SQ)|g' \
     -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
     -e 's|@@SANE_TEXT_GREP@@|$(SANE_TEXT_GREP)|g' \
+    -e 's|@@PAGER_ENV@@|$(PAGER_ENV_SQ)|g' \
     $@.sh >$@+
 endef
 
@@ -1898,10 +1933,11 @@ VCSSVN_OBJS += vcs-svn/fast_export.o
 VCSSVN_OBJS += vcs-svn/svndiff.o
 VCSSVN_OBJS += vcs-svn/svndump.o
 
-TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
+TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS))
 OBJECTS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
 	$(XDIFF_OBJS) \
 	$(VCSSVN_OBJS) \
+	common-main.o \
 	git.o
 ifndef NO_CURL
 	OBJECTS += http.o http-walker.o remote-curl.o
@@ -2063,7 +2099,10 @@ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
 	--keyword=gettextln --keyword=eval_gettextln
 XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --keyword=__ --language=Perl
 LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
-LOCALIZED_SH = $(SCRIPT_SH) git-parse-remote.sh
+LOCALIZED_SH = $(SCRIPT_SH)
+LOCALIZED_SH += git-parse-remote.sh
+LOCALIZED_SH += git-rebase--interactive.sh
+LOCALIZED_SH += git-sh-setup.sh
 LOCALIZED_PERL = $(SCRIPT_PERL)
 
 ifdef XGETTEXT_INCLUDE_TESTS
@@ -2153,6 +2192,7 @@ GIT-BUILD-OPTIONS: FORCE
 	@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@+
 	@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@+
 	@echo NO_UNIX_SOCKETS=\''$(subst ','\'',$(subst ','\'',$(NO_UNIX_SOCKETS)))'\' >>$@+
+	@echo PAGER_ENV=\''$(subst ','\'',$(subst ','\'',$(PAGER_ENV)))'\' >>$@+
 ifdef TEST_OUTPUT_DIRECTORY
 	@echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst ','\'',$(TEST_OUTPUT_DIRECTORY)))'\' >>$@+
 endif
@@ -2205,7 +2245,7 @@ bin-wrappers/%: wrap-for-bin.sh
 	@mkdir -p bin-wrappers
 	$(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 	     -e 's|@@BUILD_DIR@@|$(shell pwd)|' \
-	     -e 's|@@PROG@@|$(@F)|' < $< > $@ && \
+	     -e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%,$(@F))|' < $< > $@ && \
 	chmod +x $@
 
 # GNU make supports exporting all variables by "export" without parameters.
@@ -2225,25 +2265,17 @@ perf: all
 
 .PHONY: test perf
 
-test-ctype$X: ctype.o
-
-test-date$X: date.o ctype.o
-
-test-delta$X: diff-delta.o patch-delta.o
+t/helper/test-line-buffer$X: $(VCSSVN_LIB)
 
-test-line-buffer$X: vcs-svn/lib.a
-
-test-parse-options$X: parse-options.o parse-options-cb.o
-
-test-svn-fe$X: vcs-svn/lib.a
+t/helper/test-svn-fe$X: $(VCSSVN_LIB)
 
 .PRECIOUS: $(TEST_OBJS)
 
-test-%$X: test-%.o GIT-LDFLAGS $(GITLIBS)
+t/helper/test-%$X: t/helper/test-%.o GIT-LDFLAGS $(GITLIBS)
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(filter %.a,$^) $(LIBS)
 
-check-sha1:: test-sha1$X
-	./test-sha1.sh
+check-sha1:: t/helper/test-sha1$X
+	t/helper/test-sha1.sh
 
 SP_OBJ = $(patsubst %.o,%.sp,$(C_OBJ))
 
@@ -2390,31 +2422,25 @@ quick-install-html:
 
 ### Maintainer's dist rules
 
-git.spec: git.spec.in GIT-VERSION-FILE
-	sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+
-	mv $@+ $@
-
 GIT_TARNAME = git-$(GIT_VERSION)
-dist: git.spec git-archive$(X) configure
+dist: git-archive$(X) configure
 	./git-archive --format=tar \
 		--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
 	@mkdir -p $(GIT_TARNAME)
-	@cp git.spec configure $(GIT_TARNAME)
+	@cp configure $(GIT_TARNAME)
 	@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
 	@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
 	$(TAR) rf $(GIT_TARNAME).tar \
-		$(GIT_TARNAME)/git.spec \
 		$(GIT_TARNAME)/configure \
 		$(GIT_TARNAME)/version \
 		$(GIT_TARNAME)/git-gui/version
 	@$(RM) -r $(GIT_TARNAME)
 	gzip -f -9 $(GIT_TARNAME).tar
 
-rpm: dist
-	$(RPMBUILD) \
-		--define "_source_filedigest_algorithm md5" \
-		--define "_binary_filedigest_algorithm md5" \
-		-ta $(GIT_TARNAME).tar.gz
+rpm::
+	@echo >&2 "Use distro packaged sources to run rpmbuild"
+	@false
+.PHONY: rpm
 
 htmldocs = git-htmldocs-$(GIT_VERSION)
 manpages = git-manpages-$(GIT_VERSION)
@@ -2450,8 +2476,8 @@ profile-clean:
 	$(RM) $(addsuffix *.gcno,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
 
 clean: profile-clean coverage-clean
-	$(RM) *.o *.res refs/*.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o
-	$(RM) xdiff/*.o vcs-svn/*.o ewah/*.o builtin/*.o
+	$(RM) *.res
+	$(RM) $(OBJECTS)
 	$(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
 	$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
 	$(RM) $(TEST_PROGRAMS) $(NO_INSTALL)
@@ -2490,6 +2516,7 @@ ALL_COMMANDS += git-gui git-citool
 
 .PHONY: check-docs
 check-docs::
+	$(MAKE) -C Documentation lint-docs
 	@(for v in $(ALL_COMMANDS); \
 	do \
 		case "$$v" in \
diff --git a/README.md b/README.md
index d1ffbb6170..bd8a918a9b 100644
--- a/README.md
+++ b/README.md
@@ -17,14 +17,14 @@ including full documentation and Git related tools.
 
 See [Documentation/gittutorial.txt][] to get started, then see
 [Documentation/giteveryday.txt][] for a useful minimum set of commands, and
-[Documentation/git-commandname.txt][] for documentation of each command.
+Documentation/git-<commandname>.txt for documentation of each command.
 If git has been correctly installed, then the tutorial can also be
-read with "man gittutorial" or "git help tutorial", and the
-documentation of each command with "man git-commandname" or "git help
-commandname".
+read with `man gittutorial` or `git help tutorial`, and the
+documentation of each command with `man git-<commandname>` or `git help
+<commandname>`.
 
 CVS users may also want to read [Documentation/gitcvs-migration.txt][]
-("man gitcvs-migration" or "git help cvs-migration" if git is
+(`man gitcvs-migration` or `git help cvs-migration` if git is
 installed).
 
 The user discussion and development of Git take place on the Git
@@ -57,6 +57,5 @@ and the name as (depending on your mood):
 [INSTALL]: INSTALL
 [Documentation/gittutorial.txt]: Documentation/gittutorial.txt
 [Documentation/giteveryday.txt]: Documentation/giteveryday.txt
-[Documentation/git-commandname.txt]: Documentation/git-commandname.txt
 [Documentation/gitcvs-migration.txt]: Documentation/gitcvs-migration.txt
 [Documentation/SubmittingPatches]: Documentation/SubmittingPatches
diff --git a/RelNotes b/RelNotes
index 58fee1e347..62615ffa4e 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.8.4.txt
\ No newline at end of file
+Documentation/RelNotes/2.10.0.txt
\ No newline at end of file
diff --git a/advice.c b/advice.c
index 4dc5cf10a8..b84ae4960f 100644
--- a/advice.c
+++ b/advice.c
@@ -79,7 +79,20 @@ int git_default_advice_config(const char *var, const char *value)
 
 int error_resolve_conflict(const char *me)
 {
-	error("%s is not possible because you have unmerged files.", me);
+	if (!strcmp(me, "cherry-pick"))
+		error(_("Cherry-picking is not possible because you have unmerged files."));
+	else if (!strcmp(me, "commit"))
+		error(_("Committing is not possible because you have unmerged files."));
+	else if (!strcmp(me, "merge"))
+		error(_("Merging is not possible because you have unmerged files."));
+	else if (!strcmp(me, "pull"))
+		error(_("Pulling is not possible because you have unmerged files."));
+	else if (!strcmp(me, "revert"))
+		error(_("Reverting is not possible because you have unmerged files."));
+	else
+		error(_("It is not possible to %s because you have unmerged files."),
+			me);
+
 	if (advice_resolve_conflict)
 		/*
 		 * Message used both when 'git commit' fails and when
@@ -93,7 +106,7 @@ int error_resolve_conflict(const char *me)
 void NORETURN die_resolve_conflict(const char *me)
 {
 	error_resolve_conflict(me);
-	die("Exiting because of an unresolved conflict.");
+	die(_("Exiting because of an unresolved conflict."));
 }
 
 void NORETURN die_conclude_merge(void)
@@ -106,14 +119,14 @@ void NORETURN die_conclude_merge(void)
 
 void detach_advice(const char *new_name)
 {
-	const char fmt[] =
-	"Note: checking out '%s'.\n\n"
+	const char *fmt =
+	_("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";
+	"  git checkout -b <new-branch-name>\n\n");
 
 	fprintf(stderr, fmt, new_name);
 }
diff --git a/archive-tar.c b/archive-tar.c
index cb99df2814..380e3aedd2 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -18,6 +18,21 @@ static int tar_umask = 002;
 static int write_tar_filter_archive(const struct archiver *ar,
 				    struct archiver_args *args);
 
+/*
+ * This is the max value that a ustar size header can specify, as it is fixed
+ * at 11 octal digits. POSIX specifies that we switch to extended headers at
+ * this size.
+ *
+ * Likewise for the mtime (which happens to use a buffer of the same size).
+ */
+#if ULONG_MAX == 0xFFFFFFFF
+#define USTAR_MAX_SIZE ULONG_MAX
+#define USTAR_MAX_MTIME ULONG_MAX
+#else
+#define USTAR_MAX_SIZE 077777777777UL
+#define USTAR_MAX_MTIME 077777777777UL
+#endif
+
 /* writes out the whole block, but only if it is full */
 static void write_if_needed(void)
 {
@@ -137,6 +152,20 @@ static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword,
 	strbuf_addch(sb, '\n');
 }
 
+/*
+ * Like strbuf_append_ext_header, but for numeric values.
+ */
+static void strbuf_append_ext_header_uint(struct strbuf *sb,
+					  const char *keyword,
+					  uintmax_t value)
+{
+	char buf[40]; /* big enough for 2^128 in decimal, plus NUL */
+	int len;
+
+	len = xsnprintf(buf, sizeof(buf), "%"PRIuMAX, value);
+	strbuf_append_ext_header(sb, keyword, buf, len);
+}
+
 static unsigned int ustar_header_chksum(const struct ustar_header *header)
 {
 	const unsigned char *p = (const unsigned char *)header;
@@ -184,9 +213,9 @@ static void prepare_header(struct archiver_args *args,
 	xsnprintf(header->chksum, sizeof(header->chksum), "%07o", ustar_header_chksum(header));
 }
 
-static int write_extended_header(struct archiver_args *args,
-				 const unsigned char *sha1,
-				 const void *buffer, unsigned long size)
+static void write_extended_header(struct archiver_args *args,
+				  const unsigned char *sha1,
+				  const void *buffer, unsigned long size)
 {
 	struct ustar_header header;
 	unsigned int mode;
@@ -197,7 +226,6 @@ static int write_extended_header(struct archiver_args *args,
 	prepare_header(args, &header, mode, size);
 	write_blocked(&header, sizeof(header));
 	write_blocked(buffer, size);
-	return 0;
 }
 
 static int write_tar_entry(struct archiver_args *args,
@@ -208,7 +236,7 @@ static int write_tar_entry(struct archiver_args *args,
 	struct ustar_header header;
 	struct strbuf ext_header = STRBUF_INIT;
 	unsigned int old_mode = mode;
-	unsigned long size;
+	unsigned long size, size_in_header;
 	void *buffer;
 	int err = 0;
 
@@ -267,15 +295,17 @@ static int write_tar_entry(struct archiver_args *args,
 			memcpy(header.linkname, buffer, size);
 	}
 
-	prepare_header(args, &header, mode, size);
+	size_in_header = size;
+	if (S_ISREG(mode) && size > USTAR_MAX_SIZE) {
+		size_in_header = 0;
+		strbuf_append_ext_header_uint(&ext_header, "size", size);
+	}
+
+	prepare_header(args, &header, mode, size_in_header);
 
 	if (ext_header.len > 0) {
-		err = write_extended_header(args, sha1, ext_header.buf,
-					    ext_header.len);
-		if (err) {
-			free(buffer);
-			return err;
-		}
+		write_extended_header(args, sha1, ext_header.buf,
+				      ext_header.len);
 	}
 	strbuf_release(&ext_header);
 	write_blocked(&header, sizeof(header));
@@ -289,15 +319,25 @@ static int write_tar_entry(struct archiver_args *args,
 	return err;
 }
 
-static int write_global_extended_header(struct archiver_args *args)
+static void write_global_extended_header(struct archiver_args *args)
 {
 	const unsigned char *sha1 = args->commit_sha1;
 	struct strbuf ext_header = STRBUF_INIT;
 	struct ustar_header header;
 	unsigned int mode;
-	int err = 0;
 
-	strbuf_append_ext_header(&ext_header, "comment", sha1_to_hex(sha1), 40);
+	if (sha1)
+		strbuf_append_ext_header(&ext_header, "comment",
+					 sha1_to_hex(sha1), 40);
+	if (args->time > USTAR_MAX_MTIME) {
+		strbuf_append_ext_header_uint(&ext_header, "mtime",
+					      args->time);
+		args->time = USTAR_MAX_MTIME;
+	}
+
+	if (!ext_header.len)
+		return;
+
 	memset(&header, 0, sizeof(header));
 	*header.typeflag = TYPEFLAG_GLOBAL_HEADER;
 	mode = 0100666;
@@ -306,7 +346,6 @@ static int write_global_extended_header(struct archiver_args *args)
 	write_blocked(&header, sizeof(header));
 	write_blocked(ext_header.buf, ext_header.len);
 	strbuf_release(&ext_header);
-	return err;
 }
 
 static struct archiver **tar_filters;
@@ -382,10 +421,8 @@ static int write_tar_archive(const struct archiver *ar,
 {
 	int err = 0;
 
-	if (args->commit_sha1)
-		err = write_global_extended_header(args);
-	if (!err)
-		err = write_archive_entries(args, write_tar_entry);
+	write_global_extended_header(args);
+	err = write_archive_entries(args, write_tar_entry);
 	if (!err)
 		write_trailer();
 	return err;
diff --git a/archive.c b/archive.c
index 5d735ae603..dde1ab4c79 100644
--- a/archive.c
+++ b/archive.c
@@ -322,7 +322,7 @@ static int path_exists(struct tree *tree, const char *path)
 	pathspec.recursive = 1;
 	ret = read_tree_recursive(tree, "", 0, 0, &pathspec,
 				  reject_entry, &pathspec);
-	free_pathspec(&pathspec);
+	clear_pathspec(&pathspec);
 	return ret != 0;
 }
 
@@ -458,11 +458,11 @@ static int parse_archive_args(int argc, const char **argv,
 	argc = parse_options(argc, argv, NULL, opts, archive_usage, 0);
 
 	if (remote)
-		die("Unexpected option --remote");
+		die(_("Unexpected option --remote"));
 	if (exec)
-		die("Option --exec can only be used together with --remote");
+		die(_("Option --exec can only be used together with --remote"));
 	if (output)
-		die("Unexpected option --output");
+		die(_("Unexpected option --output"));
 
 	if (!base)
 		base = "";
@@ -484,14 +484,14 @@ static int parse_archive_args(int argc, const char **argv,
 		usage_with_options(archive_usage, opts);
 	*ar = lookup_archiver(format);
 	if (!*ar || (is_remote && !((*ar)->flags & ARCHIVER_REMOTE)))
-		die("Unknown archive format '%s'", format);
+		die(_("Unknown archive format '%s'"), format);
 
 	args->compression_level = Z_DEFAULT_COMPRESSION;
 	if (compression_level != -1) {
 		if ((*ar)->flags & ARCHIVER_WANT_COMPRESSION_LEVELS)
 			args->compression_level = compression_level;
 		else {
-			die("Argument not supported for format '%s': -%d",
+			die(_("Argument not supported for format '%s': -%d"),
 					format, compression_level);
 		}
 	}
diff --git a/bisect.c b/bisect.c
index 7996c2907b..6f512c2063 100644
--- a/bisect.c
+++ b/bisect.c
@@ -438,12 +438,12 @@ static void read_bisect_paths(struct argv_array *array)
 	FILE *fp = fopen(filename, "r");
 
 	if (!fp)
-		die_errno("Could not open file '%s'", filename);
+		die_errno(_("Could not open file '%s'"), filename);
 
 	while (strbuf_getline_lf(&str, fp) != EOF) {
 		strbuf_trim(&str);
 		if (sq_dequote_to_argv_array(str.buf, array))
-			die("Badly quoted content in file '%s': %s",
+			die(_("Badly quoted content in file '%s': %s"),
 			    filename, str.buf);
 	}
 
@@ -646,10 +646,13 @@ static void exit_if_skipped_commits(struct commit_list *tried,
 
 	printf("There are only 'skip'ped commits left to test.\n"
 	       "The first %s commit could be any of:\n", term_bad);
-	print_commit_list(tried, "%s\n", "%s\n");
+
+	for ( ; tried; tried = tried->next)
+		printf("%s\n", oid_to_hex(&tried->item->object.oid));
+
 	if (bad)
 		printf("%s\n", oid_to_hex(bad));
-	printf("We cannot bisect more!\n");
+	printf(_("We cannot bisect more!\n"));
 	exit(2);
 }
 
@@ -702,7 +705,7 @@ static struct commit *get_commit_reference(const unsigned char *sha1)
 {
 	struct commit *r = lookup_commit_reference(sha1);
 	if (!r)
-		die("Not a valid commit name %s", sha1_to_hex(sha1));
+		die(_("Not a valid commit name %s"), sha1_to_hex(sha1));
 	return r;
 }
 
@@ -726,27 +729,27 @@ static void handle_bad_merge_base(void)
 		char *bad_hex = oid_to_hex(current_bad_oid);
 		char *good_hex = join_sha1_array_hex(&good_revs, ' ');
 		if (!strcmp(term_bad, "bad") && !strcmp(term_good, "good")) {
-			fprintf(stderr, "The merge base %s is bad.\n"
+			fprintf(stderr, _("The merge base %s is bad.\n"
 				"This means the bug has been fixed "
-				"between %s and [%s].\n",
+				"between %s and [%s].\n"),
 				bad_hex, bad_hex, good_hex);
 		} else if (!strcmp(term_bad, "new") && !strcmp(term_good, "old")) {
-			fprintf(stderr, "The merge base %s is new.\n"
+			fprintf(stderr, _("The merge base %s is new.\n"
 				"The property has changed "
-				"between %s and [%s].\n",
+				"between %s and [%s].\n"),
 				bad_hex, bad_hex, good_hex);
 		} else {
-			fprintf(stderr, "The merge base %s is %s.\n"
+			fprintf(stderr, _("The merge base %s is %s.\n"
 				"This means the first '%s' commit is "
-				"between %s and [%s].\n",
+				"between %s and [%s].\n"),
 				bad_hex, term_bad, term_good, bad_hex, good_hex);
 		}
 		exit(3);
 	}
 
-	fprintf(stderr, "Some %s revs are not ancestor of the %s rev.\n"
+	fprintf(stderr, _("Some %s revs are not ancestor of the %s rev.\n"
 		"git bisect cannot work properly in this case.\n"
-		"Maybe you mistook %s and %s revs?\n",
+		"Maybe you mistook %s and %s revs?\n"),
 		term_good, term_bad, term_good, term_bad);
 	exit(1);
 }
@@ -754,14 +757,14 @@ static void handle_bad_merge_base(void)
 static void handle_skipped_merge_base(const unsigned char *mb)
 {
 	char *mb_hex = sha1_to_hex(mb);
-	char *bad_hex = sha1_to_hex(current_bad_oid->hash);
+	char *bad_hex = oid_to_hex(current_bad_oid);
 	char *good_hex = join_sha1_array_hex(&good_revs, ' ');
 
-	warning("the merge base between %s and [%s] "
+	warning(_("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.",
+		"We continue anyway."),
 		bad_hex, good_hex, term_bad, mb_hex, bad_hex);
 	free(good_hex);
 }
@@ -792,7 +795,7 @@ static void check_merge_bases(int no_checkout)
 		} else if (0 <= sha1_array_lookup(&skipped_revs, mb)) {
 			handle_skipped_merge_base(mb);
 		} else {
-			printf("Bisecting: a merge base must be tested\n");
+			printf(_("Bisecting: a merge base must be tested\n"));
 			exit(bisect_checkout(mb, no_checkout));
 		}
 	}
@@ -843,7 +846,7 @@ static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout)
 	int fd;
 
 	if (!current_bad_oid)
-		die("a %s revision is needed", term_bad);
+		die(_("a %s revision is needed"), term_bad);
 
 	/* Check if file BISECT_ANCESTORS_OK exists. */
 	if (!stat(filename, &st) && S_ISREG(st.st_mode))
@@ -860,8 +863,8 @@ static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout)
 	/* Create file BISECT_ANCESTORS_OK. */
 	fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
 	if (fd < 0)
-		warning("could not create file '%s': %s",
-			filename, strerror(errno));
+		warning_errno(_("could not create file '%s'"),
+			      filename);
 	else
 		close(fd);
  done:
@@ -890,6 +893,7 @@ static void show_diff_tree(const char *prefix, struct commit *commit)
 	if (!opt.diffopt.output_format)
 		opt.diffopt.output_format = DIFF_FORMAT_RAW;
 
+	setup_revisions(0, NULL, &opt, NULL);
 	log_tree_commit(&opt, commit);
 }
 
@@ -910,8 +914,7 @@ void read_bisect_terms(const char **read_bad, const char **read_good)
 			*read_good = "good";
 			return;
 		} else {
-			die("could not read file '%s': %s", filename,
-				strerror(errno));
+			die_errno(_("could not read file '%s'"), filename);
 		}
 	} else {
 		strbuf_getline_lf(&str, fp);
@@ -937,10 +940,11 @@ int bisect_next_all(const char *prefix, int no_checkout)
 	struct commit_list *tried;
 	int reaches = 0, all = 0, nr, steps;
 	const unsigned char *bisect_rev;
+	char steps_msg[32];
 
 	read_bisect_terms(&term_bad, &term_good);
 	if (read_bisect_refs())
-		die("reading bisect refs failed");
+		die(_("reading bisect refs failed"));
 
 	check_good_are_ancestors_of_bad(prefix, no_checkout);
 
@@ -960,7 +964,7 @@ int bisect_next_all(const char *prefix, int no_checkout)
 		 */
 		exit_if_skipped_commits(tried, NULL);
 
-		printf("%s was both %s and %s\n",
+		printf(_("%s was both %s and %s\n"),
 		       oid_to_hex(current_bad_oid),
 		       term_good,
 		       term_bad);
@@ -968,8 +972,8 @@ int bisect_next_all(const char *prefix, int no_checkout)
 	}
 
 	if (!all) {
-		fprintf(stderr, "No testable commit found.\n"
-			"Maybe you started with bad path parameters?\n");
+		fprintf(stderr, _("No testable commit found.\n"
+			"Maybe you started with bad path parameters?\n"));
 		exit(4);
 	}
 
@@ -986,9 +990,14 @@ int bisect_next_all(const char *prefix, int no_checkout)
 
 	nr = all - reaches - 1;
 	steps = estimate_bisect_steps(all);
-	printf("Bisecting: %d revision%s left to test after this "
-	       "(roughly %d step%s)\n", nr, (nr == 1 ? "" : "s"),
-	       steps, (steps == 1 ? "" : "s"));
+	xsnprintf(steps_msg, sizeof(steps_msg),
+		  Q_("(roughly %d step)", "(roughly %d steps)", steps),
+		  steps);
+	/* TRANSLATORS: the last %s will be replaced with
+	   "(roughly %d steps)" translation */
+	printf(Q_("Bisecting: %d revision left to test after this %s\n",
+		  "Bisecting: %d revisions left to test after this %s\n",
+		  nr), nr, steps_msg);
 
 	return bisect_checkout(bisect_rev, no_checkout);
 }
diff --git a/branch.c b/branch.c
index 4162443707..a5a8dcbd0e 100644
--- a/branch.c
+++ b/branch.c
@@ -334,15 +334,16 @@ void remove_branch_state(void)
 	unlink(git_path_squash_msg());
 }
 
-void die_if_checked_out(const char *branch)
+void die_if_checked_out(const char *branch, int ignore_current_worktree)
 {
-	char *existing;
+	const struct worktree *wt;
 
-	existing = find_shared_symref("HEAD", branch);
-	if (existing) {
-		skip_prefix(branch, "refs/heads/", &branch);
-		die(_("'%s' is already checked out at '%s'"), branch, existing);
-	}
+	wt = find_shared_symref("HEAD", branch);
+	if (!wt || (ignore_current_worktree && wt->is_current))
+		return;
+	skip_prefix(branch, "refs/heads/", &branch);
+	die(_("'%s' is already checked out at '%s'"),
+	    branch, wt->path);
 }
 
 int replace_each_worktree_head_symref(const char *oldref, const char *newref)
@@ -357,7 +358,8 @@ int replace_each_worktree_head_symref(const char *oldref, const char *newref)
 		if (strcmp(oldref, worktrees[i]->head_ref))
 			continue;
 
-		if (set_worktree_head_symref(worktrees[i]->git_dir, newref)) {
+		if (set_worktree_head_symref(get_worktree_git_dir(worktrees[i]),
+					     newref)) {
 			ret = -1;
 			error(_("HEAD of working tree %s is not updated"),
 			      worktrees[i]->path);
diff --git a/branch.h b/branch.h
index d69163daf7..b2f9649332 100644
--- a/branch.h
+++ b/branch.h
@@ -58,7 +58,7 @@ extern int read_branch_desc(struct strbuf *, const char *branch_name);
  * worktree and die (with a message describing its checkout location) if
  * it is.
  */
-extern void die_if_checked_out(const char *branch);
+extern void die_if_checked_out(const char *branch, int ignore_current_worktree);
 
 /*
  * Update all per-worktree HEADs pointing at the old ref to point the new ref.
diff --git a/builtin/add.c b/builtin/add.c
index 145f06ef97..b1dddb4ac6 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -26,7 +26,7 @@ static int patch_interactive, add_interactive, edit_interactive;
 static int take_worktree_changes;
 
 struct update_callback_data {
-	int flags;
+	int flags, force_mode;
 	int add_errors;
 };
 
@@ -65,7 +65,8 @@ static void update_callback(struct diff_queue_struct *q,
 			die(_("unexpected diff status %c"), p->status);
 		case DIFF_STATUS_MODIFIED:
 		case DIFF_STATUS_TYPE_CHANGED:
-			if (add_file_to_index(&the_index, path, data->flags)) {
+			if (add_file_to_index(&the_index, path,
+					data->flags, data->force_mode)) {
 				if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
 					die(_("updating files failed"));
 				data->add_errors++;
@@ -83,14 +84,15 @@ static void update_callback(struct diff_queue_struct *q,
 	}
 }
 
-int add_files_to_cache(const char *prefix,
-		       const struct pathspec *pathspec, int flags)
+int add_files_to_cache(const char *prefix, const struct pathspec *pathspec,
+	int flags, int force_mode)
 {
 	struct update_callback_data data;
 	struct rev_info rev;
 
 	memset(&data, 0, sizeof(data));
 	data.flags = flags;
+	data.force_mode = force_mode;
 
 	init_revisions(&rev, prefix);
 	setup_revisions(0, NULL, &rev, NULL);
@@ -238,6 +240,8 @@ static int ignore_add_errors, intent_to_add, ignore_missing;
 static int addremove = ADDREMOVE_DEFAULT;
 static int addremove_explicit = -1; /* unspecified */
 
+static char *chmod_arg;
+
 static int ignore_removal_cb(const struct option *opt, const char *arg, int unset)
 {
 	/* if we are told to ignore, we are not adding removals */
@@ -263,6 +267,7 @@ static struct option builtin_add_options[] = {
 	OPT_BOOL( 0 , "refresh", &refresh_only, N_("don't add, only refresh the index")),
 	OPT_BOOL( 0 , "ignore-errors", &ignore_add_errors, N_("just skip files which cannot be added because of errors")),
 	OPT_BOOL( 0 , "ignore-missing", &ignore_missing, N_("check if - even missing - files are ignored in dry run")),
+	OPT_STRING( 0 , "chmod", &chmod_arg, N_("(+/-)x"), N_("override the executable bit of the listed files")),
 	OPT_END(),
 };
 
@@ -276,7 +281,7 @@ static int add_config(const char *var, const char *value, void *cb)
 	return git_default_config(var, value, cb);
 }
 
-static int add_files(struct dir_struct *dir, int flags)
+static int add_files(struct dir_struct *dir, int flags, int force_mode)
 {
 	int i, exit_status = 0;
 
@@ -289,7 +294,8 @@ static int add_files(struct dir_struct *dir, int flags)
 	}
 
 	for (i = 0; i < dir->nr; i++)
-		if (add_file_to_cache(dir->entries[i]->name, flags)) {
+		if (add_file_to_index(&the_index, dir->entries[i]->name,
+				flags, force_mode)) {
 			if (!ignore_add_errors)
 				die(_("adding files failed"));
 			exit_status = 1;
@@ -302,7 +308,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 	int exit_status = 0;
 	struct pathspec pathspec;
 	struct dir_struct dir;
-	int flags;
+	int flags, force_mode;
 	int add_new_files;
 	int require_pathspec;
 	char *seen = NULL;
@@ -336,6 +342,15 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 	if (!show_only && ignore_missing)
 		die(_("Option --ignore-missing can only be used together with --dry-run"));
 
+	if (!chmod_arg)
+		force_mode = 0;
+	else if (!strcmp(chmod_arg, "-x"))
+		force_mode = 0666;
+	else if (!strcmp(chmod_arg, "+x"))
+		force_mode = 0777;
+	else
+		die(_("--chmod param '%s' must be either -x or +x"), chmod_arg);
+
 	add_new_files = !take_worktree_changes && !refresh_only;
 	require_pathspec = !(take_worktree_changes || (0 < addremove_explicit));
 
@@ -426,10 +441,10 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 
 	plug_bulk_checkin();
 
-	exit_status |= add_files_to_cache(prefix, &pathspec, flags);
+	exit_status |= add_files_to_cache(prefix, &pathspec, flags, force_mode);
 
 	if (add_new_files)
-		exit_status |= add_files(&dir, flags);
+		exit_status |= add_files(&dir, flags, force_mode);
 
 	unplug_bulk_checkin();
 
diff --git a/builtin/am.c b/builtin/am.c
index d003939bc5..739b34dcf2 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -70,7 +70,8 @@ enum patch_format {
 	PATCH_FORMAT_MBOX,
 	PATCH_FORMAT_STGIT,
 	PATCH_FORMAT_STGIT_SERIES,
-	PATCH_FORMAT_HG
+	PATCH_FORMAT_HG,
+	PATCH_FORMAT_MBOXRD
 };
 
 enum keep_type {
@@ -183,22 +184,22 @@ static inline const char *am_path(const struct am_state *state, const char *path
 /**
  * For convenience to call write_file()
  */
-static int write_state_text(const struct am_state *state,
-			    const char *name, const char *string)
+static void write_state_text(const struct am_state *state,
+			     const char *name, const char *string)
 {
-	return write_file(am_path(state, name), "%s", string);
+	write_file(am_path(state, name), "%s", string);
 }
 
-static int write_state_count(const struct am_state *state,
-			     const char *name, int value)
+static void write_state_count(const struct am_state *state,
+			      const char *name, int value)
 {
-	return write_file(am_path(state, name), "%d", value);
+	write_file(am_path(state, name), "%d", value);
 }
 
-static int write_state_bool(const struct am_state *state,
-			    const char *name, int value)
+static void write_state_bool(const struct am_state *state,
+			     const char *name, int value)
 {
-	return write_state_text(state, name, value ? "t" : "f");
+	write_state_text(state, name, value ? "t" : "f");
 }
 
 /**
@@ -402,13 +403,8 @@ static int read_commit_msg(struct am_state *state)
  */
 static void write_commit_msg(const struct am_state *state)
 {
-	int fd;
 	const char *filename = am_path(state, "final-commit");
-
-	fd = xopen(filename, O_WRONLY | O_CREAT, 0666);
-	if (write_in_full(fd, state->msg, state->msg_len) < 0)
-		die_errno(_("could not write to %s"), filename);
-	close(fd);
+	write_file_buf(filename, state->msg, state->msg_len);
 }
 
 /**
@@ -712,7 +708,8 @@ done:
  * Splits out individual email patches from `paths`, where each path is either
  * a mbox file or a Maildir. Returns 0 on success, -1 on failure.
  */
-static int split_mail_mbox(struct am_state *state, const char **paths, int keep_cr)
+static int split_mail_mbox(struct am_state *state, const char **paths,
+				int keep_cr, int mboxrd)
 {
 	struct child_process cp = CHILD_PROCESS_INIT;
 	struct strbuf last = STRBUF_INIT;
@@ -724,6 +721,8 @@ static int split_mail_mbox(struct am_state *state, const char **paths, int keep_
 	argv_array_push(&cp.args, "-b");
 	if (keep_cr)
 		argv_array_push(&cp.args, "--keep-cr");
+	if (mboxrd)
+		argv_array_push(&cp.args, "--mboxrd");
 	argv_array_push(&cp.args, "--");
 	argv_array_pushv(&cp.args, paths);
 
@@ -769,15 +768,15 @@ static int split_mail_conv(mail_conv_fn fn, struct am_state *state,
 			in = fopen(*paths, "r");
 
 		if (!in)
-			return error(_("could not open '%s' for reading: %s"),
-					*paths, strerror(errno));
+			return error_errno(_("could not open '%s' for reading"),
+					   *paths);
 
 		mail = mkpath("%s/%0*d", state->dir, state->prec, i + 1);
 
 		out = fopen(mail, "w");
 		if (!out)
-			return error(_("could not open '%s' for writing: %s"),
-					mail, strerror(errno));
+			return error_errno(_("could not open '%s' for writing"),
+					   mail);
 
 		ret = fn(out, in, keep_cr);
 
@@ -857,8 +856,7 @@ static int split_mail_stgit_series(struct am_state *state, const char **paths,
 
 	fp = fopen(*paths, "r");
 	if (!fp)
-		return error(_("could not open '%s' for reading: %s"), *paths,
-				strerror(errno));
+		return error_errno(_("could not open '%s' for reading"), *paths);
 
 	while (!strbuf_getline_lf(&sb, fp)) {
 		if (*sb.buf == '#')
@@ -966,13 +964,15 @@ static int split_mail(struct am_state *state, enum patch_format patch_format,
 
 	switch (patch_format) {
 	case PATCH_FORMAT_MBOX:
-		return split_mail_mbox(state, paths, keep_cr);
+		return split_mail_mbox(state, paths, keep_cr, 0);
 	case PATCH_FORMAT_STGIT:
 		return split_mail_conv(stgit_patch_to_mail, state, paths, keep_cr);
 	case PATCH_FORMAT_STGIT_SERIES:
 		return split_mail_stgit_series(state, paths, keep_cr);
 	case PATCH_FORMAT_HG:
 		return split_mail_conv(hg_patch_to_mail, state, paths, keep_cr);
+	case PATCH_FORMAT_MBOXRD:
+		return split_mail_mbox(state, paths, keep_cr, 1);
 	default:
 		die("BUG: invalid patch_format");
 	}
@@ -1579,47 +1579,18 @@ static int build_fake_ancestor(const struct am_state *state, const char *index_f
 }
 
 /**
- * Do the three-way merge using fake ancestor, his tree constructed
- * from the fake ancestor and the postimage of the patch, and our
- * state.
- */
-static int run_fallback_merge_recursive(const struct am_state *state,
-					unsigned char *orig_tree,
-					unsigned char *our_tree,
-					unsigned char *his_tree)
-{
-	struct child_process cp = CHILD_PROCESS_INIT;
-	int status;
-
-	cp.git_cmd = 1;
-
-	argv_array_pushf(&cp.env_array, "GITHEAD_%s=%.*s",
-			 sha1_to_hex(his_tree), linelen(state->msg), state->msg);
-	if (state->quiet)
-		argv_array_push(&cp.env_array, "GIT_MERGE_VERBOSITY=0");
-
-	argv_array_push(&cp.args, "merge-recursive");
-	argv_array_push(&cp.args, sha1_to_hex(orig_tree));
-	argv_array_push(&cp.args, "--");
-	argv_array_push(&cp.args, sha1_to_hex(our_tree));
-	argv_array_push(&cp.args, sha1_to_hex(his_tree));
-
-	status = run_command(&cp) ? (-1) : 0;
-	discard_cache();
-	read_cache();
-	return status;
-}
-
-/**
  * Attempt a threeway merge, using index_path as the temporary index.
  */
 static int fall_back_threeway(const struct am_state *state, const char *index_path)
 {
-	unsigned char orig_tree[GIT_SHA1_RAWSZ], his_tree[GIT_SHA1_RAWSZ],
-		      our_tree[GIT_SHA1_RAWSZ];
+	struct object_id orig_tree, their_tree, our_tree;
+	const struct object_id *bases[1] = { &orig_tree };
+	struct merge_options o;
+	struct commit *result;
+	char *their_tree_name;
 
-	if (get_sha1("HEAD", our_tree) < 0)
-		hashcpy(our_tree, EMPTY_TREE_SHA1_BIN);
+	if (get_oid("HEAD", &our_tree) < 0)
+		hashcpy(our_tree.hash, EMPTY_TREE_SHA1_BIN);
 
 	if (build_fake_ancestor(state, index_path))
 		return error("could not build fake ancestor");
@@ -1627,7 +1598,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
 	discard_cache();
 	read_cache_from(index_path);
 
-	if (write_index_as_tree(orig_tree, &the_index, index_path, 0, NULL))
+	if (write_index_as_tree(orig_tree.hash, &the_index, index_path, 0, NULL))
 		return error(_("Repository lacks necessary blobs to fall back on 3-way merge."));
 
 	say(state, stdout, _("Using index info to reconstruct a base tree..."));
@@ -1643,7 +1614,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
 		init_revisions(&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);
-		add_pending_sha1(&rev_info, "HEAD", our_tree, 0);
+		add_pending_sha1(&rev_info, "HEAD", our_tree.hash, 0);
 		diff_setup_done(&rev_info.diffopt);
 		run_diff_index(&rev_info, 1);
 	}
@@ -1652,7 +1623,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
 		return error(_("Did you hand edit your patch?\n"
 				"It does not apply to blobs recorded in its index."));
 
-	if (write_index_as_tree(his_tree, &the_index, index_path, 0, NULL))
+	if (write_index_as_tree(their_tree.hash, &the_index, index_path, 0, NULL))
 		return error("could not write tree");
 
 	say(state, stdout, _("Falling back to patching base and 3-way merge..."));
@@ -1662,17 +1633,28 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
 
 	/*
 	 * This is not so wrong. Depending on which base we picked, orig_tree
-	 * may be wildly different from ours, but his_tree has the same set of
+	 * may be wildly different from ours, but their_tree has the same set of
 	 * wildly different changes in parts the patch did not touch, so
 	 * recursive ends up canceling them, saying that we reverted all those
 	 * changes.
 	 */
 
-	if (run_fallback_merge_recursive(state, orig_tree, our_tree, his_tree)) {
+	init_merge_options(&o);
+
+	o.branch1 = "HEAD";
+	their_tree_name = xstrfmt("%.*s", linelen(state->msg), state->msg);
+	o.branch2 = their_tree_name;
+
+	if (state->quiet)
+		o.verbosity = 0;
+
+	if (merge_recursive_generic(&o, &our_tree, &their_tree, 1, bases, &result)) {
 		rerere(state->allow_rerere_autoupdate);
+		free(their_tree_name);
 		return error(_("Failed to merge in the changes."));
 	}
 
+	free(their_tree_name);
 	return 0;
 }
 
@@ -1840,6 +1822,8 @@ static void am_run(struct am_state *state, int resume)
 		const char *mail = am_path(state, msgnum(state));
 		int apply_status;
 
+		reset_ident_date();
+
 		if (!file_exists(mail))
 			goto next;
 
@@ -2202,6 +2186,8 @@ static int parse_opt_patchformat(const struct option *opt, const char *arg, int
 		*opt_value = PATCH_FORMAT_STGIT_SERIES;
 	else if (!strcmp(arg, "hg"))
 		*opt_value = PATCH_FORMAT_HG;
+	else if (!strcmp(arg, "mboxrd"))
+		*opt_value = PATCH_FORMAT_MBOXRD;
 	else
 		return error(_("Invalid value for --patch-format: %s"), arg);
 	return 0;
diff --git a/builtin/apply.c b/builtin/apply.c
index ce3b77853c..1a488f9e88 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -21,132 +21,161 @@
 #include "ll-merge.h"
 #include "rerere.h"
 
-/*
- *  --check turns on checking that the working tree matches the
- *    files that are being modified, but doesn't apply the patch
- *  --stat does just a diffstat, and doesn't actually apply
- *  --numstat does numeric diffstat, and doesn't actually apply
- *  --index-info shows the old and new index info for paths if available.
- *  --index updates the cache as well.
- *  --cached updates only the cache without ever touching the working tree.
- */
-static const char *prefix;
-static int prefix_length = -1;
-static int newfd = -1;
-
-static int unidiff_zero;
-static int p_value = 1;
-static int p_value_known;
-static int check_index;
-static int update_index;
-static int cached;
-static int diffstat;
-static int numstat;
-static int summary;
-static int check;
-static int apply = 1;
-static int apply_in_reverse;
-static int apply_with_reject;
-static int apply_verbosely;
-static int allow_overlap;
-static int no_add;
-static int threeway;
-static int unsafe_paths;
-static const char *fake_ancestor;
-static int line_termination = '\n';
-static unsigned int p_context = UINT_MAX;
-static const char * const apply_usage[] = {
-	N_("git apply [<options>] [<patch>...]"),
-	NULL
-};
-
-static enum ws_error_action {
+enum ws_error_action {
 	nowarn_ws_error,
 	warn_on_ws_error,
 	die_on_ws_error,
 	correct_ws_error
-} ws_error_action = warn_on_ws_error;
-static int whitespace_error;
-static int squelch_whitespace_errors = 5;
-static int applied_after_fixing_ws;
+};
+
 
-static enum ws_ignore {
+enum ws_ignore {
 	ignore_ws_none,
 	ignore_ws_change
-} ws_ignore_action = ignore_ws_none;
+};
+
+/*
+ * We need to keep track of how symlinks in the preimage are
+ * manipulated by the patches.  A patch to add a/b/c where a/b
+ * is a symlink should not be allowed to affect the directory
+ * the symlink points at, but if the same patch removes a/b,
+ * it is perfectly fine, as the patch removes a/b to make room
+ * to create a directory a/b so that a/b/c can be created.
+ *
+ * See also "struct string_list symlink_changes" in "struct
+ * apply_state".
+ */
+#define SYMLINK_GOES_AWAY 01
+#define SYMLINK_IN_RESULT 02
 
+struct apply_state {
+	const char *prefix;
+	int prefix_length;
+
+	/* These are lock_file related */
+	struct lock_file *lock_file;
+	int newfd;
+
+	/* These control what gets looked at and modified */
+	int apply; /* this is not a dry-run */
+	int cached; /* apply to the index only */
+	int check; /* preimage must match working tree, don't actually apply */
+	int check_index; /* preimage must match the indexed version */
+	int update_index; /* check_index && apply */
+
+	/* These control cosmetic aspect of the output */
+	int diffstat; /* just show a diffstat, and don't actually apply */
+	int numstat; /* just show a numeric diffstat, and don't actually apply */
+	int summary; /* just report creation, deletion, etc, and don't actually apply */
+
+	/* These boolean parameters control how the apply is done */
+	int allow_overlap;
+	int apply_in_reverse;
+	int apply_with_reject;
+	int apply_verbosely;
+	int no_add;
+	int threeway;
+	int unidiff_zero;
+	int unsafe_paths;
+
+	/* Other non boolean parameters */
+	const char *fake_ancestor;
+	const char *patch_input_file;
+	int line_termination;
+	struct strbuf root;
+	int p_value;
+	int p_value_known;
+	unsigned int p_context;
+
+	/* Exclude and include path parameters */
+	struct string_list limit_by_name;
+	int has_include;
+
+	/* Various "current state" */
+	int linenr; /* current line number */
+	struct string_list symlink_changes; /* we have to track symlinks */
 
-static const char *patch_input_file;
-static struct strbuf root = STRBUF_INIT;
-static int read_stdin = 1;
-static int options;
+	/*
+	 * For "diff-stat" like behaviour, we keep track of the biggest change
+	 * we've seen, and the longest filename. That allows us to do simple
+	 * scaling.
+	 */
+	int max_change;
+	int max_len;
 
-static void parse_whitespace_option(const char *option)
+	/*
+	 * Records filenames that have been touched, in order to handle
+	 * the case where more than one patches touch the same file.
+	 */
+	struct string_list fn_table;
+
+	/* These control whitespace errors */
+	enum ws_error_action ws_error_action;
+	enum ws_ignore ws_ignore_action;
+	const char *whitespace_option;
+	int whitespace_error;
+	int squelch_whitespace_errors;
+	int applied_after_fixing_ws;
+};
+
+static const char * const apply_usage[] = {
+	N_("git apply [<options>] [<patch>...]"),
+	NULL
+};
+
+static void parse_whitespace_option(struct apply_state *state, const char *option)
 {
 	if (!option) {
-		ws_error_action = warn_on_ws_error;
+		state->ws_error_action = warn_on_ws_error;
 		return;
 	}
 	if (!strcmp(option, "warn")) {
-		ws_error_action = warn_on_ws_error;
+		state->ws_error_action = warn_on_ws_error;
 		return;
 	}
 	if (!strcmp(option, "nowarn")) {
-		ws_error_action = nowarn_ws_error;
+		state->ws_error_action = nowarn_ws_error;
 		return;
 	}
 	if (!strcmp(option, "error")) {
-		ws_error_action = die_on_ws_error;
+		state->ws_error_action = die_on_ws_error;
 		return;
 	}
 	if (!strcmp(option, "error-all")) {
-		ws_error_action = die_on_ws_error;
-		squelch_whitespace_errors = 0;
+		state->ws_error_action = die_on_ws_error;
+		state->squelch_whitespace_errors = 0;
 		return;
 	}
 	if (!strcmp(option, "strip") || !strcmp(option, "fix")) {
-		ws_error_action = correct_ws_error;
+		state->ws_error_action = correct_ws_error;
 		return;
 	}
 	die(_("unrecognized whitespace option '%s'"), option);
 }
 
-static void parse_ignorewhitespace_option(const char *option)
+static void parse_ignorewhitespace_option(struct apply_state *state,
+					  const char *option)
 {
 	if (!option || !strcmp(option, "no") ||
 	    !strcmp(option, "false") || !strcmp(option, "never") ||
 	    !strcmp(option, "none")) {
-		ws_ignore_action = ignore_ws_none;
+		state->ws_ignore_action = ignore_ws_none;
 		return;
 	}
 	if (!strcmp(option, "change")) {
-		ws_ignore_action = ignore_ws_change;
+		state->ws_ignore_action = ignore_ws_change;
 		return;
 	}
 	die(_("unrecognized whitespace ignore option '%s'"), option);
 }
 
-static void set_default_whitespace_mode(const char *whitespace_option)
+static void set_default_whitespace_mode(struct apply_state *state)
 {
-	if (!whitespace_option && !apply_default_whitespace)
-		ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error);
+	if (!state->whitespace_option && !apply_default_whitespace)
+		state->ws_error_action = (state->apply ? warn_on_ws_error : nowarn_ws_error);
 }
 
 /*
- * For "diff-stat" like behaviour, we keep track of the biggest change
- * we've seen, and the longest filename. That allows us to do simple
- * scaling.
- */
-static int max_change, max_len;
-
-/*
- * Various "current state", notably line numbers and what
- * file (and how) we're patching right now.. The "is_xxxx"
- * things are flags, where -1 means "don't know yet".
- */
-static int linenr = 1;
-
-/*
  * This represents one "hunk" from a patch, starting with
  * "@@ -oldpos,oldlines +newpos,newlines @@" marker.  The
  * patch text is pointed at by patch, and its byte length
@@ -265,13 +294,6 @@ struct image {
 	struct line *line;
 };
 
-/*
- * Records filenames that have been touched, in order to handle
- * the case where more than one patches touch the same file.
- */
-
-static struct string_list fn_table;
-
 static uint32_t hash_line(const char *cp, size_t len)
 {
 	size_t i;
@@ -442,7 +464,7 @@ static int is_dev_null(const char *str)
 #define TERM_SPACE	1
 #define TERM_TAB	2
 
-static int name_terminate(const char *name, int namelen, int c, int terminate)
+static int name_terminate(int c, int terminate)
 {
 	if (c == ' ' && !(terminate & TERM_SPACE))
 		return 0;
@@ -469,7 +491,10 @@ static char *squash_slash(char *name)
 	return name;
 }
 
-static char *find_name_gnu(const char *line, const char *def, int p_value)
+static char *find_name_gnu(struct apply_state *state,
+			   const char *line,
+			   const char *def,
+			   int p_value)
 {
 	struct strbuf name = STRBUF_INIT;
 	char *cp;
@@ -493,8 +518,8 @@ static char *find_name_gnu(const char *line, const char *def, int p_value)
 	}
 
 	strbuf_remove(&name, 0, cp - name.buf);
-	if (root.len)
-		strbuf_insert(&name, 0, root.buf, root.len);
+	if (state->root.len)
+		strbuf_insert(&name, 0, state->root.buf, state->root.len);
 	return squash_slash(strbuf_detach(&name, NULL));
 }
 
@@ -657,8 +682,12 @@ static size_t diff_timestamp_len(const char *line, size_t len)
 	return line + len - end;
 }
 
-static char *find_name_common(const char *line, const char *def,
-			      int p_value, const char *end, int terminate)
+static char *find_name_common(struct apply_state *state,
+			      const char *line,
+			      const char *def,
+			      int p_value,
+			      const char *end,
+			      int terminate)
 {
 	int len;
 	const char *start = NULL;
@@ -671,7 +700,7 @@ static char *find_name_common(const char *line, const char *def,
 		if (!end && isspace(c)) {
 			if (c == '\n')
 				break;
-			if (name_terminate(start, line-start, c, terminate))
+			if (name_terminate(c, terminate))
 				break;
 		}
 		line++;
@@ -696,32 +725,39 @@ static char *find_name_common(const char *line, const char *def,
 			return squash_slash(xstrdup(def));
 	}
 
-	if (root.len) {
-		char *ret = xstrfmt("%s%.*s", root.buf, len, start);
+	if (state->root.len) {
+		char *ret = xstrfmt("%s%.*s", state->root.buf, len, start);
 		return squash_slash(ret);
 	}
 
 	return squash_slash(xmemdupz(start, len));
 }
 
-static char *find_name(const char *line, char *def, int p_value, int terminate)
+static char *find_name(struct apply_state *state,
+		       const char *line,
+		       char *def,
+		       int p_value,
+		       int terminate)
 {
 	if (*line == '"') {
-		char *name = find_name_gnu(line, def, p_value);
+		char *name = find_name_gnu(state, line, def, p_value);
 		if (name)
 			return name;
 	}
 
-	return find_name_common(line, def, p_value, NULL, terminate);
+	return find_name_common(state, line, def, p_value, NULL, terminate);
 }
 
-static char *find_name_traditional(const char *line, char *def, int p_value)
+static char *find_name_traditional(struct apply_state *state,
+				   const char *line,
+				   char *def,
+				   int p_value)
 {
 	size_t len;
 	size_t date_len;
 
 	if (*line == '"') {
-		char *name = find_name_gnu(line, def, p_value);
+		char *name = find_name_gnu(state, line, def, p_value);
 		if (name)
 			return name;
 	}
@@ -729,10 +765,10 @@ static char *find_name_traditional(const char *line, char *def, int p_value)
 	len = strchrnul(line, '\n') - line;
 	date_len = diff_timestamp_len(line, len);
 	if (!date_len)
-		return find_name_common(line, def, p_value, NULL, TERM_TAB);
+		return find_name_common(state, line, def, p_value, NULL, TERM_TAB);
 	len -= date_len;
 
-	return find_name_common(line, def, p_value, line + len, 0);
+	return find_name_common(state, line, def, p_value, line + len, 0);
 }
 
 static int count_slashes(const char *cp)
@@ -750,30 +786,30 @@ static int count_slashes(const char *cp)
  * Given the string after "--- " or "+++ ", guess the appropriate
  * p_value for the given patch.
  */
-static int guess_p_value(const char *nameline)
+static int guess_p_value(struct apply_state *state, const char *nameline)
 {
 	char *name, *cp;
 	int val = -1;
 
 	if (is_dev_null(nameline))
 		return -1;
-	name = find_name_traditional(nameline, NULL, 0);
+	name = find_name_traditional(state, nameline, NULL, 0);
 	if (!name)
 		return -1;
 	cp = strchr(name, '/');
 	if (!cp)
 		val = 0;
-	else if (prefix) {
+	else if (state->prefix) {
 		/*
 		 * Does it begin with "a/$our-prefix" and such?  Then this is
 		 * very likely to apply to our directory.
 		 */
-		if (!strncmp(name, prefix, prefix_length))
-			val = count_slashes(prefix);
+		if (!strncmp(name, state->prefix, state->prefix_length))
+			val = count_slashes(state->prefix);
 		else {
 			cp++;
-			if (!strncmp(cp, prefix, prefix_length))
-				val = count_slashes(prefix) + 1;
+			if (!strncmp(cp, state->prefix, state->prefix_length))
+				val = count_slashes(state->prefix) + 1;
 		}
 	}
 	free(name);
@@ -860,36 +896,39 @@ static int has_epoch_timestamp(const char *nameline)
  * files, we can happily check the index for a match, but for creating a
  * new file we should try to match whatever "patch" does. I have no idea.
  */
-static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
+static void parse_traditional_patch(struct apply_state *state,
+				    const char *first,
+				    const char *second,
+				    struct patch *patch)
 {
 	char *name;
 
 	first += 4;	/* skip "--- " */
 	second += 4;	/* skip "+++ " */
-	if (!p_value_known) {
+	if (!state->p_value_known) {
 		int p, q;
-		p = guess_p_value(first);
-		q = guess_p_value(second);
+		p = guess_p_value(state, first);
+		q = guess_p_value(state, second);
 		if (p < 0) p = q;
 		if (0 <= p && p == q) {
-			p_value = p;
-			p_value_known = 1;
+			state->p_value = p;
+			state->p_value_known = 1;
 		}
 	}
 	if (is_dev_null(first)) {
 		patch->is_new = 1;
 		patch->is_delete = 0;
-		name = find_name_traditional(second, NULL, p_value);
+		name = find_name_traditional(state, 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(first, NULL, p_value);
+		name = find_name_traditional(state, first, NULL, state->p_value);
 		patch->old_name = name;
 	} else {
 		char *first_name;
-		first_name = find_name_traditional(first, NULL, p_value);
-		name = find_name_traditional(second, first_name, p_value);
+		first_name = find_name_traditional(state, first, NULL, state->p_value);
+		name = find_name_traditional(state, second, first_name, state->p_value);
 		free(first_name);
 		if (has_epoch_timestamp(first)) {
 			patch->is_new = 1;
@@ -905,10 +944,12 @@ static void parse_traditional_patch(const char *first, const char *second, struc
 		}
 	}
 	if (!name)
-		die(_("unable to find filename in patch at line %d"), linenr);
+		die(_("unable to find filename in patch at line %d"), state->linenr);
 }
 
-static int gitdiff_hdrend(const char *line, struct patch *patch)
+static int gitdiff_hdrend(struct apply_state *state,
+			  const char *line,
+			  struct patch *patch)
 {
 	return -1;
 }
@@ -925,107 +966,135 @@ static int gitdiff_hdrend(const char *line, struct patch *patch)
 #define DIFF_OLD_NAME 0
 #define DIFF_NEW_NAME 1
 
-static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, int side)
+static void gitdiff_verify_name(struct apply_state *state,
+				const char *line,
+				int isnull,
+				char **name,
+				int side)
 {
-	if (!orig_name && !isnull)
-		return find_name(line, NULL, p_value, TERM_TAB);
+	if (!*name && !isnull) {
+		*name = find_name(state, line, NULL, state->p_value, TERM_TAB);
+		return;
+	}
 
-	if (orig_name) {
-		int len = strlen(orig_name);
+	if (*name) {
+		int len = strlen(*name);
 		char *another;
 		if (isnull)
 			die(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"),
-			    orig_name, linenr);
-		another = find_name(line, NULL, p_value, TERM_TAB);
-		if (!another || memcmp(another, orig_name, len + 1))
+			    *name, state->linenr);
+		another = find_name(state, line, NULL, state->p_value, TERM_TAB);
+		if (!another || memcmp(another, *name, len + 1))
 			die((side == DIFF_NEW_NAME) ?
 			    _("git apply: bad git-diff - inconsistent new filename on line %d") :
-			    _("git apply: bad git-diff - inconsistent old filename on line %d"), linenr);
+			    _("git apply: bad git-diff - inconsistent old filename on line %d"), state->linenr);
 		free(another);
-		return orig_name;
 	} else {
 		/* expect "/dev/null" */
 		if (memcmp("/dev/null", line, 9) || line[9] != '\n')
-			die(_("git apply: bad git-diff - expected /dev/null on line %d"), linenr);
-		return NULL;
+			die(_("git apply: bad git-diff - expected /dev/null on line %d"), state->linenr);
 	}
 }
 
-static int gitdiff_oldname(const char *line, struct patch *patch)
+static int gitdiff_oldname(struct apply_state *state,
+			   const char *line,
+			   struct patch *patch)
 {
-	patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name,
-					      DIFF_OLD_NAME);
+	gitdiff_verify_name(state, line,
+			    patch->is_new, &patch->old_name,
+			    DIFF_OLD_NAME);
 	return 0;
 }
 
-static int gitdiff_newname(const char *line, struct patch *patch)
+static int gitdiff_newname(struct apply_state *state,
+			   const char *line,
+			   struct patch *patch)
 {
-	patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name,
-					      DIFF_NEW_NAME);
+	gitdiff_verify_name(state, line,
+			    patch->is_delete, &patch->new_name,
+			    DIFF_NEW_NAME);
 	return 0;
 }
 
-static int gitdiff_oldmode(const char *line, struct patch *patch)
+static int gitdiff_oldmode(struct apply_state *state,
+			   const char *line,
+			   struct patch *patch)
 {
 	patch->old_mode = strtoul(line, NULL, 8);
 	return 0;
 }
 
-static int gitdiff_newmode(const char *line, struct patch *patch)
+static int gitdiff_newmode(struct apply_state *state,
+			   const char *line,
+			   struct patch *patch)
 {
 	patch->new_mode = strtoul(line, NULL, 8);
 	return 0;
 }
 
-static int gitdiff_delete(const char *line, struct patch *patch)
+static int gitdiff_delete(struct apply_state *state,
+			  const char *line,
+			  struct patch *patch)
 {
 	patch->is_delete = 1;
 	free(patch->old_name);
 	patch->old_name = xstrdup_or_null(patch->def_name);
-	return gitdiff_oldmode(line, patch);
+	return gitdiff_oldmode(state, line, patch);
 }
 
-static int gitdiff_newfile(const char *line, struct patch *patch)
+static int gitdiff_newfile(struct apply_state *state,
+			   const char *line,
+			   struct patch *patch)
 {
 	patch->is_new = 1;
 	free(patch->new_name);
 	patch->new_name = xstrdup_or_null(patch->def_name);
-	return gitdiff_newmode(line, patch);
+	return gitdiff_newmode(state, line, patch);
 }
 
-static int gitdiff_copysrc(const char *line, struct patch *patch)
+static int gitdiff_copysrc(struct apply_state *state,
+			   const char *line,
+			   struct patch *patch)
 {
 	patch->is_copy = 1;
 	free(patch->old_name);
-	patch->old_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);
+	patch->old_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
 	return 0;
 }
 
-static int gitdiff_copydst(const char *line, struct patch *patch)
+static int gitdiff_copydst(struct apply_state *state,
+			   const char *line,
+			   struct patch *patch)
 {
 	patch->is_copy = 1;
 	free(patch->new_name);
-	patch->new_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);
+	patch->new_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
 	return 0;
 }
 
-static int gitdiff_renamesrc(const char *line, struct patch *patch)
+static int gitdiff_renamesrc(struct apply_state *state,
+			     const char *line,
+			     struct patch *patch)
 {
 	patch->is_rename = 1;
 	free(patch->old_name);
-	patch->old_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);
+	patch->old_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
 	return 0;
 }
 
-static int gitdiff_renamedst(const char *line, struct patch *patch)
+static int gitdiff_renamedst(struct apply_state *state,
+			     const char *line,
+			     struct patch *patch)
 {
 	patch->is_rename = 1;
 	free(patch->new_name);
-	patch->new_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);
+	patch->new_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
 	return 0;
 }
 
-static int gitdiff_similarity(const char *line, struct patch *patch)
+static int gitdiff_similarity(struct apply_state *state,
+			      const char *line,
+			      struct patch *patch)
 {
 	unsigned long val = strtoul(line, NULL, 10);
 	if (val <= 100)
@@ -1033,7 +1102,9 @@ static int gitdiff_similarity(const char *line, struct patch *patch)
 	return 0;
 }
 
-static int gitdiff_dissimilarity(const char *line, struct patch *patch)
+static int gitdiff_dissimilarity(struct apply_state *state,
+				 const char *line,
+				 struct patch *patch)
 {
 	unsigned long val = strtoul(line, NULL, 10);
 	if (val <= 100)
@@ -1041,7 +1112,9 @@ static int gitdiff_dissimilarity(const char *line, struct patch *patch)
 	return 0;
 }
 
-static int gitdiff_index(const char *line, struct patch *patch)
+static int gitdiff_index(struct apply_state *state,
+			 const char *line,
+			 struct patch *patch)
 {
 	/*
 	 * index line is N hexadecimal, "..", N hexadecimal,
@@ -1078,7 +1151,9 @@ static int gitdiff_index(const char *line, struct patch *patch)
  * 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(const char *line, struct patch *patch)
+static int gitdiff_unrecognized(struct apply_state *state,
+				const char *line,
+				struct patch *patch)
 {
 	return -1;
 }
@@ -1087,15 +1162,17 @@ static int gitdiff_unrecognized(const char *line, struct patch *patch)
  * 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(const char *line, int llen)
+static const char *skip_tree_prefix(struct apply_state *state,
+				    const char *line,
+				    int llen)
 {
 	int nslash;
 	int i;
 
-	if (!p_value)
+	if (!state->p_value)
 		return (llen && line[0] == '/') ? NULL : line;
 
-	nslash = p_value;
+	nslash = state->p_value;
 	for (i = 0; i < llen; i++) {
 		int ch = line[i];
 		if (ch == '/' && --nslash <= 0)
@@ -1112,7 +1189,9 @@ static const char *skip_tree_prefix(const char *line, int llen)
  * 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(const char *line, int llen)
+static char *git_header_name(struct apply_state *state,
+			     const char *line,
+			     int llen)
 {
 	const char *name;
 	const char *second = NULL;
@@ -1130,7 +1209,7 @@ static char *git_header_name(const char *line, int llen)
 			goto free_and_fail1;
 
 		/* strip the a/b prefix including trailing slash */
-		cp = skip_tree_prefix(first.buf, first.len);
+		cp = skip_tree_prefix(state, first.buf, first.len);
 		if (!cp)
 			goto free_and_fail1;
 		strbuf_remove(&first, 0, cp - first.buf);
@@ -1147,7 +1226,7 @@ static char *git_header_name(const char *line, int llen)
 		if (*second == '"') {
 			if (unquote_c_style(&sp, second, NULL))
 				goto free_and_fail1;
-			cp = skip_tree_prefix(sp.buf, sp.len);
+			cp = skip_tree_prefix(state, sp.buf, sp.len);
 			if (!cp)
 				goto free_and_fail1;
 			/* They must match, otherwise ignore */
@@ -1158,7 +1237,7 @@ static char *git_header_name(const char *line, int llen)
 		}
 
 		/* unquoted second */
-		cp = skip_tree_prefix(second, line + llen - second);
+		cp = skip_tree_prefix(state, second, line + llen - second);
 		if (!cp)
 			goto free_and_fail1;
 		if (line + llen - cp != first.len ||
@@ -1173,7 +1252,7 @@ static char *git_header_name(const char *line, int llen)
 	}
 
 	/* unquoted first name */
-	name = skip_tree_prefix(line, llen);
+	name = skip_tree_prefix(state, line, llen);
 	if (!name)
 		return NULL;
 
@@ -1189,7 +1268,7 @@ static char *git_header_name(const char *line, int llen)
 			if (unquote_c_style(&sp, second, NULL))
 				goto free_and_fail2;
 
-			np = skip_tree_prefix(sp.buf, sp.len);
+			np = skip_tree_prefix(state, sp.buf, sp.len);
 			if (!np)
 				goto free_and_fail2;
 
@@ -1233,7 +1312,7 @@ static char *git_header_name(const char *line, int llen)
 			 */
 			if (!name[len + 1])
 				return NULL; /* no postimage name */
-			second = skip_tree_prefix(name + len + 1,
+			second = skip_tree_prefix(state, name + len + 1,
 						  line_len - (len + 1));
 			if (!second)
 				return NULL;
@@ -1249,7 +1328,11 @@ static char *git_header_name(const char *line, int llen)
 }
 
 /* Verify that we recognize the lines following a git header */
-static int parse_git_header(const char *line, int len, unsigned int size, struct patch *patch)
+static int parse_git_header(struct apply_state *state,
+			    const char *line,
+			    int len,
+			    unsigned int size,
+			    struct patch *patch)
 {
 	unsigned long offset;
 
@@ -1263,20 +1346,20 @@ static int parse_git_header(const char *line, int len, unsigned int size, struct
 	 * or removing or adding empty files), so we get
 	 * the default name from the header.
 	 */
-	patch->def_name = git_header_name(line, len);
-	if (patch->def_name && root.len) {
-		char *s = xstrfmt("%s%s", root.buf, patch->def_name);
+	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);
 		free(patch->def_name);
 		patch->def_name = s;
 	}
 
 	line += len;
 	size -= len;
-	linenr++;
-	for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
+	state->linenr++;
+	for (offset = len ; size > 0 ; offset += len, size -= len, line += len, state->linenr++) {
 		static const struct opentry {
 			const char *str;
-			int (*fn)(const char *, struct patch *);
+			int (*fn)(struct apply_state *, const char *, struct patch *);
 		} optable[] = {
 			{ "@@ -", gitdiff_hdrend },
 			{ "--- ", gitdiff_oldname },
@@ -1306,7 +1389,7 @@ static int parse_git_header(const char *line, int len, unsigned int size, struct
 			int oplen = strlen(p->str);
 			if (len < oplen || memcmp(p->str, line, oplen))
 				continue;
-			if (p->fn(line + oplen, patch) < 0)
+			if (p->fn(state, line + oplen, patch) < 0)
 				return offset;
 			break;
 		}
@@ -1431,7 +1514,11 @@ static int parse_fragment_header(const char *line, int len, struct fragment *fra
 	return offset;
 }
 
-static int find_header(const char *line, unsigned long size, int *hdrsize, struct patch *patch)
+static int find_header(struct apply_state *state,
+		       const char *line,
+		       unsigned long size,
+		       int *hdrsize,
+		       struct patch *patch)
 {
 	unsigned long offset, len;
 
@@ -1440,7 +1527,7 @@ static int find_header(const char *line, unsigned long size, int *hdrsize, struc
 	patch->is_new = patch->is_delete = -1;
 	patch->old_mode = patch->new_mode = 0;
 	patch->old_name = patch->new_name = NULL;
-	for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
+	for (offset = 0; size > 0; offset += len, size -= len, line += len, state->linenr++) {
 		unsigned long nextlen;
 
 		len = linelen(line, size);
@@ -1461,7 +1548,7 @@ static int find_header(const char *line, unsigned long size, int *hdrsize, struc
 			if (parse_fragment_header(line, len, &dummy) < 0)
 				continue;
 			die(_("patch fragment without header at line %d: %.*s"),
-			    linenr, (int)len-1, line);
+			    state->linenr, (int)len-1, line);
 		}
 
 		if (size < len + 6)
@@ -1472,7 +1559,7 @@ static int find_header(const char *line, unsigned long size, int *hdrsize, struc
 		 * or mode change, so we handle that specially
 		 */
 		if (!memcmp("diff --git ", line, 11)) {
-			int git_hdr_len = parse_git_header(line, len, size, patch);
+			int git_hdr_len = parse_git_header(state, line, len, size, patch);
 			if (git_hdr_len <= len)
 				continue;
 			if (!patch->old_name && !patch->new_name) {
@@ -1481,14 +1568,14 @@ static int find_header(const char *line, unsigned long size, int *hdrsize, struc
 					       "%d leading pathname component (line %d)",
 					       "git diff header lacks filename information when removing "
 					       "%d leading pathname components (line %d)",
-					       p_value),
-					    p_value, linenr);
+					       state->p_value),
+					    state->p_value, state->linenr);
 				patch->old_name = xstrdup(patch->def_name);
 				patch->new_name = xstrdup(patch->def_name);
 			}
 			if (!patch->is_delete && !patch->new_name)
 				die("git diff header lacks filename information "
-				    "(line %d)", linenr);
+				    "(line %d)", state->linenr);
 			patch->is_toplevel_relative = 1;
 			*hdrsize = git_hdr_len;
 			return offset;
@@ -1508,37 +1595,44 @@ static int find_header(const char *line, unsigned long size, int *hdrsize, struc
 			continue;
 
 		/* Ok, we'll consider it a patch */
-		parse_traditional_patch(line, line+len, patch);
+		parse_traditional_patch(state, line, line+len, patch);
 		*hdrsize = len + nextlen;
-		linenr += 2;
+		state->linenr += 2;
 		return offset;
 	}
 	return -1;
 }
 
-static void record_ws_error(unsigned result, const char *line, int len, int linenr)
+static void record_ws_error(struct apply_state *state,
+			    unsigned result,
+			    const char *line,
+			    int len,
+			    int linenr)
 {
 	char *err;
 
 	if (!result)
 		return;
 
-	whitespace_error++;
-	if (squelch_whitespace_errors &&
-	    squelch_whitespace_errors < whitespace_error)
+	state->whitespace_error++;
+	if (state->squelch_whitespace_errors &&
+	    state->squelch_whitespace_errors < state->whitespace_error)
 		return;
 
 	err = whitespace_error_string(result);
 	fprintf(stderr, "%s:%d: %s.\n%.*s\n",
-		patch_input_file, linenr, err, len, line);
+		state->patch_input_file, linenr, err, len, line);
 	free(err);
 }
 
-static void check_whitespace(const char *line, int len, unsigned ws_rule)
+static void check_whitespace(struct apply_state *state,
+			     const char *line,
+			     int len,
+			     unsigned ws_rule)
 {
 	unsigned result = ws_check(line + 1, len - 1, ws_rule);
 
-	record_ws_error(result, line + 1, len - 2, linenr);
+	record_ws_error(state, result, line + 1, len - 2, state->linenr);
 }
 
 /*
@@ -1547,8 +1641,11 @@ static void check_whitespace(const char *line, int len, unsigned ws_rule)
  * between a "---" that is part of a patch, and a "---" that starts
  * the next patch is to look at the line counts..
  */
-static int parse_fragment(const char *line, unsigned long size,
-			  struct patch *patch, struct fragment *fragment)
+static int parse_fragment(struct apply_state *state,
+			  const char *line,
+			  unsigned long size,
+			  struct patch *patch,
+			  struct fragment *fragment)
 {
 	int added, deleted;
 	int len = linelen(line, size), offset;
@@ -1568,11 +1665,11 @@ static int parse_fragment(const char *line, unsigned long size,
 	/* Parse the thing.. */
 	line += len;
 	size -= len;
-	linenr++;
+	state->linenr++;
 	added = deleted = 0;
 	for (offset = len;
 	     0 < size;
-	     offset += len, size -= len, line += len, linenr++) {
+	     offset += len, size -= len, line += len, state->linenr++) {
 		if (!oldlines && !newlines)
 			break;
 		len = linelen(line, size);
@@ -1588,22 +1685,22 @@ static int parse_fragment(const char *line, unsigned long size,
 			if (!deleted && !added)
 				leading++;
 			trailing++;
-			if (!apply_in_reverse &&
-			    ws_error_action == correct_ws_error)
-				check_whitespace(line, len, patch->ws_rule);
+			if (!state->apply_in_reverse &&
+			    state->ws_error_action == correct_ws_error)
+				check_whitespace(state, line, len, patch->ws_rule);
 			break;
 		case '-':
-			if (apply_in_reverse &&
-			    ws_error_action != nowarn_ws_error)
-				check_whitespace(line, len, patch->ws_rule);
+			if (state->apply_in_reverse &&
+			    state->ws_error_action != nowarn_ws_error)
+				check_whitespace(state, line, len, patch->ws_rule);
 			deleted++;
 			oldlines--;
 			trailing = 0;
 			break;
 		case '+':
-			if (!apply_in_reverse &&
-			    ws_error_action != nowarn_ws_error)
-				check_whitespace(line, len, patch->ws_rule);
+			if (!state->apply_in_reverse &&
+			    state->ws_error_action != nowarn_ws_error)
+				check_whitespace(state, line, len, patch->ws_rule);
 			added++;
 			newlines--;
 			trailing = 0;
@@ -1657,7 +1754,10 @@ static int parse_fragment(const char *line, unsigned long size,
  * The (fragment->patch, fragment->size) pair points into the memory given
  * by the caller, not a copy, when we return.
  */
-static int parse_single_patch(const char *line, unsigned long size, struct patch *patch)
+static int parse_single_patch(struct apply_state *state,
+			      const char *line,
+			      unsigned long size,
+			      struct patch *patch)
 {
 	unsigned long offset = 0;
 	unsigned long oldlines = 0, newlines = 0, context = 0;
@@ -1668,10 +1768,10 @@ static int parse_single_patch(const char *line, unsigned long size, struct patch
 		int len;
 
 		fragment = xcalloc(1, sizeof(*fragment));
-		fragment->linenr = linenr;
-		len = parse_fragment(line, size, patch, fragment);
+		fragment->linenr = state->linenr;
+		len = parse_fragment(state, line, size, patch, fragment);
 		if (len <= 0)
-			die(_("corrupt patch at line %d"), linenr);
+			die(_("corrupt patch at line %d"), state->linenr);
 		fragment->patch = line;
 		fragment->size = len;
 		oldlines += fragment->oldlines;
@@ -1757,7 +1857,8 @@ static char *inflate_it(const void *data, unsigned long size,
  * points at an allocated memory that the caller must free, so
  * it is marked as "->free_patch = 1".
  */
-static struct fragment *parse_binary_hunk(char **buf_p,
+static struct fragment *parse_binary_hunk(struct apply_state *state,
+					  char **buf_p,
 					  unsigned long *sz_p,
 					  int *status_p,
 					  int *used_p)
@@ -1799,13 +1900,13 @@ static struct fragment *parse_binary_hunk(char **buf_p,
 	else
 		return NULL;
 
-	linenr++;
+	state->linenr++;
 	buffer += llen;
 	while (1) {
 		int byte_length, max_byte_length, newsize;
 		llen = linelen(buffer, size);
 		used += llen;
-		linenr++;
+		state->linenr++;
 		if (llen == 1) {
 			/* consume the blank line */
 			buffer++;
@@ -1859,7 +1960,7 @@ static struct fragment *parse_binary_hunk(char **buf_p,
 	free(data);
 	*status_p = -1;
 	error(_("corrupt binary patch at line %d: %.*s"),
-	      linenr-1, llen-1, buffer);
+	      state->linenr-1, llen-1, buffer);
 	return NULL;
 }
 
@@ -1868,7 +1969,10 @@ static struct fragment *parse_binary_hunk(char **buf_p,
  *   -1 in case of error,
  *   the length of the parsed binary patch otherwise
  */
-static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
+static int parse_binary(struct apply_state *state,
+			char *buffer,
+			unsigned long size,
+			struct patch *patch)
 {
 	/*
 	 * We have read "GIT binary patch\n"; what follows is a line
@@ -1889,15 +1993,15 @@ static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
 	int status;
 	int used, used_1;
 
-	forward = parse_binary_hunk(&buffer, &size, &status, &used);
+	forward = parse_binary_hunk(state, &buffer, &size, &status, &used);
 	if (!forward && !status)
 		/* there has to be one hunk (forward hunk) */
-		return error(_("unrecognized binary patch at line %d"), linenr-1);
+		return error(_("unrecognized binary patch at line %d"), state->linenr-1);
 	if (status)
 		/* otherwise we already gave an error message */
 		return status;
 
-	reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);
+	reverse = parse_binary_hunk(state, &buffer, &size, &status, &used_1);
 	if (reverse)
 		used += used_1;
 	else if (status) {
@@ -1915,53 +2019,53 @@ static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
 	return used;
 }
 
-static void prefix_one(char **name)
+static void prefix_one(struct apply_state *state, char **name)
 {
 	char *old_name = *name;
 	if (!old_name)
 		return;
-	*name = xstrdup(prefix_filename(prefix, prefix_length, *name));
+	*name = xstrdup(prefix_filename(state->prefix, state->prefix_length, *name));
 	free(old_name);
 }
 
-static void prefix_patch(struct patch *p)
+static void prefix_patch(struct apply_state *state, struct patch *p)
 {
-	if (!prefix || p->is_toplevel_relative)
+	if (!state->prefix || p->is_toplevel_relative)
 		return;
-	prefix_one(&p->new_name);
-	prefix_one(&p->old_name);
+	prefix_one(state, &p->new_name);
+	prefix_one(state, &p->old_name);
 }
 
 /*
  * include/exclude
  */
 
-static struct string_list limit_by_name;
-static int has_include;
-static void add_name_limit(const char *name, int exclude)
+static void add_name_limit(struct apply_state *state,
+			   const char *name,
+			   int exclude)
 {
 	struct string_list_item *it;
 
-	it = string_list_append(&limit_by_name, name);
+	it = string_list_append(&state->limit_by_name, name);
 	it->util = exclude ? NULL : (void *) 1;
 }
 
-static int use_patch(struct patch *p)
+static int use_patch(struct apply_state *state, struct patch *p)
 {
 	const char *pathname = p->new_name ? p->new_name : p->old_name;
 	int i;
 
 	/* Paths outside are not touched regardless of "--include" */
-	if (0 < prefix_length) {
+	if (0 < state->prefix_length) {
 		int pathlen = strlen(pathname);
-		if (pathlen <= prefix_length ||
-		    memcmp(prefix, pathname, prefix_length))
+		if (pathlen <= state->prefix_length ||
+		    memcmp(state->prefix, pathname, state->prefix_length))
 			return 0;
 	}
 
 	/* See if it matches any of exclude/include rule */
-	for (i = 0; i < limit_by_name.nr; i++) {
-		struct string_list_item *it = &limit_by_name.items[i];
+	for (i = 0; i < state->limit_by_name.nr; i++) {
+		struct string_list_item *it = &state->limit_by_name.items[i];
 		if (!wildmatch(it->string, pathname, 0, NULL))
 			return (it->util != NULL);
 	}
@@ -1971,7 +2075,7 @@ static int use_patch(struct patch *p)
 	 * not used.  Otherwise, we saw bunch of exclude rules (or none)
 	 * and such a path is used.
 	 */
-	return !has_include;
+	return !state->has_include;
 }
 
 
@@ -1982,25 +2086,27 @@ static int use_patch(struct patch *p)
  * Return the number of bytes consumed, so that the caller can call us
  * again for the next patch.
  */
-static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
+static int parse_chunk(struct apply_state *state, char *buffer, unsigned long size, struct patch *patch)
 {
 	int hdrsize, patchsize;
-	int offset = find_header(buffer, size, &hdrsize, patch);
+	int offset = find_header(state, buffer, size, &hdrsize, patch);
 
 	if (offset < 0)
 		return offset;
 
-	prefix_patch(patch);
+	prefix_patch(state, patch);
 
-	if (!use_patch(patch))
+	if (!use_patch(state, patch))
 		patch->ws_rule = 0;
 	else
 		patch->ws_rule = whitespace_rule(patch->new_name
 						 ? patch->new_name
 						 : patch->old_name);
 
-	patchsize = parse_single_patch(buffer + offset + hdrsize,
-				       size - offset - hdrsize, patch);
+	patchsize = parse_single_patch(state,
+				       buffer + offset + hdrsize,
+				       size - offset - hdrsize,
+				       patch);
 
 	if (!patchsize) {
 		static const char git_binary[] = "GIT binary patch\n";
@@ -2010,8 +2116,8 @@ static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
 		if (llen == sizeof(git_binary) - 1 &&
 		    !memcmp(git_binary, buffer + hd, llen)) {
 			int used;
-			linenr++;
-			used = parse_binary(buffer + hd + llen,
+			state->linenr++;
+			used = parse_binary(state, buffer + hd + llen,
 					    size - hd - llen, patch);
 			if (used < 0)
 				return -1;
@@ -2031,7 +2137,7 @@ static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
 				int len = strlen(binhdr[i]);
 				if (len < size - hd &&
 				    !memcmp(binhdr[i], buffer + hd, len)) {
-					linenr++;
+					state->linenr++;
 					patch->is_binary = 1;
 					patchsize = llen;
 					break;
@@ -2043,9 +2149,9 @@ static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
 		 * without metadata change.  A binary patch appears
 		 * empty to us here.
 		 */
-		if ((apply || check) &&
+		if ((state->apply || state->check) &&
 		    (!patch->is_binary && !metadata_changes(patch)))
-			die(_("patch with only garbage at line %d"), linenr);
+			die(_("patch with only garbage at line %d"), state->linenr);
 	}
 
 	return offset + hdrsize + patchsize;
@@ -2083,7 +2189,7 @@ static const char pluses[] =
 static const char minuses[]=
 "----------------------------------------------------------------------";
 
-static void show_stats(struct patch *patch)
+static void show_stats(struct apply_state *state, struct patch *patch)
 {
 	struct strbuf qname = STRBUF_INIT;
 	char *cp = patch->new_name ? patch->new_name : patch->old_name;
@@ -2094,7 +2200,7 @@ static void show_stats(struct patch *patch)
 	/*
 	 * "scale" the filename
 	 */
-	max = max_len;
+	max = state->max_len;
 	if (max > 50)
 		max = 50;
 
@@ -2117,13 +2223,13 @@ static void show_stats(struct patch *patch)
 	/*
 	 * scale the add/delete
 	 */
-	max = max + max_change > 70 ? 70 - max : max_change;
+	max = max + state->max_change > 70 ? 70 - max : state->max_change;
 	add = patch->lines_added;
 	del = patch->lines_deleted;
 
-	if (max_change > 0) {
-		int total = ((add + del) * max + max_change / 2) / max_change;
-		add = (add * max + max_change / 2) / max_change;
+	if (state->max_change > 0) {
+		int total = ((add + del) * max + state->max_change / 2) / state->max_change;
+		add = (add * max + state->max_change / 2) / state->max_change;
 		del = total - add;
 	}
 	printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,
@@ -2194,17 +2300,17 @@ static void update_pre_post_images(struct image *preimage,
 	fixed = preimage->buf;
 
 	for (i = reduced = ctx = 0; i < postimage->nr; i++) {
-		size_t len = postimage->line[i].len;
+		size_t l_len = postimage->line[i].len;
 		if (!(postimage->line[i].flag & LINE_COMMON)) {
 			/* an added line -- no counterparts in preimage */
-			memmove(new, old, len);
-			old += len;
-			new += len;
+			memmove(new, old, l_len);
+			old += l_len;
+			new += l_len;
 			continue;
 		}
 
 		/* a common context -- skip it in the original postimage */
-		old += len;
+		old += l_len;
 
 		/* and find the corresponding one in the fixed preimage */
 		while (ctx < preimage->nr &&
@@ -2223,11 +2329,11 @@ static void update_pre_post_images(struct image *preimage,
 		}
 
 		/* and copy it in, while fixing the line length */
-		len = preimage->line[ctx].len;
-		memcpy(new, fixed, len);
-		new += len;
-		fixed += len;
-		postimage->line[i].len = len;
+		l_len = preimage->line[ctx].len;
+		memcpy(new, fixed, l_len);
+		new += l_len;
+		fixed += l_len;
+		postimage->line[i].len = l_len;
 		ctx++;
 	}
 
@@ -2242,7 +2348,76 @@ static void update_pre_post_images(struct image *preimage,
 	postimage->nr -= reduced;
 }
 
-static int match_fragment(struct image *img,
+static int line_by_line_fuzzy_match(struct image *img,
+				    struct image *preimage,
+				    struct image *postimage,
+				    unsigned long try,
+				    int try_lno,
+				    int preimage_limit)
+{
+	int i;
+	size_t imgoff = 0;
+	size_t preoff = 0;
+	size_t postlen = postimage->len;
+	size_t extra_chars;
+	char *buf;
+	char *preimage_eof;
+	char *preimage_end;
+	struct strbuf fixed;
+	char *fixed_buf;
+	size_t fixed_len;
+
+	for (i = 0; i < preimage_limit; i++) {
+		size_t prelen = preimage->line[i].len;
+		size_t imglen = img->line[try_lno+i].len;
+
+		if (!fuzzy_matchlines(img->buf + try + imgoff, imglen,
+				      preimage->buf + preoff, prelen))
+			return 0;
+		if (preimage->line[i].flag & LINE_COMMON)
+			postlen += imglen - prelen;
+		imgoff += imglen;
+		preoff += prelen;
+	}
+
+	/*
+	 * Ok, the preimage matches with whitespace fuzz.
+	 *
+	 * imgoff now holds the true length of the target that
+	 * matches the preimage before the end of the file.
+	 *
+	 * Count the number of characters in the preimage that fall
+	 * beyond the end of the file and make sure that all of them
+	 * are whitespace characters. (This can only happen if
+	 * we are removing blank lines at the end of the file.)
+	 */
+	buf = preimage_eof = preimage->buf + preoff;
+	for ( ; i < preimage->nr; i++)
+		preoff += preimage->line[i].len;
+	preimage_end = preimage->buf + preoff;
+	for ( ; buf < preimage_end; buf++)
+		if (!isspace(*buf))
+			return 0;
+
+	/*
+	 * Update the preimage and the common postimage context
+	 * lines to use the same whitespace as the target.
+	 * If whitespace is missing in the target (i.e.
+	 * if the preimage extends beyond the end of the file),
+	 * use the whitespace from the preimage.
+	 */
+	extra_chars = preimage_end - preimage_eof;
+	strbuf_init(&fixed, imgoff + extra_chars);
+	strbuf_add(&fixed, img->buf + try, imgoff);
+	strbuf_add(&fixed, preimage_eof, extra_chars);
+	fixed_buf = strbuf_detach(&fixed, &fixed_len);
+	update_pre_post_images(preimage, postimage,
+			       fixed_buf, fixed_len, postlen);
+	return 1;
+}
+
+static int match_fragment(struct apply_state *state,
+			  struct image *img,
 			  struct image *preimage,
 			  struct image *postimage,
 			  unsigned long try,
@@ -2263,7 +2438,7 @@ static int match_fragment(struct image *img,
 		preimage_limit = preimage->nr;
 		if (match_end && (preimage->nr + try_lno != img->nr))
 			return 0;
-	} else if (ws_error_action == correct_ws_error &&
+	} else if (state->ws_error_action == correct_ws_error &&
 		   (ws_rule & WS_BLANK_AT_EOF)) {
 		/*
 		 * This hunk extends beyond the end of img, and we are
@@ -2331,63 +2506,11 @@ static int match_fragment(struct image *img,
 	 * fuzzy matching. We collect all the line length information because
 	 * we need it to adjust whitespace if we match.
 	 */
-	if (ws_ignore_action == ignore_ws_change) {
-		size_t imgoff = 0;
-		size_t preoff = 0;
-		size_t postlen = postimage->len;
-		size_t extra_chars;
-		char *preimage_eof;
-		char *preimage_end;
-		for (i = 0; i < preimage_limit; i++) {
-			size_t prelen = preimage->line[i].len;
-			size_t imglen = img->line[try_lno+i].len;
-
-			if (!fuzzy_matchlines(img->buf + try + imgoff, imglen,
-					      preimage->buf + preoff, prelen))
-				return 0;
-			if (preimage->line[i].flag & LINE_COMMON)
-				postlen += imglen - prelen;
-			imgoff += imglen;
-			preoff += prelen;
-		}
+	if (state->ws_ignore_action == ignore_ws_change)
+		return line_by_line_fuzzy_match(img, preimage, postimage,
+						try, try_lno, preimage_limit);
 
-		/*
-		 * Ok, the preimage matches with whitespace fuzz.
-		 *
-		 * imgoff now holds the true length of the target that
-		 * matches the preimage before the end of the file.
-		 *
-		 * Count the number of characters in the preimage that fall
-		 * beyond the end of the file and make sure that all of them
-		 * are whitespace characters. (This can only happen if
-		 * we are removing blank lines at the end of the file.)
-		 */
-		buf = preimage_eof = preimage->buf + preoff;
-		for ( ; i < preimage->nr; i++)
-			preoff += preimage->line[i].len;
-		preimage_end = preimage->buf + preoff;
-		for ( ; buf < preimage_end; buf++)
-			if (!isspace(*buf))
-				return 0;
-
-		/*
-		 * Update the preimage and the common postimage context
-		 * lines to use the same whitespace as the target.
-		 * If whitespace is missing in the target (i.e.
-		 * if the preimage extends beyond the end of the file),
-		 * use the whitespace from the preimage.
-		 */
-		extra_chars = preimage_end - preimage_eof;
-		strbuf_init(&fixed, imgoff + extra_chars);
-		strbuf_add(&fixed, img->buf + try, imgoff);
-		strbuf_add(&fixed, preimage_eof, extra_chars);
-		fixed_buf = strbuf_detach(&fixed, &fixed_len);
-		update_pre_post_images(preimage, postimage,
-				fixed_buf, fixed_len, postlen);
-		return 1;
-	}
-
-	if (ws_error_action != correct_ws_error)
+	if (state->ws_error_action != correct_ws_error)
 		return 0;
 
 	/*
@@ -2499,7 +2622,8 @@ static int match_fragment(struct image *img,
 	return 0;
 }
 
-static int find_pos(struct image *img,
+static int find_pos(struct apply_state *state,
+		    struct image *img,
 		    struct image *preimage,
 		    struct image *postimage,
 		    int line,
@@ -2543,7 +2667,7 @@ static int find_pos(struct image *img,
 	try_lno = line;
 
 	for (i = 0; ; i++) {
-		if (match_fragment(img, preimage, postimage,
+		if (match_fragment(state, img, preimage, postimage,
 				   try, try_lno, ws_rule,
 				   match_beginning, match_end))
 			return try_lno;
@@ -2594,7 +2718,8 @@ static void remove_last_line(struct image *img)
  * apply at applied_pos (counts in line numbers) in "img".
  * Update "img" to remove "preimage" and replace it with "postimage".
  */
-static void update_image(struct image *img,
+static void update_image(struct apply_state *state,
+			 struct image *img,
 			 int applied_pos,
 			 struct image *preimage,
 			 struct image *postimage)
@@ -2659,7 +2784,7 @@ static void update_image(struct image *img,
 	memcpy(img->line + applied_pos,
 	       postimage->line,
 	       postimage->nr * sizeof(*img->line));
-	if (!allow_overlap)
+	if (!state->allow_overlap)
 		for (i = 0; i < postimage->nr; i++)
 			img->line[applied_pos + i].flag |= LINE_PATCHED;
 	img->nr = nr;
@@ -2670,7 +2795,8 @@ static void update_image(struct image *img,
  * postimage) for the hunk.  Find lines that match "preimage" in "img" and
  * replace the part of "img" with "postimage" text.
  */
-static int apply_one_fragment(struct image *img, struct fragment *frag,
+static int apply_one_fragment(struct apply_state *state,
+			      struct image *img, struct fragment *frag,
 			      int inaccurate_eof, unsigned ws_rule,
 			      int nth_fragment)
 {
@@ -2715,7 +2841,7 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
 		if (len < size && patch[len] == '\\')
 			plen--;
 		first = *patch;
-		if (apply_in_reverse) {
+		if (state->apply_in_reverse) {
 			if (first == '-')
 				first = '+';
 			else if (first == '+')
@@ -2748,17 +2874,17 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
 		/* Fall-through for ' ' */
 		case '+':
 			/* --no-add does not add new lines */
-			if (first == '+' && no_add)
+			if (first == '+' && state->no_add)
 				break;
 
 			start = newlines.len;
 			if (first != '+' ||
-			    !whitespace_error ||
-			    ws_error_action != correct_ws_error) {
+			    !state->whitespace_error ||
+			    state->ws_error_action != correct_ws_error) {
 				strbuf_add(&newlines, patch + 1, plen);
 			}
 			else {
-				ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &applied_after_fixing_ws);
+				ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &state->applied_after_fixing_ws);
 			}
 			add_line_info(&postimage, newlines.buf + start, newlines.len - start,
 				      (first == '+' ? 0 : LINE_COMMON));
@@ -2771,7 +2897,7 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
 			/* Ignore it, we already handled it */
 			break;
 		default:
-			if (apply_verbosely)
+			if (state->apply_verbosely)
 				error(_("invalid start of line: '%c'"), first);
 			applied_pos = -1;
 			goto out;
@@ -2812,7 +2938,7 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
 	 * without leading context must match at the beginning.
 	 */
 	match_beginning = (!frag->oldpos ||
-			   (frag->oldpos == 1 && !unidiff_zero));
+			   (frag->oldpos == 1 && !state->unidiff_zero));
 
 	/*
 	 * A hunk without trailing lines must match at the end.
@@ -2820,7 +2946,7 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
 	 * from the lack of trailing lines if the patch was generated
 	 * with unidiff without any context.
 	 */
-	match_end = !unidiff_zero && !trailing;
+	match_end = !state->unidiff_zero && !trailing;
 
 	pos = frag->newpos ? (frag->newpos - 1) : 0;
 	preimage.buf = oldlines;
@@ -2832,14 +2958,14 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
 
 	for (;;) {
 
-		applied_pos = find_pos(img, &preimage, &postimage, pos,
+		applied_pos = find_pos(state, img, &preimage, &postimage, pos,
 				       ws_rule, match_beginning, match_end);
 
 		if (applied_pos >= 0)
 			break;
 
 		/* Am I at my context limits? */
-		if ((leading <= p_context) && (trailing <= p_context))
+		if ((leading <= state->p_context) && (trailing <= state->p_context))
 			break;
 		if (match_beginning || match_end) {
 			match_beginning = match_end = 0;
@@ -2868,10 +2994,10 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
 		if (new_blank_lines_at_end &&
 		    preimage.nr + applied_pos >= img->nr &&
 		    (ws_rule & WS_BLANK_AT_EOF) &&
-		    ws_error_action != nowarn_ws_error) {
-			record_ws_error(WS_BLANK_AT_EOF, "+", 1,
+		    state->ws_error_action != nowarn_ws_error) {
+			record_ws_error(state, WS_BLANK_AT_EOF, "+", 1,
 					found_new_blank_lines_at_end);
-			if (ws_error_action == correct_ws_error) {
+			if (state->ws_error_action == correct_ws_error) {
 				while (new_blank_lines_at_end--)
 					remove_last_line(&postimage);
 			}
@@ -2882,13 +3008,13 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
 			 * apply_patch->check_patch_list->check_patch->
 			 * apply_data->apply_fragments->apply_one_fragment
 			 */
-			if (ws_error_action == die_on_ws_error)
-				apply = 0;
+			if (state->ws_error_action == die_on_ws_error)
+				state->apply = 0;
 		}
 
-		if (apply_verbosely && applied_pos != pos) {
+		if (state->apply_verbosely && applied_pos != pos) {
 			int offset = applied_pos - pos;
-			if (apply_in_reverse)
+			if (state->apply_in_reverse)
 				offset = 0 - offset;
 			fprintf_ln(stderr,
 				   Q_("Hunk #%d succeeded at %d (offset %d line).",
@@ -2906,9 +3032,9 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
 			fprintf_ln(stderr, _("Context reduced to (%ld/%ld)"
 					     " to apply fragment at %d"),
 				   leading, trailing, applied_pos+1);
-		update_image(img, applied_pos, &preimage, &postimage);
+		update_image(state, img, applied_pos, &preimage, &postimage);
 	} else {
-		if (apply_verbosely)
+		if (state->apply_verbosely)
 			error(_("while searching for:\n%.*s"),
 			      (int)(old - oldlines), oldlines);
 	}
@@ -2922,7 +3048,9 @@ out:
 	return (applied_pos < 0);
 }
 
-static int apply_binary_fragment(struct image *img, struct patch *patch)
+static int apply_binary_fragment(struct apply_state *state,
+				 struct image *img,
+				 struct patch *patch)
 {
 	struct fragment *fragment = patch->fragments;
 	unsigned long len;
@@ -2935,7 +3063,7 @@ static int apply_binary_fragment(struct image *img, struct patch *patch)
 			     patch->old_name);
 
 	/* Binary patch is irreversible without the optional second hunk */
-	if (apply_in_reverse) {
+	if (state->apply_in_reverse) {
 		if (!fragment->next)
 			return error("cannot reverse-apply a binary patch "
 				     "without the reverse hunk to '%s'",
@@ -2968,7 +3096,9 @@ static int apply_binary_fragment(struct image *img, struct patch *patch)
  * but the preimage prepared by the caller in "img" is freed here
  * or in the helper function apply_binary_fragment() this calls.
  */
-static int apply_binary(struct image *img, struct patch *patch)
+static int apply_binary(struct apply_state *state,
+			struct image *img,
+			struct patch *patch)
 {
 	const char *name = patch->old_name ? patch->old_name : patch->new_name;
 	unsigned char sha1[20];
@@ -3029,7 +3159,7 @@ static int apply_binary(struct image *img, struct patch *patch)
 		 * apply the patch data to it, which is stored
 		 * in the patch->fragments->{patch,size}.
 		 */
-		if (apply_binary_fragment(img, patch))
+		if (apply_binary_fragment(state, img, patch))
 			return error(_("binary patch does not apply to '%s'"),
 				     name);
 
@@ -3043,7 +3173,7 @@ static int apply_binary(struct image *img, struct patch *patch)
 	return 0;
 }
 
-static int apply_fragments(struct image *img, struct patch *patch)
+static int apply_fragments(struct apply_state *state, struct image *img, struct patch *patch)
 {
 	struct fragment *frag = patch->fragments;
 	const char *name = patch->old_name ? patch->old_name : patch->new_name;
@@ -3052,13 +3182,13 @@ static int apply_fragments(struct image *img, struct patch *patch)
 	int nth = 0;
 
 	if (patch->is_binary)
-		return apply_binary(img, patch);
+		return apply_binary(state, img, patch);
 
 	while (frag) {
 		nth++;
-		if (apply_one_fragment(img, frag, inaccurate_eof, ws_rule, nth)) {
+		if (apply_one_fragment(state, img, frag, inaccurate_eof, ws_rule, nth)) {
 			error(_("patch failed: %s:%ld"), name, frag->oldpos);
-			if (!apply_with_reject)
+			if (!state->apply_with_reject)
 				return -1;
 			frag->rejected = 1;
 		}
@@ -3093,14 +3223,14 @@ static int read_file_or_gitlink(const struct cache_entry *ce, struct strbuf *buf
 	return read_blob_object(buf, ce->sha1, ce->ce_mode);
 }
 
-static struct patch *in_fn_table(const char *name)
+static struct patch *in_fn_table(struct apply_state *state, const char *name)
 {
 	struct string_list_item *item;
 
 	if (name == NULL)
 		return NULL;
 
-	item = string_list_lookup(&fn_table, name);
+	item = string_list_lookup(&state->fn_table, name);
 	if (item != NULL)
 		return (struct patch *)item->util;
 
@@ -3132,7 +3262,7 @@ static int was_deleted(struct patch *patch)
 	return patch == PATH_WAS_DELETED;
 }
 
-static void add_to_fn_table(struct patch *patch)
+static void add_to_fn_table(struct apply_state *state, struct patch *patch)
 {
 	struct string_list_item *item;
 
@@ -3142,7 +3272,7 @@ static void add_to_fn_table(struct patch *patch)
 	 * file creations and copies
 	 */
 	if (patch->new_name != NULL) {
-		item = string_list_insert(&fn_table, patch->new_name);
+		item = string_list_insert(&state->fn_table, patch->new_name);
 		item->util = patch;
 	}
 
@@ -3151,12 +3281,12 @@ static void add_to_fn_table(struct patch *patch)
 	 * later chunks shouldn't patch old names
 	 */
 	if ((patch->new_name == NULL) || (patch->is_rename)) {
-		item = string_list_insert(&fn_table, patch->old_name);
+		item = string_list_insert(&state->fn_table, patch->old_name);
 		item->util = PATH_WAS_DELETED;
 	}
 }
 
-static void prepare_fn_table(struct patch *patch)
+static void prepare_fn_table(struct apply_state *state, struct patch *patch)
 {
 	/*
 	 * store information about incoming file deletion
@@ -3164,7 +3294,7 @@ static void prepare_fn_table(struct patch *patch)
 	while (patch) {
 		if ((patch->new_name == NULL) || (patch->is_rename)) {
 			struct string_list_item *item;
-			item = string_list_insert(&fn_table, patch->old_name);
+			item = string_list_insert(&state->fn_table, patch->old_name);
 			item->util = PATH_TO_BE_DELETED;
 		}
 		patch = patch->next;
@@ -3185,7 +3315,9 @@ static int checkout_target(struct index_state *istate,
 	return 0;
 }
 
-static struct patch *previous_patch(struct patch *patch, int *gone)
+static struct patch *previous_patch(struct apply_state *state,
+				    struct patch *patch,
+				    int *gone)
 {
 	struct patch *previous;
 
@@ -3193,7 +3325,7 @@ static struct patch *previous_patch(struct patch *patch, int *gone)
 	if (patch->is_copy || patch->is_rename)
 		return NULL; /* "git" patches do not depend on the order */
 
-	previous = in_fn_table(patch->old_name);
+	previous = in_fn_table(state, patch->old_name);
 	if (!previous)
 		return NULL;
 
@@ -3218,15 +3350,16 @@ static int verify_index_match(const struct cache_entry *ce, struct stat *st)
 
 #define SUBMODULE_PATCH_WITHOUT_INDEX 1
 
-static int load_patch_target(struct strbuf *buf,
+static int load_patch_target(struct apply_state *state,
+			     struct strbuf *buf,
 			     const struct cache_entry *ce,
 			     struct stat *st,
 			     const char *name,
 			     unsigned expected_mode)
 {
-	if (cached || check_index) {
+	if (state->cached || state->check_index) {
 		if (read_file_or_gitlink(ce, buf))
-			return error(_("read of %s failed"), name);
+			return error(_("failed to read %s"), name);
 	} else if (name) {
 		if (S_ISGITLINK(expected_mode)) {
 			if (ce)
@@ -3237,7 +3370,7 @@ static int load_patch_target(struct strbuf *buf,
 			return error(_("reading from '%s' beyond a symbolic link"), name);
 		} else {
 			if (read_old_data(st, name, buf))
-				return error(_("read of %s failed"), name);
+				return error(_("failed to read %s"), name);
 		}
 	}
 	return 0;
@@ -3250,7 +3383,8 @@ static int load_patch_target(struct strbuf *buf,
  * applying a non-git patch that incrementally updates the tree,
  * we read from the result of a previous diff.
  */
-static int load_preimage(struct image *image,
+static int load_preimage(struct apply_state *state,
+			 struct image *image,
 			 struct patch *patch, struct stat *st,
 			 const struct cache_entry *ce)
 {
@@ -3260,7 +3394,7 @@ static int load_preimage(struct image *image,
 	struct patch *previous;
 	int status;
 
-	previous = previous_patch(patch, &status);
+	previous = previous_patch(state, patch, &status);
 	if (status)
 		return error(_("path %s has been renamed/deleted"),
 			     patch->old_name);
@@ -3268,7 +3402,7 @@ static int load_preimage(struct image *image,
 		/* We have a patched copy in memory; use that. */
 		strbuf_add(&buf, previous->result, previous->resultsize);
 	} else {
-		status = load_patch_target(&buf, ce, st,
+		status = load_patch_target(state, &buf, ce, st,
 					   patch->old_name, patch->old_mode);
 		if (status < 0)
 			return status;
@@ -3282,7 +3416,7 @@ static int load_preimage(struct image *image,
 			free_fragment_list(patch->fragments);
 			patch->fragments = NULL;
 		} else if (status) {
-			return error(_("read of %s failed"), patch->old_name);
+			return error(_("failed to read %s"), patch->old_name);
 		}
 	}
 
@@ -3327,7 +3461,9 @@ static int three_way_merge(struct image *image,
  * the current contents of the new_name.  In no cases other than that
  * this function will be called.
  */
-static int load_current(struct image *image, struct patch *patch)
+static int load_current(struct apply_state *state,
+			struct image *image,
+			struct patch *patch)
 {
 	struct strbuf buf = STRBUF_INIT;
 	int status, pos;
@@ -3354,7 +3490,7 @@ static int load_current(struct image *image, struct patch *patch)
 	if (verify_index_match(ce, &st))
 		return error(_("%s: does not match index"), name);
 
-	status = load_patch_target(&buf, ce, &st, name, mode);
+	status = load_patch_target(state, &buf, ce, &st, name, mode);
 	if (status < 0)
 		return status;
 	else if (status)
@@ -3364,8 +3500,11 @@ static int load_current(struct image *image, struct patch *patch)
 	return 0;
 }
 
-static int try_threeway(struct image *image, struct patch *patch,
-			struct stat *st, const struct cache_entry *ce)
+static int try_threeway(struct apply_state *state,
+			struct image *image,
+			struct patch *patch,
+			struct stat *st,
+			const struct cache_entry *ce)
 {
 	unsigned char pre_sha1[20], post_sha1[20], our_sha1[20];
 	struct strbuf buf = STRBUF_INIT;
@@ -3391,7 +3530,7 @@ static int try_threeway(struct image *image, struct patch *patch,
 	img = strbuf_detach(&buf, &len);
 	prepare_image(&tmp_image, img, len, 1);
 	/* Apply the patch to get the post image */
-	if (apply_fragments(&tmp_image, patch) < 0) {
+	if (apply_fragments(state, &tmp_image, patch) < 0) {
 		clear_image(&tmp_image);
 		return -1;
 	}
@@ -3401,11 +3540,11 @@ static int try_threeway(struct image *image, struct patch *patch,
 
 	/* our_sha1[] is ours */
 	if (patch->is_new) {
-		if (load_current(&tmp_image, patch))
+		if (load_current(state, &tmp_image, patch))
 			return error("cannot read the current contents of '%s'",
 				     patch->new_name);
 	} else {
-		if (load_preimage(&tmp_image, patch, st, ce))
+		if (load_preimage(state, &tmp_image, patch, st, ce))
 			return error("cannot read the current contents of '%s'",
 				     patch->old_name);
 	}
@@ -3435,22 +3574,23 @@ static int try_threeway(struct image *image, struct patch *patch,
 	return 0;
 }
 
-static int apply_data(struct patch *patch, struct stat *st, const struct cache_entry *ce)
+static int apply_data(struct apply_state *state, struct patch *patch,
+		      struct stat *st, const struct cache_entry *ce)
 {
 	struct image image;
 
-	if (load_preimage(&image, patch, st, ce) < 0)
+	if (load_preimage(state, &image, patch, st, ce) < 0)
 		return -1;
 
 	if (patch->direct_to_threeway ||
-	    apply_fragments(&image, patch) < 0) {
+	    apply_fragments(state, &image, patch) < 0) {
 		/* Note: with --reject, apply_fragments() returns 0 */
-		if (!threeway || try_threeway(&image, patch, st, ce) < 0)
+		if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0)
 			return -1;
 	}
 	patch->result = image.buf;
 	patch->resultsize = image.len;
-	add_to_fn_table(patch);
+	add_to_fn_table(state, patch);
 	free(image.line_allocated);
 
 	if (0 < patch->is_delete && patch->resultsize)
@@ -3470,7 +3610,10 @@ static int apply_data(struct patch *patch, struct stat *st, const struct cache_e
  * check_patch() separately makes sure (and errors out otherwise) that
  * the path the patch creates does not exist in the current tree.
  */
-static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)
+static int check_preimage(struct apply_state *state,
+			  struct patch *patch,
+			  struct cache_entry **ce,
+			  struct stat *st)
 {
 	const char *old_name = patch->old_name;
 	struct patch *previous = NULL;
@@ -3481,19 +3624,19 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
 		return 0;
 
 	assert(patch->is_new <= 0);
-	previous = previous_patch(patch, &status);
+	previous = previous_patch(state, patch, &status);
 
 	if (status)
 		return error(_("path %s has been renamed/deleted"), old_name);
 	if (previous) {
 		st_mode = previous->new_mode;
-	} else if (!cached) {
+	} else if (!state->cached) {
 		stat_ret = lstat(old_name, st);
 		if (stat_ret && errno != ENOENT)
 			return error(_("%s: %s"), old_name, strerror(errno));
 	}
 
-	if (check_index && !previous) {
+	if (state->check_index && !previous) {
 		int pos = cache_name_pos(old_name, strlen(old_name));
 		if (pos < 0) {
 			if (patch->is_new < 0)
@@ -3505,9 +3648,9 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
 			if (checkout_target(&the_index, *ce, st))
 				return -1;
 		}
-		if (!cached && verify_index_match(*ce, st))
+		if (!state->cached && verify_index_match(*ce, st))
 			return error(_("%s: does not match index"), old_name);
-		if (cached)
+		if (state->cached)
 			st_mode = (*ce)->ce_mode;
 	} else if (stat_ret < 0) {
 		if (patch->is_new < 0)
@@ -3515,7 +3658,7 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
 		return error(_("%s: %s"), old_name, strerror(errno));
 	}
 
-	if (!cached && !previous)
+	if (!state->cached && !previous)
 		st_mode = ce_mode_from_stat(*ce, st->st_mode);
 
 	if (patch->is_new < 0)
@@ -3543,15 +3686,17 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
 #define EXISTS_IN_INDEX 1
 #define EXISTS_IN_WORKTREE 2
 
-static int check_to_create(const char *new_name, int ok_if_exists)
+static int check_to_create(struct apply_state *state,
+			   const char *new_name,
+			   int ok_if_exists)
 {
 	struct stat nst;
 
-	if (check_index &&
+	if (state->check_index &&
 	    cache_name_pos(new_name, strlen(new_name)) >= 0 &&
 	    !ok_if_exists)
 		return EXISTS_IN_INDEX;
-	if (cached)
+	if (state->cached)
 		return 0;
 
 	if (!lstat(new_name, &nst)) {
@@ -3574,56 +3719,46 @@ static int check_to_create(const char *new_name, int ok_if_exists)
 	return 0;
 }
 
-/*
- * We need to keep track of how symlinks in the preimage are
- * manipulated by the patches.  A patch to add a/b/c where a/b
- * is a symlink should not be allowed to affect the directory
- * the symlink points at, but if the same patch removes a/b,
- * it is perfectly fine, as the patch removes a/b to make room
- * to create a directory a/b so that a/b/c can be created.
- */
-static struct string_list symlink_changes;
-#define SYMLINK_GOES_AWAY 01
-#define SYMLINK_IN_RESULT 02
-
-static uintptr_t register_symlink_changes(const char *path, uintptr_t what)
+static uintptr_t register_symlink_changes(struct apply_state *state,
+					  const char *path,
+					  uintptr_t what)
 {
 	struct string_list_item *ent;
 
-	ent = string_list_lookup(&symlink_changes, path);
+	ent = string_list_lookup(&state->symlink_changes, path);
 	if (!ent) {
-		ent = string_list_insert(&symlink_changes, path);
+		ent = string_list_insert(&state->symlink_changes, path);
 		ent->util = (void *)0;
 	}
 	ent->util = (void *)(what | ((uintptr_t)ent->util));
 	return (uintptr_t)ent->util;
 }
 
-static uintptr_t check_symlink_changes(const char *path)
+static uintptr_t check_symlink_changes(struct apply_state *state, const char *path)
 {
 	struct string_list_item *ent;
 
-	ent = string_list_lookup(&symlink_changes, path);
+	ent = string_list_lookup(&state->symlink_changes, path);
 	if (!ent)
 		return 0;
 	return (uintptr_t)ent->util;
 }
 
-static void prepare_symlink_changes(struct patch *patch)
+static void prepare_symlink_changes(struct apply_state *state, struct patch *patch)
 {
 	for ( ; patch; patch = patch->next) {
 		if ((patch->old_name && S_ISLNK(patch->old_mode)) &&
 		    (patch->is_rename || patch->is_delete))
 			/* the symlink at patch->old_name is removed */
-			register_symlink_changes(patch->old_name, SYMLINK_GOES_AWAY);
+			register_symlink_changes(state, patch->old_name, SYMLINK_GOES_AWAY);
 
 		if (patch->new_name && S_ISLNK(patch->new_mode))
 			/* the symlink at patch->new_name is created or remains */
-			register_symlink_changes(patch->new_name, SYMLINK_IN_RESULT);
+			register_symlink_changes(state, patch->new_name, SYMLINK_IN_RESULT);
 	}
 }
 
-static int path_is_beyond_symlink_1(struct strbuf *name)
+static int path_is_beyond_symlink_1(struct apply_state *state, struct strbuf *name)
 {
 	do {
 		unsigned int change;
@@ -3633,7 +3768,7 @@ static int path_is_beyond_symlink_1(struct strbuf *name)
 		if (!name->len)
 			break;
 		name->buf[name->len] = '\0';
-		change = check_symlink_changes(name->buf);
+		change = check_symlink_changes(state, name->buf);
 		if (change & SYMLINK_IN_RESULT)
 			return 1;
 		if (change & SYMLINK_GOES_AWAY)
@@ -3644,7 +3779,7 @@ static int path_is_beyond_symlink_1(struct strbuf *name)
 			continue;
 
 		/* otherwise, check the preimage */
-		if (check_index) {
+		if (state->check_index) {
 			struct cache_entry *ce;
 
 			ce = cache_file_exists(name->buf, name->len, ignore_case);
@@ -3659,14 +3794,14 @@ static int path_is_beyond_symlink_1(struct strbuf *name)
 	return 0;
 }
 
-static int path_is_beyond_symlink(const char *name_)
+static int path_is_beyond_symlink(struct apply_state *state, const char *name_)
 {
 	int ret;
 	struct strbuf name = STRBUF_INIT;
 
 	assert(*name_ != '\0');
 	strbuf_addstr(&name, name_);
-	ret = path_is_beyond_symlink_1(&name);
+	ret = path_is_beyond_symlink_1(state, &name);
 	strbuf_release(&name);
 
 	return ret;
@@ -3693,7 +3828,7 @@ static void die_on_unsafe_path(struct patch *patch)
  * Check and apply the patch in-core; leave the result in patch->result
  * for the caller to write it out to the final destination.
  */
-static int check_patch(struct patch *patch)
+static int check_patch(struct apply_state *state, struct patch *patch)
 {
 	struct stat st;
 	const char *old_name = patch->old_name;
@@ -3706,7 +3841,7 @@ static int check_patch(struct patch *patch)
 
 	patch->rejected = 1; /* we will drop this after we succeed */
 
-	status = check_preimage(patch, &ce, &st);
+	status = check_preimage(state, patch, &ce, &st);
 	if (status)
 		return status;
 	old_name = patch->old_name;
@@ -3725,7 +3860,7 @@ static int check_patch(struct patch *patch)
 	 * B and rename from A to B is handled the same way by asking
 	 * was_deleted().
 	 */
-	if ((tpatch = in_fn_table(new_name)) &&
+	if ((tpatch = in_fn_table(state, new_name)) &&
 	    (was_deleted(tpatch) || to_be_deleted(tpatch)))
 		ok_if_exists = 1;
 	else
@@ -3733,9 +3868,9 @@ static int check_patch(struct patch *patch)
 
 	if (new_name &&
 	    ((0 < patch->is_new) || patch->is_rename || patch->is_copy)) {
-		int err = check_to_create(new_name, ok_if_exists);
+		int err = check_to_create(state, new_name, ok_if_exists);
 
-		if (err && threeway) {
+		if (err && state->threeway) {
 			patch->direct_to_threeway = 1;
 		} else switch (err) {
 		case 0:
@@ -3776,7 +3911,7 @@ static int check_patch(struct patch *patch)
 		}
 	}
 
-	if (!unsafe_paths)
+	if (!state->unsafe_paths)
 		die_on_unsafe_path(patch);
 
 	/*
@@ -3788,27 +3923,27 @@ static int check_patch(struct patch *patch)
 	 * is not deposited to a path that is beyond a symbolic link
 	 * here.
 	 */
-	if (!patch->is_delete && path_is_beyond_symlink(patch->new_name))
+	if (!patch->is_delete && path_is_beyond_symlink(state, patch->new_name))
 		return error(_("affected file '%s' is beyond a symbolic link"),
 			     patch->new_name);
 
-	if (apply_data(patch, &st, ce) < 0)
+	if (apply_data(state, patch, &st, ce) < 0)
 		return error(_("%s: patch does not apply"), name);
 	patch->rejected = 0;
 	return 0;
 }
 
-static int check_patch_list(struct patch *patch)
+static int check_patch_list(struct apply_state *state, struct patch *patch)
 {
 	int err = 0;
 
-	prepare_symlink_changes(patch);
-	prepare_fn_table(patch);
+	prepare_symlink_changes(state, patch);
+	prepare_fn_table(state, patch);
 	while (patch) {
-		if (apply_verbosely)
+		if (state->apply_verbosely)
 			say_patch_name(stderr,
 				       _("Checking patch %s..."), patch);
-		err |= check_patch(patch);
+		err |= check_patch(state, patch);
 		patch = patch->next;
 	}
 	return err;
@@ -3912,7 +4047,7 @@ static void build_fake_ancestor(struct patch *list, const char *filename)
 	discard_index(&result);
 }
 
-static void stat_patch_list(struct patch *patch)
+static void stat_patch_list(struct apply_state *state, struct patch *patch)
 {
 	int files, adds, dels;
 
@@ -3920,13 +4055,14 @@ static void stat_patch_list(struct patch *patch)
 		files++;
 		adds += patch->lines_added;
 		dels += patch->lines_deleted;
-		show_stats(patch);
+		show_stats(state, patch);
 	}
 
 	print_stat_summary(stdout, files, adds, dels);
 }
 
-static void numstat_patch_list(struct patch *patch)
+static void numstat_patch_list(struct apply_state *state,
+			       struct patch *patch)
 {
 	for ( ; patch; patch = patch->next) {
 		const char *name;
@@ -3935,7 +4071,7 @@ static void numstat_patch_list(struct patch *patch)
 			printf("-\t-\t");
 		else
 			printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
-		write_name_quoted(name, stdout, line_termination);
+		write_name_quoted(name, stdout, state->line_termination);
 	}
 }
 
@@ -4017,49 +4153,53 @@ static void summary_patch_list(struct patch *patch)
 	}
 }
 
-static void patch_stats(struct patch *patch)
+static void patch_stats(struct apply_state *state, struct patch *patch)
 {
 	int lines = patch->lines_added + patch->lines_deleted;
 
-	if (lines > max_change)
-		max_change = lines;
+	if (lines > state->max_change)
+		state->max_change = lines;
 	if (patch->old_name) {
 		int len = quote_c_style(patch->old_name, NULL, NULL, 0);
 		if (!len)
 			len = strlen(patch->old_name);
-		if (len > max_len)
-			max_len = len;
+		if (len > state->max_len)
+			state->max_len = len;
 	}
 	if (patch->new_name) {
 		int len = quote_c_style(patch->new_name, NULL, NULL, 0);
 		if (!len)
 			len = strlen(patch->new_name);
-		if (len > max_len)
-			max_len = len;
+		if (len > state->max_len)
+			state->max_len = len;
 	}
 }
 
-static void remove_file(struct patch *patch, int rmdir_empty)
+static void remove_file(struct apply_state *state, struct patch *patch, int rmdir_empty)
 {
-	if (update_index) {
+	if (state->update_index) {
 		if (remove_file_from_cache(patch->old_name) < 0)
 			die(_("unable to remove %s from index"), patch->old_name);
 	}
-	if (!cached) {
+	if (!state->cached) {
 		if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {
 			remove_path(patch->old_name);
 		}
 	}
 }
 
-static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
+static void add_index_file(struct apply_state *state,
+			   const char *path,
+			   unsigned mode,
+			   void *buf,
+			   unsigned long size)
 {
 	struct stat st;
 	struct cache_entry *ce;
 	int namelen = strlen(path);
 	unsigned ce_size = cache_entry_size(namelen);
 
-	if (!update_index)
+	if (!state->update_index)
 		return;
 
 	ce = xcalloc(1, ce_size);
@@ -4074,7 +4214,7 @@ static void add_index_file(const char *path, unsigned mode, void *buf, unsigned
 		    get_sha1_hex(s, ce->sha1))
 			die(_("corrupt patch for submodule %s"), path);
 	} else {
-		if (!cached) {
+		if (!state->cached) {
 			if (lstat(path, &st) < 0)
 				die_errno(_("unable to stat newly created file '%s'"),
 					  path);
@@ -4126,9 +4266,13 @@ static int try_create_file(const char *path, unsigned int mode, const char *buf,
  * which is true 99% of the time anyway. If they don't,
  * we create them and try again.
  */
-static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
+static void create_one_file(struct apply_state *state,
+			    char *path,
+			    unsigned mode,
+			    const char *buf,
+			    unsigned long size)
 {
-	if (cached)
+	if (state->cached)
 		return;
 	if (!try_create_file(path, mode, buf, size))
 		return;
@@ -4169,13 +4313,14 @@ static void create_one_file(char *path, unsigned mode, const char *buf, unsigned
 	die_errno(_("unable to write file '%s' mode %o"), path, mode);
 }
 
-static void add_conflicted_stages_file(struct patch *patch)
+static void add_conflicted_stages_file(struct apply_state *state,
+				       struct patch *patch)
 {
 	int stage, namelen;
 	unsigned ce_size, mode;
 	struct cache_entry *ce;
 
-	if (!update_index)
+	if (!state->update_index)
 		return;
 	namelen = strlen(patch->new_name);
 	ce_size = cache_entry_size(namelen);
@@ -4196,7 +4341,7 @@ static void add_conflicted_stages_file(struct patch *patch)
 	}
 }
 
-static void create_file(struct patch *patch)
+static void create_file(struct apply_state *state, struct patch *patch)
 {
 	char *path = patch->new_name;
 	unsigned mode = patch->new_mode;
@@ -4205,25 +4350,27 @@ static void create_file(struct patch *patch)
 
 	if (!mode)
 		mode = S_IFREG | 0644;
-	create_one_file(path, mode, buf, size);
+	create_one_file(state, path, mode, buf, size);
 
 	if (patch->conflicted_threeway)
-		add_conflicted_stages_file(patch);
+		add_conflicted_stages_file(state, patch);
 	else
-		add_index_file(path, mode, buf, size);
+		add_index_file(state, path, mode, buf, size);
 }
 
 /* phase zero is to remove, phase one is to create */
-static void write_out_one_result(struct patch *patch, int phase)
+static void write_out_one_result(struct apply_state *state,
+				 struct patch *patch,
+				 int phase)
 {
 	if (patch->is_delete > 0) {
 		if (phase == 0)
-			remove_file(patch, 1);
+			remove_file(state, patch, 1);
 		return;
 	}
 	if (patch->is_new > 0 || patch->is_copy) {
 		if (phase == 1)
-			create_file(patch);
+			create_file(state, patch);
 		return;
 	}
 	/*
@@ -4231,12 +4378,12 @@ static void write_out_one_result(struct patch *patch, int phase)
 	 * thing: remove the old, write the new
 	 */
 	if (phase == 0)
-		remove_file(patch, patch->is_rename);
+		remove_file(state, patch, patch->is_rename);
 	if (phase == 1)
-		create_file(patch);
+		create_file(state, patch);
 }
 
-static int write_out_one_reject(struct patch *patch)
+static int write_out_one_reject(struct apply_state *state, struct patch *patch)
 {
 	FILE *rej;
 	char namebuf[PATH_MAX];
@@ -4251,7 +4398,7 @@ static int write_out_one_reject(struct patch *patch)
 	}
 
 	if (!cnt) {
-		if (apply_verbosely)
+		if (state->apply_verbosely)
 			say_patch_name(stderr,
 				       _("Applied patch %s cleanly."), patch);
 		return 0;
@@ -4307,7 +4454,7 @@ static int write_out_one_reject(struct patch *patch)
 	return -1;
 }
 
-static int write_out_results(struct patch *list)
+static int write_out_results(struct apply_state *state, struct patch *list)
 {
 	int phase;
 	int errs = 0;
@@ -4320,9 +4467,9 @@ static int write_out_results(struct patch *list)
 			if (l->rejected)
 				errs = 1;
 			else {
-				write_out_one_result(l, phase);
+				write_out_one_result(state, l, phase);
 				if (phase == 1) {
-					if (write_out_one_reject(l))
+					if (write_out_one_reject(state, l))
 						errs = 1;
 					if (l->conflicted_threeway) {
 						string_list_append(&cpath, l->new_name);
@@ -4353,14 +4500,17 @@ static struct lock_file lock_file;
 #define INACCURATE_EOF	(1<<0)
 #define RECOUNT		(1<<1)
 
-static int apply_patch(int fd, const char *filename, int options)
+static int apply_patch(struct apply_state *state,
+		       int fd,
+		       const char *filename,
+		       int options)
 {
 	size_t offset;
 	struct strbuf buf = STRBUF_INIT; /* owns the patch text */
 	struct patch *list = NULL, **listp = &list;
 	int skipped_patch = 0;
 
-	patch_input_file = filename;
+	state->patch_input_file = filename;
 	read_patch_file(&buf, fd);
 	offset = 0;
 	while (offset < buf.len) {
@@ -4370,19 +4520,21 @@ static int apply_patch(int fd, const char *filename, int options)
 		patch = xcalloc(1, sizeof(*patch));
 		patch->inaccurate_eof = !!(options & INACCURATE_EOF);
 		patch->recount =  !!(options & RECOUNT);
-		nr = parse_chunk(buf.buf + offset, buf.len - offset, patch);
+		nr = parse_chunk(state, buf.buf + offset, buf.len - offset, patch);
 		if (nr < 0) {
 			free_patch(patch);
 			break;
 		}
-		if (apply_in_reverse)
+		if (state->apply_in_reverse)
 			reverse_patches(patch);
-		if (use_patch(patch)) {
-			patch_stats(patch);
+		if (use_patch(state, patch)) {
+			patch_stats(state, patch);
 			*listp = patch;
 			listp = &patch->next;
 		}
 		else {
+			if (state->apply_verbosely)
+				say_patch_name(stderr, _("Skipped patch '%s'."), patch);
 			free_patch(patch);
 			skipped_patch++;
 		}
@@ -4392,45 +4544,45 @@ static int apply_patch(int fd, const char *filename, int options)
 	if (!list && !skipped_patch)
 		die(_("unrecognized input"));
 
-	if (whitespace_error && (ws_error_action == die_on_ws_error))
-		apply = 0;
+	if (state->whitespace_error && (state->ws_error_action == die_on_ws_error))
+		state->apply = 0;
 
-	update_index = check_index && apply;
-	if (update_index && newfd < 0)
-		newfd = hold_locked_index(&lock_file, 1);
+	state->update_index = state->check_index && state->apply;
+	if (state->update_index && state->newfd < 0)
+		state->newfd = hold_locked_index(state->lock_file, 1);
 
-	if (check_index) {
+	if (state->check_index) {
 		if (read_cache() < 0)
 			die(_("unable to read index file"));
 	}
 
-	if ((check || apply) &&
-	    check_patch_list(list) < 0 &&
-	    !apply_with_reject)
+	if ((state->check || state->apply) &&
+	    check_patch_list(state, list) < 0 &&
+	    !state->apply_with_reject)
 		exit(1);
 
-	if (apply && write_out_results(list)) {
-		if (apply_with_reject)
+	if (state->apply && write_out_results(state, list)) {
+		if (state->apply_with_reject)
 			exit(1);
 		/* with --3way, we still need to write the index out */
 		return 1;
 	}
 
-	if (fake_ancestor)
-		build_fake_ancestor(list, fake_ancestor);
+	if (state->fake_ancestor)
+		build_fake_ancestor(list, state->fake_ancestor);
 
-	if (diffstat)
-		stat_patch_list(list);
+	if (state->diffstat)
+		stat_patch_list(state, list);
 
-	if (numstat)
-		numstat_patch_list(list);
+	if (state->numstat)
+		numstat_patch_list(state, list);
 
-	if (summary)
+	if (state->summary)
 		summary_patch_list(list);
 
 	free_patch_list(list);
 	strbuf_release(&buf);
-	string_list_clear(&fn_table, 0);
+	string_list_clear(&state->fn_table, 0);
 	return 0;
 }
 
@@ -4444,220 +4596,284 @@ static void git_apply_config(void)
 static int option_parse_exclude(const struct option *opt,
 				const char *arg, int unset)
 {
-	add_name_limit(arg, 1);
+	struct apply_state *state = opt->value;
+	add_name_limit(state, arg, 1);
 	return 0;
 }
 
 static int option_parse_include(const struct option *opt,
 				const char *arg, int unset)
 {
-	add_name_limit(arg, 0);
-	has_include = 1;
+	struct apply_state *state = opt->value;
+	add_name_limit(state, arg, 0);
+	state->has_include = 1;
 	return 0;
 }
 
 static int option_parse_p(const struct option *opt,
-			  const char *arg, int unset)
+			  const char *arg,
+			  int unset)
 {
-	p_value = atoi(arg);
-	p_value_known = 1;
+	struct apply_state *state = opt->value;
+	state->p_value = atoi(arg);
+	state->p_value_known = 1;
 	return 0;
 }
 
 static int option_parse_space_change(const struct option *opt,
-			  const char *arg, int unset)
+				     const char *arg, int unset)
 {
+	struct apply_state *state = opt->value;
 	if (unset)
-		ws_ignore_action = ignore_ws_none;
+		state->ws_ignore_action = ignore_ws_none;
 	else
-		ws_ignore_action = ignore_ws_change;
+		state->ws_ignore_action = ignore_ws_change;
 	return 0;
 }
 
 static int option_parse_whitespace(const struct option *opt,
 				   const char *arg, int unset)
 {
-	const char **whitespace_option = opt->value;
-
-	*whitespace_option = arg;
-	parse_whitespace_option(arg);
+	struct apply_state *state = opt->value;
+	state->whitespace_option = arg;
+	parse_whitespace_option(state, arg);
 	return 0;
 }
 
 static int option_parse_directory(const struct option *opt,
 				  const char *arg, int unset)
 {
-	strbuf_reset(&root);
-	strbuf_addstr(&root, arg);
-	strbuf_complete(&root, '/');
+	struct apply_state *state = opt->value;
+	strbuf_reset(&state->root);
+	strbuf_addstr(&state->root, arg);
+	strbuf_complete(&state->root, '/');
 	return 0;
 }
 
-int cmd_apply(int argc, const char **argv, const char *prefix_)
+static void init_apply_state(struct apply_state *state,
+			     const char *prefix,
+			     struct lock_file *lock_file)
+{
+	memset(state, 0, sizeof(*state));
+	state->prefix = prefix;
+	state->prefix_length = state->prefix ? strlen(state->prefix) : 0;
+	state->lock_file = lock_file;
+	state->newfd = -1;
+	state->apply = 1;
+	state->line_termination = '\n';
+	state->p_value = 1;
+	state->p_context = UINT_MAX;
+	state->squelch_whitespace_errors = 5;
+	state->ws_error_action = warn_on_ws_error;
+	state->ws_ignore_action = ignore_ws_none;
+	state->linenr = 1;
+	string_list_init(&state->fn_table, 0);
+	string_list_init(&state->limit_by_name, 0);
+	string_list_init(&state->symlink_changes, 0);
+	strbuf_init(&state->root, 0);
+
+	git_apply_config();
+	if (apply_default_whitespace)
+		parse_whitespace_option(state, apply_default_whitespace);
+	if (apply_default_ignorewhitespace)
+		parse_ignorewhitespace_option(state, apply_default_ignorewhitespace);
+}
+
+static void clear_apply_state(struct apply_state *state)
+{
+	string_list_clear(&state->limit_by_name, 0);
+	string_list_clear(&state->symlink_changes, 0);
+	strbuf_release(&state->root);
+
+	/* &state->fn_table is cleared at the end of apply_patch() */
+}
+
+static void check_apply_state(struct apply_state *state, int force_apply)
+{
+	int is_not_gitdir = !startup_info->have_repository;
+
+	if (state->apply_with_reject && state->threeway)
+		die("--reject and --3way cannot be used together.");
+	if (state->cached && state->threeway)
+		die("--cached and --3way cannot be used together.");
+	if (state->threeway) {
+		if (is_not_gitdir)
+			die(_("--3way outside a repository"));
+		state->check_index = 1;
+	}
+	if (state->apply_with_reject)
+		state->apply = state->apply_verbosely = 1;
+	if (!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor))
+		state->apply = 0;
+	if (state->check_index && is_not_gitdir)
+		die(_("--index outside a repository"));
+	if (state->cached) {
+		if (is_not_gitdir)
+			die(_("--cached outside a repository"));
+		state->check_index = 1;
+	}
+	if (state->check_index)
+		state->unsafe_paths = 0;
+	if (!state->lock_file)
+		die("BUG: state->lock_file should not be NULL");
+}
+
+static int apply_all_patches(struct apply_state *state,
+			     int argc,
+			     const char **argv,
+			     int options)
 {
 	int i;
 	int errs = 0;
-	int is_not_gitdir = !startup_info->have_repository;
-	int force_apply = 0;
+	int read_stdin = 1;
+
+	for (i = 0; i < argc; i++) {
+		const char *arg = argv[i];
+		int fd;
+
+		if (!strcmp(arg, "-")) {
+			errs |= apply_patch(state, 0, "<stdin>", options);
+			read_stdin = 0;
+			continue;
+		} else if (0 < state->prefix_length)
+			arg = prefix_filename(state->prefix,
+					      state->prefix_length,
+					      arg);
+
+		fd = open(arg, O_RDONLY);
+		if (fd < 0)
+			die_errno(_("can't open patch '%s'"), arg);
+		read_stdin = 0;
+		set_default_whitespace_mode(state);
+		errs |= apply_patch(state, fd, arg, options);
+		close(fd);
+	}
+	set_default_whitespace_mode(state);
+	if (read_stdin)
+		errs |= apply_patch(state, 0, "<stdin>", options);
+
+	if (state->whitespace_error) {
+		if (state->squelch_whitespace_errors &&
+		    state->squelch_whitespace_errors < state->whitespace_error) {
+			int squelched =
+				state->whitespace_error - state->squelch_whitespace_errors;
+			warning(Q_("squelched %d whitespace error",
+				   "squelched %d whitespace errors",
+				   squelched),
+				squelched);
+		}
+		if (state->ws_error_action == die_on_ws_error)
+			die(Q_("%d line adds whitespace errors.",
+			       "%d lines add whitespace errors.",
+			       state->whitespace_error),
+			    state->whitespace_error);
+		if (state->applied_after_fixing_ws && state->apply)
+			warning("%d line%s applied after"
+				" fixing whitespace errors.",
+				state->applied_after_fixing_ws,
+				state->applied_after_fixing_ws == 1 ? "" : "s");
+		else if (state->whitespace_error)
+			warning(Q_("%d line adds whitespace errors.",
+				   "%d lines add whitespace errors.",
+				   state->whitespace_error),
+				state->whitespace_error);
+	}
+
+	if (state->update_index) {
+		if (write_locked_index(&the_index, state->lock_file, COMMIT_LOCK))
+			die(_("Unable to write new index file"));
+		state->newfd = -1;
+	}
+
+	return !!errs;
+}
 
-	const char *whitespace_option = NULL;
+int cmd_apply(int argc, const char **argv, const char *prefix)
+{
+	int force_apply = 0;
+	int options = 0;
+	int ret;
+	struct apply_state state;
 
 	struct option builtin_apply_options[] = {
-		{ OPTION_CALLBACK, 0, "exclude", NULL, N_("path"),
+		{ OPTION_CALLBACK, 0, "exclude", &state, N_("path"),
 			N_("don't apply changes matching the given path"),
 			0, option_parse_exclude },
-		{ OPTION_CALLBACK, 0, "include", NULL, N_("path"),
+		{ OPTION_CALLBACK, 0, "include", &state, N_("path"),
 			N_("apply changes matching the given path"),
 			0, option_parse_include },
-		{ OPTION_CALLBACK, 'p', NULL, NULL, N_("num"),
+		{ OPTION_CALLBACK, 'p', NULL, &state, N_("num"),
 			N_("remove <num> leading slashes from traditional diff paths"),
 			0, option_parse_p },
-		OPT_BOOL(0, "no-add", &no_add,
+		OPT_BOOL(0, "no-add", &state.no_add,
 			N_("ignore additions made by the patch")),
-		OPT_BOOL(0, "stat", &diffstat,
+		OPT_BOOL(0, "stat", &state.diffstat,
 			N_("instead of applying the patch, output diffstat for the input")),
 		OPT_NOOP_NOARG(0, "allow-binary-replacement"),
 		OPT_NOOP_NOARG(0, "binary"),
-		OPT_BOOL(0, "numstat", &numstat,
+		OPT_BOOL(0, "numstat", &state.numstat,
 			N_("show number of added and deleted lines in decimal notation")),
-		OPT_BOOL(0, "summary", &summary,
+		OPT_BOOL(0, "summary", &state.summary,
 			N_("instead of applying the patch, output a summary for the input")),
-		OPT_BOOL(0, "check", &check,
+		OPT_BOOL(0, "check", &state.check,
 			N_("instead of applying the patch, see if the patch is applicable")),
-		OPT_BOOL(0, "index", &check_index,
+		OPT_BOOL(0, "index", &state.check_index,
 			N_("make sure the patch is applicable to the current index")),
-		OPT_BOOL(0, "cached", &cached,
+		OPT_BOOL(0, "cached", &state.cached,
 			N_("apply a patch without touching the working tree")),
-		OPT_BOOL(0, "unsafe-paths", &unsafe_paths,
+		OPT_BOOL(0, "unsafe-paths", &state.unsafe_paths,
 			N_("accept a patch that touches outside the working area")),
 		OPT_BOOL(0, "apply", &force_apply,
 			N_("also apply the patch (use with --stat/--summary/--check)")),
-		OPT_BOOL('3', "3way", &threeway,
+		OPT_BOOL('3', "3way", &state.threeway,
 			 N_( "attempt three-way merge if a patch does not apply")),
-		OPT_FILENAME(0, "build-fake-ancestor", &fake_ancestor,
+		OPT_FILENAME(0, "build-fake-ancestor", &state.fake_ancestor,
 			N_("build a temporary index based on embedded index information")),
 		/* Think twice before adding "--nul" synonym to this */
-		OPT_SET_INT('z', NULL, &line_termination,
+		OPT_SET_INT('z', NULL, &state.line_termination,
 			N_("paths are separated with NUL character"), '\0'),
-		OPT_INTEGER('C', NULL, &p_context,
+		OPT_INTEGER('C', NULL, &state.p_context,
 				N_("ensure at least <n> lines of context match")),
-		{ OPTION_CALLBACK, 0, "whitespace", &whitespace_option, N_("action"),
+		{ OPTION_CALLBACK, 0, "whitespace", &state, N_("action"),
 			N_("detect new or modified lines that have whitespace errors"),
 			0, option_parse_whitespace },
-		{ OPTION_CALLBACK, 0, "ignore-space-change", NULL, NULL,
+		{ OPTION_CALLBACK, 0, "ignore-space-change", &state, NULL,
 			N_("ignore changes in whitespace when finding context"),
 			PARSE_OPT_NOARG, option_parse_space_change },
-		{ OPTION_CALLBACK, 0, "ignore-whitespace", NULL, NULL,
+		{ OPTION_CALLBACK, 0, "ignore-whitespace", &state, NULL,
 			N_("ignore changes in whitespace when finding context"),
 			PARSE_OPT_NOARG, option_parse_space_change },
-		OPT_BOOL('R', "reverse", &apply_in_reverse,
+		OPT_BOOL('R', "reverse", &state.apply_in_reverse,
 			N_("apply the patch in reverse")),
-		OPT_BOOL(0, "unidiff-zero", &unidiff_zero,
+		OPT_BOOL(0, "unidiff-zero", &state.unidiff_zero,
 			N_("don't expect at least one line of context")),
-		OPT_BOOL(0, "reject", &apply_with_reject,
+		OPT_BOOL(0, "reject", &state.apply_with_reject,
 			N_("leave the rejected hunks in corresponding *.rej files")),
-		OPT_BOOL(0, "allow-overlap", &allow_overlap,
+		OPT_BOOL(0, "allow-overlap", &state.allow_overlap,
 			N_("allow overlapping hunks")),
-		OPT__VERBOSE(&apply_verbosely, N_("be verbose")),
+		OPT__VERBOSE(&state.apply_verbosely, N_("be verbose")),
 		OPT_BIT(0, "inaccurate-eof", &options,
 			N_("tolerate incorrectly detected missing new-line at the end of file"),
 			INACCURATE_EOF),
 		OPT_BIT(0, "recount", &options,
 			N_("do not trust the line counts in the hunk headers"),
 			RECOUNT),
-		{ OPTION_CALLBACK, 0, "directory", NULL, N_("root"),
+		{ OPTION_CALLBACK, 0, "directory", &state, N_("root"),
 			N_("prepend <root> to all filenames"),
 			0, option_parse_directory },
 		OPT_END()
 	};
 
-	prefix = prefix_;
-	prefix_length = prefix ? strlen(prefix) : 0;
-	git_apply_config();
-	if (apply_default_whitespace)
-		parse_whitespace_option(apply_default_whitespace);
-	if (apply_default_ignorewhitespace)
-		parse_ignorewhitespace_option(apply_default_ignorewhitespace);
+	init_apply_state(&state, prefix, &lock_file);
 
-	argc = parse_options(argc, argv, prefix, builtin_apply_options,
+	argc = parse_options(argc, argv, state.prefix, builtin_apply_options,
 			apply_usage, 0);
 
-	if (apply_with_reject && threeway)
-		die("--reject and --3way cannot be used together.");
-	if (cached && threeway)
-		die("--cached and --3way cannot be used together.");
-	if (threeway) {
-		if (is_not_gitdir)
-			die(_("--3way outside a repository"));
-		check_index = 1;
-	}
-	if (apply_with_reject)
-		apply = apply_verbosely = 1;
-	if (!force_apply && (diffstat || numstat || summary || check || fake_ancestor))
-		apply = 0;
-	if (check_index && is_not_gitdir)
-		die(_("--index outside a repository"));
-	if (cached) {
-		if (is_not_gitdir)
-			die(_("--cached outside a repository"));
-		check_index = 1;
-	}
-	if (check_index)
-		unsafe_paths = 0;
+	check_apply_state(&state, force_apply);
 
-	for (i = 0; i < argc; i++) {
-		const char *arg = argv[i];
-		int fd;
+	ret = apply_all_patches(&state, argc, argv, options);
 
-		if (!strcmp(arg, "-")) {
-			errs |= apply_patch(0, "<stdin>", options);
-			read_stdin = 0;
-			continue;
-		} else if (0 < prefix_length)
-			arg = prefix_filename(prefix, prefix_length, arg);
+	clear_apply_state(&state);
 
-		fd = open(arg, O_RDONLY);
-		if (fd < 0)
-			die_errno(_("can't open patch '%s'"), arg);
-		read_stdin = 0;
-		set_default_whitespace_mode(whitespace_option);
-		errs |= apply_patch(fd, arg, options);
-		close(fd);
-	}
-	set_default_whitespace_mode(whitespace_option);
-	if (read_stdin)
-		errs |= apply_patch(0, "<stdin>", options);
-	if (whitespace_error) {
-		if (squelch_whitespace_errors &&
-		    squelch_whitespace_errors < whitespace_error) {
-			int squelched =
-				whitespace_error - squelch_whitespace_errors;
-			warning(Q_("squelched %d whitespace error",
-				   "squelched %d whitespace errors",
-				   squelched),
-				squelched);
-		}
-		if (ws_error_action == die_on_ws_error)
-			die(Q_("%d line adds whitespace errors.",
-			       "%d lines add whitespace errors.",
-			       whitespace_error),
-			    whitespace_error);
-		if (applied_after_fixing_ws && apply)
-			warning("%d line%s applied after"
-				" fixing whitespace errors.",
-				applied_after_fixing_ws,
-				applied_after_fixing_ws == 1 ? "" : "s");
-		else if (whitespace_error)
-			warning(Q_("%d line adds whitespace errors.",
-				   "%d lines add whitespace errors.",
-				   whitespace_error),
-				whitespace_error);
-	}
-
-	if (update_index) {
-		if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
-			die(_("Unable to write new index file"));
-	}
-
-	return !!errs;
+	return ret;
 }
diff --git a/builtin/blame.c b/builtin/blame.c
index 21f42b0b62..7ec7823430 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -56,7 +56,7 @@ static int show_progress;
 static struct date_mode blame_date_mode = { DATE_ISO8601 };
 static size_t blame_date_width;
 
-static struct string_list mailmap;
+static struct string_list mailmap = STRING_LIST_INIT_NODUP;
 
 #ifndef DEBUG
 #define DEBUG 0
@@ -134,7 +134,7 @@ struct progress_info {
 	int blamed_lines;
 };
 
-static int diff_hunks(mmfile_t *file_a, mmfile_t *file_b, long ctxlen,
+static int diff_hunks(mmfile_t *file_a, mmfile_t *file_b,
 		      xdl_emit_hunk_consume_func_t hunk_func, void *cb_data)
 {
 	xpparam_t xpp = {0};
@@ -142,7 +142,6 @@ static int diff_hunks(mmfile_t *file_a, mmfile_t *file_b, long ctxlen,
 	xdemitcb_t ecb = {NULL};
 
 	xpp.flags = xdl_opts;
-	xecfg.ctxlen = ctxlen;
 	xecfg.hunk_func = hunk_func;
 	ecb.priv = cb_data;
 	return xdi_diff(file_a, file_b, &xpp, &xecfg, &ecb);
@@ -599,7 +598,7 @@ static struct origin *find_origin(struct scoreboard *sb,
 			    p->status);
 		case 'M':
 			porigin = get_origin(sb, parent, origin->path);
-			hashcpy(porigin->blob_sha1, p->one->sha1);
+			hashcpy(porigin->blob_sha1, p->one->oid.hash);
 			porigin->mode = p->one->mode;
 			break;
 		case 'A':
@@ -609,7 +608,7 @@ static struct origin *find_origin(struct scoreboard *sb,
 		}
 	}
 	diff_flush(&diff_opts);
-	free_pathspec(&diff_opts.pathspec);
+	clear_pathspec(&diff_opts.pathspec);
 	return porigin;
 }
 
@@ -645,13 +644,13 @@ static struct origin *find_rename(struct scoreboard *sb,
 		if ((p->status == 'R' || p->status == 'C') &&
 		    !strcmp(p->two->path, origin->path)) {
 			porigin = get_origin(sb, parent, p->one->path);
-			hashcpy(porigin->blob_sha1, p->one->sha1);
+			hashcpy(porigin->blob_sha1, p->one->oid.hash);
 			porigin->mode = p->one->mode;
 			break;
 		}
 	}
 	diff_flush(&diff_opts);
-	free_pathspec(&diff_opts.pathspec);
+	clear_pathspec(&diff_opts.pathspec);
 	return porigin;
 }
 
@@ -980,7 +979,7 @@ static void pass_blame_to_parent(struct scoreboard *sb,
 	fill_origin_blob(&sb->revs->diffopt, target, &file_o);
 	num_get_patch++;
 
-	if (diff_hunks(&file_p, &file_o, 0, blame_chunk_cb, &d))
+	if (diff_hunks(&file_p, &file_o, blame_chunk_cb, &d))
 		die("unable to generate diff (%s -> %s)",
 		    oid_to_hex(&parent->commit->object.oid),
 		    oid_to_hex(&target->commit->object.oid));
@@ -1129,7 +1128,7 @@ static void find_copy_in_blob(struct scoreboard *sb,
 	 * file_p partially may match that image.
 	 */
 	memset(split, 0, sizeof(struct blame_entry [3]));
-	if (diff_hunks(file_p, &file_o, 1, handle_split_cb, &d))
+	if (diff_hunks(file_p, &file_o, handle_split_cb, &d))
 		die("unable to generate diff (%s)",
 		    oid_to_hex(&parent->commit->object.oid));
 	/* remainder, if any, all match the preimage */
@@ -1309,7 +1308,7 @@ static void find_copy_in_parent(struct scoreboard *sb,
 				continue;
 
 			norigin = get_origin(sb, parent, p->one->path);
-			hashcpy(norigin->blob_sha1, p->one->sha1);
+			hashcpy(norigin->blob_sha1, p->one->oid.hash);
 			norigin->mode = p->one->mode;
 			fill_origin_blob(&sb->revs->diffopt, norigin, &file_p);
 			if (!file_p.ptr)
@@ -1343,7 +1342,7 @@ static void find_copy_in_parent(struct scoreboard *sb,
 	} while (unblamed);
 	target->suspects = reverse_blame(leftover, NULL);
 	diff_flush(&diff_opts);
-	free_pathspec(&diff_opts.pathspec);
+	clear_pathspec(&diff_opts.pathspec);
 }
 
 /*
@@ -2230,6 +2229,7 @@ static int git_blame_config(const char *var, const char *value, void *cb)
 static void verify_working_tree_path(struct commit *work_tree, const char *path)
 {
 	struct commit_list *parents;
+	int pos;
 
 	for (parents = work_tree->parents; parents; parents = parents->next) {
 		const unsigned char *commit_sha1 = parents->item->object.oid.hash;
@@ -2240,7 +2240,14 @@ static void verify_working_tree_path(struct commit *work_tree, const char *path)
 		    sha1_object_info(blob_sha1, NULL) == OBJ_BLOB)
 			return;
 	}
-	die("no such path '%s' in HEAD", path);
+
+	pos = cache_name_pos(path, strlen(path));
+	if (pos >= 0)
+		; /* path is in the index */
+	else if (!strcmp(active_cache[-1 - pos]->name, path))
+		; /* path is in the index, unmerged */
+	else
+		die("no such path '%s' in HEAD", path);
 }
 
 static struct commit_list **append_parent(struct commit_list **tail, const unsigned char *sha1)
@@ -2425,8 +2432,7 @@ static struct commit *find_single_final(struct rev_info *revs,
 		struct object *obj = revs->pending.objects[i].item;
 		if (obj->flags & UNINTERESTING)
 			continue;
-		while (obj->type == OBJ_TAG)
-			obj = deref_tag(obj, NULL, 0);
+		obj = deref_tag(obj, NULL, 0);
 		if (obj->type != OBJ_COMMIT)
 			die("Non commit %s?", revs->pending.objects[i].name);
 		if (found)
@@ -2461,8 +2467,7 @@ static char *prepare_initial(struct scoreboard *sb)
 		struct object *obj = revs->pending.objects[i].item;
 		if (!(obj->flags & UNINTERESTING))
 			continue;
-		while (obj->type == OBJ_TAG)
-			obj = deref_tag(obj, NULL, 0);
+		obj = deref_tag(obj, NULL, 0);
 		if (obj->type != OBJ_COMMIT)
 			die("Non commit %s?", revs->pending.objects[i].name);
 		if (sb->final)
@@ -2522,12 +2527,12 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 	enum object_type type;
 	struct commit *final_commit = NULL;
 
-	static struct string_list range_list;
-	static int output_option = 0, opt = 0;
-	static int show_stats = 0;
-	static const char *revs_file = NULL;
-	static const char *contents_from = NULL;
-	static const struct option options[] = {
+	struct string_list range_list = STRING_LIST_INIT_NODUP;
+	int output_option = 0, opt = 0;
+	int show_stats = 0;
+	const char *revs_file = NULL;
+	const char *contents_from = NULL;
+	const struct option options[] = {
 		OPT_BOOL(0, "incremental", &incremental, N_("Show blame entries as we find them, incrementally")),
 		OPT_BOOL('b', NULL, &blank_boundary, N_("Show blank SHA-1 for boundary commits (Default: off)")),
 		OPT_BOOL(0, "root", &show_root, N_("Do not treat root commits as boundaries (Default: off)")),
@@ -2628,6 +2633,9 @@ parse_done:
 	case DATE_RAW:
 		blame_date_width = sizeof("1161298804 -0700");
 		break;
+	case DATE_UNIX:
+		blame_date_width = sizeof("1161298804");
+		break;
 	case DATE_SHORT:
 		blame_date_width = sizeof("2006-10-19");
 		break;
@@ -2800,7 +2808,7 @@ parse_done:
 	lno = prepare_lines(&sb);
 
 	if (lno && !range_list.nr)
-		string_list_append(&range_list, xstrdup("1"));
+		string_list_append(&range_list, "1");
 
 	anchor = 1;
 	range_set_init(&ranges, range_list.nr);
diff --git a/builtin/branch.c b/builtin/branch.c
index 37af77161e..7df05437f1 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -212,7 +212,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
 			die(_("Couldn't look up commit object for HEAD"));
 	}
 	for (i = 0; i < argc; i++, strbuf_release(&bname)) {
-		const char *target;
+		char *target = NULL;
 		int flags = 0;
 
 		strbuf_branchname(&bname, argv[i]);
@@ -220,22 +220,22 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
 		name = mkpathdup(fmt, bname.buf);
 
 		if (kinds == FILTER_REFS_BRANCHES) {
-			char *worktree = find_shared_symref("HEAD", name);
-			if (worktree) {
+			const struct worktree *wt =
+				find_shared_symref("HEAD", name);
+			if (wt) {
 				error(_("Cannot delete branch '%s' "
 					"checked out at '%s'"),
-				      bname.buf, worktree);
-				free(worktree);
+				      bname.buf, wt->path);
 				ret = 1;
 				continue;
 			}
 		}
 
-		target = resolve_ref_unsafe(name,
-					    RESOLVE_REF_READING
-					    | RESOLVE_REF_NO_RECURSE
-					    | RESOLVE_REF_ALLOW_BAD_NAME,
-					    sha1, &flags);
+		target = resolve_refdup(name,
+					RESOLVE_REF_READING
+					| RESOLVE_REF_NO_RECURSE
+					| RESOLVE_REF_ALLOW_BAD_NAME,
+					sha1, &flags);
 		if (!target) {
 			error(remote_branch
 			      ? _("remote-tracking branch '%s' not found.")
@@ -248,7 +248,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
 		    check_branch_commit(bname.buf, name, sha1, head_rev, kinds,
 					force)) {
 			ret = 1;
-			continue;
+			goto next;
 		}
 
 		if (delete_ref(name, is_null_sha1(sha1) ? NULL : sha1,
@@ -258,7 +258,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
 			      : _("Error deleting branch '%s'"),
 			      bname.buf);
 			ret = 1;
-			continue;
+			goto next;
 		}
 		if (!quiet) {
 			printf(remote_branch
@@ -270,6 +270,9 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
 			       : find_unique_abbrev(sha1, DEFAULT_ABBREV));
 		}
 		delete_branch_config(bname.buf);
+
+	next:
+		free(target);
 	}
 
 	free(name);
@@ -526,6 +529,29 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin
 	ref_array_clear(&array);
 }
 
+static void reject_rebase_or_bisect_branch(const char *target)
+{
+	struct worktree **worktrees = get_worktrees();
+	int i;
+
+	for (i = 0; worktrees[i]; i++) {
+		struct worktree *wt = worktrees[i];
+
+		if (!wt->is_detached)
+			continue;
+
+		if (is_worktree_being_rebased(wt, target))
+			die(_("Branch %s is being rebased at %s"),
+			    target, wt->path);
+
+		if (is_worktree_being_bisected(wt, target))
+			die(_("Branch %s is being bisected at %s"),
+			    target, wt->path);
+	}
+
+	free_worktrees(worktrees);
+}
+
 static void rename_branch(const char *oldname, const char *newname, int force)
 {
 	struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
@@ -555,6 +581,8 @@ static void rename_branch(const char *oldname, const char *newname, int force)
 
 	validate_new_branchname(newname, &newref, force, clobber_head_ok);
 
+	reject_rebase_or_bisect_branch(oldref.buf);
+
 	strbuf_addf(&logmsg, "Branch: renamed %s to %s",
 		 oldref.buf, newref.buf);
 
@@ -589,15 +617,11 @@ static int edit_branch_description(const char *branch_name)
 	if (!buf.len || buf.buf[buf.len-1] != '\n')
 		strbuf_addch(&buf, '\n');
 	strbuf_commented_addf(&buf,
-		    "Please edit the description for the branch\n"
-		    "  %s\n"
-		    "Lines starting with '%c' will be stripped.\n",
+		    _("Please edit the description for the branch\n"
+		      "  %s\n"
+		      "Lines starting with '%c' will be stripped.\n"),
 		    branch_name, comment_line_char);
-	if (write_file_gently(git_path(edit_description), "%s", buf.buf)) {
-		strbuf_release(&buf);
-		return error(_("could not write branch description template: %s"),
-			     strerror(errno));
-	}
+	write_file_buf(git_path(edit_description), buf.buf, buf.len);
 	strbuf_reset(&buf);
 	if (launch_editor(git_path(edit_description), &buf, NULL)) {
 		strbuf_release(&buf);
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 54db1184a0..2dfe6265f7 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -131,7 +131,7 @@ struct expand_data {
 	unsigned char sha1[20];
 	enum object_type type;
 	unsigned long size;
-	unsigned long disk_size;
+	off_t disk_size;
 	const char *rest;
 	unsigned char delta_base_sha1[20];
 
@@ -154,6 +154,13 @@ struct expand_data {
 	 * elements above, so you can retrieve the response from there.
 	 */
 	struct object_info info;
+
+	/*
+	 * This flag will be true if the requested batch format and options
+	 * don't require us to call sha1_object_info, which can then be
+	 * optimized out.
+	 */
+	unsigned skip_object_info : 1;
 };
 
 static int is_atom(const char *atom, const char *s, int slen)
@@ -184,7 +191,7 @@ static void expand_atom(struct strbuf *sb, const char *atom, int len,
 		if (data->mark_query)
 			data->info.disk_sizep = &data->disk_size;
 		else
-			strbuf_addf(sb, "%lu", data->disk_size);
+			strbuf_addf(sb, "%"PRIuMAX, (uintmax_t)data->disk_size);
 	} else if (is_atom("rest", atom, len)) {
 		if (data->mark_query)
 			data->split_on_whitespace = 1;
@@ -258,7 +265,8 @@ static void batch_object_write(const char *obj_name, struct batch_options *opt,
 {
 	struct strbuf buf = STRBUF_INIT;
 
-	if (sha1_object_info_extended(data->sha1, &data->info, LOOKUP_REPLACE_OBJECT) < 0) {
+	if (!data->skip_object_info &&
+	    sha1_object_info_extended(data->sha1, &data->info, LOOKUP_REPLACE_OBJECT) < 0) {
 		printf("%s missing\n", obj_name ? obj_name : sha1_to_hex(data->sha1));
 		fflush(stdout);
 		return;
@@ -369,6 +377,13 @@ static int batch_objects(struct batch_options *opt)
 	strbuf_expand(&buf, opt->format, expand_format, &data);
 	data.mark_query = 0;
 
+	if (opt->all_objects) {
+		struct object_info empty;
+		memset(&empty, 0, sizeof(empty));
+		if (!memcmp(&data.info, &empty, sizeof(empty)))
+			data.skip_object_info = 1;
+	}
+
 	/*
 	 * If we are printing out the object, then always fill in the type,
 	 * since we will want to decide whether or not to stream.
@@ -489,6 +504,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
 
 	git_config(git_cat_file_config, NULL);
 
+	batch.buffer_output = -1;
 	argc = parse_options(argc, argv, prefix, options, cat_file_usage, 0);
 
 	if (opt) {
@@ -512,6 +528,9 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
 		usage_with_options(cat_file_usage, options);
 	}
 
+	if (batch.buffer_output < 0)
+		batch.buffer_output = batch.all_objects;
+
 	if (batch.enabled)
 		return batch_objects(&batch);
 
diff --git a/builtin/checkout.c b/builtin/checkout.c
index efcbd8f6b5..4866111522 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -242,7 +242,6 @@ static int checkout_paths(const struct checkout_opts *opts,
 	struct checkout state;
 	static char *ps_matched;
 	unsigned char rev[20];
-	int flag;
 	struct commit *head;
 	int errs = 0;
 	struct lock_file *lock_file;
@@ -277,7 +276,7 @@ static int checkout_paths(const struct checkout_opts *opts,
 
 	hold_locked_index(lock_file, 1);
 	if (read_cache_preload(&opts->pathspec) < 0)
-		return error(_("corrupt index file"));
+		return error(_("index file corrupt"));
 
 	if (opts->source_tree)
 		read_tree_some(opts->source_tree, &opts->pathspec);
@@ -375,7 +374,7 @@ static int checkout_paths(const struct checkout_opts *opts,
 	if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
 		die(_("unable to write new index file"));
 
-	read_ref_full("HEAD", 0, rev, &flag);
+	read_ref_full("HEAD", 0, rev, NULL);
 	head = lookup_commit_reference_gently(rev, 1);
 
 	errs |= post_checkout_hook(head, head, 0);
@@ -471,7 +470,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
 
 	hold_locked_index(lock_file, 1);
 	if (read_cache_preload(NULL) < 0)
-		return error(_("corrupt index file"));
+		return error(_("index file corrupt"));
 
 	resolve_undo_clear();
 	if (opts->force) {
@@ -549,7 +548,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
 			 * entries in the index.
 			 */
 
-			add_files_to_cache(NULL, NULL, 0);
+			add_files_to_cache(NULL, NULL, 0, 0);
 			/*
 			 * NEEDSWORK: carrying over local changes
 			 * when branches have different end-of-line
@@ -568,10 +567,13 @@ static int merge_working_tree(const struct checkout_opts *opts,
 			o.ancestor = old->name;
 			o.branch1 = new->name;
 			o.branch2 = "local";
-			merge_trees(&o, new->commit->tree, work,
+			ret = merge_trees(&o, new->commit->tree, work,
 				old->commit->tree, &result);
+			if (ret < 0)
+				exit(128);
 			ret = reset_tree(new->commit->tree, opts, 0,
 					 writeout_error);
+			strbuf_release(&o.obuf);
 			if (ret)
 				return ret;
 		}
@@ -704,8 +706,7 @@ static int add_pending_uninteresting_ref(const char *refname,
 static void describe_one_orphan(struct strbuf *sb, struct commit *commit)
 {
 	strbuf_addstr(sb, "  ");
-	strbuf_addstr(sb,
-		find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV));
+	strbuf_add_unique_abbrev(sb, commit->object.oid.hash, DEFAULT_ABBREV);
 	strbuf_addch(sb, ' ');
 	if (!parse_commit(commit))
 		pp_commit_easy(CMIT_FMT_ONELINE, commit, sb);
@@ -1111,7 +1112,7 @@ static int checkout_branch(struct checkout_opts *opts,
 		char *head_ref = resolve_refdup("HEAD", 0, sha1, &flag);
 		if (head_ref &&
 		    (!(flag & REF_ISSYMREF) || strcmp(head_ref, new->path)))
-			die_if_checked_out(new->path);
+			die_if_checked_out(new->path, 1);
 		free(head_ref);
 	}
 
@@ -1139,7 +1140,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
 		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 the HEAD at named commit")),
+		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")),
diff --git a/builtin/clone.c b/builtin/clone.c
index 661639255c..f044a8c27f 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -40,6 +40,7 @@ static const char * const builtin_clone_usage[] = {
 
 static int option_no_checkout, option_bare, option_mirror, option_single_branch = -1;
 static int option_local = -1, option_no_hardlinks, option_shared, option_recursive;
+static int option_shallow_submodules;
 static char *option_template, *option_depth;
 static char *option_origin = NULL;
 static char *option_branch = NULL;
@@ -48,9 +49,10 @@ static char *option_upload_pack = "git-upload-pack";
 static int option_verbosity;
 static int option_progress = -1;
 static enum transport_family family;
-static struct string_list option_config;
-static struct string_list option_reference;
+static struct string_list option_config = STRING_LIST_INIT_NODUP;
+static struct string_list option_reference = STRING_LIST_INIT_NODUP;
 static int option_dissociate;
+static int max_jobs = -1;
 
 static struct option builtin_clone_options[] = {
 	OPT__VERBOSITY(&option_verbosity),
@@ -73,6 +75,8 @@ static struct option builtin_clone_options[] = {
 		    N_("initialize submodules in the clone")),
 	OPT_BOOL(0, "recurse-submodules", &option_recursive,
 		    N_("initialize submodules in the clone")),
+	OPT_INTEGER('j', "jobs", &max_jobs,
+		    N_("number of submodules cloned in parallel")),
 	OPT_STRING(0, "template", &option_template, N_("template-directory"),
 		   N_("directory from which templates will be used")),
 	OPT_STRING_LIST(0, "reference", &option_reference, N_("repo"),
@@ -89,6 +93,8 @@ static struct option builtin_clone_options[] = {
 		    N_("create a shallow clone of that depth")),
 	OPT_BOOL(0, "single-branch", &option_single_branch,
 		    N_("clone only one branch, HEAD or --branch")),
+	OPT_BOOL(0, "shallow-submodules", &option_shallow_submodules,
+		    N_("any cloned submodules will be shallow")),
 	OPT_STRING(0, "separate-git-dir", &real_git_dir, N_("gitdir"),
 		   N_("separate git dir from working tree")),
 	OPT_STRING_LIST('c', "config", &option_config, N_("key=value"),
@@ -100,10 +106,6 @@ static struct option builtin_clone_options[] = {
 	OPT_END()
 };
 
-static const char *argv_submodule[] = {
-	"submodule", "update", "--init", "--recursive", NULL
-};
-
 static const char *get_repo_path_1(struct strbuf *path, int *is_bundle)
 {
 	static char *suffix[] = { "/.git", "", ".git/.git", ".git" };
@@ -622,13 +624,13 @@ static void update_remote_refs(const struct ref *refs,
 	const struct ref *rm = mapped_refs;
 
 	if (check_connectivity) {
-		if (transport->progress)
-			fprintf(stderr, _("Checking connectivity... "));
-		if (check_everything_connected_with_transport(iterate_ref_map,
-							      0, &rm, transport))
+		struct check_connected_options opt = CHECK_CONNECTED_INIT;
+
+		opt.transport = transport;
+		opt.progress = transport->progress;
+
+		if (check_connected(iterate_ref_map, &rm, &opt))
 			die(_("remote did not send all necessary objects"));
-		if (transport->progress)
-			fprintf(stderr, _("done.\n"));
 	}
 
 	if (refs) {
@@ -732,8 +734,19 @@ static int checkout(void)
 	err |= run_hook_le(NULL, "post-checkout", sha1_to_hex(null_sha1),
 			   sha1_to_hex(sha1), "1", NULL);
 
-	if (!err && option_recursive)
-		err = run_command_v_opt(argv_submodule, RUN_GIT_CMD);
+	if (!err && option_recursive) {
+		struct argv_array args = ARGV_ARRAY_INIT;
+		argv_array_pushl(&args, "submodule", "update", "--init", "--recursive", NULL);
+
+		if (option_shallow_submodules == 1)
+			argv_array_push(&args, "--depth=1");
+
+		if (max_jobs != -1)
+			argv_array_pushf(&args, "--jobs=%d", max_jobs);
+
+		err = run_command_v_opt(args.argv, RUN_GIT_CMD);
+		argv_array_clear(&args);
+	}
 
 	return err;
 }
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index 3feeffeab1..8a674bc9e7 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -33,10 +33,6 @@ static int commit_tree_config(const char *var, const char *value, void *cb)
 	int status = git_gpg_config(var, value, NULL);
 	if (status)
 		return status;
-	if (!strcmp(var, "commit.gpgsign")) {
-		sign_commit = git_config_bool(var, value) ? "" : NULL;
-		return 0;
-	}
 	return git_default_config(var, value, cb);
 }
 
diff --git a/builtin/commit.c b/builtin/commit.c
index e13303787a..77e3dc8494 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -92,8 +92,9 @@ N_("If you wish to skip this commit, use:\n"
 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
 "the remaining commits.\n");
 
+static GIT_PATH_FUNC(git_path_commit_editmsg, "COMMIT_EDITMSG")
+
 static const char *use_message_buffer;
-static const char commit_editmsg[] = "COMMIT_EDITMSG";
 static struct lock_file index_lock; /* real index */
 static struct lock_file false_lock; /* used only for partial commits */
 static enum {
@@ -114,6 +115,7 @@ static char *fixup_message, *squash_message;
 static int all, also, interactive, patch_interactive, only, amend, signoff;
 static int edit_flag = -1; /* unspecified */
 static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
+static int config_commit_verbose = -1; /* unspecified */
 static int no_post_rewrite, allow_empty_message;
 static char *untracked_files_arg, *force_date, *ignore_submodule_arg;
 static char *sign_commit;
@@ -186,6 +188,7 @@ static void status_init_config(struct wt_status *s, config_fn_t fn)
 	gitmodules_config();
 	git_config(fn, s);
 	determine_whence(s);
+	init_diff_ui_defaults();
 	s->hints = advice_status_hints; /* must come after git_config() */
 }
 
@@ -384,7 +387,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
 	 */
 	if (all || (also && pathspec.nr)) {
 		hold_locked_index(&index_lock, 1);
-		add_files_to_cache(also ? prefix : NULL, &pathspec, 0);
+		add_files_to_cache(also ? prefix : NULL, &pathspec, 0, 0);
 		refresh_cache_or_die(refresh_flags);
 		update_main_cache_tree(WRITE_TREE_SILENT);
 		if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK))
@@ -712,7 +715,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 		char *buffer;
 		buffer = strstr(use_message_buffer, "\n\n");
 		if (buffer)
-			strbuf_addstr(&sb, buffer + 2);
+			strbuf_addstr(&sb, skip_blank_lines(buffer + 2));
 		hook_arg1 = "commit";
 		hook_arg2 = use_message;
 	} else if (fixup_message) {
@@ -770,9 +773,9 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 		hook_arg2 = "";
 	}
 
-	s->fp = fopen_for_writing(git_path(commit_editmsg));
+	s->fp = fopen_for_writing(git_path_commit_editmsg());
 	if (s->fp == NULL)
-		die_errno(_("could not open '%s'"), git_path(commit_editmsg));
+		die_errno(_("could not open '%s'"), git_path_commit_editmsg());
 
 	/* Ignore status.displayCommentPrefix: we do need comments in COMMIT_EDITMSG. */
 	old_display_comment_prefix = s->display_comment_prefix;
@@ -949,7 +952,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 	}
 
 	if (run_commit_hook(use_editor, index_file, "prepare-commit-msg",
-			    git_path(commit_editmsg), hook_arg1, hook_arg2, NULL))
+			    git_path_commit_editmsg(), hook_arg1, hook_arg2, NULL))
 		return 0;
 
 	if (use_editor) {
@@ -957,7 +960,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 		const char *env[2] = { NULL };
 		env[0] =  index;
 		snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
-		if (launch_editor(git_path(commit_editmsg), NULL, env)) {
+		if (launch_editor(git_path_commit_editmsg(), NULL, env)) {
 			fprintf(stderr,
 			_("Please supply the message using either -m or -F option.\n"));
 			exit(1);
@@ -965,7 +968,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 	}
 
 	if (!no_verify &&
-	    run_commit_hook(use_editor, index_file, "commit-msg", git_path(commit_editmsg), NULL)) {
+	    run_commit_hook(use_editor, index_file, "commit-msg", git_path_commit_editmsg(), NULL)) {
 		return 0;
 	}
 
@@ -1514,6 +1517,11 @@ static int git_commit_config(const char *k, const char *v, void *cb)
 		sign_commit = git_config_bool(k, v) ? "" : NULL;
 		return 0;
 	}
+	if (!strcmp(k, "commit.verbose")) {
+		int is_bool;
+		config_commit_verbose = git_config_bool_or_int(k, v, &is_bool);
+		return 0;
+	}
 
 	status = git_gpg_config(k, v, NULL);
 	if (status)
@@ -1609,7 +1617,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		OPT_BOOL(0, "interactive", &interactive, N_("interactively add files")),
 		OPT_BOOL('p', "patch", &patch_interactive, N_("interactively add changes")),
 		OPT_BOOL('o', "only", &only, N_("commit only specified files")),
-		OPT_BOOL('n', "no-verify", &no_verify, N_("bypass pre-commit hook")),
+		OPT_BOOL('n', "no-verify", &no_verify, N_("bypass pre-commit and commit-msg hooks")),
 		OPT_BOOL(0, "dry-run", &dry_run, N_("show what would be committed")),
 		OPT_SET_INT(0, "short", &status_format, N_("show status concisely"),
 			    STATUS_FORMAT_SHORT),
@@ -1660,9 +1668,13 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		if (parse_commit(current_head))
 			die(_("could not parse HEAD commit"));
 	}
+	verbose = -1; /* unspecified */
 	argc = parse_and_validate_options(argc, argv, builtin_commit_options,
 					  builtin_commit_usage,
 					  prefix, current_head, &s);
+	if (verbose == -1)
+		verbose = (config_commit_verbose < 0) ? 0 : config_commit_verbose;
+
 	if (dry_run)
 		return dry_run_commit(argc, argv, prefix, current_head, &s);
 	index_file = prepare_index(argc, argv, prefix, current_head, 0);
@@ -1727,7 +1739,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 
 	/* Finally, get the commit message */
 	strbuf_reset(&sb);
-	if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) {
+	if (strbuf_read_file(&sb, git_path_commit_editmsg(), 0) < 0) {
 		int saved_errno = errno;
 		rollback_index_files();
 		die(_("could not read commit message: %s"), strerror(saved_errno));
diff --git a/builtin/config.c b/builtin/config.c
index 1d7c6ef558..6cbf73369b 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -25,7 +25,6 @@ static char term = '\n';
 static int use_global_config, use_system_config, use_local_config;
 static struct git_config_source given_config_source;
 static int actions, types;
-static const char *get_color_slot, *get_colorbool_slot;
 static int end_null;
 static int respect_includes = -1;
 static int show_origin;
@@ -604,7 +603,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 				      given_config_source.file : git_path("config"));
 		if (use_global_config) {
 			int fd = open(config_file, O_CREAT | O_EXCL | O_WRONLY, 0666);
-			if (fd) {
+			if (fd >= 0) {
 				char *content = default_user_config();
 				write_str_in_full(fd, content);
 				free(content);
diff --git a/builtin/diff.c b/builtin/diff.c
index d6b8f9834d..b7a9405d9f 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -318,6 +318,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 
 	if (!no_index)
 		gitmodules_config();
+	init_diff_ui_defaults();
 	git_config(git_diff_ui_config, NULL);
 	precompose_argv(argc, argv);
 
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 8164b581a6..c0652a7ed0 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -368,7 +368,7 @@ static void show_filemodify(struct diff_queue_struct *q,
 			print_path(spec->path);
 			putchar('\n');
 
-			if (!hashcmp(ospec->sha1, spec->sha1) &&
+			if (!oidcmp(&ospec->oid, &spec->oid) &&
 			    ospec->mode == spec->mode)
 				break;
 			/* fallthrough */
@@ -383,10 +383,10 @@ static void show_filemodify(struct diff_queue_struct *q,
 			if (no_data || S_ISGITLINK(spec->mode))
 				printf("M %06o %s ", spec->mode,
 				       sha1_to_hex(anonymize ?
-						   anonymize_sha1(spec->sha1) :
-						   spec->sha1));
+						   anonymize_sha1(spec->oid.hash) :
+						   spec->oid.hash));
 			else {
-				struct object *object = lookup_object(spec->sha1);
+				struct object *object = lookup_object(spec->oid.hash);
 				printf("M %06o :%d ", spec->mode,
 				       get_object_mark(object));
 			}
@@ -572,7 +572,7 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
 	/* Export the referenced blobs, and remember the marks. */
 	for (i = 0; i < diff_queued_diff.nr; i++)
 		if (!S_ISGITLINK(diff_queued_diff.queue[i]->two->mode))
-			export_blob(diff_queued_diff.queue[i]->two->sha1);
+			export_blob(diff_queued_diff.queue[i]->two->oid.hash);
 
 	refname = commit->util;
 	if (anonymize) {
diff --git a/builtin/fetch.c b/builtin/fetch.c
index e4639d8eb1..164623bb6f 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -15,6 +15,7 @@
 #include "submodule.h"
 #include "connected.h"
 #include "argv-array.h"
+#include "utf8.h"
 
 static const char * const builtin_fetch_usage[] = {
 	N_("git fetch [<options>] [<repository> [<refspec>...]]"),
@@ -37,7 +38,7 @@ static int prune = -1; /* unspecified */
 static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity;
 static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
 static int tags = TAGS_DEFAULT, unshallow, update_shallow;
-static int max_children = 1;
+static int max_children = -1;
 static enum transport_family family;
 static const char *depth;
 static const char *upload_pack;
@@ -449,7 +450,132 @@ fail:
 			   : STORE_REF_ERROR_OTHER;
 }
 
-#define REFCOL_WIDTH  10
+static int refcol_width = 10;
+static int compact_format;
+
+static void adjust_refcol_width(const struct ref *ref)
+{
+	int max, rlen, llen, len;
+
+	/* uptodate lines are only shown on high verbosity level */
+	if (!verbosity && !oidcmp(&ref->peer_ref->old_oid, &ref->old_oid))
+		return;
+
+	max    = term_columns();
+	rlen   = utf8_strwidth(prettify_refname(ref->name));
+
+	llen   = utf8_strwidth(prettify_refname(ref->peer_ref->name));
+
+	/*
+	 * rough estimation to see if the output line is too long and
+	 * should not be counted (we can't do precise calculation
+	 * anyway because we don't know if the error explanation part
+	 * will be printed in update_local_ref)
+	 */
+	if (compact_format) {
+		llen = 0;
+		max = max * 2 / 3;
+	}
+	len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen;
+	if (len >= max)
+		return;
+
+	/*
+	 * Not precise calculation for compact mode because '*' can
+	 * appear on the left hand side of '->' and shrink the column
+	 * back.
+	 */
+	if (refcol_width < rlen)
+		refcol_width = rlen;
+}
+
+static void prepare_format_display(struct ref *ref_map)
+{
+	struct ref *rm;
+	const char *format = "full";
+
+	git_config_get_string_const("fetch.output", &format);
+	if (!strcasecmp(format, "full"))
+		compact_format = 0;
+	else if (!strcasecmp(format, "compact"))
+		compact_format = 1;
+	else
+		die(_("configuration fetch.output contains invalid value %s"),
+		    format);
+
+	for (rm = ref_map; rm; rm = rm->next) {
+		if (rm->status == REF_STATUS_REJECT_SHALLOW ||
+		    !rm->peer_ref ||
+		    !strcmp(rm->name, "HEAD"))
+			continue;
+
+		adjust_refcol_width(rm);
+	}
+}
+
+static void print_remote_to_local(struct strbuf *display,
+				  const char *remote, const char *local)
+{
+	strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local);
+}
+
+static int find_and_replace(struct strbuf *haystack,
+			    const char *needle,
+			    const char *placeholder)
+{
+	const char *p = strstr(haystack->buf, needle);
+	int plen, nlen;
+
+	if (!p)
+		return 0;
+
+	if (p > haystack->buf && p[-1] != '/')
+		return 0;
+
+	plen = strlen(p);
+	nlen = strlen(needle);
+	if (plen > nlen && p[nlen] != '/')
+		return 0;
+
+	strbuf_splice(haystack, p - haystack->buf, nlen,
+		      placeholder, strlen(placeholder));
+	return 1;
+}
+
+static void print_compact(struct strbuf *display,
+			  const char *remote, const char *local)
+{
+	struct strbuf r = STRBUF_INIT;
+	struct strbuf l = STRBUF_INIT;
+
+	if (!strcmp(remote, local)) {
+		strbuf_addf(display, "%-*s -> *", refcol_width, remote);
+		return;
+	}
+
+	strbuf_addstr(&r, remote);
+	strbuf_addstr(&l, local);
+
+	if (!find_and_replace(&r, local, "*"))
+		find_and_replace(&l, remote, "*");
+	print_remote_to_local(display, r.buf, l.buf);
+
+	strbuf_release(&r);
+	strbuf_release(&l);
+}
+
+static void format_display(struct strbuf *display, char code,
+			   const char *summary, const char *error,
+			   const char *remote, const char *local)
+{
+	strbuf_addf(display, "%c %-*s ", code, TRANSPORT_SUMMARY(summary));
+	if (!compact_format)
+		print_remote_to_local(display, remote, local);
+	else
+		print_compact(display, remote, local);
+	if (error)
+		strbuf_addf(display, "  (%s)", error);
+}
 
 static int update_local_ref(struct ref *ref,
 			    const char *remote,
@@ -467,9 +593,8 @@ static int update_local_ref(struct ref *ref,
 
 	if (!oidcmp(&ref->old_oid, &ref->new_oid)) {
 		if (verbosity > 0)
-			strbuf_addf(display, "= %-*s %-*s -> %s",
-				    TRANSPORT_SUMMARY(_("[up to date]")),
-				    REFCOL_WIDTH, remote, pretty_ref);
+			format_display(display, '=', _("[up to date]"), NULL,
+				       remote, pretty_ref);
 		return 0;
 	}
 
@@ -481,10 +606,9 @@ static int update_local_ref(struct ref *ref,
 		 * If this is the head, and it's not okay to update
 		 * the head, and the old value of the head isn't empty...
 		 */
-		strbuf_addf(display,
-			    _("! %-*s %-*s -> %s  (can't fetch in current branch)"),
-			    TRANSPORT_SUMMARY(_("[rejected]")),
-			    REFCOL_WIDTH, remote, pretty_ref);
+		format_display(display, '!', _("[rejected]"),
+			       _("can't fetch in current branch"),
+			       remote, pretty_ref);
 		return 1;
 	}
 
@@ -492,11 +616,9 @@ static int update_local_ref(struct ref *ref,
 	    starts_with(ref->name, "refs/tags/")) {
 		int r;
 		r = s_update_ref("updating tag", ref, 0);
-		strbuf_addf(display, "%c %-*s %-*s -> %s%s",
-			    r ? '!' : '-',
-			    TRANSPORT_SUMMARY(_("[tag update]")),
-			    REFCOL_WIDTH, remote, pretty_ref,
-			    r ? _("  (unable to update local ref)") : "");
+		format_display(display, r ? '!' : 't', _("[tag update]"),
+			       r ? _("unable to update local ref") : NULL,
+			       remote, pretty_ref);
 		return r;
 	}
 
@@ -527,11 +649,9 @@ static int update_local_ref(struct ref *ref,
 		    (recurse_submodules != RECURSE_SUBMODULES_ON))
 			check_for_new_submodule_commits(ref->new_oid.hash);
 		r = s_update_ref(msg, ref, 0);
-		strbuf_addf(display, "%c %-*s %-*s -> %s%s",
-			    r ? '!' : '*',
-			    TRANSPORT_SUMMARY(what),
-			    REFCOL_WIDTH, remote, pretty_ref,
-			    r ? _("  (unable to update local ref)") : "");
+		format_display(display, r ? '!' : '*', what,
+			       r ? _("unable to update local ref") : NULL,
+			       remote, pretty_ref);
 		return r;
 	}
 
@@ -545,11 +665,9 @@ static int update_local_ref(struct ref *ref,
 		    (recurse_submodules != RECURSE_SUBMODULES_ON))
 			check_for_new_submodule_commits(ref->new_oid.hash);
 		r = s_update_ref("fast-forward", ref, 1);
-		strbuf_addf(display, "%c %-*s %-*s -> %s%s",
-			    r ? '!' : ' ',
-			    TRANSPORT_SUMMARY_WIDTH, quickref.buf,
-			    REFCOL_WIDTH, remote, pretty_ref,
-			    r ? _("  (unable to update local ref)") : "");
+		format_display(display, r ? '!' : ' ', quickref.buf,
+			       r ? _("unable to update local ref") : NULL,
+			       remote, pretty_ref);
 		strbuf_release(&quickref);
 		return r;
 	} else if (force || ref->force) {
@@ -562,18 +680,14 @@ static int update_local_ref(struct ref *ref,
 		    (recurse_submodules != RECURSE_SUBMODULES_ON))
 			check_for_new_submodule_commits(ref->new_oid.hash);
 		r = s_update_ref("forced-update", ref, 1);
-		strbuf_addf(display, "%c %-*s %-*s -> %s  (%s)",
-			    r ? '!' : '+',
-			    TRANSPORT_SUMMARY_WIDTH, quickref.buf,
-			    REFCOL_WIDTH, remote, pretty_ref,
-			    r ? _("unable to update local ref") : _("forced update"));
+		format_display(display, r ? '!' : '+', quickref.buf,
+			       r ? _("unable to update local ref") : _("forced update"),
+			       remote, pretty_ref);
 		strbuf_release(&quickref);
 		return r;
 	} else {
-		strbuf_addf(display, "! %-*s %-*s -> %s  %s",
-			    TRANSPORT_SUMMARY(_("[rejected]")),
-			    REFCOL_WIDTH, remote, pretty_ref,
-			    _("(non-fast-forward)"));
+		format_display(display, '!', _("[rejected]"), _("non-fast-forward"),
+			       remote, pretty_ref);
 		return 1;
 	}
 }
@@ -607,7 +721,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 
 	fp = fopen(filename, "a");
 	if (!fp)
-		return error(_("cannot open %s: %s\n"), filename, strerror(errno));
+		return error_errno(_("cannot open %s"), filename);
 
 	if (raw_url)
 		url = transport_anonymize_url(raw_url);
@@ -615,11 +729,13 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 		url = xstrdup("foreign");
 
 	rm = ref_map;
-	if (check_everything_connected(iterate_ref_map, 0, &rm)) {
+	if (check_connected(iterate_ref_map, &rm, NULL)) {
 		rc = error(_("%s did not send all necessary objects\n"), url);
 		goto abort;
 	}
 
+	prepare_format_display(ref_map);
+
 	/*
 	 * We do a pass for each fetch_head_status type in their enum order, so
 	 * merged entries are written before not-for-merge. That lets readers
@@ -714,11 +830,10 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 				rc |= update_local_ref(ref, what, rm, &note);
 				free(ref);
 			} else
-				strbuf_addf(&note, "* %-*s %-*s -> FETCH_HEAD",
-					    TRANSPORT_SUMMARY_WIDTH,
-					    *kind ? kind : "branch",
-					    REFCOL_WIDTH,
-					    *what ? what : "HEAD");
+				format_display(&note, '*',
+					       *kind ? kind : "branch", NULL,
+					       *what ? what : "HEAD",
+					       "FETCH_HEAD");
 			if (note.len) {
 				if (verbosity >= 0 && !shown_url) {
 					fprintf(stderr, _("From %.*s\n"),
@@ -751,6 +866,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 static int quickfetch(struct ref *ref_map)
 {
 	struct ref *rm = ref_map;
+	struct check_connected_options opt = CHECK_CONNECTED_INIT;
 
 	/*
 	 * If we are deepening a shallow clone we already have these
@@ -761,7 +877,8 @@ static int quickfetch(struct ref *ref_map)
 	 */
 	if (depth)
 		return -1;
-	return check_everything_connected(iterate_ref_map, 1, &rm);
+	opt.quiet = 1;
+	return check_connected(iterate_ref_map, &rm, &opt);
 }
 
 static int fetch_refs(struct transport *transport, struct ref *ref_map)
@@ -806,19 +923,21 @@ static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map,
 		for (ref = stale_refs; ref; ref = ref->next)
 			string_list_append(&refnames, ref->name);
 
-		result = delete_refs(&refnames);
+		result = delete_refs(&refnames, 0);
 		string_list_clear(&refnames, 0);
 	}
 
 	if (verbosity >= 0) {
 		for (ref = stale_refs; ref; ref = ref->next) {
+			struct strbuf sb = STRBUF_INIT;
 			if (!shown_url) {
 				fprintf(stderr, _("From %.*s\n"), url_len, url);
 				shown_url = 1;
 			}
-			fprintf(stderr, " x %-*s %-*s -> %s\n",
-				TRANSPORT_SUMMARY(_("[deleted]")),
-				REFCOL_WIDTH, _("(none)"), prettify_refname(ref->name));
+			format_display(&sb, '-', _("[deleted]"), NULL,
+				       _("(none)"), prettify_refname(ref->name));
+			fprintf(stderr, " %s\n",sb.buf);
+			strbuf_release(&sb);
 			warn_dangling_symref(stderr, dangling_msg, ref->name);
 		}
 	}
@@ -848,7 +967,7 @@ static int truncate_fetch_head(void)
 	FILE *fp = fopen_for_writing(filename);
 
 	if (!fp)
-		return error(_("cannot open %s: %s\n"), filename, strerror(errno));
+		return error_errno(_("cannot open %s"), filename);
 	fclose(fp);
 	return 0;
 }
@@ -1005,7 +1124,7 @@ static int get_remote_group(const char *key, const char *value, void *priv)
 			size_t wordlen = strcspn(value, " \t\n");
 
 			if (wordlen >= 1)
-				string_list_append(g->list,
+				string_list_append_nodup(g->list,
 						   xstrndup(value, wordlen));
 			value += wordlen + (value[wordlen] != '\0');
 		}
@@ -1143,7 +1262,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv)
 int cmd_fetch(int argc, const char **argv, const char *prefix)
 {
 	int i;
-	struct string_list list = STRING_LIST_INIT_NODUP;
+	struct string_list list = STRING_LIST_INIT_DUP;
 	struct remote *remote;
 	int result = 0;
 	struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
@@ -1226,8 +1345,6 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 		argv_array_clear(&options);
 	}
 
-	/* All names were strdup()ed or strndup()ed */
-	list.strdup_strings = 1;
 	string_list_clear(&list, 0);
 
 	close_all_packs();
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index e5658c320e..ac84e99f3a 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -272,7 +272,7 @@ static int cmp_string_list_util_as_integral(const void *a_, const void *b_)
 static void add_people_count(struct strbuf *out, struct string_list *people)
 {
 	if (people->nr == 1)
-		strbuf_addf(out, "%s", people->items[0].string);
+		strbuf_addstr(out, people->items[0].string);
 	else if (people->nr == 2)
 		strbuf_addf(out, "%s (%d) and %s (%d)",
 			    people->items[0].string,
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 55eac756f7..2de272ea36 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -13,6 +13,7 @@
 #include "dir.h"
 #include "progress.h"
 #include "streaming.h"
+#include "decorate.h"
 
 #define REACHABLE 0x0001
 #define SEEN      0x0002
@@ -35,11 +36,26 @@ static int write_lost_and_found;
 static int verbose;
 static int show_progress = -1;
 static int show_dangling = 1;
+static int name_objects;
 #define ERROR_OBJECT 01
 #define ERROR_REACHABLE 02
 #define ERROR_PACK 04
 #define ERROR_REFS 010
 
+static const char *describe_object(struct object *obj)
+{
+	static struct strbuf buf = STRBUF_INIT;
+	char *name = name_objects ?
+		lookup_decoration(fsck_walk_options.object_names, obj) : NULL;
+
+	strbuf_reset(&buf);
+	strbuf_addstr(&buf, oid_to_hex(&obj->oid));
+	if (name)
+		strbuf_addf(&buf, " (%s)", name);
+
+	return buf.buf;
+}
+
 static int fsck_config(const char *var, const char *value, void *cb)
 {
 	if (strcmp(var, "fsck.skiplist") == 0) {
@@ -67,7 +83,7 @@ static void objreport(struct object *obj, const char *msg_type,
 			const char *err)
 {
 	fprintf(stderr, "%s in %s %s: %s\n",
-		msg_type, typename(obj->type), oid_to_hex(&obj->oid), err);
+		msg_type, typename(obj->type), describe_object(obj), err);
 }
 
 static int objerror(struct object *obj, const char *err)
@@ -77,7 +93,8 @@ static int objerror(struct object *obj, const char *err)
 	return -1;
 }
 
-static int fsck_error_func(struct object *obj, int type, const char *message)
+static int fsck_error_func(struct fsck_options *o,
+	struct object *obj, int type, const char *message)
 {
 	objreport(obj, (type == FSCK_WARN) ? "warning" : "error", message);
 	return (type == FSCK_WARN) ? 0 : 1;
@@ -97,7 +114,7 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt
 	if (!obj) {
 		/* ... these references to parent->fld are safe here */
 		printf("broken link from %7s %s\n",
-			   typename(parent->type), oid_to_hex(&parent->oid));
+			   typename(parent->type), describe_object(parent));
 		printf("broken link from %7s %s\n",
 			   (type == OBJ_ANY ? "unknown" : typename(type)), "unknown");
 		errors_found |= ERROR_REACHABLE;
@@ -114,9 +131,9 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt
 	if (!(obj->flags & HAS_OBJ)) {
 		if (parent && !has_object_file(&obj->oid)) {
 			printf("broken link from %7s %s\n",
-				 typename(parent->type), oid_to_hex(&parent->oid));
+				 typename(parent->type), describe_object(parent));
 			printf("              to %7s %s\n",
-				 typename(obj->type), oid_to_hex(&obj->oid));
+				 typename(obj->type), describe_object(obj));
 			errors_found |= ERROR_REACHABLE;
 		}
 		return 1;
@@ -190,7 +207,8 @@ static void check_reachable_object(struct object *obj)
 			return; /* it is in pack - forget about it */
 		if (connectivity_only && has_object_file(&obj->oid))
 			return;
-		printf("missing %s %s\n", typename(obj->type), oid_to_hex(&obj->oid));
+		printf("missing %s %s\n", typename(obj->type),
+			describe_object(obj));
 		errors_found |= ERROR_REACHABLE;
 		return;
 	}
@@ -215,7 +233,8 @@ static void check_unreachable_object(struct object *obj)
 	 * since this is something that is prunable.
 	 */
 	if (show_unreachable) {
-		printf("unreachable %s %s\n", typename(obj->type), oid_to_hex(&obj->oid));
+		printf("unreachable %s %s\n", typename(obj->type),
+			describe_object(obj));
 		return;
 	}
 
@@ -234,11 +253,11 @@ static void check_unreachable_object(struct object *obj)
 	if (!obj->used) {
 		if (show_dangling)
 			printf("dangling %s %s\n", typename(obj->type),
-			       oid_to_hex(&obj->oid));
+			       describe_object(obj));
 		if (write_lost_and_found) {
 			char *filename = git_pathdup("lost-found/%s/%s",
 				obj->type == OBJ_COMMIT ? "commit" : "other",
-				oid_to_hex(&obj->oid));
+				describe_object(obj));
 			FILE *f;
 
 			if (safe_create_leading_directories_const(filename)) {
@@ -252,7 +271,7 @@ static void check_unreachable_object(struct object *obj)
 				if (stream_blob_to_fd(fileno(f), obj->oid.hash, NULL, 1))
 					die_errno("Could not write '%s'", filename);
 			} else
-				fprintf(f, "%s\n", oid_to_hex(&obj->oid));
+				fprintf(f, "%s\n", describe_object(obj));
 			if (fclose(f))
 				die_errno("Could not finish '%s'",
 					  filename);
@@ -271,7 +290,7 @@ static void check_unreachable_object(struct object *obj)
 static void check_object(struct object *obj)
 {
 	if (verbose)
-		fprintf(stderr, "Checking %s\n", oid_to_hex(&obj->oid));
+		fprintf(stderr, "Checking %s\n", describe_object(obj));
 
 	if (obj->flags & REACHABLE)
 		check_reachable_object(obj);
@@ -307,7 +326,7 @@ static int fsck_obj(struct object *obj)
 
 	if (verbose)
 		fprintf(stderr, "Checking %s %s\n",
-			typename(obj->type), oid_to_hex(&obj->oid));
+			typename(obj->type), describe_object(obj));
 
 	if (fsck_walk(obj, NULL, &fsck_obj_options))
 		objerror(obj, "broken links");
@@ -326,15 +345,17 @@ static int fsck_obj(struct object *obj)
 		free_commit_buffer(commit);
 
 		if (!commit->parents && show_root)
-			printf("root %s\n", oid_to_hex(&commit->object.oid));
+			printf("root %s\n", describe_object(&commit->object));
 	}
 
 	if (obj->type == OBJ_TAG) {
 		struct tag *tag = (struct tag *) obj;
 
 		if (show_tags && tag->tagged) {
-			printf("tagged %s %s", typename(tag->tagged->type), oid_to_hex(&tag->tagged->oid));
-			printf(" (%s) in %s\n", tag->tag, oid_to_hex(&tag->object.oid));
+			printf("tagged %s %s", typename(tag->tagged->type),
+				describe_object(tag->tagged));
+			printf(" (%s) in %s\n", tag->tag,
+				describe_object(&tag->object));
 		}
 	}
 
@@ -356,6 +377,10 @@ static int fsck_sha1(const unsigned char *sha1)
 static int fsck_obj_buffer(const unsigned char *sha1, enum object_type type,
 			   unsigned long size, void *buffer, int *eaten)
 {
+	/*
+	 * Note, buffer may be NULL if type is OBJ_BLOB. See
+	 * verify_packfile(), data_valid variable for details.
+	 */
 	struct object *obj;
 	obj = parse_object_buffer(sha1, type, size, buffer, eaten);
 	if (!obj) {
@@ -368,13 +393,18 @@ static int fsck_obj_buffer(const unsigned char *sha1, enum object_type type,
 
 static int default_refs;
 
-static void fsck_handle_reflog_sha1(const char *refname, unsigned char *sha1)
+static void fsck_handle_reflog_sha1(const char *refname, unsigned char *sha1,
+	unsigned long timestamp)
 {
 	struct object *obj;
 
 	if (!is_null_sha1(sha1)) {
 		obj = lookup_object(sha1);
 		if (obj) {
+			if (timestamp && name_objects)
+				add_decoration(fsck_walk_options.object_names,
+					obj,
+					xstrfmt("%s@{%ld}", refname, timestamp));
 			obj->used = 1;
 			mark_object_reachable(obj);
 		} else {
@@ -394,8 +424,8 @@ static int fsck_handle_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
 		fprintf(stderr, "Checking reflog %s->%s\n",
 			sha1_to_hex(osha1), sha1_to_hex(nsha1));
 
-	fsck_handle_reflog_sha1(refname, osha1);
-	fsck_handle_reflog_sha1(refname, nsha1);
+	fsck_handle_reflog_sha1(refname, osha1, 0);
+	fsck_handle_reflog_sha1(refname, nsha1, timestamp);
 	return 0;
 }
 
@@ -424,6 +454,9 @@ static int fsck_handle_ref(const char *refname, const struct object_id *oid,
 	}
 	default_refs++;
 	obj->used = 1;
+	if (name_objects)
+		add_decoration(fsck_walk_options.object_names,
+			obj, xstrdup(refname));
 	mark_object_reachable(obj);
 
 	return 0;
@@ -493,13 +526,12 @@ static void fsck_object_dir(const char *path)
 
 static int fsck_head_link(void)
 {
-	int flag;
 	int null_is_error = 0;
 
 	if (verbose)
 		fprintf(stderr, "Checking HEAD link\n");
 
-	head_points_at = resolve_ref_unsafe("HEAD", 0, head_oid.hash, &flag);
+	head_points_at = resolve_ref_unsafe("HEAD", 0, head_oid.hash, NULL);
 	if (!head_points_at) {
 		errors_found |= ERROR_REFS;
 		return error("Invalid HEAD");
@@ -540,6 +572,9 @@ static int fsck_cache_tree(struct cache_tree *it)
 			return 1;
 		}
 		obj->used = 1;
+		if (name_objects)
+			add_decoration(fsck_walk_options.object_names,
+				obj, xstrdup(":"));
 		mark_object_reachable(obj);
 		if (obj->type != OBJ_TREE)
 			err |= objerror(obj, "non-tree in cache-tree");
@@ -568,6 +603,7 @@ static struct option fsck_opts[] = {
 	OPT_BOOL(0, "lost-found", &write_lost_and_found,
 				N_("write dangling objects in .git/lost-found")),
 	OPT_BOOL(0, "progress", &show_progress, N_("show progress")),
+	OPT_BOOL(0, "name-objects", &name_objects, N_("show verbose names for reachable objects")),
 	OPT_END(),
 };
 
@@ -597,6 +633,10 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 		include_reflogs = 0;
 	}
 
+	if (name_objects)
+		fsck_walk_options.object_names =
+			xcalloc(1, sizeof(struct decoration));
+
 	git_config(fsck_config, NULL);
 
 	fsck_head_link();
@@ -652,6 +692,9 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 				continue;
 
 			obj->used = 1;
+			if (name_objects)
+				add_decoration(fsck_walk_options.object_names,
+					obj, xstrdup(arg));
 			mark_object_reachable(obj);
 			heads++;
 			continue;
@@ -684,6 +727,10 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 				continue;
 			obj = &blob->object;
 			obj->used = 1;
+			if (name_objects)
+				add_decoration(fsck_walk_options.object_names,
+					obj,
+					xstrfmt(":%s", active_cache[i]->name));
 			mark_object_reachable(obj);
 		}
 		if (active_cache_tree)
diff --git a/builtin/gc.c b/builtin/gc.c
index c583aad6ec..332bcf7e7a 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -177,7 +177,7 @@ static int too_many_packs(void)
 		 */
 		cnt++;
 	}
-	return gc_auto_pack_limit <= cnt;
+	return gc_auto_pack_limit < cnt;
 }
 
 static void add_repack_all_option(void)
diff --git a/builtin/grep.c b/builtin/grep.c
index 111b6f6cf1..ae738312aa 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -386,7 +386,7 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec, int
 
 	for (nr = 0; nr < active_nr; nr++) {
 		const struct cache_entry *ce = active_cache[nr];
-		if (!S_ISREG(ce->ce_mode) || ce_intent_to_add(ce))
+		if (!S_ISREG(ce->ce_mode))
 			continue;
 		if (!ce_path_match(ce, pathspec, NULL))
 			continue;
@@ -396,7 +396,7 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec, int
 		 * cache version instead
 		 */
 		if (cached || (ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) {
-			if (ce_stage(ce))
+			if (ce_stage(ce) || ce_intent_to_add(ce))
 				continue;
 			hit |= grep_sha1(opt, ce->sha1, ce->name, 0, ce->name);
 		}
@@ -438,7 +438,7 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
 		strbuf_add(base, entry.path, te_len);
 
 		if (S_ISREG(entry.mode)) {
-			hit |= grep_sha1(opt, entry.sha1, base->buf, tn_len,
+			hit |= grep_sha1(opt, entry.oid->hash, base->buf, tn_len,
 					 check_attr ? base->buf + tn_len : NULL);
 		}
 		else if (S_ISDIR(entry.mode)) {
@@ -447,10 +447,10 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
 			void *data;
 			unsigned long size;
 
-			data = lock_and_read_sha1_file(entry.sha1, &type, &size);
+			data = lock_and_read_sha1_file(entry.oid->hash, &type, &size);
 			if (!data)
 				die(_("unable to read tree (%s)"),
-				    sha1_to_hex(entry.sha1));
+				    oid_to_hex(entry.oid));
 
 			strbuf_addch(base, '/');
 			init_tree_desc(&sub, data, size);
diff --git a/builtin/help.c b/builtin/help.c
index 3c55ce4563..88480131cf 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -127,7 +127,7 @@ static void exec_woman_emacs(const char *path, const char *page)
 			path = "emacsclient";
 		strbuf_addf(&man_page, "(woman \"%s\")", page);
 		execlp(path, "emacsclient", "-e", man_page.buf, (char *)NULL);
-		warning(_("failed to exec '%s': %s"), path, strerror(errno));
+		warning_errno(_("failed to exec '%s'"), path);
 	}
 }
 
@@ -148,7 +148,7 @@ static void exec_man_konqueror(const char *path, const char *page)
 			path = "kfmclient";
 		strbuf_addf(&man_page, "man:%s(1)", page);
 		execlp(path, filename, "newTab", man_page.buf, (char *)NULL);
-		warning(_("failed to exec '%s': %s"), path, strerror(errno));
+		warning_errno(_("failed to exec '%s'"), path);
 	}
 }
 
@@ -157,7 +157,7 @@ static void exec_man_man(const char *path, const char *page)
 	if (!path)
 		path = "man";
 	execlp(path, "man", page, (char *)NULL);
-	warning(_("failed to exec '%s': %s"), path, strerror(errno));
+	warning_errno(_("failed to exec '%s'"), path);
 }
 
 static void exec_man_cmd(const char *cmd, const char *page)
@@ -165,7 +165,7 @@ static void exec_man_cmd(const char *cmd, const char *page)
 	struct strbuf shell_cmd = STRBUF_INIT;
 	strbuf_addf(&shell_cmd, "%s %s", cmd, page);
 	execl(SHELL_PATH, SHELL_PATH, "-c", shell_cmd.buf, (char *)NULL);
-	warning(_("failed to exec '%s': %s"), cmd, strerror(errno));
+	warning(_("failed to exec '%s'"), cmd);
 }
 
 static void add_man_viewer(const char *name)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index e8c71fc1d2..1d2ea583a4 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -77,6 +77,7 @@ static int strict;
 static int do_fsck_object;
 static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT;
 static int verbose;
+static int show_resolving_progress;
 static int show_stat;
 static int check_self_contained_and_connected;
 
@@ -338,10 +339,10 @@ static void parse_pack_header(void)
 	use(sizeof(struct pack_header));
 }
 
-static NORETURN void bad_object(unsigned long offset, const char *format,
+static NORETURN void bad_object(off_t offset, const char *format,
 		       ...) __attribute__((format (printf, 2, 3)));
 
-static NORETURN void bad_object(unsigned long offset, const char *format, ...)
+static NORETURN void bad_object(off_t offset, const char *format, ...)
 {
 	va_list params;
 	char buf[1024];
@@ -349,7 +350,8 @@ static NORETURN void bad_object(unsigned long offset, const char *format, ...)
 	va_start(params, format);
 	vsnprintf(buf, sizeof(buf), format, params);
 	va_end(params);
-	die(_("pack has bad object at offset %lu: %s"), offset, buf);
+	die(_("pack has bad object at offset %"PRIuMAX": %s"),
+	    (uintmax_t)offset, buf);
 }
 
 static inline struct thread_local *get_thread_data(void)
@@ -429,7 +431,7 @@ static int is_delta_type(enum object_type type)
 	return (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA);
 }
 
-static void *unpack_entry_data(unsigned long offset, unsigned long size,
+static void *unpack_entry_data(off_t offset, unsigned long size,
 			       enum object_type type, unsigned char *sha1)
 {
 	static char fixed_buf[8192];
@@ -549,13 +551,13 @@ static void *unpack_data(struct object_entry *obj,
 			 void *cb_data)
 {
 	off_t from = obj[0].idx.offset + obj[0].hdr_size;
-	unsigned long len = obj[1].idx.offset - from;
+	off_t len = obj[1].idx.offset - from;
 	unsigned char *data, *inbuf;
 	git_zstream stream;
 	int status;
 
 	data = xmallocz(consume ? 64*1024 : obj->size);
-	inbuf = xmalloc((len < 64*1024) ? len : 64*1024);
+	inbuf = xmalloc((len < 64*1024) ? (int)len : 64*1024);
 
 	memset(&stream, 0, sizeof(stream));
 	git_inflate_init(&stream);
@@ -563,15 +565,15 @@ static void *unpack_data(struct object_entry *obj,
 	stream.avail_out = consume ? 64*1024 : obj->size;
 
 	do {
-		ssize_t n = (len < 64*1024) ? len : 64*1024;
+		ssize_t n = (len < 64*1024) ? (ssize_t)len : 64*1024;
 		n = xpread(get_thread_data()->pack_fd, inbuf, n, from);
 		if (n < 0)
 			die_errno(_("cannot pread pack file"));
 		if (!n)
-			die(Q_("premature end of pack file, %lu byte missing",
-			       "premature end of pack file, %lu bytes missing",
-			       len),
-			    len);
+			die(Q_("premature end of pack file, %"PRIuMAX" byte missing",
+			       "premature end of pack file, %"PRIuMAX" bytes missing",
+			       (unsigned int)len),
+			    (uintmax_t)len);
 		from += n;
 		len -= n;
 		stream.next_in = inbuf;
@@ -1190,7 +1192,7 @@ static void resolve_deltas(void)
 	qsort(ref_deltas, nr_ref_deltas, sizeof(struct ref_delta_entry),
 	      compare_ref_delta_entry);
 
-	if (verbose)
+	if (verbose || show_resolving_progress)
 		progress = start_progress(_("Resolving deltas"),
 					  nr_ref_deltas + nr_ofs_deltas);
 
@@ -1625,6 +1627,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
 	struct pack_idx_option opts;
 	unsigned char pack_sha1[20];
 	unsigned foreign_nr = 1;	/* zero is a "good" value, assume bad */
+	int report_end_of_input = 0;
 
 	if (argc == 2 && !strcmp(argv[1], "-h"))
 		usage(index_pack_usage);
@@ -1694,6 +1697,10 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
 				input_len = sizeof(*hdr);
 			} else if (!strcmp(arg, "-v")) {
 				verbose = 1;
+			} else if (!strcmp(arg, "--show-resolving-progress")) {
+				show_resolving_progress = 1;
+			} else if (!strcmp(arg, "--report-end-of-input")) {
+				report_end_of_input = 1;
 			} else if (!strcmp(arg, "-o")) {
 				if (index_name || (i+1) >= argc)
 					usage(index_pack_usage);
@@ -1751,6 +1758,8 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
 		obj_stat = xcalloc(st_add(nr_objects, 1), sizeof(struct object_stat));
 	ofs_deltas = xcalloc(nr_objects, sizeof(struct ofs_delta_entry));
 	parse_pack_objects(pack_sha1);
+	if (report_end_of_input)
+		write_in_full(2, "\0", 1);
 	resolve_deltas();
 	conclude_pack(fix_thin_pack, curr_pack, pack_sha1);
 	free(ofs_deltas);
diff --git a/builtin/init-db.c b/builtin/init-db.c
index b2d8d40a67..3a45f0bcfb 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -397,13 +397,16 @@ int init_db(const char *template_dir, unsigned int flags)
 	if (!(flags & INIT_DB_QUIET)) {
 		int len = strlen(git_dir);
 
-		/* 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. */
-		printf(_("%s%s Git repository in %s%s\n"),
-		       reinit ? _("Reinitialized existing") : _("Initialized empty"),
-		       get_shared_repository() ? _(" shared") : "",
-		       git_dir, len && git_dir[len-1] != '/' ? "/" : "");
+		if (reinit)
+			printf(get_shared_repository()
+			       ? _("Reinitialized existing shared Git repository in %s%s\n")
+			       : _("Reinitialized existing Git repository in %s%s\n"),
+			       git_dir, len && git_dir[len-1] != '/' ? "/" : "");
+		else
+			printf(get_shared_repository()
+			       ? _("Initialized empty shared Git repository in %s%s\n")
+			       : _("Initialized empty Git repository in %s%s\n"),
+			       git_dir, len && git_dir[len-1] != '/' ? "/" : "");
 	}
 
 	return 0;
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index b99ae4be88..175f14797b 100644
--- a/builtin/interpret-trailers.c
+++ b/builtin/interpret-trailers.c
@@ -20,7 +20,7 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
 {
 	int in_place = 0;
 	int trim_empty = 0;
-	struct string_list trailers = STRING_LIST_INIT_DUP;
+	struct string_list trailers = STRING_LIST_INIT_NODUP;
 
 	struct option options[] = {
 		OPT_BOOL(0, "in-place", &in_place, N_("edit files in place")),
diff --git a/builtin/log.c b/builtin/log.c
index 0d738d6ddc..92dc34dcb0 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -33,6 +33,7 @@ static const char *default_date_mode = NULL;
 static int default_abbrev_commit;
 static int default_show_root = 1;
 static int default_follow;
+static int default_show_signature;
 static int decoration_style;
 static int decoration_given;
 static int use_mailmap_config;
@@ -100,6 +101,12 @@ static int log_line_range_callback(const struct option *option, const char *arg,
 	return 0;
 }
 
+static void init_log_defaults(void)
+{
+	init_grep_defaults();
+	init_diff_ui_defaults();
+}
+
 static void cmd_log_init_defaults(struct rev_info *rev)
 {
 	if (fmt_pretty)
@@ -113,6 +120,7 @@ static void cmd_log_init_defaults(struct rev_info *rev)
 	rev->abbrev_commit = default_abbrev_commit;
 	rev->show_root_diff = default_show_root;
 	rev->subject_prefix = fmt_patch_subject_prefix;
+	rev->show_signature = default_show_signature;
 	DIFF_OPT_SET(&rev->diffopt, ALLOW_TEXTCONV);
 
 	if (default_date_mode)
@@ -230,16 +238,17 @@ static void show_early_header(struct rev_info *rev, const char *stage, int nr)
 		if (rev->commit_format != CMIT_FMT_ONELINE)
 			putchar(rev->diffopt.line_termination);
 	}
-	printf(_("Final output: %d %s\n"), nr, stage);
+	fprintf(rev->diffopt.file, _("Final output: %d %s\n"), nr, stage);
 }
 
 static struct itimerval early_output_timer;
 
 static void log_show_early(struct rev_info *revs, struct commit_list *list)
 {
-	int i = revs->early_output;
+	int i = revs->early_output, close_file = revs->diffopt.close_file;
 	int show_header = 1;
 
+	revs->diffopt.close_file = 0;
 	sort_in_topological_order(&list, revs->sort_order);
 	while (list && i) {
 		struct commit *commit = list->item;
@@ -256,14 +265,19 @@ static void log_show_early(struct rev_info *revs, struct commit_list *list)
 		case commit_ignore:
 			break;
 		case commit_error:
+			if (close_file)
+				fclose(revs->diffopt.file);
 			return;
 		}
 		list = list->next;
 	}
 
 	/* Did we already get enough commits for the early output? */
-	if (!i)
+	if (!i) {
+		if (close_file)
+			fclose(revs->diffopt.file);
 		return;
+	}
 
 	/*
 	 * ..if no, then repeat it twice a second until we
@@ -325,7 +339,7 @@ static int cmd_log_walk(struct rev_info *rev)
 {
 	struct commit *commit;
 	int saved_nrl = 0;
-	int saved_dcctc = 0;
+	int saved_dcctc = 0, close_file = rev->diffopt.close_file;
 
 	if (rev->early_output)
 		setup_early_output(rev);
@@ -341,6 +355,7 @@ static int cmd_log_walk(struct rev_info *rev)
 	 * and HAS_CHANGES being accumulated in rev->diffopt, so be careful to
 	 * retain that state information if replacing rev->diffopt in this loop
 	 */
+	rev->diffopt.close_file = 0;
 	while ((commit = get_revision(rev)) != NULL) {
 		if (!log_tree_commit(rev, commit) && rev->max_count >= 0)
 			/*
@@ -361,6 +376,8 @@ static int cmd_log_walk(struct rev_info *rev)
 	}
 	rev->diffopt.degraded_cc_to_c = saved_dcctc;
 	rev->diffopt.needed_rename_limit = saved_nrl;
+	if (close_file)
+		fclose(rev->diffopt.file);
 
 	if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF &&
 	    DIFF_OPT_TST(&rev->diffopt, CHECK_FAILED)) {
@@ -403,6 +420,10 @@ static int git_log_config(const char *var, const char *value, void *cb)
 		use_mailmap_config = git_config_bool(var, value);
 		return 0;
 	}
+	if (!strcmp(var, "log.showsignature")) {
+		default_show_signature = git_config_bool(var, value);
+		return 0;
+	}
 
 	if (grep_config(var, value, cb) < 0)
 		return -1;
@@ -416,7 +437,7 @@ int cmd_whatchanged(int argc, const char **argv, const char *prefix)
 	struct rev_info rev;
 	struct setup_revision_opt opt;
 
-	init_grep_defaults();
+	init_log_defaults();
 	git_config(git_log_config, NULL);
 
 	init_revisions(&rev, prefix);
@@ -439,7 +460,7 @@ static void show_tagger(char *buf, int len, struct rev_info *rev)
 	pp.fmt = rev->commit_format;
 	pp.date_mode = rev->date_mode;
 	pp_user_info(&pp, "Tagger", &out, buf, get_log_output_encoding());
-	printf("%s", out.buf);
+	fprintf(rev->diffopt.file, "%s", out.buf);
 	strbuf_release(&out);
 }
 
@@ -450,7 +471,7 @@ static int show_blob_object(const unsigned char *sha1, struct rev_info *rev, con
 	char *buf;
 	unsigned long size;
 
-	fflush(stdout);
+	fflush(rev->diffopt.file);
 	if (!DIFF_OPT_TOUCHED(&rev->diffopt, ALLOW_TEXTCONV) ||
 	    !DIFF_OPT_TST(&rev->diffopt, ALLOW_TEXTCONV))
 		return stream_blob_to_fd(1, sha1, NULL, 0);
@@ -490,7 +511,7 @@ static int show_tag_object(const unsigned char *sha1, struct rev_info *rev)
 	}
 
 	if (offset < size)
-		fwrite(buf + offset, size - offset, 1, stdout);
+		fwrite(buf + offset, size - offset, 1, rev->diffopt.file);
 	free(buf);
 	return 0;
 }
@@ -499,7 +520,8 @@ static int show_tree_object(const unsigned char *sha1,
 		struct strbuf *base,
 		const char *pathname, unsigned mode, int stage, void *context)
 {
-	printf("%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
+	FILE *file = context;
+	fprintf(file, "%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
 	return 0;
 }
 
@@ -527,7 +549,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
 	struct pathspec match_all;
 	int i, count, ret = 0;
 
-	init_grep_defaults();
+	init_log_defaults();
 	git_config(git_log_config, NULL);
 
 	memset(&match_all, 0, sizeof(match_all));
@@ -559,7 +581,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
 
 			if (rev.shown_one)
 				putchar('\n');
-			printf("%stag %s%s\n",
+			fprintf(rev.diffopt.file, "%stag %s%s\n",
 					diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
 					t->tag,
 					diff_get_color_opt(&rev.diffopt, DIFF_RESET));
@@ -578,12 +600,12 @@ int cmd_show(int argc, const char **argv, const char *prefix)
 		case OBJ_TREE:
 			if (rev.shown_one)
 				putchar('\n');
-			printf("%stree %s%s\n\n",
+			fprintf(rev.diffopt.file, "%stree %s%s\n\n",
 					diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
 					name,
 					diff_get_color_opt(&rev.diffopt, DIFF_RESET));
 			read_tree_recursive((struct tree *)o, "", 0, 0, &match_all,
-					show_tree_object, NULL);
+					show_tree_object, rev.diffopt.file);
 			rev.shown_one = 1;
 			break;
 		case OBJ_COMMIT:
@@ -608,7 +630,7 @@ int cmd_log_reflog(int argc, const char **argv, const char *prefix)
 	struct rev_info rev;
 	struct setup_revision_opt opt;
 
-	init_grep_defaults();
+	init_log_defaults();
 	git_config(git_log_config, NULL);
 
 	init_revisions(&rev, prefix);
@@ -647,7 +669,7 @@ int cmd_log(int argc, const char **argv, const char *prefix)
 	struct rev_info rev;
 	struct setup_revision_opt opt;
 
-	init_grep_defaults();
+	init_log_defaults();
 	git_config(git_log_config, NULL);
 
 	init_revisions(&rev, prefix);
@@ -668,9 +690,9 @@ static int auto_number = 1;
 
 static char *default_attach = NULL;
 
-static struct string_list extra_hdr;
-static struct string_list extra_to;
-static struct string_list extra_cc;
+static struct string_list extra_hdr = STRING_LIST_INIT_NODUP;
+static struct string_list extra_to = STRING_LIST_INIT_NODUP;
+static struct string_list extra_cc = STRING_LIST_INIT_NODUP;
 
 static void add_header(const char *value)
 {
@@ -696,6 +718,8 @@ static void add_header(const char *value)
 #define THREAD_DEEP 2
 static int thread;
 static int do_signoff;
+static int base_auto;
+static char *from;
 static const char *signature = git_version_string;
 static const char *signature_file;
 static int config_cover_letter;
@@ -780,15 +804,29 @@ static int git_format_config(const char *var, const char *value, void *cb)
 	}
 	if (!strcmp(var, "format.outputdirectory"))
 		return git_config_string(&config_output_directory, var, value);
+	if (!strcmp(var, "format.useautobase")) {
+		base_auto = git_config_bool(var, value);
+		return 0;
+	}
+	if (!strcmp(var, "format.from")) {
+		int b = git_config_maybe_bool(var, value);
+		free(from);
+		if (b < 0)
+			from = xstrdup(value);
+		else if (b)
+			from = xstrdup(git_committer_info(IDENT_NO_DATE));
+		else
+			from = NULL;
+		return 0;
+	}
 
 	return git_log_config(var, value, cb);
 }
 
-static FILE *realstdout = NULL;
 static const char *output_directory = NULL;
 static int outdir_offset;
 
-static int reopen_stdout(struct commit *commit, const char *subject,
+static int open_next_file(struct commit *commit, const char *subject,
 			 struct rev_info *rev, int quiet)
 {
 	struct strbuf filename = STRBUF_INIT;
@@ -810,9 +848,9 @@ static int reopen_stdout(struct commit *commit, const char *subject,
 		fmt_output_subject(&filename, subject, rev);
 
 	if (!quiet)
-		fprintf(realstdout, "%s\n", filename.buf + outdir_offset);
+		printf("%s\n", filename.buf + outdir_offset);
 
-	if (freopen(filename.buf, "w", stdout) == NULL)
+	if ((rev->diffopt.file = fopen(filename.buf, "w")) == NULL)
 		return error(_("Cannot open patch file %s"), filename.buf);
 
 	strbuf_release(&filename);
@@ -871,15 +909,15 @@ static void gen_message_id(struct rev_info *info, char *base)
 	info->message_id = strbuf_detach(&buf, NULL);
 }
 
-static void print_signature(void)
+static void print_signature(FILE *file)
 {
 	if (!signature || !*signature)
 		return;
 
-	printf("-- \n%s", signature);
+	fprintf(file, "-- \n%s", signature);
 	if (signature[strlen(signature)-1] != '\n')
-		putchar('\n');
-	putchar('\n');
+		putc('\n', file);
+	putc('\n', file);
 }
 
 static void add_branch_description(struct strbuf *buf, const char *branch_name)
@@ -942,13 +980,13 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 	struct pretty_print_context pp = {0};
 	struct commit *head = list[0];
 
-	if (rev->commit_format != CMIT_FMT_EMAIL)
+	if (!cmit_fmt_is_mail(rev->commit_format))
 		die(_("Cover letter needs email format"));
 
 	committer = git_committer_info(0);
 
 	if (!use_stdout &&
-	    reopen_stdout(NULL, rev->numbered_files ? NULL : "cover-letter", rev, quiet))
+	    open_next_file(NULL, rev->numbered_files ? NULL : "cover-letter", rev, quiet))
 		return;
 
 	log_write_email_headers(rev, head, &pp.subject, &pp.after_subject,
@@ -971,7 +1009,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 	pp_title_line(&pp, &msg, &sb, encoding, need_8bit_cte);
 	pp_remainder(&pp, &msg, &sb, 0);
 	add_branch_description(&sb, branch_name);
-	printf("%s\n", sb.buf);
+	fprintf(rev->diffopt.file, "%s\n", sb.buf);
 
 	strbuf_release(&sb);
 
@@ -980,6 +1018,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 	log.wrap = 72;
 	log.in1 = 2;
 	log.in2 = 4;
+	log.file = rev->diffopt.file;
 	for (i = 0; i < nr; i++)
 		shortlog_add_commit(&log, list[i]);
 
@@ -1002,8 +1041,8 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 	diffcore_std(&opts);
 	diff_flush(&opts);
 
-	printf("\n");
-	print_signature();
+	fprintf(rev->diffopt.file, "\n");
+	print_signature(rev->diffopt.file);
 }
 
 static const char *clean_message_id(const char *msg_id)
@@ -1185,6 +1224,155 @@ static int from_callback(const struct option *opt, const char *arg, int unset)
 	return 0;
 }
 
+struct base_tree_info {
+	struct object_id base_commit;
+	int nr_patch_id, alloc_patch_id;
+	struct object_id *patch_id;
+};
+
+static struct commit *get_base_commit(const char *base_commit,
+				      struct commit **list,
+				      int total)
+{
+	struct commit *base = NULL;
+	struct commit **rev;
+	int i = 0, rev_nr = 0;
+
+	if (base_commit && strcmp(base_commit, "auto")) {
+		base = lookup_commit_reference_by_name(base_commit);
+		if (!base)
+			die(_("Unknown commit %s"), base_commit);
+	} else if ((base_commit && !strcmp(base_commit, "auto")) || base_auto) {
+		struct branch *curr_branch = branch_get(NULL);
+		const char *upstream = branch_get_upstream(curr_branch, NULL);
+		if (upstream) {
+			struct commit_list *base_list;
+			struct commit *commit;
+			unsigned char sha1[20];
+
+			if (get_sha1(upstream, sha1))
+				die(_("Failed to resolve '%s' as a valid ref."), upstream);
+			commit = lookup_commit_or_die(sha1, "upstream base");
+			base_list = get_merge_bases_many(commit, total, list);
+			/* There should be one and only one merge base. */
+			if (!base_list || base_list->next)
+				die(_("Could not find exact merge base."));
+			base = base_list->item;
+			free_commit_list(base_list);
+		} else {
+			die(_("Failed to get upstream, if you want to record base commit automatically,\n"
+			      "please use git branch --set-upstream-to to track a remote branch.\n"
+			      "Or you could specify base commit by --base=<base-commit-id> manually."));
+		}
+	}
+
+	ALLOC_ARRAY(rev, total);
+	for (i = 0; i < total; i++)
+		rev[i] = list[i];
+
+	rev_nr = total;
+	/*
+	 * Get merge base through pair-wise computations
+	 * and store it in rev[0].
+	 */
+	while (rev_nr > 1) {
+		for (i = 0; i < rev_nr / 2; i++) {
+			struct commit_list *merge_base;
+			merge_base = get_merge_bases(rev[2 * i], rev[2 * i + 1]);
+			if (!merge_base || merge_base->next)
+				die(_("Failed to find exact merge base"));
+
+			rev[i] = merge_base->item;
+		}
+
+		if (rev_nr % 2)
+			rev[i] = rev[2 * i];
+		rev_nr = (rev_nr + 1) / 2;
+	}
+
+	if (!in_merge_bases(base, rev[0]))
+		die(_("base commit should be the ancestor of revision list"));
+
+	for (i = 0; i < total; i++) {
+		if (base == list[i])
+			die(_("base commit shouldn't be in revision list"));
+	}
+
+	free(rev);
+	return base;
+}
+
+static void prepare_bases(struct base_tree_info *bases,
+			  struct commit *base,
+			  struct commit **list,
+			  int total)
+{
+	struct commit *commit;
+	struct rev_info revs;
+	struct diff_options diffopt;
+	int i;
+
+	if (!base)
+		return;
+
+	diff_setup(&diffopt);
+	DIFF_OPT_SET(&diffopt, RECURSIVE);
+	diff_setup_done(&diffopt);
+
+	oidcpy(&bases->base_commit, &base->object.oid);
+
+	init_revisions(&revs, NULL);
+	revs.max_parents = 1;
+	revs.topo_order = 1;
+	for (i = 0; i < total; i++) {
+		list[i]->object.flags &= ~UNINTERESTING;
+		add_pending_object(&revs, &list[i]->object, "rev_list");
+		list[i]->util = (void *)1;
+	}
+	base->object.flags |= UNINTERESTING;
+	add_pending_object(&revs, &base->object, "base");
+
+	if (prepare_revision_walk(&revs))
+		die(_("revision walk setup failed"));
+	/*
+	 * Traverse the commits list, get prerequisite patch ids
+	 * and stuff them in bases structure.
+	 */
+	while ((commit = get_revision(&revs)) != NULL) {
+		unsigned char sha1[20];
+		struct object_id *patch_id;
+		if (commit->util)
+			continue;
+		if (commit_patch_id(commit, &diffopt, sha1, 0))
+			die(_("cannot get patch id"));
+		ALLOC_GROW(bases->patch_id, bases->nr_patch_id + 1, bases->alloc_patch_id);
+		patch_id = bases->patch_id + bases->nr_patch_id;
+		hashcpy(patch_id->hash, sha1);
+		bases->nr_patch_id++;
+	}
+}
+
+static void print_bases(struct base_tree_info *bases, FILE *file)
+{
+	int i;
+
+	/* Only do this once, either for the cover or for the first one */
+	if (is_null_oid(&bases->base_commit))
+		return;
+
+	/* Show the base commit */
+	fprintf(file, "base-commit: %s\n", oid_to_hex(&bases->base_commit));
+
+	/* Show the prerequisite patches */
+	for (i = bases->nr_patch_id - 1; i >= 0; i--)
+		fprintf(file, "prerequisite-patch-id: %s\n", oid_to_hex(&bases->patch_id[i]));
+
+	free(bases->patch_id);
+	bases->nr_patch_id = 0;
+	bases->alloc_patch_id = 0;
+	oidclr(&bases->base_commit);
+}
+
 int cmd_format_patch(int argc, const char **argv, const char *prefix)
 {
 	struct commit *commit;
@@ -1208,7 +1396,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	int quiet = 0;
 	int reroll_count = -1;
 	char *branch_name = NULL;
-	char *from = NULL;
+	char *base_commit = NULL;
+	struct base_tree_info bases;
+
 	const struct option builtin_format_patch_options[] = {
 		{ OPTION_CALLBACK, 'n', "numbered", &numbered, NULL,
 			    N_("use [PATCH n/m] even with a single patch"),
@@ -1271,6 +1461,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 			    PARSE_OPT_OPTARG, thread_callback },
 		OPT_STRING(0, "signature", &signature, N_("signature"),
 			    N_("add a signature")),
+		OPT_STRING(0, "base", &base_commit, N_("base-commit"),
+			   N_("add prerequisite tree info to the patch series")),
 		OPT_FILENAME(0, "signature-file", &signature_file,
 				N_("add a signature from a file")),
 		OPT__QUIET(&quiet, N_("don't print the patch filenames")),
@@ -1280,10 +1472,11 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	extra_hdr.strdup_strings = 1;
 	extra_to.strdup_strings = 1;
 	extra_cc.strdup_strings = 1;
-	init_grep_defaults();
+	init_log_defaults();
 	git_config(git_format_config, NULL);
 	init_revisions(&rev, prefix);
 	rev.commit_format = CMIT_FMT_EMAIL;
+	rev.expand_tabs_in_log_default = 0;
 	rev.verbose_header = 1;
 	rev.diff = 1;
 	rev.max_parents = 1;
@@ -1403,6 +1596,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		setup_pager();
 
 	if (output_directory) {
+		if (rev.diffopt.use_color != GIT_COLOR_ALWAYS)
+			rev.diffopt.use_color = GIT_COLOR_NEVER;
 		if (use_stdout)
 			die(_("standard output, or directory, which one?"));
 		if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
@@ -1460,9 +1655,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		get_patch_ids(&rev, &ids);
 	}
 
-	if (!use_stdout)
-		realstdout = xfdopen(xdup(1), "w");
-
 	if (prepare_revision_walk(&rev))
 		die(_("revision walk setup failed"));
 	rev.boundary = 1;
@@ -1507,6 +1699,13 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		signature = strbuf_detach(&buf, NULL);
 	}
 
+	memset(&bases, 0, sizeof(bases));
+	if (base_commit || base_auto) {
+		struct commit *base = get_base_commit(base_commit, list, nr);
+		reset_revision_walk();
+		prepare_bases(&bases, base, list, nr);
+	}
+
 	if (in_reply_to || thread || cover_letter)
 		rev.ref_message_ids = xcalloc(1, sizeof(struct string_list));
 	if (in_reply_to) {
@@ -1520,6 +1719,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 			gen_message_id(&rev, "cover");
 		make_cover_letter(&rev, use_stdout,
 				  origin, nr, list, branch_name, quiet);
+		print_bases(&bases, rev.diffopt.file);
 		total++;
 		start_number--;
 	}
@@ -1565,7 +1765,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		}
 
 		if (!use_stdout &&
-		    reopen_stdout(rev.numbered_files ? NULL : commit, NULL, &rev, quiet))
+		    open_next_file(rev.numbered_files ? NULL : commit, NULL, &rev, quiet))
 			die(_("Failed to create output files"));
 		shown = log_tree_commit(&rev, commit);
 		free_commit_buffer(commit);
@@ -1580,14 +1780,15 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 			rev.shown_one = 0;
 		if (shown) {
 			if (rev.mime_boundary)
-				printf("\n--%s%s--\n\n\n",
+				fprintf(rev.diffopt.file, "\n--%s%s--\n\n\n",
 				       mime_boundary_leader,
 				       rev.mime_boundary);
 			else
-				print_signature();
+				print_signature(rev.diffopt.file);
+			print_bases(&bases, rev.diffopt.file);
 		}
 		if (!use_stdout)
-			fclose(stdout);
+			fclose(rev.diffopt.file);
 	}
 	free(list);
 	free(branch_name);
@@ -1619,15 +1820,15 @@ static const char * const cherry_usage[] = {
 };
 
 static void print_commit(char sign, struct commit *commit, int verbose,
-			 int abbrev)
+			 int abbrev, FILE *file)
 {
 	if (!verbose) {
-		printf("%c %s\n", sign,
+		fprintf(file, "%c %s\n", sign,
 		       find_unique_abbrev(commit->object.oid.hash, abbrev));
 	} else {
 		struct strbuf buf = STRBUF_INIT;
 		pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf);
-		printf("%c %s %s\n", sign,
+		fprintf(file, "%c %s %s\n", sign,
 		       find_unique_abbrev(commit->object.oid.hash, abbrev),
 		       buf.buf);
 		strbuf_release(&buf);
@@ -1708,7 +1909,7 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
 		commit = list->item;
 		if (has_commit_patch_id(commit, &ids))
 			sign = '-';
-		print_commit(sign, commit, verbose, abbrev);
+		print_commit(sign, commit, verbose, abbrev, revs.diffopt.file);
 		list = list->next;
 	}
 
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index f02e3d23bb..00ea91aae6 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -118,7 +118,8 @@ static void show_killed_files(struct dir_struct *dir)
 				 */
 				pos = cache_name_pos(ent->name, ent->len);
 				if (0 <= pos)
-					die("bug in show-killed-files");
+					die("BUG: killed-file %.*s not found",
+						ent->len, ent->name);
 				pos = -pos - 1;
 				while (pos < active_nr &&
 				       ce_stage(active_cache[pos]))
diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c
index 104277acc4..30681681c1 100644
--- a/builtin/mailsplit.c
+++ b/builtin/mailsplit.c
@@ -45,6 +45,19 @@ static int is_from_line(const char *line, int len)
 
 static struct strbuf buf = STRBUF_INIT;
 static int keep_cr;
+static int mboxrd;
+
+static int is_gtfrom(const struct strbuf *buf)
+{
+	size_t min = strlen(">From ");
+	size_t ngt;
+
+	if (buf->len < min)
+		return 0;
+
+	ngt = strspn(buf->buf, ">");
+	return ngt && starts_with(buf->buf + ngt, "From ");
+}
 
 /* Called with the first line (potentially partial)
  * already in buf[] -- normally that should begin with
@@ -77,6 +90,9 @@ static int split_one(FILE *mbox, const char *name, int allow_bare)
 			strbuf_addch(&buf, '\n');
 		}
 
+		if (mboxrd && is_gtfrom(&buf))
+			strbuf_remove(&buf, 0, 1);
+
 		if (fwrite(buf.buf, 1, buf.len, output) != buf.len)
 			die_errno("cannot write output");
 
@@ -109,7 +125,7 @@ static int populate_maildir_list(struct string_list *list, const char *path)
 		if ((dir = opendir(name)) == NULL) {
 			if (errno == ENOENT)
 				continue;
-			error("cannot opendir %s (%s)", name, strerror(errno));
+			error_errno("cannot opendir %s", name);
 			goto out;
 		}
 
@@ -174,12 +190,12 @@ static int split_maildir(const char *maildir, const char *dir,
 
 		f = fopen(file, "r");
 		if (!f) {
-			error("cannot open mail %s (%s)", file, strerror(errno));
+			error_errno("cannot open mail %s", file);
 			goto out;
 		}
 
 		if (strbuf_getwholeline(&buf, f, '\n')) {
-			error("cannot read mail %s (%s)", file, strerror(errno));
+			error_errno("cannot read mail %s", file);
 			goto out;
 		}
 
@@ -210,7 +226,7 @@ static int split_mbox(const char *file, const char *dir, int allow_bare,
 	int file_done = 0;
 
 	if (!f) {
-		error("cannot open mbox %s", file);
+		error_errno("cannot open mbox %s", file);
 		goto out;
 	}
 
@@ -271,6 +287,8 @@ int cmd_mailsplit(int argc, const char **argv, const char *prefix)
 			keep_cr = 1;
 		} else if ( arg[1] == 'o' && arg[2] ) {
 			dir = arg+2;
+		} else if (!strcmp(arg, "--mboxrd")) {
+			mboxrd = 1;
 		} else if ( arg[1] == '-' && !arg[2] ) {
 			argp++;	/* -- marks end of options */
 			break;
@@ -318,7 +336,7 @@ int cmd_mailsplit(int argc, const char **argv, const char *prefix)
 		}
 
 		if (stat(arg, &argstat) == -1) {
-			error("cannot stat %s (%s)", arg, strerror(errno));
+			error_errno("cannot stat %s", arg);
 			return 1;
 		}
 
diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 55447053f2..13e22a2f0b 100644
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -62,8 +62,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
 		usage_with_options(merge_file_usage, options);
 	if (quiet) {
 		if (!freopen("/dev/null", "w", stderr))
-			return error("failed to redirect stderr to /dev/null: "
-				     "%s", strerror(errno));
+			return error_errno("failed to redirect stderr to /dev/null");
 	}
 
 	if (prefix)
@@ -95,12 +94,13 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
 		FILE *f = to_stdout ? stdout : fopen(fpath, "wb");
 
 		if (!f)
-			ret = error("Could not open %s for writing", filename);
+			ret = error_errno("Could not open %s for writing",
+					  filename);
 		else if (result.size &&
 			 fwrite(result.ptr, result.size, 1, f) != 1)
-			ret = error("Could not write to %s", filename);
+			ret = error_errno("Could not write to %s", filename);
 		else if (fclose(f))
-			ret = error("Could not close %s", filename);
+			ret = error_errno("Could not close %s", filename);
 		free(result.ptr);
 	}
 
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index 491efd556e..fd2c4556e1 100644
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -9,10 +9,10 @@ static const char builtin_merge_recursive_usage[] =
 
 static const char *better_branch_name(const char *branch)
 {
-	static char githead_env[8 + 40 + 1];
+	static char githead_env[8 + GIT_SHA1_HEXSZ + 1];
 	char *name;
 
-	if (strlen(branch) != 40)
+	if (strlen(branch) != GIT_SHA1_HEXSZ)
 		return branch;
 	xsnprintf(githead_env, sizeof(githead_env), "GITHEAD_%s", branch);
 	name = getenv(githead_env);
@@ -21,10 +21,10 @@ static const char *better_branch_name(const char *branch)
 
 int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
 {
-	const unsigned char *bases[21];
+	const struct object_id *bases[21];
 	unsigned bases_count = 0;
 	int i, failed;
-	unsigned char h1[20], h2[20];
+	struct object_id h1, h2;
 	struct merge_options o;
 	struct commit *result;
 
@@ -46,10 +46,10 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
 			continue;
 		}
 		if (bases_count < ARRAY_SIZE(bases)-1) {
-			unsigned char *sha = xmalloc(20);
-			if (get_sha1(argv[i], sha))
+			struct object_id *oid = xmalloc(sizeof(struct object_id));
+			if (get_oid(argv[i], oid))
 				die("Could not parse object '%s'", argv[i]);
-			bases[bases_count++] = sha;
+			bases[bases_count++] = oid;
 		}
 		else
 			warning("Cannot handle more than %d bases. "
@@ -62,9 +62,9 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
 	o.branch1 = argv[++i];
 	o.branch2 = argv[++i];
 
-	if (get_sha1(o.branch1, h1))
+	if (get_oid(o.branch1, &h1))
 		die("Could not resolve ref '%s'", o.branch1);
-	if (get_sha1(o.branch2, h2))
+	if (get_oid(o.branch2, &h2))
 		die("Could not resolve ref '%s'", o.branch2);
 
 	o.branch1 = better_branch_name(o.branch1);
@@ -73,7 +73,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
 	if (o.verbosity >= 3)
 		printf("Merging %s with %s\n", o.branch1, o.branch2);
 
-	failed = merge_recursive_generic(&o, h1, h2, bases_count, bases, &result);
+	failed = merge_recursive_generic(&o, &h1, &h2, bases_count, bases, &result);
 	if (failed < 0)
 		return 128; /* die() error code */
 	return failed;
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index ca570041df..5b7ab9b967 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -150,15 +150,15 @@ static void show_result(void)
 /* An empty entry never compares same, not even to another empty entry */
 static int same_entry(struct name_entry *a, struct name_entry *b)
 {
-	return	a->sha1 &&
-		b->sha1 &&
-		!hashcmp(a->sha1, b->sha1) &&
+	return	a->oid &&
+		b->oid &&
+		!oidcmp(a->oid, b->oid) &&
 		a->mode == b->mode;
 }
 
 static int both_empty(struct name_entry *a, struct name_entry *b)
 {
-	return !(a->sha1 || b->sha1);
+	return !(a->oid || b->oid);
 }
 
 static struct merge_list *create_entry(unsigned stage, unsigned mode, const unsigned char *sha1, const char *path)
@@ -188,8 +188,8 @@ static void resolve(const struct traverse_info *info, struct name_entry *ours, s
 		return;
 
 	path = traverse_path(info, result);
-	orig = create_entry(2, ours->mode, ours->sha1, path);
-	final = create_entry(0, result->mode, result->sha1, path);
+	orig = create_entry(2, ours->mode, ours->oid->hash, path);
+	final = create_entry(0, result->mode, result->oid->hash, path);
 
 	final->link = orig;
 
@@ -213,7 +213,7 @@ static void unresolved_directory(const struct traverse_info *info,
 
 	newbase = traverse_path(info, p);
 
-#define ENTRY_SHA1(e) (((e)->mode && S_ISDIR((e)->mode)) ? (e)->sha1 : NULL)
+#define ENTRY_SHA1(e) (((e)->mode && S_ISDIR((e)->mode)) ? (e)->oid->hash : NULL)
 	buf0 = fill_tree_descriptor(t+0, ENTRY_SHA1(n + 0));
 	buf1 = fill_tree_descriptor(t+1, ENTRY_SHA1(n + 1));
 	buf2 = fill_tree_descriptor(t+2, ENTRY_SHA1(n + 2));
@@ -239,7 +239,7 @@ static struct merge_list *link_entry(unsigned stage, const struct traverse_info
 		path = entry->path;
 	else
 		path = traverse_path(info, n);
-	link = create_entry(stage, n->mode, n->sha1, path);
+	link = create_entry(stage, n->mode, n->oid->hash, path);
 	link->link = entry;
 	return link;
 }
@@ -314,7 +314,7 @@ static int threeway_callback(int n, unsigned long mask, unsigned long dirmask, s
 	}
 
 	if (same_entry(entry+0, entry+1)) {
-		if (entry[2].sha1 && !S_ISDIR(entry[2].mode)) {
+		if (entry[2].oid && !S_ISDIR(entry[2].mode)) {
 			/* We did not touch, they modified -- take theirs */
 			resolve(info, entry+1, entry+2);
 			return mask;
diff --git a/builtin/merge.c b/builtin/merge.c
index bf2f2614fb..0ae099f746 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -30,6 +30,7 @@
 #include "fmt-merge-msg.h"
 #include "gpg-interface.h"
 #include "sequencer.h"
+#include "string-list.h"
 
 #define DEFAULT_TWOHEAD (1<<0)
 #define DEFAULT_OCTOPUS (1<<1)
@@ -64,6 +65,7 @@ static int option_renormalize;
 static int verbosity;
 static int allow_rerere_auto;
 static int abort_current_merge;
+static int allow_unrelated_histories;
 static int show_progress = -1;
 static int default_to_upstream = 1;
 static const char *sign_commit;
@@ -210,7 +212,7 @@ static struct option builtin_merge_options[] = {
 		PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, FF_ONLY },
 	OPT_RERERE_AUTOUPDATE(&allow_rerere_auto),
 	OPT_BOOL(0, "verify-signatures", &verify_signatures,
-		N_("Verify that the named commit has a valid GPG signature")),
+		N_("verify that the named commit has a valid GPG signature")),
 	OPT_CALLBACK('s', "strategy", &use_strategies, N_("strategy"),
 		N_("merge strategy to use"), option_parse_strategy),
 	OPT_CALLBACK('X', "strategy-option", &xopts, N_("option=value"),
@@ -221,6 +223,8 @@ static struct option builtin_merge_options[] = {
 	OPT__VERBOSITY(&verbosity),
 	OPT_BOOL(0, "abort", &abort_current_merge,
 		N_("abort the current in-progress merge")),
+	OPT_BOOL(0, "allow-unrelated-histories", &allow_unrelated_histories,
+		 N_("allow merging unrelated histories")),
 	OPT_SET_INT(0, "progress", &show_progress, N_("force progress reporting"), 1),
 	{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
 	  N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
@@ -333,15 +337,9 @@ static void squash_message(struct commit *commit, struct commit_list *remotehead
 	struct rev_info rev;
 	struct strbuf out = STRBUF_INIT;
 	struct commit_list *j;
-	const char *filename;
-	int fd;
 	struct pretty_print_context ctx = {0};
 
 	printf(_("Squash commit -- not updating HEAD\n"));
-	filename = git_path_squash_msg();
-	fd = open(filename, O_WRONLY | O_CREAT, 0666);
-	if (fd < 0)
-		die_errno(_("Could not write to '%s'"), filename);
 
 	init_revisions(&rev, NULL);
 	rev.ignore_merges = 1;
@@ -368,10 +366,7 @@ static void squash_message(struct commit *commit, struct commit_list *remotehead
 			oid_to_hex(&commit->object.oid));
 		pretty_print_commit(&ctx, commit, &out);
 	}
-	if (write_in_full(fd, out.buf, out.len) != out.len)
-		die_errno(_("Writing SQUASH_MSG"));
-	if (close(fd))
-		die_errno(_("Finishing SQUASH_MSG"));
+	write_file_buf(git_path_squash_msg(), out.buf, out.len);
 	strbuf_release(&out);
 }
 
@@ -498,7 +493,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
 		if (ref_exists(truname.buf)) {
 			strbuf_addf(msg,
 				    "%s\t\tbranch '%s'%s of .\n",
-				    sha1_to_hex(remote_head->object.oid.hash),
+				    oid_to_hex(&remote_head->object.oid),
 				    truname.buf + 11,
 				    (early ? " (early part)" : ""));
 			strbuf_release(&truname);
@@ -512,7 +507,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
 		desc = merge_remote_util(remote_head);
 		if (desc && desc->obj && desc->obj->type == OBJ_TAG) {
 			strbuf_addf(msg, "%s\t\t%s '%s'\n",
-				    sha1_to_hex(desc->obj->oid.hash),
+				    oid_to_hex(&desc->obj->oid),
 				    typename(desc->obj->type),
 				    remote);
 			goto cleanup;
@@ -520,7 +515,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
 	}
 
 	strbuf_addf(msg, "%s\t\tcommit '%s'\n",
-		sha1_to_hex(remote_head->object.oid.hash), remote);
+		oid_to_hex(&remote_head->object.oid), remote);
 cleanup:
 	strbuf_release(&buf);
 	strbuf_release(&bname);
@@ -679,6 +674,8 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
 		hold_locked_index(&lock, 1);
 		clean = merge_recursive(&o, head,
 				remoteheads->item, reversed, &result);
+		if (clean < 0)
+			exit(128);
 		if (active_cache_changed &&
 		    write_locked_index(&the_index, &lock, COMMIT_LOCK))
 			die (_("unable to write %s"), get_index_file());
@@ -709,42 +706,17 @@ static int count_unmerged_entries(void)
 	return ret;
 }
 
-static void split_merge_strategies(const char *string, struct strategy **list,
-				   int *nr, int *alloc)
-{
-	char *p, *q, *buf;
-
-	if (!string)
-		return;
-
-	buf = xstrdup(string);
-	q = buf;
-	for (;;) {
-		p = strchr(q, ' ');
-		if (!p) {
-			ALLOC_GROW(*list, *nr + 1, *alloc);
-			(*list)[(*nr)++].name = xstrdup(q);
-			free(buf);
-			return;
-		} else {
-			*p = '\0';
-			ALLOC_GROW(*list, *nr + 1, *alloc);
-			(*list)[(*nr)++].name = xstrdup(q);
-			q = ++p;
-		}
-	}
-}
-
 static void add_strategies(const char *string, unsigned attr)
 {
-	struct strategy *list = NULL;
-	int list_alloc = 0, list_nr = 0, i;
-
-	memset(&list, 0, sizeof(list));
-	split_merge_strategies(string, &list, &list_nr, &list_alloc);
-	if (list) {
-		for (i = 0; i < list_nr; i++)
-			append_strategy(get_strategy(list[i].name));
+	int i;
+
+	if (string) {
+		struct string_list list = STRING_LIST_INIT_DUP;
+		struct string_list_item *item;
+		string_list_split(&list, string, ' ', -1);
+		for_each_string_list_item(item, &list)
+			append_strategy(get_strategy(item->string));
+		string_list_clear(&list, 0);
 		return;
 	}
 	for (i = 0; i < ARRAY_SIZE(all_strategy); i++)
@@ -753,18 +725,6 @@ static void add_strategies(const char *string, unsigned attr)
 
 }
 
-static void write_merge_msg(struct strbuf *msg)
-{
-	const char *filename = git_path_merge_msg();
-	int fd = open(filename, O_WRONLY | O_CREAT, 0666);
-	if (fd < 0)
-		die_errno(_("Could not open '%s' for writing"),
-			  filename);
-	if (write_in_full(fd, msg->buf, msg->len) != msg->len)
-		die_errno(_("Could not write to '%s'"), filename);
-	close(fd);
-}
-
 static void read_merge_msg(struct strbuf *msg)
 {
 	const char *filename = git_path_merge_msg();
@@ -798,7 +758,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
 	strbuf_addch(&msg, '\n');
 	if (0 < option_edit)
 		strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char);
-	write_merge_msg(&msg);
+	write_file_buf(git_path_merge_msg(), msg.buf, msg.len);
 	if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
 			    git_path_merge_msg(), "merge", NULL))
 		abort_commit(remoteheads, NULL);
@@ -819,6 +779,14 @@ static int merge_trivial(struct commit *head, struct commit_list *remoteheads)
 {
 	unsigned char result_tree[20], result_commit[20];
 	struct commit_list *parents, **pptr = &parents;
+	static struct lock_file lock;
+
+	hold_locked_index(&lock, 1);
+	refresh_cache(REFRESH_QUIET);
+	if (active_cache_changed &&
+	    write_locked_index(&the_index, &lock, COMMIT_LOCK))
+		return error(_("Unable to write index."));
+	rollback_lock_file(&lock);
 
 	write_tree_trivial(result_tree);
 	printf(_("Wonderful.\n"));
@@ -953,8 +921,6 @@ static int setup_with_upstream(const char ***argv)
 
 static void write_merge_state(struct commit_list *remoteheads)
 {
-	const char *filename;
-	int fd;
 	struct commit_list *j;
 	struct strbuf buf = STRBUF_INIT;
 
@@ -968,26 +934,14 @@ static void write_merge_state(struct commit_list *remoteheads)
 		}
 		strbuf_addf(&buf, "%s\n", oid_to_hex(oid));
 	}
-	filename = git_path_merge_head();
-	fd = open(filename, O_WRONLY | O_CREAT, 0666);
-	if (fd < 0)
-		die_errno(_("Could not open '%s' for writing"), filename);
-	if (write_in_full(fd, buf.buf, buf.len) != buf.len)
-		die_errno(_("Could not write to '%s'"), filename);
-	close(fd);
+	write_file_buf(git_path_merge_head(), buf.buf, buf.len);
 	strbuf_addch(&merge_msg, '\n');
-	write_merge_msg(&merge_msg);
+	write_file_buf(git_path_merge_msg(), merge_msg.buf, merge_msg.len);
 
-	filename = git_path_merge_mode();
-	fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-	if (fd < 0)
-		die_errno(_("Could not open '%s' for writing"), filename);
 	strbuf_reset(&buf);
 	if (fast_forward == FF_NO)
 		strbuf_addf(&buf, "no-ff");
-	if (write_in_full(fd, buf.buf, buf.len) != buf.len)
-		die_errno(_("Could not write to '%s'"), filename);
-	close(fd);
+	write_file_buf(git_path_merge_mode(), buf.buf, buf.len);
 }
 
 static int default_edit_option(void)
@@ -1003,7 +957,7 @@ static int default_edit_option(void)
 	if (e) {
 		int v = git_config_maybe_bool(name, e);
 		if (v < 0)
-			die("Bad value '%s' in environment '%s'", e, name);
+			die(_("Bad value '%s' in environment '%s'"), e, name);
 		return v;
 	}
 
@@ -1104,7 +1058,7 @@ static void handle_fetch_head(struct commit_list **remotes, struct strbuf *merge
 		if (!commit) {
 			if (ptr)
 				*ptr = '\0';
-			die("not something we can merge in %s: %s",
+			die(_("not something we can merge in %s: %s"),
 			    filename, merge_names->buf + pos);
 		}
 		remotes = &commit_list_insert(commit, remotes)->next;
@@ -1138,7 +1092,7 @@ static struct commit_list *collect_parents(struct commit *head_commit,
 			struct commit *commit = get_merge_parent(argv[i]);
 			if (!commit)
 				help_unknown_ref(argv[i], "merge",
-						 "not something we can merge");
+						 _("not something we can merge"));
 			remotes = &commit_list_insert(commit, remotes)->next;
 		}
 		remoteheads = reduce_parents(head_commit, head_subsumed, remoteheads);
@@ -1165,7 +1119,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 	struct commit *head_commit;
 	struct strbuf buf = STRBUF_INIT;
 	const char *head_arg;
-	int flag, i, ret = 0, head_subsumed;
+	int i, ret = 0, head_subsumed;
 	int best_cnt = -1, merge_was_ok = 0, automerge_was_ok = 0;
 	struct commit_list *common = NULL;
 	const char *best_strategy = NULL, *wt_strategy = NULL;
@@ -1179,7 +1133,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 	 * Check if we are _not_ on a detached HEAD, i.e. if there is a
 	 * current branch.
 	 */
-	branch = branch_to_free = resolve_refdup("HEAD", 0, head_sha1, &flag);
+	branch = branch_to_free = resolve_refdup("HEAD", 0, head_sha1, NULL);
 	if (branch && starts_with(branch, "refs/heads/"))
 		branch += 11;
 	if (!branch || is_null_sha1(head_sha1))
@@ -1187,6 +1141,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 	else
 		head_commit = lookup_commit_or_die(head_sha1, "HEAD");
 
+	init_diff_ui_defaults();
 	git_config(git_merge_config, NULL);
 
 	if (branch_mergeoptions)
@@ -1354,7 +1309,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 	for (p = remoteheads; p; p = p->next) {
 		struct commit *commit = p->item;
 		strbuf_addf(&buf, "GITHEAD_%s",
-			    sha1_to_hex(commit->object.oid.hash));
+			    oid_to_hex(&commit->object.oid));
 		setenv(buf.buf, merge_remote_util(commit)->name, 1);
 		strbuf_reset(&buf);
 		if (fast_forward != FF_ONLY &&
@@ -1397,20 +1352,23 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 	update_ref("updating ORIG_HEAD", "ORIG_HEAD", head_commit->object.oid.hash,
 		   NULL, 0, UPDATE_REFS_DIE_ON_ERR);
 
-	if (remoteheads && !common)
-		; /* No common ancestors found. We need a real merge. */
-	else if (!remoteheads ||
+	if (remoteheads && !common) {
+		/* No common ancestors found. */
+		if (!allow_unrelated_histories)
+			die(_("refusing to merge unrelated histories"));
+		/* otherwise, we need a real merge. */
+	} else if (!remoteheads ||
 		 (!remoteheads->next && !common->next &&
 		  common->item == remoteheads->item)) {
 		/*
 		 * If head can reach all the merge then we are up to date.
 		 * but first the most common case of merging one remote.
 		 */
-		finish_up_to_date("Already up-to-date.");
+		finish_up_to_date(_("Already up-to-date."));
 		goto done;
 	} else if (fast_forward != FF_NO && !remoteheads->next &&
 			!common->next &&
-			!hashcmp(common->item->object.oid.hash, head_commit->object.oid.hash)) {
+			!oidcmp(&common->item->object.oid, &head_commit->object.oid)) {
 		/* Again the most common case of merging one remote. */
 		struct strbuf msg = STRBUF_INIT;
 		struct commit *commit;
@@ -1484,14 +1442,13 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 			 * HEAD^^" would be missed.
 			 */
 			common_one = get_merge_bases(head_commit, j->item);
-			if (hashcmp(common_one->item->object.oid.hash,
-				j->item->object.oid.hash)) {
+			if (oidcmp(&common_one->item->object.oid, &j->item->object.oid)) {
 				up_to_date = 0;
 				break;
 			}
 		}
 		if (up_to_date) {
-			finish_up_to_date("Already up-to-date. Yeeah!");
+			finish_up_to_date(_("Already up-to-date. Yeeah!"));
 			goto done;
 		}
 	}
@@ -1515,7 +1472,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 	     * Stash away the local changes so that we can try more than one.
 	     */
 	    save_state(stash))
-		hashcpy(stash, null_sha1);
+		hashclr(stash);
 
 	for (i = 0; i < use_strategies_nr; i++) {
 		int ret;
diff --git a/builtin/mv.c b/builtin/mv.c
index a2014266b6..446a316738 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -104,7 +104,7 @@ static int index_range_of_same_dir(const char *src, int length,
 
 int cmd_mv(int argc, const char **argv, const char *prefix)
 {
-	int i, gitmodules_modified = 0;
+	int i, flags, gitmodules_modified = 0;
 	int verbose = 0, show_only = 0, force = 0, ignore_errors = 0;
 	struct option builtin_mv_options[] = {
 		OPT__VERBOSE(&verbose, N_("be verbose")),
@@ -134,10 +134,13 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 	modes = xcalloc(argc, sizeof(enum update_mode));
 	/*
 	 * Keep trailing slash, needed to let
-	 * "git mv file no-such-dir/" error out.
+	 * "git mv file no-such-dir/" error out, except in the case
+	 * "git mv directory no-such-dir/".
 	 */
-	dest_path = internal_copy_pathspec(prefix, argv + argc, 1,
-					   KEEP_TRAILING_SLASH);
+	flags = KEEP_TRAILING_SLASH;
+	if (argc == 1 && is_directory(argv[0]) && !is_directory(argv[1]))
+		flags = 0;
+	dest_path = internal_copy_pathspec(prefix, argv + argc, 1, flags);
 	submodule_gitfile = xcalloc(argc, sizeof(char *));
 
 	if (dest_path[0][0] == '\0')
diff --git a/builtin/notes.c b/builtin/notes.c
index 6fd058de92..f848b89692 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -91,7 +91,7 @@ static const char * const git_notes_get_ref_usage[] = {
 };
 
 static const char note_template[] =
-	"\nWrite/edit the notes for the following object:\n";
+	N_("Write/edit the notes for the following object:");
 
 struct note_data {
 	int given;
@@ -179,7 +179,8 @@ static void prepare_note_data(const unsigned char *object, struct note_data *d,
 			copy_obj_to_fd(fd, old_note);
 
 		strbuf_addch(&buf, '\n');
-		strbuf_add_commented_lines(&buf, note_template, strlen(note_template));
+		strbuf_add_commented_lines(&buf, "\n", strlen("\n"));
+		strbuf_add_commented_lines(&buf, _(note_template), strlen(_(note_template)));
 		strbuf_addch(&buf, '\n');
 		write_or_die(fd, buf.buf, buf.len);
 
@@ -749,7 +750,7 @@ static int git_config_get_notes_strategy(const char *key,
 	if (git_config_get_string(key, &value))
 		return 1;
 	if (parse_notes_merge_strategy(value, strategy))
-		git_die_config(key, "unknown notes merge strategy %s", value);
+		git_die_config(key, _("unknown notes merge strategy %s"), value);
 
 	free(value);
 	return 0;
@@ -788,15 +789,15 @@ static int merge(int argc, const char **argv, const char *prefix)
 	if (strategy || do_commit + do_abort == 0)
 		do_merge = 1;
 	if (do_merge + do_commit + do_abort != 1) {
-		error("cannot mix --commit, --abort or -s/--strategy");
+		error(_("cannot mix --commit, --abort or -s/--strategy"));
 		usage_with_options(git_notes_merge_usage, options);
 	}
 
 	if (do_merge && argc != 1) {
-		error("Must specify a notes ref to merge");
+		error(_("Must specify a notes ref to merge"));
 		usage_with_options(git_notes_merge_usage, options);
 	} else if (!do_merge && argc) {
-		error("too many parameters");
+		error(_("too many parameters"));
 		usage_with_options(git_notes_merge_usage, options);
 	}
 
@@ -817,7 +818,7 @@ static int merge(int argc, const char **argv, const char *prefix)
 
 	if (strategy) {
 		if (parse_notes_merge_strategy(strategy, &o.strategy)) {
-			error("Unknown -s/--strategy: %s", strategy);
+			error(_("Unknown -s/--strategy: %s"), strategy);
 			usage_with_options(git_notes_merge_usage, options);
 		}
 	} else {
@@ -847,21 +848,21 @@ static int merge(int argc, const char **argv, const char *prefix)
 		update_ref(msg.buf, default_notes_ref(), result_sha1, NULL,
 			   0, UPDATE_REFS_DIE_ON_ERR);
 	else { /* Merge has unresolved conflicts */
-		char *existing;
+		const struct worktree *wt;
 		/* Update .git/NOTES_MERGE_PARTIAL with partial merge result */
 		update_ref(msg.buf, "NOTES_MERGE_PARTIAL", result_sha1, NULL,
 			   0, UPDATE_REFS_DIE_ON_ERR);
 		/* Store ref-to-be-updated into .git/NOTES_MERGE_REF */
-		existing = find_shared_symref("NOTES_MERGE_REF", default_notes_ref());
-		if (existing)
+		wt = find_shared_symref("NOTES_MERGE_REF", default_notes_ref());
+		if (wt)
 			die(_("A notes merge into %s is already in-progress at %s"),
-			    default_notes_ref(), existing);
+			    default_notes_ref(), wt->path);
 		if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL))
-			die("Failed to store link to current notes ref (%s)",
+			die(_("Failed to store link to current notes ref (%s)"),
 			    default_notes_ref());
-		printf("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",
+		printf(_("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"),
 		       git_path(NOTES_MERGE_WORKTREE));
 	}
 
@@ -934,8 +935,8 @@ static int prune(int argc, const char **argv, const char *prefix)
 	struct notes_tree *t;
 	int show_only = 0, verbose = 0;
 	struct option options[] = {
-		OPT__DRY_RUN(&show_only, "do not remove, show only"),
-		OPT__VERBOSE(&verbose, "report pruned notes"),
+		OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
+		OPT__VERBOSE(&verbose, N_("report pruned notes")),
 		OPT_END()
 	};
 
@@ -964,7 +965,7 @@ static int get_ref(int argc, const char **argv, const char *prefix)
 			     git_notes_get_ref_usage, 0);
 
 	if (argc) {
-		error("too many parameters");
+		error(_("too many parameters"));
 		usage_with_options(git_notes_get_ref_usage, options);
 	}
 
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index b6664ce4d8..4a63398960 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -44,7 +44,9 @@ static int non_empty;
 static int reuse_delta = 1, reuse_object = 1;
 static int keep_unreachable, unpack_unreachable, include_tag;
 static unsigned long unpack_unreachable_expiration;
+static int pack_loose_unreachable;
 static int local;
+static int have_non_local_packs;
 static int incremental;
 static int ignore_packed_keep;
 static int allow_ofs_delta;
@@ -341,15 +343,15 @@ static unsigned long write_no_reuse_object(struct sha1file *f, struct object_ent
 }
 
 /* Return 0 if we will bust the pack-size limit */
-static unsigned long write_reuse_object(struct sha1file *f, struct object_entry *entry,
-					unsigned long limit, int usable_delta)
+static off_t write_reuse_object(struct sha1file *f, struct object_entry *entry,
+				unsigned long limit, int usable_delta)
 {
 	struct packed_git *p = entry->in_pack;
 	struct pack_window *w_curs = NULL;
 	struct revindex_entry *revidx;
 	off_t offset;
 	enum object_type type = entry->type;
-	unsigned long datalen;
+	off_t datalen;
 	unsigned char header[10], dheader[10];
 	unsigned hdrlen;
 
@@ -415,11 +417,12 @@ static unsigned long write_reuse_object(struct sha1file *f, struct object_entry
 }
 
 /* Return 0 if we will bust the pack-size limit */
-static unsigned long write_object(struct sha1file *f,
-				  struct object_entry *entry,
-				  off_t write_offset)
+static off_t write_object(struct sha1file *f,
+			  struct object_entry *entry,
+			  off_t write_offset)
 {
-	unsigned long limit, len;
+	unsigned long limit;
+	off_t len;
 	int usable_delta, to_reuse;
 
 	if (!pack_to_stdout)
@@ -491,7 +494,7 @@ static enum write_one_status write_one(struct sha1file *f,
 				       struct object_entry *e,
 				       off_t *offset)
 {
-	unsigned long size;
+	off_t size;
 	int recursing;
 
 	/*
@@ -835,8 +838,7 @@ static void write_pack_file(void)
 			 * to preserve this property.
 			 */
 			if (stat(pack_tmp_name, &st) < 0) {
-				warning("failed to stat %s: %s",
-					pack_tmp_name, strerror(errno));
+				warning_errno("failed to stat %s", pack_tmp_name);
 			} else if (!last_mtime) {
 				last_mtime = st.st_mtime;
 			} else {
@@ -844,8 +846,7 @@ static void write_pack_file(void)
 				utb.actime = st.st_atime;
 				utb.modtime = --last_mtime;
 				if (utime(pack_tmp_name, &utb) < 0)
-					warning("failed utime() on %s: %s",
-						pack_tmp_name, strerror(errno));
+					warning_errno("failed utime() on %s", pack_tmp_name);
 			}
 
 			strbuf_addf(&tmpname, "%s-", base_name);
@@ -978,6 +979,23 @@ static int want_object_in_pack(const unsigned char *sha1,
 				return 1;
 			if (incremental)
 				return 0;
+
+			/*
+			 * When asked to do --local (do not include an
+			 * object that appears in a pack we borrow
+			 * from elsewhere) or --honor-pack-keep (do not
+			 * include an object that appears in a pack marked
+			 * with .keep), we need to make sure no copy of this
+			 * object come from in _any_ pack that causes us to
+			 * omit it, and need to complete this loop.  When
+			 * neither option is in effect, we know the object
+			 * we just found is going to be packed, so break
+			 * out of the loop to return 1 now.
+			 */
+			if (!ignore_packed_keep &&
+			    (!local || !have_non_local_packs))
+				break;
+
 			if (local && !p->pack_local)
 				return 0;
 			if (ignore_packed_keep && p->pack_local && p->pack_keep)
@@ -1193,7 +1211,7 @@ static void add_pbase_object(struct tree_desc *tree,
 		if (cmp < 0)
 			return;
 		if (name[cmplen] != '/') {
-			add_object_entry(entry.sha1,
+			add_object_entry(entry.oid->hash,
 					 object_type(entry.mode),
 					 fullname, 1);
 			return;
@@ -1204,7 +1222,7 @@ static void add_pbase_object(struct tree_desc *tree,
 			const char *down = name+cmplen+1;
 			int downlen = name_cmp_len(down);
 
-			tree = pbase_tree_get(entry.sha1);
+			tree = pbase_tree_get(entry.oid->hash);
 			if (!tree)
 				return;
 			init_tree_desc(&sub, tree->tree_data, tree->tree_size);
@@ -2380,6 +2398,32 @@ static void add_objects_in_unpacked_packs(struct rev_info *revs)
 	free(in_pack.array);
 }
 
+static int add_loose_object(const unsigned char *sha1, const char *path,
+			    void *data)
+{
+	enum object_type type = sha1_object_info(sha1, NULL);
+
+	if (type < 0) {
+		warning("loose object at %s could not be examined", path);
+		return 0;
+	}
+
+	add_object_entry(sha1, type, "", 0);
+	return 0;
+}
+
+/*
+ * We actually don't even have to worry about reachability here.
+ * add_object_entry will weed out duplicates, so we just add every
+ * loose object we find.
+ */
+static void add_unreachable_loose_objects(void)
+{
+	for_each_loose_file_in_objdir(get_object_directory(),
+				      add_loose_object,
+				      NULL, NULL, NULL);
+}
+
 static int has_sha1_pack_kept_or_nonlocal(const unsigned char *sha1)
 {
 	static struct packed_git *last_found = (void *)1;
@@ -2549,6 +2593,8 @@ static void get_object_list(int ac, const char **av)
 
 	if (keep_unreachable)
 		add_objects_in_unpacked_packs(&revs);
+	if (pack_loose_unreachable)
+		add_unreachable_loose_objects();
 	if (unpack_unreachable)
 		loosen_unused_packed_objects(&revs);
 
@@ -2649,6 +2695,8 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 			 N_("include tag objects that refer to objects to be packed")),
 		OPT_BOOL(0, "keep-unreachable", &keep_unreachable,
 			 N_("keep unreachable objects")),
+		OPT_BOOL(0, "pack-loose-unreachable", &pack_loose_unreachable,
+			 N_("pack loose unreachable objects")),
 		{ OPTION_CALLBACK, 0, "unpack-unreachable", NULL, N_("time"),
 		  N_("unpack unreachable objects newer than <time>"),
 		  PARSE_OPT_OPTARG, option_parse_unpack_unreachable },
@@ -2754,6 +2802,28 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 		progress = 2;
 
 	prepare_packed_git();
+	if (ignore_packed_keep) {
+		struct packed_git *p;
+		for (p = packed_git; p; p = p->next)
+			if (p->pack_local && p->pack_keep)
+				break;
+		if (!p) /* no keep-able packs found */
+			ignore_packed_keep = 0;
+	}
+	if (local) {
+		/*
+		 * unlike ignore_packed_keep above, we do not want to
+		 * unset "local" based on looking at packs, as it
+		 * also covers non-local objects
+		 */
+		struct packed_git *p;
+		for (p = packed_git; p; p = p->next) {
+			if (!p->pack_local) {
+				have_non_local_packs = 1;
+				break;
+			}
+		}
+	}
 
 	if (progress)
 		progress_state = start_progress(_("Counting objects"), 0);
diff --git a/builtin/patch-id.c b/builtin/patch-id.c
index 366ce5a5d4..a84d0003a3 100644
--- a/builtin/patch-id.c
+++ b/builtin/patch-id.c
@@ -81,16 +81,13 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result,
 
 	while (strbuf_getwholeline(line_buf, stdin, '\n') != EOF) {
 		char *line = line_buf->buf;
-		char *p = line;
+		const char *p = line;
 		int len;
 
-		if (!memcmp(line, "diff-tree ", 10))
-			p += 10;
-		else if (!memcmp(line, "commit ", 7))
-			p += 7;
-		else if (!memcmp(line, "From ", 5))
-			p += 5;
-		else if (!memcmp(line, "\\ ", 2) && 12 < strlen(line))
+		if (!skip_prefix(line, "diff-tree ", &p) &&
+		    !skip_prefix(line, "commit ", &p) &&
+		    !skip_prefix(line, "From ", &p) &&
+		    starts_with(line, "\\ ") && 12 < strlen(line))
 			continue;
 
 		if (!get_oid_hex(p, next_oid)) {
@@ -99,14 +96,14 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result,
 		}
 
 		/* Ignore commit comments */
-		if (!patchlen && memcmp(line, "diff ", 5))
+		if (!patchlen && !starts_with(line, "diff "))
 			continue;
 
 		/* Parsing diff header?  */
 		if (before == -1) {
-			if (!memcmp(line, "index ", 6))
+			if (starts_with(line, "index "))
 				continue;
-			else if (!memcmp(line, "--- ", 4))
+			else if (starts_with(line, "--- "))
 				before = after = 1;
 			else if (!isalpha(line[0]))
 				break;
@@ -114,14 +111,14 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result,
 
 		/* Looking for a valid hunk header?  */
 		if (before == 0 && after == 0) {
-			if (!memcmp(line, "@@ -", 4)) {
+			if (starts_with(line, "@@ -")) {
 				/* Parse next hunk, but ignore line numbers.  */
 				scan_hunk_header(line, &before, &after);
 				continue;
 			}
 
 			/* Split at the end of the patch.  */
-			if (memcmp(line, "diff ", 5))
+			if (!starts_with(line, "diff "))
 				break;
 
 			/* Else we're parsing another header.  */
diff --git a/builtin/pull.c b/builtin/pull.c
index 6214af9b10..398aae16c0 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -86,9 +86,12 @@ static char *opt_commit;
 static char *opt_edit;
 static char *opt_ff;
 static char *opt_verify_signatures;
+static int opt_autostash = -1;
+static int config_autostash;
 static struct argv_array opt_strategies = ARGV_ARRAY_INIT;
 static struct argv_array opt_strategy_opts = ARGV_ARRAY_INIT;
 static char *opt_gpg_sign;
+static int opt_allow_unrelated_histories;
 
 /* Options passed to git-fetch */
 static char *opt_all;
@@ -149,6 +152,8 @@ static struct option pull_options[] = {
 	OPT_PASSTHRU(0, "verify-signatures", &opt_verify_signatures, NULL,
 		N_("verify that the named commit has a valid GPG signature"),
 		PARSE_OPT_NOARG),
+	OPT_BOOL(0, "autostash", &opt_autostash,
+		N_("automatically stash/stash pop before and after rebase")),
 	OPT_PASSTHRU_ARGV('s', "strategy", &opt_strategies, N_("strategy"),
 		N_("merge strategy to use"),
 		0),
@@ -159,6 +164,9 @@ static struct option pull_options[] = {
 	OPT_PASSTHRU('S', "gpg-sign", &opt_gpg_sign, N_("key-id"),
 		N_("GPG sign commit"),
 		PARSE_OPT_OPTARG),
+	OPT_SET_INT(0, "allow-unrelated-histories",
+		    &opt_allow_unrelated_histories,
+		    N_("allow merging unrelated histories"), 1),
 
 	/* Options passed to git-fetch */
 	OPT_GROUP(N_("Options related to fetching")),
@@ -306,6 +314,18 @@ static enum rebase_type config_get_rebase(void)
 }
 
 /**
+ * Read config variables.
+ */
+static int git_pull_config(const char *var, const char *value, void *cb)
+{
+	if (!strcmp(var, "rebase.autostash")) {
+		config_autostash = git_config_bool(var, value);
+		return 0;
+	}
+	return git_default_config(var, value, cb);
+}
+
+/**
  * Returns 1 if there are unstaged changes, 0 otherwise.
  */
 static int has_unstaged_changes(const char *prefix)
@@ -612,6 +632,8 @@ static int run_merge(void)
 	argv_array_pushv(&args, opt_strategy_opts.argv);
 	if (opt_gpg_sign)
 		argv_array_push(&args, opt_gpg_sign);
+	if (opt_allow_unrelated_histories > 0)
+		argv_array_push(&args, "--allow-unrelated-histories");
 
 	argv_array_push(&args, "FETCH_HEAD");
 	ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
@@ -789,6 +811,13 @@ static int run_rebase(const unsigned char *curr_head,
 	argv_array_pushv(&args, opt_strategy_opts.argv);
 	if (opt_gpg_sign)
 		argv_array_push(&args, opt_gpg_sign);
+	if (opt_autostash == 0)
+		argv_array_push(&args, "--no-autostash");
+	else if (opt_autostash == 1)
+		argv_array_push(&args, "--autostash");
+	if (opt_verify_signatures &&
+	    !strcmp(opt_verify_signatures, "--verify-signatures"))
+		warning(_("ignoring --verify-signatures for rebase"));
 
 	argv_array_push(&args, "--onto");
 	argv_array_push(&args, sha1_to_hex(merge_head));
@@ -823,10 +852,10 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
 	if (opt_rebase < 0)
 		opt_rebase = config_get_rebase();
 
-	git_config(git_default_config, NULL);
+	git_config(git_pull_config, NULL);
 
 	if (read_cache_unmerged())
-		die_resolve_conflict("Pull");
+		die_resolve_conflict("pull");
 
 	if (file_exists(git_path("MERGE_HEAD")))
 		die_conclude_merge();
@@ -834,13 +863,17 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
 	if (get_sha1("HEAD", orig_head))
 		hashclr(orig_head);
 
+	if (!opt_rebase && opt_autostash != -1)
+		die(_("--[no-]autostash option is only valid with --rebase."));
+
 	if (opt_rebase) {
-		int autostash = 0;
+		int autostash = config_autostash;
+		if (opt_autostash != -1)
+			autostash = opt_autostash;
 
 		if (is_null_sha1(orig_head) && !is_cache_unborn())
 			die(_("Updating an unborn branch with changes added to the index."));
 
-		git_config_get_bool("rebase.autostash", &autostash);
 		if (!autostash)
 			die_on_unclean_work_tree(prefix);
 
diff --git a/builtin/push.c b/builtin/push.c
index 4e9e4dbab2..3bb9d6b7e6 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -353,7 +353,8 @@ static int push_with_options(struct transport *transport, int flags)
 	return 1;
 }
 
-static int do_push(const char *repo, int flags)
+static int do_push(const char *repo, int flags,
+		   const struct string_list *push_options)
 {
 	int i, errs;
 	struct remote *remote = pushremote_get(repo);
@@ -376,6 +377,9 @@ static int do_push(const char *repo, int flags)
 	if (remote->mirror)
 		flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
 
+	if (push_options->nr)
+		flags |= TRANSPORT_PUSH_OPTIONS;
+
 	if ((flags & TRANSPORT_PUSH_ALL) && refspec) {
 		if (!strcmp(*refspec, "refs/tags/*"))
 			return error(_("--all and --tags are incompatible"));
@@ -406,13 +410,16 @@ static int do_push(const char *repo, int flags)
 		for (i = 0; i < url_nr; i++) {
 			struct transport *transport =
 				transport_get(remote, url[i]);
+			if (flags & TRANSPORT_PUSH_OPTIONS)
+				transport->push_options = push_options;
 			if (push_with_options(transport, flags))
 				errs++;
 		}
 	} else {
 		struct transport *transport =
 			transport_get(remote, NULL);
-
+		if (flags & TRANSPORT_PUSH_OPTIONS)
+			transport->push_options = push_options;
 		if (push_with_options(transport, flags))
 			errs++;
 	}
@@ -500,6 +507,9 @@ int cmd_push(int argc, const char **argv, const char *prefix)
 	int push_cert = -1;
 	int rc;
 	const char *repo = NULL;	/* default repository */
+	static struct string_list push_options = STRING_LIST_INIT_DUP;
+	static struct string_list_item *item;
+
 	struct option options[] = {
 		OPT__VERBOSITY(&verbosity),
 		OPT_STRING( 0 , "repo", &repo, N_("repository"), N_("repository")),
@@ -533,6 +543,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
 		  0, "signed", &push_cert, "yes|no|if-asked", N_("GPG sign the push"),
 		  PARSE_OPT_OPTARG, option_parse_push_signed },
 		OPT_BIT(0, "atomic", &flags, N_("request atomic transaction on remote side"), TRANSPORT_PUSH_ATOMIC),
+		OPT_STRING_LIST('o', "push-option", &push_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"),
@@ -563,7 +574,11 @@ int cmd_push(int argc, const char **argv, const char *prefix)
 		set_refspecs(argv + 1, argc - 1, repo);
 	}
 
-	rc = do_push(repo, flags);
+	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);
 	if (rc == -1)
 		usage_with_options(push_usage, options);
 	else
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index c8e32b297c..92e1213ecc 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -21,7 +21,10 @@
 #include "sigchain.h"
 #include "fsck.h"
 
-static const char receive_pack_usage[] = "git receive-pack <git-dir>";
+static const char * const receive_pack_usage[] = {
+	N_("git receive-pack <git-dir>"),
+	NULL
+};
 
 enum deny_action {
 	DENY_UNCONFIGURED,
@@ -41,15 +44,17 @@ static struct strbuf fsck_msg_types = STRBUF_INIT;
 static int receive_unpack_limit = -1;
 static int transfer_unpack_limit = -1;
 static int advertise_atomic_push = 1;
+static int advertise_push_options;
 static int unpack_limit = 100;
 static int report_status;
 static int use_sideband;
 static int use_atomic;
+static int use_push_options;
 static int quiet;
 static int prefer_ofs_delta = 1;
 static int auto_update_server_info;
 static int auto_gc = 1;
-static int fix_thin = 1;
+static int reject_thin;
 static int stateless_rpc;
 static const char *service_dir;
 static const char *head_name;
@@ -73,6 +78,13 @@ static long nonce_stamp_slop;
 static unsigned long nonce_stamp_slop_limit;
 static struct ref_transaction *transaction;
 
+static enum {
+	KEEPALIVE_NEVER = 0,
+	KEEPALIVE_AFTER_NUL,
+	KEEPALIVE_ALWAYS
+} use_keepalive;
+static int keepalive_in_sec = 5;
+
 static enum deny_action parse_deny_action(const char *var, const char *value)
 {
 	if (value) {
@@ -190,6 +202,16 @@ static int receive_pack_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
+	if (strcmp(var, "receive.advertisepushoptions") == 0) {
+		advertise_push_options = git_config_bool(var, value);
+		return 0;
+	}
+
+	if (strcmp(var, "receive.keepalive") == 0) {
+		keepalive_in_sec = git_config_int(var, value);
+		return 0;
+	}
+
 	return git_default_config(var, value, cb);
 }
 
@@ -208,6 +230,8 @@ static void show_ref(const char *path, const unsigned char *sha1)
 			strbuf_addstr(&cap, " ofs-delta");
 		if (push_cert_nonce)
 			strbuf_addf(&cap, " push-cert=%s", push_cert_nonce);
+		if (advertise_push_options)
+			strbuf_addstr(&cap, " push-options");
 		strbuf_addf(&cap, " agent=%s", git_user_agent_sanitized());
 		packet_write(1, "%s %s%c%s\n",
 			     sha1_to_hex(sha1), path, 0, cap.buf);
@@ -316,10 +340,60 @@ static void rp_error(const char *err, ...)
 static int copy_to_sideband(int in, int out, void *arg)
 {
 	char data[128];
+	int keepalive_active = 0;
+
+	if (keepalive_in_sec <= 0)
+		use_keepalive = KEEPALIVE_NEVER;
+	if (use_keepalive == KEEPALIVE_ALWAYS)
+		keepalive_active = 1;
+
 	while (1) {
-		ssize_t sz = xread(in, data, sizeof(data));
+		ssize_t sz;
+
+		if (keepalive_active) {
+			struct pollfd pfd;
+			int ret;
+
+			pfd.fd = in;
+			pfd.events = POLLIN;
+			ret = poll(&pfd, 1, 1000 * keepalive_in_sec);
+
+			if (ret < 0) {
+				if (errno == EINTR)
+					continue;
+				else
+					break;
+			} else if (ret == 0) {
+				/* no data; send a keepalive packet */
+				static const char buf[] = "0005\1";
+				write_or_die(1, buf, sizeof(buf) - 1);
+				continue;
+			} /* else there is actual data to read */
+		}
+
+		sz = xread(in, data, sizeof(data));
 		if (sz <= 0)
 			break;
+
+		if (use_keepalive == KEEPALIVE_AFTER_NUL && !keepalive_active) {
+			const char *p = memchr(data, '\0', sz);
+			if (p) {
+				/*
+				 * The NUL tells us to start sending keepalives. Make
+				 * sure we send any other data we read along
+				 * with it.
+				 */
+				keepalive_active = 1;
+				send_sideband(1, 2, data, p - data, use_sideband);
+				send_sideband(1, 2, p + 1, sz - (p - data + 1), use_sideband);
+				continue;
+			}
+		}
+
+		/*
+		 * Either we're not looking for a NUL signal, or we didn't see
+		 * it yet; just pass along the data.
+		 */
 		send_sideband(1, 2, data, sz, use_sideband);
 	}
 	close(in);
@@ -547,8 +621,16 @@ static void prepare_push_cert_sha1(struct child_process *proc)
 	}
 }
 
+struct receive_hook_feed_state {
+	struct command *cmd;
+	int skip_broken;
+	struct strbuf buf;
+	const struct string_list *push_options;
+};
+
 typedef int (*feed_fn)(void *, const char **, size_t *);
-static int run_and_feed_hook(const char *hook_name, feed_fn feed, void *feed_state)
+static int run_and_feed_hook(const char *hook_name, feed_fn feed,
+			     struct receive_hook_feed_state *feed_state)
 {
 	struct child_process proc = CHILD_PROCESS_INIT;
 	struct async muxer;
@@ -564,6 +646,16 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed, void *feed_sta
 	proc.argv = argv;
 	proc.in = -1;
 	proc.stdout_to_stderr = 1;
+	if (feed_state->push_options) {
+		int i;
+		for (i = 0; i < feed_state->push_options->nr; i++)
+			argv_array_pushf(&proc.env_array,
+				"GIT_PUSH_OPTION_%d=%s", i,
+				feed_state->push_options->items[i].string);
+		argv_array_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT=%d",
+				 feed_state->push_options->nr);
+	} else
+		argv_array_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT");
 
 	if (use_sideband) {
 		memset(&muxer, 0, sizeof(muxer));
@@ -603,12 +695,6 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed, void *feed_sta
 	return finish_command(&proc);
 }
 
-struct receive_hook_feed_state {
-	struct command *cmd;
-	int skip_broken;
-	struct strbuf buf;
-};
-
 static int feed_receive_hook(void *state_, const char **bufp, size_t *sizep)
 {
 	struct receive_hook_feed_state *state = state_;
@@ -631,8 +717,10 @@ static int feed_receive_hook(void *state_, const char **bufp, size_t *sizep)
 	return 0;
 }
 
-static int run_receive_hook(struct command *commands, const char *hook_name,
-			    int skip_broken)
+static int run_receive_hook(struct command *commands,
+			    const char *hook_name,
+			    int skip_broken,
+			    const struct string_list *push_options)
 {
 	struct receive_hook_feed_state state;
 	int status;
@@ -643,6 +731,7 @@ static int run_receive_hook(struct command *commands, const char *hook_name,
 	if (feed_receive_hook(&state, NULL, NULL))
 		return 0;
 	state.cmd = commands;
+	state.push_options = push_options;
 	status = run_and_feed_hook(hook_name, feed_receive_hook, &state);
 	strbuf_release(&state.buf);
 	return status;
@@ -734,7 +823,7 @@ static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
 {
 	static struct lock_file shallow_lock;
 	struct sha1_array extra = SHA1_ARRAY_INIT;
-	const char *alt_file;
+	struct check_connected_options opt = CHECK_CONNECTED_INIT;
 	uint32_t mask = 1 << (cmd->index % 32);
 	int i;
 
@@ -746,9 +835,8 @@ static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
 		    !delayed_reachability_test(si, i))
 			sha1_array_append(&extra, si->shallow->sha1[i]);
 
-	setup_alternate_shallow(&shallow_lock, &alt_file, &extra);
-	if (check_shallow_connected(command_singleton_iterator,
-				    0, cmd, alt_file)) {
+	setup_alternate_shallow(&shallow_lock, &opt.shallow_file, &extra);
+	if (check_connected(command_singleton_iterator, cmd, &opt)) {
 		rollback_lock_file(&shallow_lock);
 		sha1_array_clear(&extra);
 		return -1;
@@ -1081,13 +1169,13 @@ static void check_aliased_update(struct command *cmd, struct string_list *list)
 	if (!(flag & REF_ISSYMREF))
 		return;
 
-	dst_name = strip_namespace(dst_name);
 	if (!dst_name) {
 		rp_error("refusing update to broken symref '%s'", cmd->ref_name);
 		cmd->skip_update = 1;
 		cmd->error_string = "broken symref";
 		return;
 	}
+	dst_name = strip_namespace(dst_name);
 
 	if ((item = string_list_lookup(list, dst_name)) == NULL)
 		return;
@@ -1157,8 +1245,8 @@ static void set_connectivity_errors(struct command *commands,
 		if (shallow_update && si->shallow_ref[cmd->index])
 			/* to be checked in update_shallow_ref() */
 			continue;
-		if (!check_everything_connected(command_singleton_iterator,
-						0, &singleton))
+		if (!check_connected(command_singleton_iterator, &singleton,
+				     NULL))
 			continue;
 		cmd->error_string = "missing necessary objects";
 	}
@@ -1313,11 +1401,15 @@ cleanup:
 
 static void execute_commands(struct command *commands,
 			     const char *unpacker_error,
-			     struct shallow_info *si)
+			     struct shallow_info *si,
+			     const struct string_list *push_options)
 {
+	struct check_connected_options opt = CHECK_CONNECTED_INIT;
 	struct command *cmd;
 	unsigned char sha1[20];
 	struct iterate_data data;
+	struct async muxer;
+	int err_fd = 0;
 
 	if (unpacker_error) {
 		for (cmd = commands; cmd; cmd = cmd->next)
@@ -1325,14 +1417,28 @@ static void execute_commands(struct command *commands,
 		return;
 	}
 
+	if (use_sideband) {
+		memset(&muxer, 0, sizeof(muxer));
+		muxer.proc = copy_to_sideband;
+		muxer.in = -1;
+		if (!start_async(&muxer))
+			err_fd = muxer.in;
+		/* ...else, continue without relaying sideband */
+	}
+
 	data.cmds = commands;
 	data.si = si;
-	if (check_everything_connected(iterate_receive_command_list, 0, &data))
+	opt.err_fd = err_fd;
+	opt.progress = err_fd && !quiet;
+	if (check_connected(iterate_receive_command_list, &data, &opt))
 		set_connectivity_errors(commands, si);
 
+	if (use_sideband)
+		finish_async(&muxer);
+
 	reject_updates_to_hidden(commands);
 
-	if (run_receive_hook(commands, "pre-receive", 0)) {
+	if (run_receive_hook(commands, "pre-receive", 0, push_options)) {
 		for (cmd = commands; cmd; cmd = cmd->next) {
 			if (!cmd->error_string)
 				cmd->error_string = "pre-receive hook declined";
@@ -1436,6 +1542,9 @@ static struct command *read_head_info(struct sha1_array *shallow)
 			if (advertise_atomic_push
 			    && parse_feature_request(feature_list, "atomic"))
 				use_atomic = 1;
+			if (advertise_push_options
+			    && parse_feature_request(feature_list, "push-options"))
+				use_push_options = 1;
 		}
 
 		if (!strcmp(line, "push-cert")) {
@@ -1468,6 +1577,21 @@ static struct command *read_head_info(struct sha1_array *shallow)
 	return commands;
 }
 
+static void read_push_options(struct string_list *options)
+{
+	while (1) {
+		char *line;
+		int len;
+
+		line = packet_read_line(0, &len);
+
+		if (!line)
+			break;
+
+		string_list_append(options, line);
+	}
+}
+
 static const char *parse_pack_header(struct pack_header *hdr)
 {
 	switch (read_pack_header(0, hdr)) {
@@ -1545,10 +1669,14 @@ static const char *unpack(int err_fd, struct shallow_info *si)
 				 (uintmax_t)getpid(),
 				 hostname);
 
+		if (!quiet && err_fd)
+			argv_array_push(&child.args, "--show-resolving-progress");
+		if (use_sideband)
+			argv_array_push(&child.args, "--report-end-of-input");
 		if (fsck_objects)
 			argv_array_pushf(&child.args, "--strict%s",
 				fsck_msg_types.buf);
-		if (fix_thin)
+		if (!reject_thin)
 			argv_array_push(&child.args, "--fix-thin");
 		child.out = -1;
 		child.err = err_fd;
@@ -1574,6 +1702,7 @@ static const char *unpack_with_sideband(struct shallow_info *si)
 	if (!use_sideband)
 		return unpack(0, si);
 
+	use_keepalive = KEEPALIVE_AFTER_NUL;
 	memset(&muxer, 0, sizeof(muxer));
 	muxer.proc = copy_to_sideband;
 	muxer.in = -1;
@@ -1707,45 +1836,29 @@ static int delete_only(struct command *commands)
 int cmd_receive_pack(int argc, const char **argv, const char *prefix)
 {
 	int advertise_refs = 0;
-	int i;
 	struct command *commands;
 	struct sha1_array shallow = SHA1_ARRAY_INIT;
 	struct sha1_array ref = SHA1_ARRAY_INIT;
 	struct shallow_info si;
 
-	packet_trace_identity("receive-pack");
+	struct option options[] = {
+		OPT__QUIET(&quiet, N_("quiet")),
+		OPT_HIDDEN_BOOL(0, "stateless-rpc", &stateless_rpc, NULL),
+		OPT_HIDDEN_BOOL(0, "advertise-refs", &advertise_refs, NULL),
+		OPT_HIDDEN_BOOL(0, "reject-thin-pack-for-testing", &reject_thin, NULL),
+		OPT_END()
+	};
 
-	argv++;
-	for (i = 1; i < argc; i++) {
-		const char *arg = *argv++;
+	packet_trace_identity("receive-pack");
 
-		if (*arg == '-') {
-			if (!strcmp(arg, "--quiet")) {
-				quiet = 1;
-				continue;
-			}
+	argc = parse_options(argc, argv, prefix, options, receive_pack_usage, 0);
 
-			if (!strcmp(arg, "--advertise-refs")) {
-				advertise_refs = 1;
-				continue;
-			}
-			if (!strcmp(arg, "--stateless-rpc")) {
-				stateless_rpc = 1;
-				continue;
-			}
-			if (!strcmp(arg, "--reject-thin-pack-for-testing")) {
-				fix_thin = 0;
-				continue;
-			}
+	if (argc > 1)
+		usage_msg_opt(_("Too many arguments."), receive_pack_usage, options);
+	if (argc == 0)
+		usage_msg_opt(_("You must specify a directory."), receive_pack_usage, options);
 
-			usage(receive_pack_usage);
-		}
-		if (service_dir)
-			usage(receive_pack_usage);
-		service_dir = arg;
-	}
-	if (!service_dir)
-		usage(receive_pack_usage);
+	service_dir = argv[0];
 
 	setup_path();
 
@@ -1769,6 +1882,10 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
 
 	if ((commands = read_head_info(&shallow)) != NULL) {
 		const char *unpack_status = NULL;
+		struct string_list push_options = STRING_LIST_INIT_DUP;
+
+		if (use_push_options)
+			read_push_options(&push_options);
 
 		prepare_shallow_info(&si, &shallow);
 		if (!si.nr_ours && !si.nr_theirs)
@@ -1777,20 +1894,36 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
 			unpack_status = unpack_with_sideband(&si);
 			update_shallow_info(commands, &si, &ref);
 		}
-		execute_commands(commands, unpack_status, &si);
+		use_keepalive = KEEPALIVE_ALWAYS;
+		execute_commands(commands, unpack_status, &si,
+				 &push_options);
 		if (pack_lockfile)
 			unlink_or_warn(pack_lockfile);
 		if (report_status)
 			report(commands, unpack_status);
-		run_receive_hook(commands, "post-receive", 1);
+		run_receive_hook(commands, "post-receive", 1,
+				 &push_options);
 		run_update_post_hook(commands);
+		if (push_options.nr)
+			string_list_clear(&push_options, 0);
 		if (auto_gc) {
 			const char *argv_gc_auto[] = {
 				"gc", "--auto", "--quiet", NULL,
 			};
-			int opt = RUN_GIT_CMD | RUN_COMMAND_STDOUT_TO_STDERR;
+			struct child_process proc = CHILD_PROCESS_INIT;
+
+			proc.no_stdin = 1;
+			proc.stdout_to_stderr = 1;
+			proc.err = use_sideband ? -1 : 0;
+			proc.git_cmd = 1;
+			proc.argv = argv_gc_auto;
+
 			close_all_packs();
-			run_command_v_opt(argv_gc_auto, opt);
+			if (!start_command(&proc)) {
+				if (use_sideband)
+					copy_to_sideband(proc.err, -1, NULL);
+				finish_command(&proc);
+			}
 		}
 		if (auto_update_server_info)
 			update_server_info(0);
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 2d46b6482a..7a7136e53e 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -84,8 +84,8 @@ static int tree_is_complete(const unsigned char *sha1)
 	init_tree_desc(&desc, tree->buffer, tree->size);
 	complete = 1;
 	while (tree_entry(&desc, &entry)) {
-		if (!has_sha1_file(entry.sha1) ||
-		    (S_ISDIR(entry.mode) && !tree_is_complete(entry.sha1))) {
+		if (!has_sha1_file(entry.oid->hash) ||
+		    (S_ISDIR(entry.mode) && !tree_is_complete(entry.oid->hash))) {
 			tree->object.flags |= INCOMPLETE;
 			complete = 0;
 		}
diff --git a/builtin/remote.c b/builtin/remote.c
index d33766be39..9f6a6b3a9c 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -247,7 +247,7 @@ struct branch_info {
 	enum { NO_REBASE, NORMAL_REBASE, INTERACTIVE_REBASE } rebase;
 };
 
-static struct string_list branch_list;
+static struct string_list branch_list = STRING_LIST_INIT_NODUP;
 
 static const char *abbrev_ref(const char *name, const char *prefix)
 {
@@ -539,10 +539,6 @@ static int add_branch_for_removal(const char *refname,
 		return 0;
 	}
 
-	/* make sure that symrefs are deleted */
-	if (flags & REF_ISSYMREF)
-		return unlink(git_path("%s", refname));
-
 	string_list_append(branches->branches, refname);
 
 	return 0;
@@ -788,7 +784,7 @@ static int rm(int argc, const char **argv)
 	strbuf_release(&buf);
 
 	if (!result)
-		result = delete_refs(&branches);
+		result = delete_refs(&branches, REF_NODEREF);
 	string_list_clear(&branches, 0);
 
 	if (skipped.nr) {
@@ -952,7 +948,7 @@ static int show_local_info_item(struct string_list_item *item, void *cb_data)
 	struct show_info *show_info = cb_data;
 	struct branch_info *branch_info = item->util;
 	struct string_list *merge = &branch_info->merge;
-	const char *also;
+	int width = show_info->width + 4;
 	int i;
 
 	if (branch_info->rebase && branch_info->merge.nr > 1) {
@@ -963,19 +959,18 @@ static int show_local_info_item(struct string_list_item *item, void *cb_data)
 
 	printf("    %-*s ", show_info->width, item->string);
 	if (branch_info->rebase) {
-		printf_ln(_(branch_info->rebase == INTERACTIVE_REBASE ?
-			"rebases interactively onto remote %s" :
-			"rebases onto remote %s"), merge->items[0].string);
+		printf_ln(branch_info->rebase == INTERACTIVE_REBASE
+			  ? _("rebases interactively onto remote %s")
+			  : _("rebases onto remote %s"), merge->items[0].string);
 		return 0;
 	} else if (show_info->any_rebase) {
 		printf_ln(_(" merges with remote %s"), merge->items[0].string);
-		also = _("    and with remote");
+		width++;
 	} else {
 		printf_ln(_("merges with remote %s"), merge->items[0].string);
-		also = _("   and with remote");
 	}
 	for (i = 1; i < merge->nr; i++)
-		printf("    %-*s %s %s\n", show_info->width, "", also,
+		printf(_("%-*s    and with remote %s\n"), width, "",
 		       merge->items[i].string);
 
 	return 0;
@@ -1158,11 +1153,11 @@ static int show(int argc, const char **argv)
 			   the one in "  Fetch URL: %s" translation */
 			printf_ln(_("  Push  URL: %s"), url[i]);
 		if (!i)
-			printf_ln(_("  Push  URL: %s"), "(no URL)");
+			printf_ln(_("  Push  URL: %s"), _("(no URL)"));
 		if (no_query)
-			printf_ln(_("  HEAD branch: %s"), "(not queried)");
+			printf_ln(_("  HEAD branch: %s"), _("(not queried)"));
 		else if (!states.heads.nr)
-			printf_ln(_("  HEAD branch: %s"), "(unknown)");
+			printf_ln(_("  HEAD branch: %s"), _("(unknown)"));
 		else if (states.heads.nr == 1)
 			printf_ln(_("  HEAD branch: %s"), states.heads.items[0].string);
 		else {
@@ -1305,7 +1300,7 @@ static int prune_remote(const char *remote, int dry_run)
 	string_list_sort(&refs_to_prune);
 
 	if (!dry_run)
-		result |= delete_refs(&refs_to_prune);
+		result |= delete_refs(&refs_to_prune, 0);
 
 	for_each_string_list_item(item, &states.stale) {
 		const char *refname = item->util;
diff --git a/builtin/repack.c b/builtin/repack.c
index 858db38f52..80dd06b4a2 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -146,6 +146,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	int pack_everything = 0;
 	int delete_redundant = 0;
 	const char *unpack_unreachable = NULL;
+	int keep_unreachable = 0;
 	const char *window = NULL, *window_memory = NULL;
 	const char *depth = NULL;
 	const char *max_pack_size = NULL;
@@ -175,6 +176,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 				N_("write bitmap index")),
 		OPT_STRING(0, "unpack-unreachable", &unpack_unreachable, N_("approxidate"),
 				N_("with -A, do not loosen objects older than this")),
+		OPT_BOOL('k', "keep-unreachable", &keep_unreachable,
+				N_("with -a, repack unreachable objects")),
 		OPT_STRING(0, "window", &window, N_("n"),
 				N_("size of the window used for delta compression")),
 		OPT_STRING(0, "window-memory", &window_memory, N_("bytes"),
@@ -196,6 +199,10 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	if (delete_redundant && repository_format_precious_objects)
 		die(_("cannot delete packs in a precious-objects repo"));
 
+	if (keep_unreachable &&
+	    (unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE)))
+		die(_("--keep-unreachable and -A are incompatible"));
+
 	if (pack_kept_objects < 0)
 		pack_kept_objects = write_bitmaps;
 
@@ -239,6 +246,9 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 			} else if (pack_everything & LOOSEN_UNREACHABLE) {
 				argv_array_push(&cmd.args,
 						"--unpack-unreachable");
+			} else if (keep_unreachable) {
+				argv_array_push(&cmd.args, "--keep-unreachable");
+				argv_array_push(&cmd.args, "--pack-loose-unreachable");
 			} else {
 				argv_array_push(&cmd.env_array, "GIT_REF_PARANOIA=1");
 			}
@@ -378,7 +388,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 					  item->string,
 					  exts[ext].name);
 			if (remove_path(fname))
-				warning(_("removing '%s' failed"), fname);
+				warning(_("failed to remove '%s'"), fname);
 			free(fname);
 		}
 	}
diff --git a/builtin/reset.c b/builtin/reset.c
index 092c3a5399..9020ec66c8 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -103,7 +103,7 @@ static void print_new_head_line(struct commit *commit)
 	if (body) {
 		const char *eol;
 		size_t len;
-		body += 2;
+		body = skip_blank_lines(body + 2);
 		eol = strchr(body, '\n');
 		len = eol ? eol - body : strlen(body);
 		printf(" %.*s\n", (int) len, body);
@@ -121,7 +121,7 @@ static void update_index_from_diff(struct diff_queue_struct *q,
 
 	for (i = 0; i < q->nr; i++) {
 		struct diff_filespec *one = q->queue[i]->one;
-		int is_missing = !(one->mode && !is_null_sha1(one->sha1));
+		int is_missing = !(one->mode && !is_null_oid(&one->oid));
 		struct cache_entry *ce;
 
 		if (is_missing && !intent_to_add) {
@@ -129,7 +129,7 @@ static void update_index_from_diff(struct diff_queue_struct *q,
 			continue;
 		}
 
-		ce = make_cache_entry(one->mode, one->sha1, one->path,
+		ce = make_cache_entry(one->mode, one->oid.hash, one->path,
 				      0, 0);
 		if (!ce)
 			die(_("make_cache_entry failed for path '%s'"),
@@ -158,7 +158,7 @@ static int read_from_tree(const struct pathspec *pathspec,
 		return 1;
 	diffcore_std(&opt);
 	diff_flush(&opt);
-	free_pathspec(&opt.pathspec);
+	clear_pathspec(&opt.pathspec);
 
 	return 0;
 }
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 275da0d647..0ba82b1635 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -9,6 +9,7 @@
 #include "log-tree.h"
 #include "graph.h"
 #include "bisect.h"
+#include "progress.h"
 
 static const char rev_list_usage[] =
 "git rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
@@ -49,12 +50,17 @@ static const char rev_list_usage[] =
 "    --bisect-all"
 ;
 
+static struct progress *progress;
+static unsigned progress_counter;
+
 static void finish_commit(struct commit *commit, void *data);
 static void show_commit(struct commit *commit, void *data)
 {
 	struct rev_list_info *info = data;
 	struct rev_info *revs = info->revs;
 
+	display_progress(progress, ++progress_counter);
+
 	if (info->flags & REV_LIST_QUIET) {
 		finish_commit(commit, data);
 		return;
@@ -190,6 +196,7 @@ static void show_object(struct object *obj, const char *name, void *cb_data)
 {
 	struct rev_list_info *info = cb_data;
 	finish_object(obj, name, cb_data);
+	display_progress(progress, ++progress_counter);
 	if (info->flags & REV_LIST_QUIET)
 		return;
 	show_object_with_name(stdout, obj, name);
@@ -276,6 +283,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 	int bisect_show_vars = 0;
 	int bisect_find_all = 0;
 	int use_bitmap_index = 0;
+	const char *show_progress = NULL;
 
 	git_config(git_default_config, NULL);
 	init_revisions(&revs, prefix);
@@ -325,6 +333,10 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 			test_bitmap_walk(&revs);
 			return 0;
 		}
+		if (skip_prefix(arg, "--progress=", &arg)) {
+			show_progress = arg;
+			continue;
+		}
 		usage(rev_list_usage);
 
 	}
@@ -355,15 +367,22 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 	if (bisect_list)
 		revs.limited = 1;
 
+	if (show_progress)
+		progress = start_progress_delay(show_progress, 0, 0, 2);
+
 	if (use_bitmap_index && !revs.prune) {
 		if (revs.count && !revs.left_right && !revs.cherry_mark) {
 			uint32_t commit_count;
+			int max_count = revs.max_count;
 			if (!prepare_bitmap_walk(&revs)) {
 				count_bitmap_commit_list(&commit_count, NULL, NULL, NULL);
+				if (max_count >= 0 && max_count < commit_count)
+					commit_count = max_count;
 				printf("%d\n", commit_count);
 				return 0;
 			}
-		} else if (revs.tag_objects && revs.tree_objects && revs.blob_objects) {
+		} else if (revs.max_count < 0 &&
+			   revs.tag_objects && revs.tree_objects && revs.blob_objects) {
 			if (!prepare_bitmap_walk(&revs)) {
 				traverse_bitmap_commit_list(&show_object_fast);
 				return 0;
@@ -388,6 +407,8 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 
 	traverse_commit_list(&revs, show_commit, show_object, &info);
 
+	stop_progress(&progress);
+
 	if (revs.count) {
 		if (revs.left_right && revs.cherry_mark)
 			printf("%d\t%d\t%d\n", revs.count_left, revs.count_right, revs.count_same);
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index c961b74c5a..76cf05e2ad 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -469,7 +469,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
 			(stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0) |
 			PARSE_OPT_SHELL_EVAL);
 
-	strbuf_addf(&parsed, " --");
+	strbuf_addstr(&parsed, " --");
 	sq_quote_argv(&parsed, argv, 0);
 	puts(parsed.buf);
 	return 0;
diff --git a/builtin/revert.c b/builtin/revert.c
index 56a2c36669..4e693808b1 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -76,7 +76,7 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
 	const char * const * usage_str = revert_or_cherry_pick_usage(opts);
 	const char *me = action_name(opts);
 	int cmd = 0;
-	struct option options[] = {
+	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'),
@@ -91,13 +91,9 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
 			N_("option for merge strategy"), option_parse_x),
 		{ OPTION_STRING, 'S', "gpg-sign", &opts->gpg_sign, N_("key-id"),
 		  N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
-		OPT_END(),
-		OPT_END(),
-		OPT_END(),
-		OPT_END(),
-		OPT_END(),
-		OPT_END(),
+		OPT_END()
 	};
+	struct option *options = base_options;
 
 	if (opts->action == REPLAY_PICK) {
 		struct option cp_extra[] = {
@@ -108,8 +104,7 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
 			OPT_BOOL(0, "keep-redundant-commits", &opts->keep_redundant_commits, N_("keep redundant, empty commits")),
 			OPT_END(),
 		};
-		if (parse_options_concat(options, ARRAY_SIZE(options), cp_extra))
-			die(_("program error"));
+		options = parse_options_concat(options, cp_extra);
 	}
 
 	argc = parse_options(argc, argv, NULL, options, usage_str,
diff --git a/builtin/rm.c b/builtin/rm.c
index be83c4347a..b2fee3e90a 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -152,7 +152,7 @@ static int check_local_mod(unsigned char *head, int index_only)
 
 		if (lstat(ce->name, &st) < 0) {
 			if (errno != ENOENT && errno != ENOTDIR)
-				warning("'%s': %s", ce->name, strerror(errno));
+				warning_errno(_("failed to stat '%s'"), ce->name);
 			/* It already vanished from the working tree */
 			continue;
 		}
@@ -387,6 +387,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 	 */
 	if (!index_only) {
 		int removed = 0, gitmodules_modified = 0;
+		struct strbuf buf = STRBUF_INIT;
 		for (i = 0; i < list.nr; i++) {
 			const char *path = list.entry[i].name;
 			if (list.entry[i].is_submodule) {
@@ -398,7 +399,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 						continue;
 					}
 				} else {
-					struct strbuf buf = STRBUF_INIT;
+					strbuf_reset(&buf);
 					strbuf_addstr(&buf, path);
 					if (!remove_dir_recursively(&buf, 0)) {
 						removed = 1;
@@ -410,7 +411,6 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 						/* Submodule was removed by user */
 						if (!remove_path_from_gitmodules(path))
 							gitmodules_modified = 1;
-					strbuf_release(&buf);
 					/* Fallthrough and let remove_path() fail. */
 				}
 			}
@@ -421,6 +421,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 			if (!removed)
 				die_errno("git rm: '%s'", path);
 		}
+		strbuf_release(&buf);
 		if (gitmodules_modified)
 			stage_updated_gitmodules();
 	}
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index bfc082e584..25fa8a6aed 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -233,11 +233,11 @@ void shortlog_init(struct shortlog *log)
 
 int cmd_shortlog(int argc, const char **argv, const char *prefix)
 {
-	static struct shortlog log;
-	static struct rev_info rev;
+	struct shortlog log = { STRING_LIST_INIT_NODUP };
+	struct rev_info rev;
 	int nongit = !startup_info->have_repository;
 
-	static const struct option options[] = {
+	const struct option options[] = {
 		OPT_BOOL('n', "numbered", &log.sort_by_number,
 			 N_("sort output according to the number of commits per author")),
 		OPT_BOOL('s', "summary", &log.summary,
@@ -276,6 +276,7 @@ parse_done:
 
 	log.user_format = rev.commit_format == CMIT_FMT_USERFORMAT;
 	log.abbrev = rev.abbrev;
+	log.file = rev.diffopt.file;
 
 	/* assume HEAD if from a tty */
 	if (!nongit && !rev.pending.nr && isatty(0))
@@ -289,6 +290,8 @@ parse_done:
 		get_from_rev(&rev, &log);
 
 	shortlog_output(&log);
+	if (log.file != stdout)
+		fclose(log.file);
 	return 0;
 }
 
@@ -310,22 +313,24 @@ void shortlog_output(struct shortlog *log)
 	for (i = 0; i < log->list.nr; i++) {
 		const struct string_list_item *item = &log->list.items[i];
 		if (log->summary) {
-			printf("%6d\t%s\n", (int)UTIL_TO_INT(item), item->string);
+			fprintf(log->file, "%6d\t%s\n",
+				(int)UTIL_TO_INT(item), item->string);
 		} else {
 			struct string_list *onelines = item->util;
-			printf("%s (%d):\n", item->string, onelines->nr);
+			fprintf(log->file, "%s (%d):\n",
+				item->string, onelines->nr);
 			for (j = onelines->nr - 1; j >= 0; j--) {
 				const char *msg = onelines->items[j].string;
 
 				if (log->wrap_lines) {
 					strbuf_reset(&sb);
 					add_wrapped_shortlog_msg(&sb, msg, log);
-					fwrite(sb.buf, sb.len, 1, stdout);
+					fwrite(sb.buf, sb.len, 1, log->file);
 				}
 				else
-					printf("      %s\n", msg);
+					fprintf(log->file, "      %s\n", msg);
 			}
-			putchar('\n');
+			putc('\n', log->file);
 			onelines->strdup_strings = 1;
 			string_list_clear(onelines, 0);
 			free(onelines);
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 3bea3aaa50..e79790f0bd 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -9,6 +9,211 @@
 #include "submodule-config.h"
 #include "string-list.h"
 #include "run-command.h"
+#include "remote.h"
+#include "refs.h"
+#include "connect.h"
+
+static char *get_default_remote(void)
+{
+	char *dest = NULL, *ret;
+	unsigned char sha1[20];
+	struct strbuf sb = STRBUF_INIT;
+	const char *refname = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
+
+	if (!refname)
+		die(_("No such ref: %s"), "HEAD");
+
+	/* detached HEAD */
+	if (!strcmp(refname, "HEAD"))
+		return xstrdup("origin");
+
+	if (!skip_prefix(refname, "refs/heads/", &refname))
+		die(_("Expecting a full ref name, got %s"), refname);
+
+	strbuf_addf(&sb, "branch.%s.remote", refname);
+	if (git_config_get_string(sb.buf, &dest))
+		ret = xstrdup("origin");
+	else
+		ret = dest;
+
+	strbuf_release(&sb);
+	return ret;
+}
+
+static int starts_with_dot_slash(const char *str)
+{
+	return str[0] == '.' && is_dir_sep(str[1]);
+}
+
+static int starts_with_dot_dot_slash(const char *str)
+{
+	return str[0] == '.' && str[1] == '.' && is_dir_sep(str[2]);
+}
+
+/*
+ * Returns 1 if it was the last chop before ':'.
+ */
+static int chop_last_dir(char **remoteurl, int is_relative)
+{
+	char *rfind = find_last_dir_sep(*remoteurl);
+	if (rfind) {
+		*rfind = '\0';
+		return 0;
+	}
+
+	rfind = strrchr(*remoteurl, ':');
+	if (rfind) {
+		*rfind = '\0';
+		return 1;
+	}
+
+	if (is_relative || !strcmp(".", *remoteurl))
+		die(_("cannot strip one component off url '%s'"),
+			*remoteurl);
+
+	free(*remoteurl);
+	*remoteurl = xstrdup(".");
+	return 0;
+}
+
+/*
+ * The `url` argument is the URL that navigates to the submodule origin
+ * repo. When relative, this URL is relative to the superproject origin
+ * URL repo. The `up_path` argument, if specified, is the relative
+ * path that navigates from the submodule working tree to the superproject
+ * working tree. Returns the origin URL of the submodule.
+ *
+ * Return either an absolute URL or filesystem path (if the superproject
+ * origin URL is an absolute URL or filesystem path, respectively) or a
+ * relative file system path (if the superproject origin URL is a relative
+ * file system path).
+ *
+ * When the output is a relative file system path, the path is either
+ * relative to the submodule working tree, if up_path is specified, or to
+ * the superproject working tree otherwise.
+ *
+ * NEEDSWORK: This works incorrectly on the domain and protocol part.
+ * remote_url      url              outcome          expectation
+ * http://a.com/b  ../c             http://a.com/c   as is
+ * http://a.com/b  ../../c          http://c         error out
+ * http://a.com/b  ../../../c       http:/c          error out
+ * http://a.com/b  ../../../../c    http:c           error out
+ * http://a.com/b  ../../../../../c    .:c           error out
+ * NEEDSWORK: Given how chop_last_dir() works, this function is broken
+ * when a local part has a colon in its path component, too.
+ */
+static char *relative_url(const char *remote_url,
+				const char *url,
+				const char *up_path)
+{
+	int is_relative = 0;
+	int colonsep = 0;
+	char *out;
+	char *remoteurl = xstrdup(remote_url);
+	struct strbuf sb = STRBUF_INIT;
+	size_t len = strlen(remoteurl);
+
+	if (is_dir_sep(remoteurl[len]))
+		remoteurl[len] = '\0';
+
+	if (!url_is_local_not_ssh(remoteurl) || is_absolute_path(remoteurl))
+		is_relative = 0;
+	else {
+		is_relative = 1;
+		/*
+		 * Prepend a './' to ensure all relative
+		 * remoteurls start with './' or '../'
+		 */
+		if (!starts_with_dot_slash(remoteurl) &&
+		    !starts_with_dot_dot_slash(remoteurl)) {
+			strbuf_reset(&sb);
+			strbuf_addf(&sb, "./%s", remoteurl);
+			free(remoteurl);
+			remoteurl = strbuf_detach(&sb, NULL);
+		}
+	}
+	/*
+	 * When the url starts with '../', remove that and the
+	 * last directory in remoteurl.
+	 */
+	while (url) {
+		if (starts_with_dot_dot_slash(url)) {
+			url += 3;
+			colonsep |= chop_last_dir(&remoteurl, is_relative);
+		} else if (starts_with_dot_slash(url))
+			url += 2;
+		else
+			break;
+	}
+	strbuf_reset(&sb);
+	strbuf_addf(&sb, "%s%s%s", remoteurl, colonsep ? ":" : "/", url);
+	free(remoteurl);
+
+	if (starts_with_dot_slash(sb.buf))
+		out = xstrdup(sb.buf + 2);
+	else
+		out = xstrdup(sb.buf);
+	strbuf_reset(&sb);
+
+	if (!up_path || !is_relative)
+		return out;
+
+	strbuf_addf(&sb, "%s%s", up_path, out);
+	free(out);
+	return strbuf_detach(&sb, NULL);
+}
+
+static int resolve_relative_url(int argc, const char **argv, const char *prefix)
+{
+	char *remoteurl = NULL;
+	char *remote = get_default_remote();
+	const char *up_path = NULL;
+	char *res;
+	const char *url;
+	struct strbuf sb = STRBUF_INIT;
+
+	if (argc != 2 && argc != 3)
+		die("resolve-relative-url only accepts one or two arguments");
+
+	url = argv[1];
+	strbuf_addf(&sb, "remote.%s.url", remote);
+	free(remote);
+
+	if (git_config_get_string(sb.buf, &remoteurl))
+		/* the repository is its own authoritative upstream */
+		remoteurl = xgetcwd();
+
+	if (argc == 3)
+		up_path = argv[2];
+
+	res = relative_url(remoteurl, url, up_path);
+	puts(res);
+	free(res);
+	free(remoteurl);
+	return 0;
+}
+
+static int resolve_relative_url_test(int argc, const char **argv, const char *prefix)
+{
+	char *remoteurl, *res;
+	const char *up_path, *url;
+
+	if (argc != 4)
+		die("resolve-relative-url-test only accepts three arguments: <up_path> <remoteurl> <url>");
+
+	up_path = argv[1];
+	remoteurl = xstrdup(argv[2]);
+	url = argv[3];
+
+	if (!strcmp(up_path, "(null)"))
+		up_path = NULL;
+
+	res = relative_url(remoteurl, url, up_path);
+	puts(res);
+	free(res);
+	free(remoteurl);
+	return 0;
+}
 
 struct module_list {
 	const struct cache_entry **entries;
@@ -82,10 +287,8 @@ static int module_list(int argc, const char **argv, const char *prefix)
 	argc = parse_options(argc, argv, prefix, module_list_options,
 			     git_submodule_helper_usage, 0);
 
-	if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0) {
-		printf("#unmatched\n");
+	if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
 		return 1;
-	}
 
 	for (i = 0; i < list.nr; i++) {
 		const struct cache_entry *ce = list.entries[i];
@@ -100,6 +303,125 @@ static int module_list(int argc, const char **argv, const char *prefix)
 	return 0;
 }
 
+static void init_submodule(const char *path, const char *prefix, int quiet)
+{
+	const struct submodule *sub;
+	struct strbuf sb = STRBUF_INIT;
+	char *upd = NULL, *url = NULL, *displaypath;
+
+	/* Only loads from .gitmodules, no overlay with .git/config */
+	gitmodules_config();
+
+	if (prefix) {
+		strbuf_addf(&sb, "%s%s", prefix, path);
+		displaypath = strbuf_detach(&sb, NULL);
+	} else
+		displaypath = xstrdup(path);
+
+	sub = submodule_from_path(null_sha1, path);
+
+	if (!sub)
+		die(_("No url found for submodule path '%s' in .gitmodules"),
+			displaypath);
+
+	/*
+	 * Copy url setting when it is not set yet.
+	 * To look up the url in .git/config, we must not fall back to
+	 * .gitmodules, so look it up directly.
+	 */
+	strbuf_reset(&sb);
+	strbuf_addf(&sb, "submodule.%s.url", sub->name);
+	if (git_config_get_string(sb.buf, &url)) {
+		url = xstrdup(sub->url);
+
+		if (!url)
+			die(_("No url found for submodule path '%s' in .gitmodules"),
+				displaypath);
+
+		/* Possibly a url relative to parent */
+		if (starts_with_dot_dot_slash(url) ||
+		    starts_with_dot_slash(url)) {
+			char *remoteurl, *relurl;
+			char *remote = get_default_remote();
+			struct strbuf remotesb = STRBUF_INIT;
+			strbuf_addf(&remotesb, "remote.%s.url", remote);
+			free(remote);
+
+			if (git_config_get_string(remotesb.buf, &remoteurl))
+				/*
+				 * The repository is its own
+				 * authoritative upstream
+				 */
+				remoteurl = xgetcwd();
+			relurl = relative_url(remoteurl, url, NULL);
+			strbuf_release(&remotesb);
+			free(remoteurl);
+			free(url);
+			url = relurl;
+		}
+
+		if (git_config_set_gently(sb.buf, url))
+			die(_("Failed to register url for submodule path '%s'"),
+			    displaypath);
+		if (!quiet)
+			fprintf(stderr,
+				_("Submodule '%s' (%s) registered for path '%s'\n"),
+				sub->name, url, displaypath);
+	}
+
+	/* Copy "update" setting when it is not set yet */
+	strbuf_reset(&sb);
+	strbuf_addf(&sb, "submodule.%s.update", sub->name);
+	if (git_config_get_string(sb.buf, &upd) &&
+	    sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) {
+		if (sub->update_strategy.type == SM_UPDATE_COMMAND) {
+			fprintf(stderr, _("warning: command update mode suggested for submodule '%s'\n"),
+				sub->name);
+			upd = xstrdup("none");
+		} else
+			upd = xstrdup(submodule_strategy_to_string(&sub->update_strategy));
+
+		if (git_config_set_gently(sb.buf, upd))
+			die(_("Failed to register update mode for submodule path '%s'"), displaypath);
+	}
+	strbuf_release(&sb);
+	free(displaypath);
+	free(url);
+	free(upd);
+}
+
+static int module_init(int argc, const char **argv, const char *prefix)
+{
+	struct pathspec pathspec;
+	struct module_list list = MODULE_LIST_INIT;
+	int quiet = 0;
+	int i;
+
+	struct option module_init_options[] = {
+		OPT_STRING(0, "prefix", &prefix,
+			   N_("path"),
+			   N_("alternative anchor for relative paths")),
+		OPT__QUIET(&quiet, N_("Suppress output for initializing a submodule")),
+		OPT_END()
+	};
+
+	const char *const git_submodule_helper_usage[] = {
+		N_("git submodule--helper init [<path>]"),
+		NULL
+	};
+
+	argc = parse_options(argc, argv, prefix, module_init_options,
+			     git_submodule_helper_usage, 0);
+
+	if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
+		return 1;
+
+	for (i = 0; i < list.nr; i++)
+		init_submodule(list.entries[i]->name, prefix, quiet);
+
+	return 0;
+}
+
 static int module_name(int argc, const char **argv, const char *prefix)
 {
 	const struct submodule *sub;
@@ -118,11 +440,11 @@ static int module_name(int argc, const char **argv, const char *prefix)
 
 	return 0;
 }
+
 static int clone_submodule(const char *path, const char *gitdir, const char *url,
 			   const char *depth, const char *reference, int quiet)
 {
-	struct child_process cp;
-	child_process_init(&cp);
+	struct child_process cp = CHILD_PROCESS_INIT;
 
 	argv_array_push(&cp.args, "clone");
 	argv_array_push(&cp.args, "--no-checkout");
@@ -139,7 +461,7 @@ static int clone_submodule(const char *path, const char *gitdir, const char *url
 	argv_array_push(&cp.args, path);
 
 	cp.git_cmd = 1;
-	cp.env = local_repo_env;
+	prepare_submodule_repo_env(&cp.env_array);
 	cp.no_stdin = 1;
 
 	return run_command(&cp);
@@ -180,16 +502,17 @@ static int module_clone(int argc, const char **argv, const char *prefix)
 
 	const char *const git_submodule_helper_usage[] = {
 		N_("git submodule--helper clone [--prefix=<path>] [--quiet] "
-		   "[--reference <repository>] [--name <name>] [--url <url>]"
-		   "[--depth <depth>] [--] [<path>...]"),
+		   "[--reference <repository>] [--name <name>] [--depth <depth>] "
+		   "--url <url> --path <path>"),
 		NULL
 	};
 
 	argc = parse_options(argc, argv, prefix, module_clone_options,
 			     git_submodule_helper_usage, 0);
 
-	if (!path || !*path)
-		die(_("submodule--helper: unspecified or empty --path"));
+	if (argc || !url || !path || !*path)
+		usage_with_options(git_submodule_helper_usage,
+				   module_clone_options);
 
 	strbuf_addf(&sb, "%s/modules/%s", get_git_dir(), name);
 	sm_gitdir = xstrdup(absolute_path(sb.buf));
@@ -244,6 +567,392 @@ static int module_clone(int argc, const char **argv, const char *prefix)
 	return 0;
 }
 
+struct submodule_update_clone {
+	/* index into 'list', the list of submodules to look into for cloning */
+	int current;
+	struct module_list list;
+	unsigned warn_if_uninitialized : 1;
+
+	/* update parameter passed via commandline */
+	struct submodule_update_strategy update;
+
+	/* configuration parameters which are passed on to the children */
+	int quiet;
+	int recommend_shallow;
+	const char *reference;
+	const char *depth;
+	const char *recursive_prefix;
+	const char *prefix;
+
+	/* Machine-readable status lines to be consumed by git-submodule.sh */
+	struct string_list projectlines;
+
+	/* If we want to stop as fast as possible and return an error */
+	unsigned quickstop : 1;
+
+	/* failed clones to be retried again */
+	const struct cache_entry **failed_clones;
+	int failed_clones_nr, failed_clones_alloc;
+};
+#define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \
+	SUBMODULE_UPDATE_STRATEGY_INIT, 0, -1, NULL, NULL, NULL, NULL, \
+	STRING_LIST_INIT_DUP, 0, NULL, 0, 0}
+
+
+static void next_submodule_warn_missing(struct submodule_update_clone *suc,
+		struct strbuf *out, const char *displaypath)
+{
+	/*
+	 * Only mention uninitialized submodules when their
+	 * paths have been specified.
+	 */
+	if (suc->warn_if_uninitialized) {
+		strbuf_addf(out,
+			_("Submodule path '%s' not initialized"),
+			displaypath);
+		strbuf_addch(out, '\n');
+		strbuf_addstr(out,
+			_("Maybe you want to use 'update --init'?"));
+		strbuf_addch(out, '\n');
+	}
+}
+
+/**
+ * Determine whether 'ce' needs to be cloned. If so, prepare the 'child' to
+ * run the clone. Returns 1 if 'ce' needs to be cloned, 0 otherwise.
+ */
+static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
+					   struct child_process *child,
+					   struct submodule_update_clone *suc,
+					   struct strbuf *out)
+{
+	const struct submodule *sub = NULL;
+	struct strbuf displaypath_sb = STRBUF_INIT;
+	struct strbuf sb = STRBUF_INIT;
+	const char *displaypath = NULL;
+	char *url = NULL;
+	int needs_cloning = 0;
+
+	if (ce_stage(ce)) {
+		if (suc->recursive_prefix)
+			strbuf_addf(&sb, "%s/%s", suc->recursive_prefix, ce->name);
+		else
+			strbuf_addf(&sb, "%s", ce->name);
+		strbuf_addf(out, _("Skipping unmerged submodule %s"), sb.buf);
+		strbuf_addch(out, '\n');
+		goto cleanup;
+	}
+
+	sub = submodule_from_path(null_sha1, ce->name);
+
+	if (suc->recursive_prefix)
+		displaypath = relative_path(suc->recursive_prefix,
+					    ce->name, &displaypath_sb);
+	else
+		displaypath = ce->name;
+
+	if (!sub) {
+		next_submodule_warn_missing(suc, out, displaypath);
+		goto cleanup;
+	}
+
+	if (suc->update.type == SM_UPDATE_NONE
+	    || (suc->update.type == SM_UPDATE_UNSPECIFIED
+		&& sub->update_strategy.type == SM_UPDATE_NONE)) {
+		strbuf_addf(out, _("Skipping submodule '%s'"), displaypath);
+		strbuf_addch(out, '\n');
+		goto cleanup;
+	}
+
+	/*
+	 * Looking up the url in .git/config.
+	 * We must not fall back to .gitmodules as we only want
+	 * to process configured submodules.
+	 */
+	strbuf_reset(&sb);
+	strbuf_addf(&sb, "submodule.%s.url", sub->name);
+	git_config_get_string(sb.buf, &url);
+	if (!url) {
+		next_submodule_warn_missing(suc, out, displaypath);
+		goto cleanup;
+	}
+
+	strbuf_reset(&sb);
+	strbuf_addf(&sb, "%s/.git", ce->name);
+	needs_cloning = !file_exists(sb.buf);
+
+	strbuf_reset(&sb);
+	strbuf_addf(&sb, "%06o %s %d %d\t%s\n", ce->ce_mode,
+			sha1_to_hex(ce->sha1), ce_stage(ce),
+			needs_cloning, ce->name);
+	string_list_append(&suc->projectlines, sb.buf);
+
+	if (!needs_cloning)
+		goto cleanup;
+
+	child->git_cmd = 1;
+	child->no_stdin = 1;
+	child->stdout_to_stderr = 1;
+	child->err = -1;
+	argv_array_push(&child->args, "submodule--helper");
+	argv_array_push(&child->args, "clone");
+	if (suc->quiet)
+		argv_array_push(&child->args, "--quiet");
+	if (suc->prefix)
+		argv_array_pushl(&child->args, "--prefix", suc->prefix, NULL);
+	if (suc->recommend_shallow && sub->recommend_shallow == 1)
+		argv_array_push(&child->args, "--depth=1");
+	argv_array_pushl(&child->args, "--path", sub->path, NULL);
+	argv_array_pushl(&child->args, "--name", sub->name, NULL);
+	argv_array_pushl(&child->args, "--url", url, NULL);
+	if (suc->reference)
+		argv_array_push(&child->args, suc->reference);
+	if (suc->depth)
+		argv_array_push(&child->args, suc->depth);
+
+cleanup:
+	free(url);
+	strbuf_reset(&displaypath_sb);
+	strbuf_reset(&sb);
+
+	return needs_cloning;
+}
+
+static int update_clone_get_next_task(struct child_process *child,
+				      struct strbuf *err,
+				      void *suc_cb,
+				      void **idx_task_cb)
+{
+	struct submodule_update_clone *suc = suc_cb;
+	const struct cache_entry *ce;
+	int index;
+
+	for (; suc->current < suc->list.nr; suc->current++) {
+		ce = suc->list.entries[suc->current];
+		if (prepare_to_clone_next_submodule(ce, child, suc, err)) {
+			int *p = xmalloc(sizeof(*p));
+			*p = suc->current;
+			*idx_task_cb = p;
+			suc->current++;
+			return 1;
+		}
+	}
+
+	/*
+	 * The loop above tried cloning each submodule once, now try the
+	 * stragglers again, which we can imagine as an extension of the
+	 * entry list.
+	 */
+	index = suc->current - suc->list.nr;
+	if (index < suc->failed_clones_nr) {
+		int *p;
+		ce = suc->failed_clones[index];
+		if (!prepare_to_clone_next_submodule(ce, child, suc, err)) {
+			suc->current ++;
+			strbuf_addf(err, "BUG: submodule considered for cloning,"
+				    "doesn't need cloning any more?\n");
+			return 0;
+		}
+		p = xmalloc(sizeof(*p));
+		*p = suc->current;
+		*idx_task_cb = p;
+		suc->current ++;
+		return 1;
+	}
+
+	return 0;
+}
+
+static int update_clone_start_failure(struct strbuf *err,
+				      void *suc_cb,
+				      void *idx_task_cb)
+{
+	struct submodule_update_clone *suc = suc_cb;
+	suc->quickstop = 1;
+	return 1;
+}
+
+static int update_clone_task_finished(int result,
+				      struct strbuf *err,
+				      void *suc_cb,
+				      void *idx_task_cb)
+{
+	const struct cache_entry *ce;
+	struct submodule_update_clone *suc = suc_cb;
+
+	int *idxP = *(int**)idx_task_cb;
+	int idx = *idxP;
+	free(idxP);
+
+	if (!result)
+		return 0;
+
+	if (idx < suc->list.nr) {
+		ce  = suc->list.entries[idx];
+		strbuf_addf(err, _("Failed to clone '%s'. Retry scheduled"),
+			    ce->name);
+		strbuf_addch(err, '\n');
+		ALLOC_GROW(suc->failed_clones,
+			   suc->failed_clones_nr + 1,
+			   suc->failed_clones_alloc);
+		suc->failed_clones[suc->failed_clones_nr++] = ce;
+		return 0;
+	} else {
+		idx -= suc->list.nr;
+		ce  = suc->failed_clones[idx];
+		strbuf_addf(err, _("Failed to clone '%s' a second time, aborting"),
+			    ce->name);
+		strbuf_addch(err, '\n');
+		suc->quickstop = 1;
+		return 1;
+	}
+
+	return 0;
+}
+
+static int update_clone(int argc, const char **argv, const char *prefix)
+{
+	const char *update = NULL;
+	int max_jobs = -1;
+	struct string_list_item *item;
+	struct pathspec pathspec;
+	struct submodule_update_clone suc = SUBMODULE_UPDATE_CLONE_INIT;
+
+	struct option module_update_clone_options[] = {
+		OPT_STRING(0, "prefix", &prefix,
+			   N_("path"),
+			   N_("path into the working tree")),
+		OPT_STRING(0, "recursive-prefix", &suc.recursive_prefix,
+			   N_("path"),
+			   N_("path into the working tree, across nested "
+			      "submodule boundaries")),
+		OPT_STRING(0, "update", &update,
+			   N_("string"),
+			   N_("rebase, merge, checkout or none")),
+		OPT_STRING(0, "reference", &suc.reference, N_("repo"),
+			   N_("reference repository")),
+		OPT_STRING(0, "depth", &suc.depth, "<depth>",
+			   N_("Create a shallow clone truncated to the "
+			      "specified number of revisions")),
+		OPT_INTEGER('j', "jobs", &max_jobs,
+			    N_("parallel jobs")),
+		OPT_BOOL(0, "recommend-shallow", &suc.recommend_shallow,
+			    N_("whether the initial clone should follow the shallow recommendation")),
+		OPT__QUIET(&suc.quiet, N_("don't print cloning progress")),
+		OPT_END()
+	};
+
+	const char *const git_submodule_helper_usage[] = {
+		N_("git submodule--helper update_clone [--prefix=<path>] [<path>...]"),
+		NULL
+	};
+	suc.prefix = prefix;
+
+	argc = parse_options(argc, argv, prefix, module_update_clone_options,
+			     git_submodule_helper_usage, 0);
+
+	if (update)
+		if (parse_submodule_update_strategy(update, &suc.update) < 0)
+			die(_("bad value for update parameter"));
+
+	if (module_list_compute(argc, argv, prefix, &pathspec, &suc.list) < 0)
+		return 1;
+
+	if (pathspec.nr)
+		suc.warn_if_uninitialized = 1;
+
+	/* Overlay the parsed .gitmodules file with .git/config */
+	gitmodules_config();
+	git_config(submodule_config, NULL);
+
+	if (max_jobs < 0)
+		max_jobs = parallel_submodules();
+
+	run_processes_parallel(max_jobs,
+			       update_clone_get_next_task,
+			       update_clone_start_failure,
+			       update_clone_task_finished,
+			       &suc);
+
+	/*
+	 * We saved the output and put it out all at once now.
+	 * That means:
+	 * - the listener does not have to interleave their (checkout)
+	 *   work with our fetching.  The writes involved in a
+	 *   checkout involve more straightforward sequential I/O.
+	 * - the listener can avoid doing any work if fetching failed.
+	 */
+	if (suc.quickstop)
+		return 1;
+
+	for_each_string_list_item(item, &suc.projectlines)
+		utf8_fprintf(stdout, "%s", item->string);
+
+	return 0;
+}
+
+static int resolve_relative_path(int argc, const char **argv, const char *prefix)
+{
+	struct strbuf sb = STRBUF_INIT;
+	if (argc != 3)
+		die("submodule--helper relative-path takes exactly 2 arguments, got %d", argc);
+
+	printf("%s", relative_path(argv[1], argv[2], &sb));
+	strbuf_release(&sb);
+	return 0;
+}
+
+static const char *remote_submodule_branch(const char *path)
+{
+	const struct submodule *sub;
+	gitmodules_config();
+	git_config(submodule_config, NULL);
+
+	sub = submodule_from_path(null_sha1, path);
+	if (!sub)
+		return NULL;
+
+	if (!sub->branch)
+		return "master";
+
+	if (!strcmp(sub->branch, ".")) {
+		unsigned char sha1[20];
+		const char *refname = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
+
+		if (!refname)
+			die(_("No such ref: %s"), "HEAD");
+
+		/* detached HEAD */
+		if (!strcmp(refname, "HEAD"))
+			die(_("Submodule (%s) branch configured to inherit "
+			      "branch from superproject, but the superproject "
+			      "is not on any branch"), sub->name);
+
+		if (!skip_prefix(refname, "refs/heads/", &refname))
+			die(_("Expecting a full ref name, got %s"), refname);
+		return refname;
+	}
+
+	return sub->branch;
+}
+
+static int resolve_remote_submodule_branch(int argc, const char **argv,
+		const char *prefix)
+{
+	const char *ret;
+	struct strbuf sb = STRBUF_INIT;
+	if (argc != 2)
+		die("submodule--helper remote-branch takes exactly one arguments, got %d", argc);
+
+	ret = remote_submodule_branch(argv[1]);
+	if (!ret)
+		die("submodule %s doesn't exist", argv[1]);
+
+	printf("%s", ret);
+	strbuf_release(&sb);
+	return 0;
+}
+
 struct cmd_struct {
 	const char *cmd;
 	int (*fn)(int, const char **, const char *);
@@ -253,19 +962,25 @@ static struct cmd_struct commands[] = {
 	{"list", module_list},
 	{"name", module_name},
 	{"clone", module_clone},
+	{"update-clone", update_clone},
+	{"relative-path", resolve_relative_path},
+	{"resolve-relative-url", resolve_relative_url},
+	{"resolve-relative-url-test", resolve_relative_url_test},
+	{"init", module_init},
+	{"remote-branch", resolve_remote_submodule_branch}
 };
 
 int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
 {
 	int i;
 	if (argc < 2)
-		die(_("fatal: submodule--helper subcommand must be "
+		die(_("submodule--helper subcommand must be "
 		      "called with a subcommand"));
 
 	for (i = 0; i < ARRAY_SIZE(commands); i++)
 		if (!strcmp(argv[1], commands[i].cmd))
 			return commands[i].fn(argc - 1, argv + 1, prefix);
 
-	die(_("fatal: '%s' is not a valid submodule--helper "
+	die(_("'%s' is not a valid submodule--helper "
 	      "subcommand"), argv[1]);
 }
diff --git a/builtin/tag.c b/builtin/tag.c
index 1705c94665..50e4ae5678 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -29,6 +29,7 @@ static const char * const git_tag_usage[] = {
 };
 
 static unsigned int colopts;
+static int force_sign_annotate;
 
 static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, const char *format)
 {
@@ -104,13 +105,7 @@ static int delete_tag(const char *name, const char *ref,
 static int verify_tag(const char *name, const char *ref,
 				const unsigned char *sha1)
 {
-	const char *argv_verify_tag[] = {"verify-tag",
-					"-v", "SHA1_HEX", NULL};
-	argv_verify_tag[2] = sha1_to_hex(sha1);
-
-	if (run_command_v_opt(argv_verify_tag, RUN_GIT_CMD))
-		return error(_("could not verify the tag '%s'"), name);
-	return 0;
+	return gpg_verify_tag(sha1, name, GPG_VERIFY_VERBOSE);
 }
 
 static int do_sign(struct strbuf *buffer)
@@ -166,6 +161,11 @@ static int git_tag_config(const char *var, const char *value, void *cb)
 	status = git_gpg_config(var, value, cb);
 	if (status)
 		return status;
+	if (!strcmp(var, "tag.forcesignannotated")) {
+		force_sign_annotate = git_config_bool(var, value);
+		return 0;
+	}
+
 	if (starts_with(var, "column."))
 		return git_column_config(var, value, "tag", &colopts);
 	return git_default_config(var, value, cb);
@@ -327,7 +327,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 	char *cleanup_arg = NULL;
 	int create_reflog = 0;
 	int annotate = 0, force = 0;
-	int cmdmode = 0;
+	int cmdmode = 0, create_tag_object = 0;
 	const char *msgfile = NULL, *keyid = NULL;
 	struct msg_arg msg = { 0, STRBUF_INIT };
 	struct ref_transaction *transaction;
@@ -385,12 +385,12 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		opt.sign = 1;
 		set_signing_key(keyid);
 	}
-	if (opt.sign)
-		annotate = 1;
+	create_tag_object = (opt.sign || annotate || msg.given || msgfile);
+
 	if (argc == 0 && !cmdmode)
 		cmdmode = 'l';
 
-	if ((annotate || msg.given || msgfile || force) && (cmdmode != 0))
+	if ((create_tag_object || force) && (cmdmode != 0))
 		usage_with_options(git_tag_usage, options);
 
 	finalize_colopts(&colopts, -1);
@@ -431,7 +431,6 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 	if (msg.given || msgfile) {
 		if (msg.given && msgfile)
 			die(_("only one -F or -m option is allowed."));
-		annotate = 1;
 		if (msg.given)
 			strbuf_addbuf(&buf, &(msg.buf));
 		else {
@@ -474,8 +473,11 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 	else
 		die(_("Invalid cleanup mode %s"), cleanup_arg);
 
-	if (annotate)
+	if (create_tag_object) {
+		if (force_sign_annotate && !annotate)
+			opt.sign = 1;
 		create_tag(object, tag, &buf, &opt, prev, object);
+	}
 
 	transaction = ref_transaction_begin(&err);
 	if (!transaction ||
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 875e7ed998..172470bf24 100644
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -355,7 +355,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
 			return; /* we are done */
 		else {
 			/* cannot resolve yet --- queue it */
-			hashcpy(obj_list[nr].sha1, null_sha1);
+			hashclr(obj_list[nr].sha1);
 			add_delta_to_list(nr, base_sha1, 0, delta_data, delta_size);
 			return;
 		}
@@ -406,7 +406,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
 			 * The delta base object is itself a delta that
 			 * has not been resolved yet.
 			 */
-			hashcpy(obj_list[nr].sha1, null_sha1);
+			hashclr(obj_list[nr].sha1);
 			add_delta_to_list(nr, null_sha1, base_offset, delta_data, delta_size);
 			return;
 		}
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 1c94ca59bf..ba04b197d8 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -255,7 +255,7 @@ static int process_lstat_error(const char *path, int err)
 {
 	if (err == ENOENT || err == ENOTDIR)
 		return remove_one_path(path);
-	return error("lstat(\"%s\"): %s", path, strerror(errno));
+	return error("lstat(\"%s\"): %s", path, strerror(err));
 }
 
 static int add_one_path(const struct cache_entry *old, const char *path, int len, struct stat *st)
@@ -759,7 +759,7 @@ static int do_reupdate(int ac, const char **av,
 		if (save_nr != active_nr)
 			goto redo;
 	}
-	free_pathspec(&pathspec);
+	clear_pathspec(&pathspec);
 	return 0;
 }
 
@@ -1146,7 +1146,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 		report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
 		break;
 	default:
-		die("Bug: bad untracked_cache value: %d", untracked_cache);
+		die("BUG: bad untracked_cache value: %d", untracked_cache);
 	}
 
 	if (active_cache_changed) {
diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c
index dbfe14f3fe..2caedf1849 100644
--- a/builtin/upload-archive.c
+++ b/builtin/upload-archive.c
@@ -104,8 +104,7 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix)
 		pfd[1].events = POLLIN;
 		if (poll(pfd, 2, -1) < 0) {
 			if (errno != EINTR) {
-				error("poll failed resuming: %s",
-				      strerror(errno));
+				error_errno("poll failed resuming");
 				sleep(1);
 			}
 			continue;
diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index 00663f6a30..99f8148cf7 100644
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@ -18,55 +18,6 @@ static const char * const verify_tag_usage[] = {
 		NULL
 };
 
-static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags)
-{
-	struct signature_check sigc;
-	int len;
-	int ret;
-
-	memset(&sigc, 0, sizeof(sigc));
-
-	len = parse_signature(buf, size);
-
-	if (size == len) {
-		if (flags & GPG_VERIFY_VERBOSE)
-			write_in_full(1, buf, len);
-		return error("no signature found");
-	}
-
-	ret = check_signature(buf, len, buf + len, size - len, &sigc);
-	print_signature_buffer(&sigc, flags);
-
-	signature_check_clear(&sigc);
-	return ret;
-}
-
-static int verify_tag(const char *name, unsigned flags)
-{
-	enum object_type type;
-	unsigned char sha1[20];
-	char *buf;
-	unsigned long size;
-	int ret;
-
-	if (get_sha1(name, sha1))
-		return error("tag '%s' not found.", name);
-
-	type = sha1_object_info(sha1, NULL);
-	if (type != OBJ_TAG)
-		return error("%s: cannot verify a non-tag object of type %s.",
-				name, typename(type));
-
-	buf = read_sha1_file(sha1, &type, &size);
-	if (!buf)
-		return error("%s: unable to read file.", name);
-
-	ret = run_gpg_verify(buf, size, flags);
-
-	free(buf);
-	return ret;
-}
-
 static int git_verify_tag_config(const char *var, const char *value, void *cb)
 {
 	int status = git_gpg_config(var, value, cb);
@@ -95,11 +46,13 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)
 	if (verbose)
 		flags |= GPG_VERIFY_VERBOSE;
 
-	/* sometimes the program was terminated because this signal
-	 * was received in the process of writing the gpg input: */
-	signal(SIGPIPE, SIG_IGN);
-	while (i < argc)
-		if (verify_tag(argv[i++], flags))
+	while (i < argc) {
+		unsigned char sha1[20];
+		const char *name = argv[i++];
+		if (get_sha1(name, sha1))
+			had_error = !!error("tag '%s' not found.", name);
+		else if (gpg_verify_tag(sha1, name, flags))
 			had_error = 1;
+	}
 	return had_error;
 }
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 38b56096bd..6dcf7bd9d2 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -13,14 +13,17 @@
 
 static const char * const worktree_usage[] = {
 	N_("git worktree add [<options>] <path> [<branch>]"),
-	N_("git worktree prune [<options>]"),
 	N_("git worktree list [<options>]"),
+	N_("git worktree lock [<options>] <path>"),
+	N_("git worktree prune [<options>]"),
+	N_("git worktree unlock <path>"),
 	NULL
 };
 
 struct add_opts {
 	int force;
 	int detach;
+	int checkout;
 	const char *new_branch;
 	int force_new_branch;
 };
@@ -94,7 +97,7 @@ static void prune_worktrees(void)
 	if (!dir)
 		return;
 	while ((d = readdir(dir)) != NULL) {
-		if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
+		if (is_dot_or_dotdot(d->d_name))
 			continue;
 		strbuf_reset(&reason);
 		if (!prune_worktree(d->d_name, &reason))
@@ -109,7 +112,7 @@ static void prune_worktrees(void)
 		if (ret < 0 && errno == ENOTDIR)
 			ret = unlink(path.buf);
 		if (ret)
-			error(_("failed to remove: %s"), strerror(errno));
+			error_errno(_("failed to remove '%s'"), path.buf);
 	}
 	closedir(dir);
 	if (!show_only)
@@ -191,7 +194,7 @@ static int add_worktree(const char *path, const char *refname,
 	struct strbuf sb = STRBUF_INIT;
 	const char *name;
 	struct stat st;
-	struct child_process cp;
+	struct child_process cp = CHILD_PROCESS_INIT;
 	struct argv_array child_env = ARGV_ARRAY_INIT;
 	int counter = 0, len, ret;
 	struct strbuf symref = STRBUF_INIT;
@@ -204,7 +207,7 @@ static int add_worktree(const char *path, const char *refname,
 	if (!opts->detach && !strbuf_check_branch_ref(&symref, refname) &&
 		 ref_exists(symref.buf)) { /* it's a branch */
 		if (!opts->force)
-			die_if_checked_out(symref.buf);
+			die_if_checked_out(symref.buf, 0);
 	} else { /* must be a commit */
 		commit = lookup_commit_reference_by_name(refname);
 		if (!commit)
@@ -261,7 +264,7 @@ static int add_worktree(const char *path, const char *refname,
 	 */
 	strbuf_reset(&sb);
 	strbuf_addf(&sb, "%s/HEAD", sb_repo.buf);
-	write_file(sb.buf, "0000000000000000000000000000000000000000");
+	write_file(sb.buf, "%s", sha1_to_hex(null_sha1));
 	strbuf_reset(&sb);
 	strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
 	write_file(sb.buf, "../..");
@@ -270,7 +273,6 @@ static int add_worktree(const char *path, const char *refname,
 
 	argv_array_pushf(&child_env, "%s=%s", GIT_DIR_ENVIRONMENT, sb_git.buf);
 	argv_array_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path);
-	memset(&cp, 0, sizeof(cp));
 	cp.git_cmd = 1;
 
 	if (commit)
@@ -284,18 +286,22 @@ static int add_worktree(const char *path, const char *refname,
 	if (ret)
 		goto done;
 
-	cp.argv = NULL;
-	argv_array_clear(&cp.args);
-	argv_array_pushl(&cp.args, "reset", "--hard", NULL);
-	cp.env = child_env.argv;
-	ret = run_command(&cp);
-	if (!ret) {
-		is_junk = 0;
-		free(junk_work_tree);
-		free(junk_git_dir);
-		junk_work_tree = NULL;
-		junk_git_dir = NULL;
+	if (opts->checkout) {
+		cp.argv = NULL;
+		argv_array_clear(&cp.args);
+		argv_array_pushl(&cp.args, "reset", "--hard", NULL);
+		cp.env = child_env.argv;
+		ret = run_command(&cp);
+		if (ret)
+			goto done;
 	}
+
+	is_junk = 0;
+	free(junk_work_tree);
+	free(junk_git_dir);
+	junk_work_tree = NULL;
+	junk_git_dir = NULL;
+
 done:
 	strbuf_reset(&sb);
 	strbuf_addf(&sb, "%s/locked", sb_repo.buf);
@@ -320,19 +326,24 @@ static int add(int ac, const char **av, const char *prefix)
 		OPT_STRING('B', NULL, &new_branch_force, N_("branch"),
 			   N_("create or reset a branch")),
 		OPT_BOOL(0, "detach", &opts.detach, N_("detach HEAD at named commit")),
+		OPT_BOOL(0, "checkout", &opts.checkout, N_("populate the new working tree")),
 		OPT_END()
 	};
 
 	memset(&opts, 0, sizeof(opts));
+	opts.checkout = 1;
 	ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
 	if (!!opts.detach + !!opts.new_branch + !!new_branch_force > 1)
 		die(_("-b, -B, and --detach are mutually exclusive"));
 	if (ac < 1 || ac > 2)
 		usage_with_options(worktree_usage, options);
 
-	path = prefix ? prefix_filename(prefix, strlen(prefix), av[0]) : av[0];
+	path = prefix_filename(prefix, strlen(prefix), av[0]);
 	branch = ac < 2 ? "HEAD" : av[1];
 
+	if (!strcmp(branch, "-"))
+		branch = "@{-1}";
+
 	opts.force_new_branch = !!new_branch_force;
 	if (opts.force_new_branch) {
 		struct strbuf symref = STRBUF_INIT;
@@ -342,7 +353,7 @@ static int add(int ac, const char **av, const char *prefix)
 		if (!opts.force &&
 		    !strbuf_check_branch_ref(&symref, opts.new_branch) &&
 		    ref_exists(symref.buf))
-			die_if_checked_out(symref.buf);
+			die_if_checked_out(symref.buf, 0);
 		strbuf_release(&symref);
 	}
 
@@ -353,8 +364,7 @@ static int add(int ac, const char **av, const char *prefix)
 	}
 
 	if (opts.new_branch) {
-		struct child_process cp;
-		memset(&cp, 0, sizeof(cp));
+		struct child_process cp = CHILD_PROCESS_INIT;
 		cp.git_cmd = 1;
 		argv_array_push(&cp.args, "branch");
 		if (opts.force_new_branch)
@@ -452,6 +462,66 @@ static int list(int ac, const char **av, const char *prefix)
 	return 0;
 }
 
+static int lock_worktree(int ac, const char **av, const char *prefix)
+{
+	const char *reason = "", *old_reason;
+	struct option options[] = {
+		OPT_STRING(0, "reason", &reason, N_("string"),
+			   N_("reason for locking")),
+		OPT_END()
+	};
+	struct worktree **worktrees, *wt;
+
+	ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
+	if (ac != 1)
+		usage_with_options(worktree_usage, options);
+
+	worktrees = get_worktrees();
+	wt = find_worktree(worktrees, prefix, av[0]);
+	if (!wt)
+		die(_("'%s' is not a working tree"), av[0]);
+	if (is_main_worktree(wt))
+		die(_("The main working tree cannot be locked or unlocked"));
+
+	old_reason = is_worktree_locked(wt);
+	if (old_reason) {
+		if (*old_reason)
+			die(_("'%s' is already locked, reason: %s"),
+			    av[0], old_reason);
+		die(_("'%s' is already locked"), av[0]);
+	}
+
+	write_file(git_common_path("worktrees/%s/locked", wt->id),
+		   "%s", reason);
+	free_worktrees(worktrees);
+	return 0;
+}
+
+static int unlock_worktree(int ac, const char **av, const char *prefix)
+{
+	struct option options[] = {
+		OPT_END()
+	};
+	struct worktree **worktrees, *wt;
+	int ret;
+
+	ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
+	if (ac != 1)
+		usage_with_options(worktree_usage, options);
+
+	worktrees = get_worktrees();
+	wt = find_worktree(worktrees, prefix, av[0]);
+	if (!wt)
+		die(_("'%s' is not a working tree"), av[0]);
+	if (is_main_worktree(wt))
+		die(_("The main working tree cannot be locked or unlocked"));
+	if (!is_worktree_locked(wt))
+		die(_("'%s' is not locked"), av[0]);
+	ret = unlink_or_warn(git_common_path("worktrees/%s/locked", wt->id));
+	free_worktrees(worktrees);
+	return ret;
+}
+
 int cmd_worktree(int ac, const char **av, const char *prefix)
 {
 	struct option options[] = {
@@ -460,11 +530,17 @@ int cmd_worktree(int ac, const char **av, const char *prefix)
 
 	if (ac < 2)
 		usage_with_options(worktree_usage, options);
+	if (!prefix)
+		prefix = "";
 	if (!strcmp(av[1], "add"))
 		return add(ac - 1, av + 1, prefix);
 	if (!strcmp(av[1], "prune"))
 		return prune(ac - 1, av + 1, prefix);
 	if (!strcmp(av[1], "list"))
 		return list(ac - 1, av + 1, prefix);
+	if (!strcmp(av[1], "lock"))
+		return lock_worktree(ac - 1, av + 1, prefix);
+	if (!strcmp(av[1], "unlock"))
+		return unlock_worktree(ac - 1, av + 1, prefix);
 	usage_with_options(worktree_usage, options);
 }
diff --git a/cache-tree.c b/cache-tree.c
index 3ebf9c3aa4..f28b1f45a4 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -319,12 +319,13 @@ static int update_one(struct cache_tree *it,
 	i = 0;
 	while (i < entries) {
 		const struct cache_entry *ce = cache[i];
-		struct cache_tree_sub *sub;
+		struct cache_tree_sub *sub = NULL;
 		const char *path, *slash;
 		int pathlen, entlen;
 		const unsigned char *sha1;
 		unsigned mode;
 		int expected_missing = 0;
+		int contains_ita = 0;
 
 		path = ce->name;
 		pathlen = ce_namelen(ce);
@@ -341,7 +342,8 @@ static int update_one(struct cache_tree *it,
 			i += sub->count;
 			sha1 = sub->cache_tree->sha1;
 			mode = S_IFDIR;
-			if (sub->cache_tree->entry_count < 0) {
+			contains_ita = sub->cache_tree->entry_count < 0;
+			if (contains_ita) {
 				to_invalidate = 1;
 				expected_missing = 1;
 			}
@@ -375,11 +377,17 @@ static int update_one(struct cache_tree *it,
 		 * they are not part of generated trees. Invalidate up
 		 * to root to force cache-tree users to read elsewhere.
 		 */
-		if (ce_intent_to_add(ce)) {
+		if (!sub && ce_intent_to_add(ce)) {
 			to_invalidate = 1;
 			continue;
 		}
 
+		/*
+		 * "sub" can be an empty tree if all subentries are i-t-a.
+		 */
+		if (contains_ita && !hashcmp(sha1, EMPTY_TREE_SHA1_BIN))
+			continue;
+
 		strbuf_grow(&buffer, entlen + 100);
 		strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
 		strbuf_add(&buffer, sha1, 20);
@@ -663,7 +671,7 @@ static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
 			cnt++;
 		else {
 			struct cache_tree_sub *sub;
-			struct tree *subtree = lookup_tree(entry.sha1);
+			struct tree *subtree = lookup_tree(entry.oid->hash);
 			if (!subtree->object.parsed)
 				parse_tree(subtree);
 			sub = cache_tree_sub(it, entry.path);
@@ -710,7 +718,7 @@ int cache_tree_matches_traversal(struct cache_tree *root,
 
 	it = find_cache_tree_from_traversal(root, info);
 	it = cache_tree_find(it, ent->path);
-	if (it && it->entry_count > 0 && !hashcmp(ent->sha1, it->sha1))
+	if (it && it->entry_count > 0 && !hashcmp(ent->oid->hash, it->sha1))
 		return it->entry_count;
 	return 0;
 }
diff --git a/cache.h b/cache.h
index 4ff196c259..b780a91a56 100644
--- a/cache.h
+++ b/cache.h
@@ -367,8 +367,8 @@ extern void free_name_hash(struct index_state *istate);
 #define rename_cache_entry_at(pos, new_name) rename_index_entry_at(&the_index, (pos), (new_name))
 #define remove_cache_entry_at(pos) remove_index_entry_at(&the_index, (pos))
 #define remove_file_from_cache(path) remove_file_from_index(&the_index, (path))
-#define add_to_cache(path, st, flags) add_to_index(&the_index, (path), (st), (flags))
-#define add_file_to_cache(path, flags) add_file_to_index(&the_index, (path), (flags))
+#define add_to_cache(path, st, flags) add_to_index(&the_index, (path), (st), (flags), 0)
+#define add_file_to_cache(path, flags) add_file_to_index(&the_index, (path), (flags), 0)
 #define refresh_cache(flags) refresh_index(&the_index, (flags), 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))
@@ -581,8 +581,8 @@ extern int remove_file_from_index(struct index_state *, const char *path);
 #define ADD_CACHE_IGNORE_ERRORS	4
 #define ADD_CACHE_IGNORE_REMOVAL 8
 #define ADD_CACHE_INTENT 16
-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);
+extern int add_to_index(struct index_state *, const char *path, struct stat *, int flags, int force_mode);
+extern int add_file_to_index(struct index_state *, const char *path, int flags, int force_mode);
 extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, unsigned int refresh_options);
 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);
@@ -632,6 +632,7 @@ extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
 #define REFRESH_IGNORE_SUBMODULES	0x0010	/* ignore submodules */
 #define REFRESH_IN_PORCELAIN	0x0020	/* user friendly output, not "needs update" */
 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 cache_entry *, unsigned int);
 
 extern void update_index_if_able(struct index_state *, struct lock_file *);
 
@@ -654,6 +655,7 @@ extern int warn_on_object_refname_ambiguity;
 extern const char *apply_default_whitespace;
 extern const char *apply_default_ignorewhitespace;
 extern const char *git_attributes_file;
+extern const char *git_hooks_path;
 extern int zlib_compression_level;
 extern int core_compression_level;
 extern int core_compression_seen;
@@ -807,11 +809,14 @@ extern void check_repository_format(void);
  */
 extern const char *mkpath(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
 extern const char *git_path(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
+extern const char *git_common_path(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
 
 extern char *mksnpath(char *buf, size_t n, const char *fmt, ...)
 	__attribute__((format (printf, 3, 4)));
 extern void strbuf_git_path(struct strbuf *sb, const char *fmt, ...)
 	__attribute__((format (printf, 2, 3)));
+extern void strbuf_git_common_path(struct strbuf *sb, const char *fmt, ...)
+	__attribute__((format (printf, 2, 3)));
 extern char *git_path_buf(struct strbuf *buf, const char *fmt, ...)
 	__attribute__((format (printf, 2, 3)));
 extern void strbuf_git_path_submodule(struct strbuf *sb, const char *path,
@@ -999,6 +1004,11 @@ int adjust_shared_perm(const char *path);
  * directory while we were working.  To be robust against this kind of
  * race, callers might want to try invoking the function again when it
  * returns SCLD_VANISHED.
+ *
+ * safe_create_leading_directories() temporarily changes path while it
+ * is working but restores it before returning.
+ * safe_create_leading_directories_const() doesn't modify path, even
+ * temporarily.
  */
 enum scld_error {
 	SCLD_OK = 0,
@@ -1162,6 +1172,8 @@ extern int get_sha1_blob(const char *str, unsigned char *sha1);
 extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix);
 extern int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *orc);
 
+extern int get_oid(const char *str, struct object_id *oid);
+
 typedef int each_abbrev_fn(const unsigned char *sha1, void *);
 extern int for_each_abbrev(const char *prefix, each_abbrev_fn, void *);
 
@@ -1187,6 +1199,7 @@ extern int get_oid_hex(const char *hex, struct object_id *sha1);
  *   printf("%s -> %s", sha1_to_hex(one), sha1_to_hex(two));
  */
 extern char *sha1_to_hex_r(char *out, const unsigned char *sha1);
+extern char *oid_to_hex_r(char *out, const struct object_id *oid);
 extern char *sha1_to_hex(const unsigned char *sha1);	/* static buffer result! */
 extern char *oid_to_hex(const struct object_id *oid);	/* same static buffer as sha1_to_hex */
 
@@ -1217,7 +1230,8 @@ struct date_mode {
 		DATE_ISO8601_STRICT,
 		DATE_RFC2822,
 		DATE_STRFTIME,
-		DATE_RAW
+		DATE_RAW,
+		DATE_UNIX
 	} type;
 	const char *strftime_fmt;
 	int local;
@@ -1256,6 +1270,7 @@ extern const char *ident_default_email(void);
 extern const char *git_editor(void);
 extern const char *git_pager(int stdout_is_tty);
 extern int git_ident_config(const char *, const char *, void *);
+extern void reset_ident_date(void);
 
 struct ident_split {
 	const char *name_begin;
@@ -1364,6 +1379,13 @@ extern struct packed_git {
 	char pack_name[FLEX_ARRAY]; /* more */
 } *packed_git;
 
+/*
+ * A most-recently-used ordered version of the packed_git list, which can
+ * be iterated instead of packed_git (and marked via mru_mark).
+ */
+struct mru;
+extern struct mru *packed_git_mru;
+
 struct pack_entry {
 	off_t offset;
 	unsigned char sha1[20];
@@ -1403,7 +1425,6 @@ extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t
 extern void close_pack_windows(struct packed_git *);
 extern void close_all_packs(void);
 extern void unuse_pack(struct pack_window **);
-extern void free_pack_by_name(const char *);
 extern void clear_delta_base_cache(void);
 extern struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
 
@@ -1502,7 +1523,7 @@ struct object_info {
 	/* Request */
 	enum object_type *typep;
 	unsigned long *sizep;
-	unsigned long *disk_sizep;
+	off_t *disk_sizep;
 	unsigned char *delta_base_sha1;
 	struct strbuf *typename;
 
@@ -1553,10 +1574,18 @@ struct git_config_source {
 	const char *blob;
 };
 
+enum config_origin_type {
+	CONFIG_ORIGIN_BLOB,
+	CONFIG_ORIGIN_FILE,
+	CONFIG_ORIGIN_STDIN,
+	CONFIG_ORIGIN_SUBMODULE_BLOB,
+	CONFIG_ORIGIN_CMDLINE
+};
+
 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_mem(config_fn_t fn, const char *origin_type,
+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);
 extern void git_config_push_parameter(const char *text);
 extern int git_config_from_parameters(config_fn_t fn, void *data);
@@ -1598,6 +1627,16 @@ extern const char *get_log_output_encoding(void);
 extern const char *get_commit_output_encoding(void);
 
 extern int git_config_parse_parameter(const char *, config_fn_t fn, void *data);
+
+enum config_scope {
+	CONFIG_SCOPE_UNKNOWN = 0,
+	CONFIG_SCOPE_SYSTEM,
+	CONFIG_SCOPE_GLOBAL,
+	CONFIG_SCOPE_REPO,
+	CONFIG_SCOPE_CMDLINE,
+};
+
+extern enum config_scope current_config_scope(void);
 extern const char *current_config_origin_type(void);
 extern const char *current_config_name(void);
 
@@ -1690,6 +1729,8 @@ extern int ignore_untracked_cache_config;
 struct key_value_info {
 	const char *filename;
 	int linenr;
+	enum config_origin_type origin_type;
+	enum config_scope scope;
 };
 
 extern NORETURN void git_die_config(const char *key, const char *err, ...) __attribute__((format(printf, 2, 3)));
@@ -1715,8 +1756,6 @@ 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);
 
 extern void write_or_die(int fd, const void *buf, size_t count);
-extern int write_or_whine(int fd, const void *buf, size_t count, const char *msg);
-extern int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg);
 extern void fsync_or_die(int fd, const char *);
 
 extern ssize_t read_in_full(int fd, void *buf, size_t count);
@@ -1728,8 +1767,21 @@ static inline ssize_t write_str_in_full(int fd, const char *str)
 	return write_in_full(fd, str, strlen(str));
 }
 
-extern int write_file(const char *path, const char *fmt, ...);
-extern int write_file_gently(const char *path, const char *fmt, ...);
+/**
+ * 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);
+
+/**
+ * Like write_file_buf(), but format the contents into a buffer first.
+ * Additionally, write_file() will append a newline if one is not already
+ * present, making it convenient to write text files:
+ *
+ *   write_file(path, "counter: %d", ctr);
+ */
+__attribute__((format (printf, 2, 3)))
+extern void write_file(const char *path, const char *fmt, ...);
 
 /* pager.c */
 extern void setup_pager(void);
@@ -1766,14 +1818,14 @@ void packet_trace_identity(const char *prog);
  * return 0 if success, 1 - if addition of a file failed and
  * ADD_FILES_IGNORE_ERRORS was specified in flags
  */
-int add_files_to_cache(const char *prefix, const struct pathspec *pathspec, int flags);
+int add_files_to_cache(const char *prefix, const struct pathspec *pathspec, int flags, int force_mode);
 
 /* diff.c */
 extern int diff_auto_refresh_index;
 
 /* match-trees.c */
-void shift_tree(const unsigned char *, const unsigned char *, unsigned char *, int);
-void shift_tree_by(const unsigned char *, const unsigned char *, unsigned char *, const char *);
+void shift_tree(const struct object_id *, const struct object_id *, struct object_id *, int);
+void shift_tree_by(const struct object_id *, const struct object_id *, struct object_id *, const char *);
 
 /*
  * whitespace rules.
diff --git a/check-racy.c b/check-racy.c
index 00d92a1663..24b6542352 100644
--- a/check-racy.c
+++ b/check-racy.c
@@ -12,7 +12,7 @@ int main(int ac, char **av)
 		struct stat st;
 
 		if (lstat(ce->name, &st)) {
-			error("lstat(%s): %s", ce->name, strerror(errno));
+			error_errno("lstat(%s)", ce->name);
 			continue;
 		}
 
diff --git a/color.c b/color.c
index 8f85153d0d..81c2676723 100644
--- a/color.c
+++ b/color.c
@@ -123,19 +123,34 @@ static int parse_color(struct color *out, const char *name, int len)
 	return -1;
 }
 
-static int parse_attr(const char *name, int len)
+static int parse_attr(const char *name, size_t len)
 {
-	static const int attr_values[] = { 1, 2, 4, 5, 7,
-					   22, 22, 24, 25, 27 };
-	static const char * const attr_names[] = {
-		"bold", "dim", "ul", "blink", "reverse",
-		"nobold", "nodim", "noul", "noblink", "noreverse"
+	static const struct {
+		const char *name;
+		size_t len;
+		int val, neg;
+	} attrs[] = {
+#define ATTR(x, val, neg) { (x), sizeof(x)-1, (val), (neg) }
+		ATTR("bold",      1, 22),
+		ATTR("dim",       2, 22),
+		ATTR("italic",    3, 23),
+		ATTR("ul",        4, 24),
+		ATTR("blink",     5, 25),
+		ATTR("reverse",   7, 27),
+		ATTR("strike",    9, 29)
+#undef ATTR
 	};
+	int negate = 0;
 	int i;
-	for (i = 0; i < ARRAY_SIZE(attr_names); i++) {
-		const char *str = attr_names[i];
-		if (!strncasecmp(name, str, len) && !str[len])
-			return attr_values[i];
+
+	if (skip_prefix_mem(name, len, "no", &name, &len)) {
+		skip_prefix_mem(name, len, "-", &name, &len);
+		negate = 1;
+	}
+
+	for (i = 0; i < ARRAY_SIZE(attrs); i++) {
+		if (attrs[i].len == len && !memcmp(attrs[i].name, name, len))
+			return negate ? attrs[i].neg : attrs[i].val;
 	}
 	return -1;
 }
diff --git a/color.h b/color.h
index e155d13f78..90627650fc 100644
--- a/color.h
+++ b/color.h
@@ -3,26 +3,24 @@
 
 struct strbuf;
 
-/*  2 + (2 * num_attrs) + 8 + 1 + 8 + 'm' + NUL */
-/* "\033[1;2;4;5;7;38;5;2xx;48;5;2xxm\0" */
 /*
  * The maximum length of ANSI color sequence we would generate:
  * - leading ESC '['            2
- * - attr + ';'                 3 * 10 (e.g. "1;")
+ * - attr + ';'                 2 * num_attr (e.g. "1;")
+ * - no-attr + ';'              3 * num_attr (e.g. "22;")
  * - fg color + ';'             17 (e.g. "38;2;255;255;255;")
  * - bg color + ';'             17 (e.g. "48;2;255;255;255;")
  * - terminating 'm' NUL        2
  *
- * The above overcounts attr (we only use 5 not 8) and one semicolon
- * but it is close enough.
+ * The above overcounts by one semicolon but it is close enough.
+ *
+ * The space for attributes is also slightly overallocated, as
+ * the negation for some attributes is the same (e.g., nobold and nodim).
+ *
+ * We allocate space for 7 attributes.
  */
-#define COLOR_MAXLEN 70
+#define COLOR_MAXLEN 75
 
-/*
- * IMPORTANT: Due to the way these color codes are emulated on Windows,
- * write them only using printf(), fprintf(), and fputs(). In particular,
- * do not use puts() or write().
- */
 #define GIT_COLOR_NORMAL	""
 #define GIT_COLOR_RESET		"\033[m"
 #define GIT_COLOR_BOLD		"\033[1m"
diff --git a/combine-diff.c b/combine-diff.c
index 0e1d4b0893..8e2a577bdb 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -44,9 +44,9 @@ static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr,
 			memset(p->parent, 0,
 			       sizeof(p->parent[0]) * num_parent);
 
-			hashcpy(p->oid.hash, q->queue[i]->two->sha1);
+			oidcpy(&p->oid, &q->queue[i]->two->oid);
 			p->mode = q->queue[i]->two->mode;
-			hashcpy(p->parent[n].oid.hash, q->queue[i]->one->sha1);
+			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;
 			*tail = p;
@@ -77,7 +77,7 @@ static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr,
 			continue;
 		}
 
-		hashcpy(p->parent[n].oid.hash, q->queue[i]->one->sha1);
+		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;
 
@@ -1005,8 +1005,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
 			struct strbuf buf = STRBUF_INIT;
 
 			if (strbuf_readlink(&buf, elem->path, st.st_size) < 0) {
-				error("readlink(%s): %s", elem->path,
-				      strerror(errno));
+				error_errno("readlink(%s)", elem->path);
 				return;
 			}
 			result_size = buf.len;
@@ -1269,16 +1268,16 @@ static struct diff_filepair *combined_pair(struct combine_diff_path *p,
 	for (i = 0; i < num_parent; i++) {
 		pair->one[i].path = p->path;
 		pair->one[i].mode = p->parent[i].mode;
-		hashcpy(pair->one[i].sha1, p->parent[i].oid.hash);
-		pair->one[i].sha1_valid = !is_null_oid(&p->parent[i].oid);
+		oidcpy(&pair->one[i].oid, &p->parent[i].oid);
+		pair->one[i].oid_valid = !is_null_oid(&p->parent[i].oid);
 		pair->one[i].has_more_entries = 1;
 	}
 	pair->one[num_parent - 1].has_more_entries = 0;
 
 	pair->two->path = p->path;
 	pair->two->mode = p->mode;
-	hashcpy(pair->two->sha1, p->oid.hash);
-	pair->two->sha1_valid = !is_null_oid(&p->oid);
+	oidcpy(&pair->two->oid, &p->oid);
+	pair->two->oid_valid = !is_null_oid(&p->oid);
 	return pair;
 }
 
@@ -1526,7 +1525,7 @@ void diff_tree_combined(const unsigned char *sha1,
 		free(tmp);
 	}
 
-	free_pathspec(&diffopts.pathspec);
+	clear_pathspec(&diffopts.pathspec);
 }
 
 void diff_tree_combined_merge(const struct commit *commit, int dense,
diff --git a/commit-slab.h b/commit-slab.h
index f84b449413..42d16dcded 100644
--- a/commit-slab.h
+++ b/commit-slab.h
@@ -8,7 +8,7 @@
  *
  * After including this header file, using:
  *
- * define_commit_slab(indegee, int);
+ * define_commit_slab(indegree, int);
  *
  * will let you call the following functions:
  *
@@ -126,16 +126,16 @@ static MAYBE_UNUSED elemtype *slabname## _peek(struct slabname *s,	\
 	return slabname##_at_peek(s, c, 0);				\
 }									\
 									\
-static int stat_ ##slabname## realloc
+struct slabname
 
 /*
- * Note that this seemingly redundant second declaration is required
+ * Note that this redundant forward declaration is required
  * to allow a terminating semicolon, which makes instantiations look
  * like function declarations.  I.e., the expansion of
  *
  *    define_commit_slab(indegree, int);
  *
- * ends in 'static int stat_indegreerealloc;'.  This would otherwise
+ * ends in 'struct indegree;'.  This would otherwise
  * be a syntax error according (at least) to ISO C.  It's hard to
  * catch because GCC silently parses it by default.
  */
diff --git a/commit.c b/commit.c
index 3f4f371e5e..71a360dad3 100644
--- a/commit.c
+++ b/commit.c
@@ -414,7 +414,7 @@ int find_commit_subject(const char *commit_buffer, const char **subject)
 	while (*p && (*p != '\n' || p[1] != '\n'))
 		p++;
 	if (*p) {
-		p += 2;
+		p = skip_blank_lines(p + 2);
 		for (eol = p; *eol && *eol != '\n'; eol++)
 			; /* do nothing */
 	} else
@@ -1092,9 +1092,14 @@ static int do_sign_commit(struct strbuf *buf, const char *keyid)
 {
 	struct strbuf sig = STRBUF_INIT;
 	int inspos, copypos;
+	const char *eoh;
 
 	/* find the end of the header */
-	inspos = strstr(buf->buf, "\n\n") - buf->buf + 1;
+	eoh = strstr(buf->buf, "\n\n");
+	if (!eoh)
+		inspos = buf->len;
+	else
+		inspos = eoh - buf->buf + 1;
 
 	if (!keyid || !*keyid)
 		keyid = get_signing_key();
@@ -1617,16 +1622,6 @@ struct commit_list **commit_list_append(struct commit *commit,
 	return &new->next;
 }
 
-void print_commit_list(struct commit_list *list,
-		       const char *format_cur,
-		       const char *format_last)
-{
-	for ( ; list; list = list->next) {
-		const char *format = list->next ? format_cur : format_last;
-		printf(format, oid_to_hex(&list->item->object.oid));
-	}
-}
-
 const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
 {
 	int key_len = strlen(key);
diff --git a/commit.h b/commit.h
index 5d58be0017..23ae0c1d64 100644
--- a/commit.h
+++ b/commit.h
@@ -131,11 +131,17 @@ enum cmit_fmt {
 	CMIT_FMT_FULLER,
 	CMIT_FMT_ONELINE,
 	CMIT_FMT_EMAIL,
+	CMIT_FMT_MBOXRD,
 	CMIT_FMT_USERFORMAT,
 
 	CMIT_FMT_UNSPECIFIED
 };
 
+static inline int cmit_fmt_is_mail(enum cmit_fmt fmt)
+{
+	return (fmt == CMIT_FMT_EMAIL || fmt == CMIT_FMT_MBOXRD);
+}
+
 struct pretty_print_context {
 	/*
 	 * Callers should tweak these to change the behavior of pp_* functions.
@@ -147,6 +153,7 @@ struct pretty_print_context {
 	int preserve_subject;
 	struct date_mode date_mode;
 	unsigned date_mode_explicit:1;
+	int expand_tabs_in_log;
 	int need_8bit_cte;
 	char *notes_message;
 	struct reflog_walk_info *reflog_info;
@@ -160,6 +167,7 @@ struct pretty_print_context {
 	 * should not be counted on by callers.
 	 */
 	struct string_list in_body_headers;
+	int graph_width;
 };
 
 struct userformat_want {
@@ -176,6 +184,7 @@ extern const char *format_subject(struct strbuf *sb, const char *msg,
 				  const char *line_separator);
 extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
 extern int commit_format_is_empty(enum cmit_fmt);
+extern const char *skip_blank_lines(const char *msg);
 extern void format_commit_message(const struct commit *commit,
 				  const char *format, struct strbuf *sb,
 				  const struct pretty_print_context *context);
@@ -368,10 +377,6 @@ extern int parse_signed_commit(const struct commit *commit,
 			       struct strbuf *message, struct strbuf *signature);
 extern int remove_signature(struct strbuf *buf);
 
-extern void print_commit_list(struct commit_list *list,
-			      const char *format_cur,
-			      const char *format_last);
-
 /*
  * Check the signature of the given commit. The result of the check is stored
  * in sig->check_result, 'G' for a good signature, 'U' for a good signature
diff --git a/common-main.c b/common-main.c
new file mode 100644
index 0000000000..44a29e8b13
--- /dev/null
+++ b/common-main.c
@@ -0,0 +1,41 @@
+#include "cache.h"
+#include "exec_cmd.h"
+
+/*
+ * Many parts of Git have subprograms communicate via pipe, expect the
+ * upstream of a pipe to die with SIGPIPE when the downstream of a
+ * pipe does not need to read all that is written.  Some third-party
+ * programs that ignore or block SIGPIPE for their own reason forget
+ * to restore SIGPIPE handling to the default before spawning Git and
+ * break this carefully orchestrated machinery.
+ *
+ * Restore the way SIGPIPE is handled to default, which is what we
+ * expect.
+ */
+static void restore_sigpipe_to_default(void)
+{
+	sigset_t unblock;
+
+	sigemptyset(&unblock);
+	sigaddset(&unblock, SIGPIPE);
+	sigprocmask(SIG_UNBLOCK, &unblock, NULL);
+	signal(SIGPIPE, SIG_DFL);
+}
+
+int main(int argc, const char **argv)
+{
+	/*
+	 * 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();
+
+	git_setup_gettext();
+
+	argv[0] = git_extract_argv0_path(argv[0]);
+
+	restore_sigpipe_to_default();
+
+	return cmd_main(argc, argv);
+}
diff --git a/compat/mingw.c b/compat/mingw.c
index a8218e6f0f..2b5467dead 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2162,7 +2162,7 @@ int xwcstoutf(char *utf, const wchar_t *wcs, size_t utflen)
 	return -1;
 }
 
-static void setup_windows_environment()
+static void setup_windows_environment(void)
 {
 	char *tmp = getenv("TMPDIR");
 
@@ -2204,7 +2204,7 @@ typedef struct {
 extern int __wgetmainargs(int *argc, wchar_t ***argv, wchar_t ***env, int glob,
 		_startupinfo *si);
 
-static NORETURN void die_startup()
+static NORETURN void die_startup(void)
 {
 	fputs("fatal: not enough memory for initialization", stderr);
 	exit(128);
@@ -2224,7 +2224,7 @@ static char *wcstoutfdup_startup(char *buffer, const wchar_t *wcs, size_t len)
 	return memcpy(malloc_startup(len), buffer, len);
 }
 
-void mingw_startup()
+void mingw_startup(void)
 {
 	int i, maxlen, argc;
 	char *buffer;
diff --git a/compat/mingw.h b/compat/mingw.h
index 69bb43dc35..95e128fcfd 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -73,6 +73,9 @@ typedef int pid_t;
 #ifndef ECONNABORTED
 #define ECONNABORTED WSAECONNABORTED
 #endif
+#ifndef ENOTSOCK
+#define ENOTSOCK WSAENOTSOCK
+#endif
 
 struct passwd {
 	char *pw_name;
@@ -532,10 +535,10 @@ extern CRITICAL_SECTION pinfo_cs;
  * A replacement of main() that adds win32 specific initialization.
  */
 
-void mingw_startup();
-#define main(c,v) dummy_decl_mingw_main(); \
+void mingw_startup(void);
+#define main(c,v) dummy_decl_mingw_main(void); \
 static int mingw_main(c,v); \
-int main(int argc, char **argv) \
+int main(int argc, const char **argv) \
 { \
 	mingw_startup(); \
 	return mingw_main(__argc, (void *)__argv); \
diff --git a/compat/nedmalloc/nedmalloc.c b/compat/nedmalloc/nedmalloc.c
index a0a16eb1bb..2d4ef59013 100644
--- a/compat/nedmalloc/nedmalloc.c
+++ b/compat/nedmalloc/nedmalloc.c
@@ -938,10 +938,10 @@ void **nedpindependent_comalloc(nedpool *p, size_t elems, size_t *sizes, void **
 	void **ret;
 	threadcache *tc;
 	int mymspace;
-    size_t i, *adjustedsizes=(size_t *) alloca(elems*sizeof(size_t));
-    if(!adjustedsizes) return 0;
-    for(i=0; i<elems; i++)
-	adjustedsizes[i]=sizes[i]<sizeof(threadcacheblk) ? sizeof(threadcacheblk) : sizes[i];
+	size_t i, *adjustedsizes=(size_t *) alloca(elems*sizeof(size_t));
+	if(!adjustedsizes) return 0;
+	for(i=0; i<elems; i++)
+		adjustedsizes[i]=sizes[i]<sizeof(threadcacheblk) ? sizeof(threadcacheblk) : sizes[i];
 	GetThreadCache(&p, &tc, &mymspace, 0);
 	GETMSPACE(m, p, tc, mymspace, 0,
 	      ret=mspace_independent_comalloc(m, elems, adjustedsizes, chunks));
@@ -955,12 +955,11 @@ void **nedpindependent_comalloc(nedpool *p, size_t elems, size_t *sizes, void **
  */
 char *strdup(const char *s1)
 {
-	char *s2 = 0;
-	if (s1) {
-		size_t len = strlen(s1) + 1;
-		s2 = malloc(len);
+	size_t len = strlen(s1) + 1;
+	char *s2 = malloc(len);
+
+	if (s2)
 		memcpy(s2, s1, len);
-	}
 	return s2;
 }
 #endif
diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c
index fba5986399..d8bde06f1a 100644
--- a/compat/regex/regcomp.c
+++ b/compat/regex/regcomp.c
@@ -18,8 +18,6 @@
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301 USA.  */
 
-#include <stdint.h>
-
 static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern,
 					  size_t length, reg_syntax_t syntax);
 static void re_compile_fastmap_iter (regex_t *bufp,
diff --git a/compat/regex/regex.c b/compat/regex/regex.c
index 6aaae00327..5cb23e5d59 100644
--- a/compat/regex/regex.c
+++ b/compat/regex/regex.c
@@ -60,6 +60,7 @@
    GNU regex allows.  Include it before <regex.h>, which correctly
    #undefs RE_DUP_MAX and sets it to the right value.  */
 #include <limits.h>
+#include <stdint.h>
 
 #ifdef GAWK
 #undef alloca
diff --git a/compat/win32/syslog.c b/compat/win32/syslog.c
index b905aea31b..6c7c9b6053 100644
--- a/compat/win32/syslog.c
+++ b/compat/win32/syslog.c
@@ -28,13 +28,13 @@ void syslog(int priority, const char *fmt, ...)
 	va_end(ap);
 
 	if (str_len < 0) {
-		warning("vsnprintf failed: '%s'", strerror(errno));
+		warning_errno("vsnprintf failed");
 		return;
 	}
 
 	str = malloc(st_add(str_len, 1));
 	if (!str) {
-		warning("malloc failed: '%s'", strerror(errno));
+		warning_errno("malloc failed");
 		return;
 	}
 
@@ -45,7 +45,7 @@ void syslog(int priority, const char *fmt, ...)
 	while ((pos = strstr(str, "%1")) != NULL) {
 		str = realloc(str, st_add(++str_len, 1));
 		if (!str) {
-			warning("realloc failed: '%s'", strerror(errno));
+			warning_errno("realloc failed");
 			return;
 		}
 		memmove(pos + 2, pos + 1, strlen(pos));
diff --git a/compat/winansi.c b/compat/winansi.c
index 3be60ce1c6..db4a5b0a37 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -492,7 +492,7 @@ static inline ioinfo* _pioinfo(int fd)
 			(fd & (IOINFO_ARRAY_ELTS - 1)) * sizeof_ioinfo);
 }
 
-static int init_sizeof_ioinfo()
+static int init_sizeof_ioinfo(void)
 {
 	int istty, wastty;
 	/* don't init twice */
diff --git a/config.c b/config.c
index 6dbc8a409e..584cacf148 100644
--- a/config.c
+++ b/config.c
@@ -24,7 +24,7 @@ struct config_source {
 			size_t pos;
 		} buf;
 	} u;
-	const char *origin_type;
+	enum config_origin_type origin_type;
 	const char *name;
 	const char *path;
 	int die_on_error;
@@ -38,7 +38,33 @@ struct config_source {
 	long (*do_ftell)(struct config_source *c);
 };
 
+/*
+ * These variables record the "current" config source, which
+ * can be accessed by parsing callbacks.
+ *
+ * The "cf" variable will be non-NULL only when we are actually parsing a real
+ * config source (file, blob, cmdline, etc).
+ *
+ * The "current_config_kvi" variable will be non-NULL only when we are feeding
+ * cached config from a configset into a callback.
+ *
+ * They should generally never be non-NULL at the same time. If they are both
+ * NULL, then we aren't parsing anything (and depending on the function looking
+ * at the variables, it's either a bug for it to be called in the first place,
+ * or it's a function which can be reused for non-config purposes, and should
+ * fall back to some sane behavior).
+ */
 static struct config_source *cf;
+static struct key_value_info *current_config_kvi;
+
+/*
+ * Similar to the variables above, this gives access to the "scope" of the
+ * current value (repo, global, etc). For cached values, it can be found via
+ * the current_config_kvi as above. During parsing, the current value can be
+ * found in this variable. It's not part of "cf" because it transcends a single
+ * file (i.e., a file included from .git/config is still in "repo" scope).
+ */
+static enum config_scope current_parsing_scope;
 
 static int zlib_compression_seen;
 
@@ -131,7 +157,9 @@ static int handle_path_include(const char *path, struct config_include_data *inc
 	if (!access_or_die(path, R_OK, 0)) {
 		if (++inc->depth > MAX_INCLUDE_DEPTH)
 			die(include_depth_advice, MAX_INCLUDE_DEPTH, path,
-			    cf && cf->name ? cf->name : "the command line");
+			    !cf ? "<unknown>" :
+			    cf->name ? cf->name :
+			    "the command line");
 		ret = git_config_from_file(git_config_include, path, inc);
 		inc->depth--;
 	}
@@ -162,7 +190,7 @@ void git_config_push_parameter(const char *text)
 {
 	struct strbuf env = STRBUF_INIT;
 	const char *old = getenv(CONFIG_DATA_ENVIRONMENT);
-	if (old) {
+	if (old && *old) {
 		strbuf_addstr(&env, old);
 		strbuf_addch(&env, ' ');
 	}
@@ -205,32 +233,41 @@ int git_config_parse_parameter(const char *text,
 int git_config_from_parameters(config_fn_t fn, void *data)
 {
 	const char *env = getenv(CONFIG_DATA_ENVIRONMENT);
+	int ret = 0;
 	char *envw;
 	const char **argv = NULL;
 	int nr = 0, alloc = 0;
 	int i;
+	struct config_source source;
 
 	if (!env)
 		return 0;
+
+	memset(&source, 0, sizeof(source));
+	source.prev = cf;
+	source.origin_type = CONFIG_ORIGIN_CMDLINE;
+	cf = &source;
+
 	/* sq_dequote will write over it */
 	envw = xstrdup(env);
 
 	if (sq_dequote_to_argv(envw, &argv, &nr, &alloc) < 0) {
-		free(envw);
-		return error("bogus format in " CONFIG_DATA_ENVIRONMENT);
+		ret = error("bogus format in " CONFIG_DATA_ENVIRONMENT);
+		goto out;
 	}
 
 	for (i = 0; i < nr; i++) {
 		if (git_config_parse_parameter(argv[i], fn, data) < 0) {
-			free(argv);
-			free(envw);
-			return -1;
+			ret = -1;
+			goto out;
 		}
 	}
 
+out:
 	free(argv);
 	free(envw);
-	return nr > 0;
+	cf = source.prev;
+	return ret;
 }
 
 static int get_next_char(void)
@@ -417,6 +454,8 @@ static int git_parse_source(config_fn_t fn, void *data)
 	int comment = 0;
 	int baselen = 0;
 	struct strbuf *var = &cf->var;
+	int error_return = 0;
+	char *error_msg = NULL;
 
 	/* U+FEFF Byte Order Mark in UTF8 */
 	const char *bomptr = utf8_bom;
@@ -471,10 +510,40 @@ static int git_parse_source(config_fn_t fn, void *data)
 		if (get_value(fn, data, var) < 0)
 			break;
 	}
+
+	switch (cf->origin_type) {
+	case CONFIG_ORIGIN_BLOB:
+		error_msg = xstrfmt(_("bad config line %d in blob %s"),
+				      cf->linenr, cf->name);
+		break;
+	case CONFIG_ORIGIN_FILE:
+		error_msg = xstrfmt(_("bad config line %d in file %s"),
+				      cf->linenr, cf->name);
+		break;
+	case CONFIG_ORIGIN_STDIN:
+		error_msg = xstrfmt(_("bad config line %d in standard input"),
+				      cf->linenr);
+		break;
+	case CONFIG_ORIGIN_SUBMODULE_BLOB:
+		error_msg = xstrfmt(_("bad config line %d in submodule-blob %s"),
+				       cf->linenr, cf->name);
+		break;
+	case CONFIG_ORIGIN_CMDLINE:
+		error_msg = xstrfmt(_("bad config line %d in command line %s"),
+				       cf->linenr, cf->name);
+		break;
+	default:
+		error_msg = xstrfmt(_("bad config line %d in %s"),
+				      cf->linenr, cf->name);
+	}
+
 	if (cf->die_on_error)
-		die(_("bad config line %d in %s %s"), cf->linenr, cf->origin_type, cf->name);
+		die("%s", error_msg);
 	else
-		return error(_("bad config line %d in %s %s"), cf->linenr, cf->origin_type, cf->name);
+		error_return = error("%s", error_msg);
+
+	free(error_msg);
+	return error_return;
 }
 
 static int parse_unit_factor(const char *end, uintmax_t *val)
@@ -583,16 +652,47 @@ int git_parse_ulong(const char *value, unsigned long *ret)
 NORETURN
 static void die_bad_number(const char *name, const char *value)
 {
-	const char *reason = errno == ERANGE ?
-			     "out of range" :
-			     "invalid unit";
 	if (!value)
 		value = "";
 
-	if (cf && cf->origin_type && cf->name)
-		die(_("bad numeric config value '%s' for '%s' in %s %s: %s"),
-		    value, name, cf->origin_type, cf->name, reason);
-	die(_("bad numeric config value '%s' for '%s': %s"), value, name, reason);
+	if (!(cf && cf->name))
+		die(errno == ERANGE
+		    ? _("bad numeric config value '%s' for '%s': out of range")
+		    : _("bad numeric config value '%s' for '%s': invalid unit"),
+		    value, name);
+
+	switch (cf->origin_type) {
+	case CONFIG_ORIGIN_BLOB:
+		die(errno == ERANGE
+		    ? _("bad numeric config value '%s' for '%s' in blob %s: out of range")
+		    : _("bad numeric config value '%s' for '%s' in blob %s: invalid unit"),
+		    value, name, cf->name);
+	case CONFIG_ORIGIN_FILE:
+		die(errno == ERANGE
+		    ? _("bad numeric config value '%s' for '%s' in file %s: out of range")
+		    : _("bad numeric config value '%s' for '%s' in file %s: invalid unit"),
+		    value, name, cf->name);
+	case CONFIG_ORIGIN_STDIN:
+		die(errno == ERANGE
+		    ? _("bad numeric config value '%s' for '%s' in standard input: out of range")
+		    : _("bad numeric config value '%s' for '%s' in standard input: invalid unit"),
+		    value, name);
+	case CONFIG_ORIGIN_SUBMODULE_BLOB:
+		die(errno == ERANGE
+		    ? _("bad numeric config value '%s' for '%s' in submodule-blob %s: out of range")
+		    : _("bad numeric config value '%s' for '%s' in submodule-blob %s: invalid unit"),
+		    value, name, cf->name);
+	case CONFIG_ORIGIN_CMDLINE:
+		die(errno == ERANGE
+		    ? _("bad numeric config value '%s' for '%s' in command line %s: out of range")
+		    : _("bad numeric config value '%s' for '%s' in command line %s: invalid unit"),
+		    value, name, cf->name);
+	default:
+		die(errno == ERANGE
+		    ? _("bad numeric config value '%s' for '%s' in %s: out of range")
+		    : _("bad numeric config value '%s' for '%s' in %s: invalid unit"),
+		    value, name, cf->name);
+	}
 }
 
 int git_config_int(const char *name, const char *value)
@@ -717,6 +817,9 @@ static int git_default_core_config(const char *var, const char *value)
 	if (!strcmp(var, "core.attributesfile"))
 		return git_config_pathname(&git_attributes_file, var, value);
 
+	if (!strcmp(var, "core.hookspath"))
+		return git_config_pathname(&git_hooks_path, var, value);
+
 	if (!strcmp(var, "core.bare")) {
 		is_bare_repository_cfg = git_config_bool(var, value);
 		return 0;
@@ -1066,7 +1169,8 @@ static int do_config_from(struct config_source *top, config_fn_t fn, void *data)
 }
 
 static int do_config_from_file(config_fn_t fn,
-		const char *origin_type, const char *name, const char *path, FILE *f,
+		const enum config_origin_type origin_type,
+		const char *name, const char *path, FILE *f,
 		void *data)
 {
 	struct config_source top;
@@ -1085,7 +1189,7 @@ static int do_config_from_file(config_fn_t fn,
 
 static int git_config_from_stdin(config_fn_t fn, void *data)
 {
-	return do_config_from_file(fn, "standard input", "", NULL, stdin, data);
+	return do_config_from_file(fn, CONFIG_ORIGIN_STDIN, "", NULL, stdin, data);
 }
 
 int git_config_from_file(config_fn_t fn, const char *filename, void *data)
@@ -1096,14 +1200,14 @@ int git_config_from_file(config_fn_t fn, const char *filename, void *data)
 	f = fopen(filename, "r");
 	if (f) {
 		flockfile(f);
-		ret = do_config_from_file(fn, "file", filename, filename, f, data);
+		ret = do_config_from_file(fn, CONFIG_ORIGIN_FILE, filename, filename, f, data);
 		funlockfile(f);
 		fclose(f);
 	}
 	return ret;
 }
 
-int git_config_from_mem(config_fn_t fn, const char *origin_type,
+int git_config_from_mem(config_fn_t fn, const enum config_origin_type origin_type,
 			const char *name, const char *buf, size_t len, void *data)
 {
 	struct config_source top;
@@ -1140,7 +1244,7 @@ static int git_config_from_blob_sha1(config_fn_t fn,
 		return error("reference '%s' does not point to a blob", name);
 	}
 
-	ret = git_config_from_mem(fn, "blob", name, buf, size, data);
+	ret = git_config_from_mem(fn, CONFIG_ORIGIN_BLOB, name, buf, size, data);
 	free(buf);
 
 	return ret;
@@ -1194,47 +1298,36 @@ int git_config_system(void)
 
 static int do_git_config_sequence(config_fn_t fn, void *data)
 {
-	int ret = 0, found = 0;
+	int ret = 0;
 	char *xdg_config = xdg_config_home("config");
 	char *user_config = expand_user_path("~/.gitconfig");
 	char *repo_config = git_pathdup("config");
 
-	if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK, 0)) {
+	current_parsing_scope = CONFIG_SCOPE_SYSTEM;
+	if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK, 0))
 		ret += git_config_from_file(fn, git_etc_gitconfig(),
 					    data);
-		found += 1;
-	}
 
-	if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK)) {
+	current_parsing_scope = CONFIG_SCOPE_GLOBAL;
+	if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK))
 		ret += git_config_from_file(fn, xdg_config, data);
-		found += 1;
-	}
 
-	if (user_config && !access_or_die(user_config, R_OK, ACCESS_EACCES_OK)) {
+	if (user_config && !access_or_die(user_config, R_OK, ACCESS_EACCES_OK))
 		ret += git_config_from_file(fn, user_config, data);
-		found += 1;
-	}
 
-	if (repo_config && !access_or_die(repo_config, R_OK, 0)) {
+	current_parsing_scope = CONFIG_SCOPE_REPO;
+	if (repo_config && !access_or_die(repo_config, R_OK, 0))
 		ret += git_config_from_file(fn, repo_config, data);
-		found += 1;
-	}
 
-	switch (git_config_from_parameters(fn, data)) {
-	case -1: /* error */
+	current_parsing_scope = CONFIG_SCOPE_CMDLINE;
+	if (git_config_from_parameters(fn, data) < 0)
 		die(_("unable to parse command-line config"));
-		break;
-	case 0: /* found nothing */
-		break;
-	default: /* found at least one item */
-		found++;
-		break;
-	}
 
+	current_parsing_scope = CONFIG_SCOPE_UNKNOWN;
 	free(xdg_config);
 	free(user_config);
 	free(repo_config);
-	return ret == 0 ? found : ret;
+	return ret;
 }
 
 int git_config_with_options(config_fn_t fn, void *data,
@@ -1269,7 +1362,7 @@ static void git_config_raw(config_fn_t fn, void *data)
 	if (git_config_with_options(fn, data, NULL, 1) < 0)
 		/*
 		 * git_config_with_options() normally returns only
-		 * positive values, as most errors are fatal, and
+		 * zero, as most errors are fatal, and
 		 * non-fatal potential errors are guarded by "if"
 		 * statements that are entered only when no error is
 		 * possible.
@@ -1278,7 +1371,7 @@ static void git_config_raw(config_fn_t fn, void *data)
 		 * something went really wrong and we should stop
 		 * immediately.
 		 */
-		die(_("unknown error occured while reading the configuration files"));
+		die(_("unknown error occurred while reading the configuration files"));
 }
 
 static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)
@@ -1287,16 +1380,20 @@ static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)
 	struct string_list *values;
 	struct config_set_element *entry;
 	struct configset_list *list = &cs->list;
-	struct key_value_info *kv_info;
 
 	for (i = 0; i < list->nr; i++) {
 		entry = list->items[i].e;
 		value_index = list->items[i].value_index;
 		values = &entry->value_list;
-		if (fn(entry->key, values->items[value_index].string, data) < 0) {
-			kv_info = values->items[value_index].util;
-			git_die_config_linenr(entry->key, kv_info->filename, kv_info->linenr);
-		}
+
+		current_config_kvi = values->items[value_index].util;
+
+		if (fn(entry->key, values->items[value_index].string, data) < 0)
+			git_die_config_linenr(entry->key,
+					      current_config_kvi->filename,
+					      current_config_kvi->linenr);
+
+		current_config_kvi = NULL;
 	}
 }
 
@@ -1353,14 +1450,19 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha
 	l_item->e = e;
 	l_item->value_index = e->value_list.nr - 1;
 
-	if (cf) {
+	if (!cf)
+		die("BUG: configset_add_value has no source");
+	if (cf->name) {
 		kv_info->filename = strintern(cf->name);
 		kv_info->linenr = cf->linenr;
+		kv_info->origin_type = cf->origin_type;
 	} else {
 		/* for values read from `git_config_from_parameters()` */
 		kv_info->filename = NULL;
 		kv_info->linenr = -1;
+		kv_info->origin_type = CONFIG_ORIGIN_CMDLINE;
 	}
+	kv_info->scope = current_parsing_scope;
 	si->util = kv_info;
 
 	return 0;
@@ -2013,7 +2115,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 	lock = xcalloc(1, sizeof(struct lock_file));
 	fd = hold_lock_file_for_update(lock, config_filename, 0);
 	if (fd < 0) {
-		error("could not lock config file %s: %s", config_filename, strerror(errno));
+		error_errno("could not lock config file %s", config_filename);
 		free(store.key);
 		ret = CONFIG_NO_LOCK;
 		goto out_free;
@@ -2027,8 +2129,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 		free(store.key);
 
 		if ( ENOENT != errno ) {
-			error("opening %s: %s", config_filename,
-			      strerror(errno));
+			error_errno("opening %s", config_filename);
 			ret = CONFIG_INVALID_FILE; /* same as "invalid config file" */
 			goto out_free;
 		}
@@ -2112,8 +2213,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 		if (contents == MAP_FAILED) {
 			if (errno == ENODEV && S_ISDIR(st.st_mode))
 				errno = EISDIR;
-			error("unable to mmap '%s': %s",
-			      config_filename, strerror(errno));
+			error_errno("unable to mmap '%s'", config_filename);
 			ret = CONFIG_INVALID_FILE;
 			contents = NULL;
 			goto out_free;
@@ -2122,8 +2222,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 		in_fd = -1;
 
 		if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) {
-			error("chmod on %s failed: %s",
-			      get_lock_file_path(lock), strerror(errno));
+			error_errno("chmod on %s failed", get_lock_file_path(lock));
 			ret = CONFIG_NO_WRITE;
 			goto out_free;
 		}
@@ -2179,8 +2278,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 	}
 
 	if (commit_lock_file(lock) < 0) {
-		error("could not write config file %s: %s", config_filename,
-		      strerror(errno));
+		error_errno("could not write config file %s", config_filename);
 		ret = CONFIG_NO_WRITE;
 		lock = NULL;
 		goto out_free;
@@ -2331,8 +2429,8 @@ int git_config_rename_section_in_file(const char *config_filename,
 	fstat(fileno(config_file), &st);
 
 	if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) {
-		ret = error("chmod on %s failed: %s",
-			    get_lock_file_path(lock), strerror(errno));
+		ret = error_errno("chmod on %s failed",
+				  get_lock_file_path(lock));
 		goto out;
 	}
 
@@ -2386,8 +2484,8 @@ int git_config_rename_section_in_file(const char *config_filename,
 	fclose(config_file);
 unlock_and_out:
 	if (commit_lock_file(lock) < 0)
-		ret = error("could not write config file %s: %s",
-			    config_filename, strerror(errno));
+		ret = error_errno("could not write config file %s",
+				  config_filename);
 out:
 	free(filename_buf);
 	return ret;
@@ -2443,10 +2541,46 @@ int parse_config_key(const char *var,
 
 const char *current_config_origin_type(void)
 {
-	return cf && cf->origin_type ? cf->origin_type : "command line";
+	int type;
+	if (current_config_kvi)
+		type = current_config_kvi->origin_type;
+	else if(cf)
+		type = cf->origin_type;
+	else
+		die("BUG: current_config_origin_type called outside config callback");
+
+	switch (type) {
+	case CONFIG_ORIGIN_BLOB:
+		return "blob";
+	case CONFIG_ORIGIN_FILE:
+		return "file";
+	case CONFIG_ORIGIN_STDIN:
+		return "standard input";
+	case CONFIG_ORIGIN_SUBMODULE_BLOB:
+		return "submodule-blob";
+	case CONFIG_ORIGIN_CMDLINE:
+		return "command line";
+	default:
+		die("BUG: unknown config origin type");
+	}
 }
 
 const char *current_config_name(void)
 {
-	return cf && cf->name ? cf->name : "";
+	const char *name;
+	if (current_config_kvi)
+		name = current_config_kvi->filename;
+	else if (cf)
+		name = cf->name;
+	else
+		die("BUG: current_config_name called outside config callback");
+	return name ? name : "";
+}
+
+enum config_scope current_config_scope(void)
+{
+	if (current_config_kvi)
+		return current_config_kvi->scope;
+	else
+		return current_parsing_scope;
 }
diff --git a/config.mak.uname b/config.mak.uname
index a88f13989a..b232908f8c 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -36,6 +36,8 @@ ifeq ($(uname_S),Linux)
 	HAVE_DEV_TTY = YesPlease
 	HAVE_CLOCK_GETTIME = YesPlease
 	HAVE_CLOCK_MONOTONIC = YesPlease
+	# -lrt is needed for clock_gettime on glibc <= 2.16
+	NEEDS_LIBRT = YesPlease
 	HAVE_GETDELIM = YesPlease
 	SANE_TEXT_GREP=-a
 endif
@@ -203,9 +205,11 @@ ifeq ($(uname_S),FreeBSD)
 		NO_STRTOUMAX = YesPlease
 	endif
 	PYTHON_PATH = /usr/local/bin/python
+	PERL_PATH = /usr/local/bin/perl
 	HAVE_PATHS_H = YesPlease
 	GMTIME_UNRELIABLE_ERRORS = UnfortunatelyYes
 	HAVE_BSD_SYSCTL = YesPlease
+	PAGER_ENV = LESS=FRX LV=-c MORE=FRX
 endif
 ifeq ($(uname_S),OpenBSD)
 	NO_STRCASESTR = YesPlease
diff --git a/configure.ac b/configure.ac
index c279025747..aa9c91d20d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1108,14 +1108,19 @@ GIT_CONF_SUBST([HAVE_BSD_SYSCTL])
 AC_DEFUN([PTHREADTEST_SRC], [
 AC_LANG_PROGRAM([[
 #include <pthread.h>
+static void *noop(void *ignore) { return ignore; }
 ]], [[
 	pthread_mutex_t test_mutex;
 	pthread_key_t test_key;
+	pthread_t th;
 	int retcode = 0;
+	void *ret = (void *)0;
 	retcode |= pthread_key_create(&test_key, (void *)0);
 	retcode |= pthread_mutex_init(&test_mutex,(void *)0);
 	retcode |= pthread_mutex_lock(&test_mutex);
 	retcode |= pthread_mutex_unlock(&test_mutex);
+	retcode |= pthread_create(&th, ret, noop, ret);
+	retcode |= pthread_join(th, &ret);
 	return retcode;
 ]])])
 
diff --git a/connect.c b/connect.c
index c53f3f1c55..722dc3fc54 100644
--- a/connect.c
+++ b/connect.c
@@ -658,6 +658,19 @@ static enum protocol parse_connect_url(const char *url_orig, char **ret_host,
 
 static struct child_process no_fork = CHILD_PROCESS_INIT;
 
+static const char *get_ssh_command(void)
+{
+	const char *ssh;
+
+	if ((ssh = getenv("GIT_SSH_COMMAND")))
+		return ssh;
+
+	if (!git_config_get_string_const("core.sshcommand", &ssh))
+		return ssh;
+
+	return NULL;
+}
+
 /*
  * This returns a dummy child_process if the transport protocol does not
  * need fork(2), or a struct child_process object if it does.  Once done,
@@ -758,7 +771,7 @@ struct child_process *git_connect(int fd[2], const char *url,
 				return NULL;
 			}
 
-			ssh = getenv("GIT_SSH_COMMAND");
+			ssh = get_ssh_command();
 			if (!ssh) {
 				const char *base;
 				char *ssh_dup;
diff --git a/connected.c b/connected.c
index 299c56090b..8e3e4b1dc1 100644
--- a/connected.c
+++ b/connected.c
@@ -4,10 +4,6 @@
 #include "connected.h"
 #include "transport.h"
 
-int check_everything_connected(sha1_iterate_fn fn, int quiet, void *cb_data)
-{
-	return check_everything_connected_with_transport(fn, quiet, cb_data, NULL);
-}
 /*
  * If we feed all the commits we want to verify to this command
  *
@@ -19,22 +15,27 @@ int check_everything_connected(sha1_iterate_fn fn, int quiet, void *cb_data)
  *
  * Returns 0 if everything is connected, non-zero otherwise.
  */
-static int check_everything_connected_real(sha1_iterate_fn fn,
-					   int quiet,
-					   void *cb_data,
-					   struct transport *transport,
-					   const char *shallow_file)
+int check_connected(sha1_iterate_fn fn, void *cb_data,
+		    struct check_connected_options *opt)
 {
 	struct child_process rev_list = CHILD_PROCESS_INIT;
-	const char *argv[9];
+	struct check_connected_options defaults = CHECK_CONNECTED_INIT;
 	char commit[41];
 	unsigned char sha1[20];
-	int err = 0, ac = 0;
+	int err = 0;
 	struct packed_git *new_pack = NULL;
+	struct transport *transport;
 	size_t base_len;
 
-	if (fn(cb_data, sha1))
+	if (!opt)
+		opt = &defaults;
+	transport = opt->transport;
+
+	if (fn(cb_data, sha1)) {
+		if (opt->err_fd)
+			close(opt->err_fd);
 		return err;
+	}
 
 	if (transport && transport->smart_options &&
 	    transport->smart_options->self_contained_and_connected &&
@@ -47,24 +48,28 @@ static int check_everything_connected_real(sha1_iterate_fn fn,
 		strbuf_release(&idx_file);
 	}
 
-	if (shallow_file) {
-		argv[ac++] = "--shallow-file";
-		argv[ac++] = shallow_file;
+	if (opt->shallow_file) {
+		argv_array_push(&rev_list.args, "--shallow-file");
+		argv_array_push(&rev_list.args, opt->shallow_file);
 	}
-	argv[ac++] = "rev-list";
-	argv[ac++] = "--objects";
-	argv[ac++] = "--stdin";
-	argv[ac++] = "--not";
-	argv[ac++] = "--all";
-	if (quiet)
-		argv[ac++] = "--quiet";
-	argv[ac] = NULL;
+	argv_array_push(&rev_list.args,"rev-list");
+	argv_array_push(&rev_list.args, "--objects");
+	argv_array_push(&rev_list.args, "--stdin");
+	argv_array_push(&rev_list.args, "--not");
+	argv_array_push(&rev_list.args, "--all");
+	argv_array_push(&rev_list.args, "--quiet");
+	if (opt->progress)
+		argv_array_pushf(&rev_list.args, "--progress=%s",
+				 _("Checking connectivity"));
 
-	rev_list.argv = argv;
 	rev_list.git_cmd = 1;
 	rev_list.in = -1;
 	rev_list.no_stdout = 1;
-	rev_list.no_stderr = quiet;
+	if (opt->err_fd)
+		rev_list.err = opt->err_fd;
+	else
+		rev_list.no_stderr = opt->quiet;
+
 	if (start_command(&rev_list))
 		return error(_("Could not run 'git rev-list'"));
 
@@ -86,34 +91,15 @@ static int check_everything_connected_real(sha1_iterate_fn fn,
 		memcpy(commit, sha1_to_hex(sha1), 40);
 		if (write_in_full(rev_list.in, commit, 41) < 0) {
 			if (errno != EPIPE && errno != EINVAL)
-				error(_("failed write to rev-list: %s"),
-				      strerror(errno));
+				error_errno(_("failed write to rev-list"));
 			err = -1;
 			break;
 		}
 	} while (!fn(cb_data, sha1));
 
-	if (close(rev_list.in)) {
-		error(_("failed to close rev-list's stdin: %s"), strerror(errno));
-		err = -1;
-	}
+	if (close(rev_list.in))
+		err = error_errno(_("failed to close rev-list's stdin"));
 
 	sigchain_pop(SIGPIPE);
 	return finish_command(&rev_list) || err;
 }
-
-int check_everything_connected_with_transport(sha1_iterate_fn fn,
-					      int quiet,
-					      void *cb_data,
-					      struct transport *transport)
-{
-	return check_everything_connected_real(fn, quiet, cb_data,
-					       transport, NULL);
-}
-
-int check_shallow_connected(sha1_iterate_fn fn, int quiet, void *cb_data,
-			    const char *shallow_file)
-{
-	return check_everything_connected_real(fn, quiet, cb_data,
-					       NULL, shallow_file);
-}
diff --git a/connected.h b/connected.h
index 071d408f38..afa48cc052 100644
--- a/connected.h
+++ b/connected.h
@@ -11,17 +11,42 @@ struct transport;
 typedef int (*sha1_iterate_fn)(void *, unsigned char [20]);
 
 /*
+ * Named-arguments struct for check_connected. All arguments are
+ * optional, and can be left to defaults as set by CHECK_CONNECTED_INIT.
+ */
+struct check_connected_options {
+	/* Avoid printing any errors to stderr. */
+	int quiet;
+
+	/* --shallow-file to pass to rev-list sub-process */
+	const char *shallow_file;
+
+	/* Transport whose objects we are checking, if available. */
+	struct transport *transport;
+
+	/*
+	 * If non-zero, send error messages to this descriptor rather
+	 * than stderr. The descriptor is closed before check_connected
+	 * returns.
+	 */
+	int err_fd;
+
+	/* If non-zero, show progress as we traverse the objects. */
+	int progress;
+};
+
+#define CHECK_CONNECTED_INIT { 0 }
+
+/*
  * Make sure that our object store has all the commits necessary to
  * connect the ancestry chain to some of our existing refs, and all
  * the trees and blobs that these commits use.
  *
  * Return 0 if Ok, non zero otherwise (i.e. some missing objects)
+ *
+ * If "opt" is NULL, behaves as if CHECK_CONNECTED_INIT was passed.
  */
-extern int check_everything_connected(sha1_iterate_fn, int quiet, void *cb_data);
-extern int check_shallow_connected(sha1_iterate_fn, int quiet, void *cb_data,
-				   const char *shallow_file);
-extern int check_everything_connected_with_transport(sha1_iterate_fn, int quiet,
-						     void *cb_data,
-						     struct transport *transport);
+int check_connected(sha1_iterate_fn fn, void *cb_data,
+		    struct check_connected_options *opt);
 
 #endif /* CONNECTED_H */
diff --git a/contrib/coccinelle/README b/contrib/coccinelle/README
new file mode 100644
index 0000000000..9c2f8879c2
--- /dev/null
+++ b/contrib/coccinelle/README
@@ -0,0 +1,2 @@
+This directory provides examples of Coccinelle (http://coccinelle.lip6.fr/)
+semantic patches that might be useful to developers.
diff --git a/contrib/coccinelle/object_id.cocci b/contrib/coccinelle/object_id.cocci
new file mode 100644
index 0000000000..8ccdbb5666
--- /dev/null
+++ b/contrib/coccinelle/object_id.cocci
@@ -0,0 +1,95 @@
+@@
+expression E1;
+@@
+- is_null_sha1(E1.hash)
++ is_null_oid(&E1)
+
+@@
+expression E1;
+@@
+- is_null_sha1(E1->hash)
++ is_null_oid(E1)
+
+@@
+expression E1;
+@@
+- sha1_to_hex(E1.hash)
++ oid_to_hex(&E1)
+
+@@
+expression E1;
+@@
+- sha1_to_hex(E1->hash)
++ oid_to_hex(E1)
+
+@@
+expression E1;
+@@
+- sha1_to_hex_r(E1.hash)
++ oid_to_hex_r(&E1)
+
+@@
+expression E1;
+@@
+- sha1_to_hex_r(E1->hash)
++ oid_to_hex_r(E1)
+
+@@
+expression E1;
+@@
+- hashclr(E1.hash)
++ oidclr(&E1)
+
+@@
+expression E1;
+@@
+- hashclr(E1->hash)
++ oidclr(E1)
+
+@@
+expression E1, E2;
+@@
+- hashcmp(E1.hash, E2.hash)
++ oidcmp(&E1, &E2)
+
+@@
+expression E1, E2;
+@@
+- hashcmp(E1->hash, E2->hash)
++ oidcmp(E1, E2)
+
+@@
+expression E1, E2;
+@@
+- hashcmp(E1->hash, E2.hash)
++ oidcmp(E1, &E2)
+
+@@
+expression E1, E2;
+@@
+- hashcmp(E1.hash, E2->hash)
++ oidcmp(&E1, E2)
+
+@@
+expression E1, E2;
+@@
+- hashcpy(E1.hash, E2.hash)
++ oidcpy(&E1, &E2)
+
+@@
+expression E1, E2;
+@@
+- hashcpy(E1->hash, E2->hash)
++ oidcpy(E1, E2)
+
+@@
+expression E1, E2;
+@@
+- hashcpy(E1->hash, E2.hash)
++ oidcpy(E1, &E2)
+
+@@
+expression E1, E2;
+@@
+- hashcpy(E1.hash, E2->hash)
++ oidcpy(&E1, E2)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e3918c87e3..9c8f7380d0 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -803,6 +803,50 @@ __git_find_on_cmdline ()
 	done
 }
 
+# Echo the value of an option set on the command line or config
+#
+# $1: short option name
+# $2: long option name including =
+# $3: list of possible values
+# $4: config string (optional)
+#
+# example:
+# result="$(__git_get_option_value "-d" "--do-something=" \
+#     "yes no" "core.doSomething")"
+#
+# result is then either empty (no option set) or "yes" or "no"
+#
+# __git_get_option_value requires 3 arguments
+__git_get_option_value ()
+{
+	local c short_opt long_opt val
+	local result= values config_key word
+
+	short_opt="$1"
+	long_opt="$2"
+	values="$3"
+	config_key="$4"
+
+	((c = $cword - 1))
+	while [ $c -ge 0 ]; do
+		word="${words[c]}"
+		for val in $values; do
+			if [ "$short_opt$val" = "$word" ] ||
+			   [ "$long_opt$val"  = "$word" ]; then
+				result="$val"
+				break 2
+			fi
+		done
+		((c--))
+	done
+
+	if [ -n "$config_key" ] && [ -z "$result" ]; then
+		result="$(git --git-dir="$(__gitdir)" config "$config_key")"
+	fi
+
+	echo "$result"
+}
+
 __git_has_doubledash ()
 {
 	local c=1
@@ -964,8 +1008,8 @@ _git_branch ()
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
-		-d|-m)	only_local_ref="y" ;;
-		-r)	has_r="y" ;;
+		-d|--delete|-m|--move)	only_local_ref="y" ;;
+		-r|--remotes)		has_r="y" ;;
 		esac
 		((c++))
 	done
@@ -979,7 +1023,7 @@ _git_branch ()
 			--color --no-color --verbose --abbrev= --no-abbrev
 			--track --no-track --contains --merged --no-merged
 			--set-upstream-to= --edit-description --list
-			--unset-upstream
+			--unset-upstream --delete --move --remotes
 			"
 		;;
 	*)
@@ -1092,12 +1136,15 @@ _git_clone ()
 			--depth
 			--single-branch
 			--branch
+			--recurse-submodules
 			"
 		return
 		;;
 	esac
 }
 
+__git_untracked_file_modes="all no normal"
+
 _git_commit ()
 {
 	case "$prev" in
@@ -1119,7 +1166,7 @@ _git_commit ()
 		return
 		;;
 	--untracked-files=*)
-		__gitcomp "all no normal" "" "${cur##--untracked-files=}"
+		__gitcomp "$__git_untracked_file_modes" "" "${cur##--untracked-files=}"
 		return
 		;;
 	--*)
@@ -1158,6 +1205,8 @@ _git_describe ()
 
 __git_diff_algorithms="myers minimal patience histogram"
 
+__git_diff_submodule_formats="log short"
+
 __git_diff_common_options="--stat --numstat --shortstat --summary
 			--patch-with-stat --name-only --name-status --color
 			--no-color --color-words --no-renames --check
@@ -1173,6 +1222,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--dirstat --dirstat= --dirstat-by-file
 			--dirstat-by-file= --cumulative
 			--diff-algorithm=
+			--submodule --submodule=
 "
 
 _git_diff ()
@@ -1184,6 +1234,10 @@ _git_diff ()
 		__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
 		return
 		;;
+	--submodule=*)
+		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
+		return
+		;;
 	--*)
 		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
 			--base --ours --theirs --no-index
@@ -1339,15 +1393,15 @@ _git_help ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--all --info --man --web"
+		__gitcomp "--all --guides --info --man --web"
 		return
 		;;
 	esac
 	__git_compute_all_commands
 	__gitcomp "$__git_all_commands $(__git_aliases)
 		attributes cli core-tutorial cvs-migration
-		diffcore gitk glossary hooks ignore modules
-		namespaces repository-layout tutorial tutorial-2
+		diffcore everyday gitk glossary hooks ignore modules
+		namespaces repository-layout revisions tutorial tutorial-2
 		workflows
 		"
 }
@@ -1447,6 +1501,14 @@ _git_log ()
 		__gitcomp "full short no" "" "${cur##--decorate=}"
 		return
 		;;
+	--diff-algorithm=*)
+		__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
+		return
+		;;
+	--submodule=*)
+		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
+		return
+		;;
 	--*)
 		__gitcomp "
 			$__git_log_common_options
@@ -1458,6 +1520,7 @@ _git_log ()
 			--relative-date --date=
 			--pretty= --format= --oneline
 			--show-signature
+			--cherry-mark
 			--cherry-pick
 			--graph
 			--decorate --decorate=
@@ -1779,6 +1842,56 @@ _git_stage ()
 	_git_add
 }
 
+_git_status ()
+{
+	local complete_opt
+	local untracked_state
+
+	case "$cur" in
+	--ignore-submodules=*)
+		__gitcomp "none untracked dirty all" "" "${cur##--ignore-submodules=}"
+		return
+		;;
+	--untracked-files=*)
+		__gitcomp "$__git_untracked_file_modes" "" "${cur##--untracked-files=}"
+		return
+		;;
+	--column=*)
+		__gitcomp "
+			always never auto column row plain dense nodense
+			" "" "${cur##--column=}"
+		return
+		;;
+	--*)
+		__gitcomp "
+			--short --branch --porcelain --long --verbose
+			--untracked-files= --ignore-submodules= --ignored
+			--column= --no-column
+			"
+		return
+		;;
+	esac
+
+	untracked_state="$(__git_get_option_value "-u" "--untracked-files=" \
+		"$__git_untracked_file_modes" "status.showUntrackedFiles")"
+
+	case "$untracked_state" in
+	no)
+		# --ignored option does not matter
+		complete_opt=
+		;;
+	all|normal|*)
+		complete_opt="--cached --directory --no-empty-directory --others"
+
+		if [ -n "$(__git_find_on_cmdline "--ignored")" ]; then
+			complete_opt="$complete_opt --ignored --exclude=*"
+		fi
+		;;
+	esac
+
+	__git_complete_index_file "$complete_opt"
+}
+
 __git_config_get_set_variables ()
 {
 	local prevword word config_file= c=$cword
@@ -2084,6 +2197,7 @@ _git_config ()
 		format.attach
 		format.cc
 		format.coverLetter
+		format.from
 		format.headers
 		format.numbered
 		format.pretty
@@ -2358,6 +2472,10 @@ _git_show ()
 		__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
 		return
 		;;
+	--submodule=*)
+		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
+		return
+		;;
 	--*)
 		__gitcomp "--pretty= --format= --abbrev-commit --oneline
 			--show-signature
@@ -2594,6 +2712,32 @@ _git_whatchanged ()
 	_git_log
 }
 
+_git_worktree ()
+{
+	local subcommands="add list lock prune unlock"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if [ -z "$subcommand" ]; then
+		__gitcomp "$subcommands"
+	else
+		case "$subcommand,$cur" in
+		add,--*)
+			__gitcomp "--detach"
+			;;
+		list,--*)
+			__gitcomp "--porcelain"
+			;;
+		lock,--*)
+			__gitcomp "--reason"
+			;;
+		prune,--*)
+			__gitcomp "--dry-run --expire --verbose"
+			;;
+		*)
+			;;
+		esac
+	fi
+}
+
 __git_main ()
 {
 	local i c=1 command __git_dir
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 64219e631a..97eacd7832 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -355,8 +355,8 @@ __git_ps1 ()
 	# incorrect.)
 	#
 	local ps1_expanded=yes
-	[ -z "$ZSH_VERSION" ] || [[ -o PROMPT_SUBST ]] || ps1_expanded=no
-	[ -z "$BASH_VERSION" ] || shopt -q promptvars || ps1_expanded=no
+	[ -z "${ZSH_VERSION-}" ] || [[ -o PROMPT_SUBST ]] || ps1_expanded=no
+	[ -z "${BASH_VERSION-}" ] || shopt -q promptvars || ps1_expanded=no
 
 	local repo_info rev_parse_exit_code
 	repo_info="$(git rev-parse --git-dir --is-inside-git-dir \
@@ -368,7 +368,7 @@ __git_ps1 ()
 		return $exit
 	fi
 
-	local short_sha
+	local short_sha=""
 	if [ "$rev_parse_exit_code" = "0" ]; then
 		short_sha="${repo_info##*$'\n'}"
 		repo_info="${repo_info%$'\n'*}"
diff --git a/contrib/credential/gnome-keyring/Makefile b/contrib/credential/gnome-keyring/Makefile
index c3c7c98aa1..22c19df94b 100644
--- a/contrib/credential/gnome-keyring/Makefile
+++ b/contrib/credential/gnome-keyring/Makefile
@@ -4,12 +4,13 @@ all:: $(MAIN)
 CC = gcc
 RM = rm -f
 CFLAGS = -g -O2 -Wall
+PKG_CONFIG = pkg-config
 
 -include ../../../config.mak.autogen
 -include ../../../config.mak
 
-INCS:=$(shell pkg-config --cflags gnome-keyring-1 glib-2.0)
-LIBS:=$(shell pkg-config --libs gnome-keyring-1 glib-2.0)
+INCS:=$(shell $(PKG_CONFIG) --cflags gnome-keyring-1 glib-2.0)
+LIBS:=$(shell $(PKG_CONFIG) --libs gnome-keyring-1 glib-2.0)
 
 SRCS:=$(MAIN).c
 OBJS:=$(SRCS:.c=.o)
diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index 95438e1ed4..d60b4315ed 100755
--- a/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@ -96,18 +96,21 @@ foreach my $tar_file (@ARGV)
 		$mtime = oct $mtime;
 		next if $typeflag == 5; # directory
 
-		print FI "blob\n", "mark :$next_mark\n";
-		if ($typeflag == 2) { # symbolic link
-			print FI "data ", length($linkname), "\n", $linkname;
-			$mode = 0120000;
-		} else {
-			print FI "data $size\n";
-			while ($size > 0 && read(I, $_, 512) == 512) {
-				print FI substr($_, 0, $size);
-				$size -= 512;
+		if ($typeflag != 1) { # handle hard links later
+			print FI "blob\n", "mark :$next_mark\n";
+			if ($typeflag == 2) { # symbolic link
+				print FI "data ", length($linkname), "\n",
+					$linkname;
+				$mode = 0120000;
+			} else {
+				print FI "data $size\n";
+				while ($size > 0 && read(I, $_, 512) == 512) {
+					print FI substr($_, 0, $size);
+					$size -= 512;
+				}
 			}
+			print FI "\n";
 		}
-		print FI "\n";
 
 		my $path;
 		if ($prefix) {
@@ -115,7 +118,13 @@ foreach my $tar_file (@ARGV)
 		} else {
 			$path = "$name";
 		}
-		$files{$path} = [$next_mark++, $mode];
+
+		if ($typeflag == 1) { # hard link
+			$linkname = "$prefix/$linkname" if $prefix;
+			$files{$path} = [ $files{$linkname}->[0], $mode ];
+		} else {
+			$files{$path} = [$next_mark++, $mode];
+		}
 
 		$author_time = $mtime if $mtime > $author_time;
 		$path =~ m,^([^/]+)/,;
diff --git a/contrib/git-jump/README b/contrib/git-jump/README
index 1cebc328cb..225e3f0954 100644
--- a/contrib/git-jump/README
+++ b/contrib/git-jump/README
@@ -29,7 +29,7 @@ Obviously this trivial case isn't that interesting; you could just open
 `foo.c` yourself. But when you have many changes scattered across a
 project, you can use the editor's support to "jump" from point to point.
 
-Git-jump can generate three types of interesting lists:
+Git-jump can generate four types of interesting lists:
 
   1. The beginning of any diff hunks.
 
@@ -37,6 +37,8 @@ Git-jump can generate three types of interesting lists:
 
   3. Any grep matches.
 
+  4. Any whitespace errors detected by `git diff --check`.
+
 
 Using git-jump
 --------------
@@ -83,7 +85,7 @@ complete list of files and line numbers for each match.
 Limitations
 -----------
 
-This scripts was written and tested with vim. Given that the quickfix
+This script was written and tested with vim. Given that the quickfix
 format is the same as what gcc produces, I expect emacs users have a
 similar feature for iterating through the list, but I know nothing about
 how to activate it.
diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump
index dc90cd6379..427f206a45 100755
--- a/contrib/git-jump/git-jump
+++ b/contrib/git-jump/git-jump
@@ -12,6 +12,8 @@ diff: elements are diff hunks. Arguments are given to diff.
 merge: elements are merge conflicts. Arguments are ignored.
 
 grep: elements are grep hits. Arguments are given to grep.
+
+ws: elements are whitespace errors. Arguments are given to diff --check.
 EOF
 }
 
@@ -25,7 +27,7 @@ mode_diff() {
 	perl -ne '
 	if (m{^\+\+\+ (.*)}) { $file = $1; next }
 	defined($file) or next;
-	if (m/^@@ .*\+(\d+)/) { $line = $1; next }
+	if (m/^@@ .*?\+(\d+)/) { $line = $1; next }
 	defined($line) or next;
 	if (/^ /) { $line++; next }
 	if (/^[-+]\s*(.*)/) {
@@ -55,6 +57,10 @@ mode_grep() {
 	'
 }
 
+mode_ws() {
+	git diff --check "$@"
+}
+
 if test $# -lt 1; then
 	usage >&2
 	exit 1
diff --git a/contrib/hooks/multimail/CHANGES b/contrib/hooks/multimail/CHANGES
index 53c71b422a..100cc7a6d3 100644
--- a/contrib/hooks/multimail/CHANGES
+++ b/contrib/hooks/multimail/CHANGES
@@ -1,3 +1,11 @@
+Release 1.3.1 (bugfix-only release)
+===================================
+
+* Generate links to commits in combined emails (it was done only for
+  commit emails in 1.3.0).
+
+* Fix broken links on PyPi.
+
 Release 1.3.0
 =============
 
diff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README
index 1e04801978..22a23cdb94 100644
--- a/contrib/hooks/multimail/README
+++ b/contrib/hooks/multimail/README
@@ -1,4 +1,4 @@
-git-multimail 1.3.0
+git-multimail 1.3.1
 ===================
 
 .. image:: https://travis-ci.org/git-multimail/git-multimail.svg?branch=master
@@ -294,7 +294,7 @@ multimailhook.htmlInIntro, multimailhook.htmlInFooter
     like ``<a href="foo">link</a>``, the reader will see the HTML
     source code and not a proper link.
 
-    Set ``multimailhook.htmlInIntro`` to true to allow writting HTML
+    Set ``multimailhook.htmlInIntro`` to true to allow writing HTML
     formatting in introduction templates. Similarly, set
     ``multimailhook.htmlInFooter`` for HTML in the footer.
 
@@ -516,7 +516,7 @@ multimailhook.commitLogOpts
 
 multimailhook.dateSubstitute
     String to use as a substitute for ``Date:`` in the output of ``git
-    log`` while formatting commit messages. This is usefull to avoid
+    log`` while formatting commit messages. This is useful to avoid
     emitting a line that can be interpreted by mailers as the start of
     a cited message (Zimbra webmail in particular). Defaults to
     ``CommitDate:``. Set to an empty string or ``none`` to deactivate
diff --git a/contrib/hooks/multimail/README.Git b/contrib/hooks/multimail/README.Git
index ee1fa75f99..1210bde045 100644
--- a/contrib/hooks/multimail/README.Git
+++ b/contrib/hooks/multimail/README.Git
@@ -6,10 +6,10 @@ website:
     https://github.com/git-multimail/git-multimail
 
 The version in this directory was obtained from the upstream project
-on May 03 2016 and consists of the "git-multimail" subdirectory from
+on May 13 2016 and consists of the "git-multimail" subdirectory from
 revision
 
-    26f3ae9f86aa7f8a054ba89235c4d3879f98b03d refs/tags/1.3.0
+    3ce5470d4abf7251604cbf64e73a962e1b617f5e refs/tags/1.3.1
 
 Please see the README file in this directory for information about how
 to report bugs or contribute to git-multimail.
diff --git a/contrib/hooks/multimail/git_multimail.py b/contrib/hooks/multimail/git_multimail.py
index f2c92aeed8..54ab4a4942 100755
--- a/contrib/hooks/multimail/git_multimail.py
+++ b/contrib/hooks/multimail/git_multimail.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-__version__ = '1.3.0'
+__version__ = '1.3.1'
 
 # Copyright (c) 2015 Matthieu Moy and others
 # Copyright (c) 2012-2014 Michael Haggerty and others
@@ -1704,6 +1704,14 @@ class BranchChange(ReferenceChange):
         self.header_template = COMBINED_HEADER_TEMPLATE
         self.intro_template = COMBINED_INTRO_TEMPLATE
         self.footer_template = COMBINED_FOOTER_TEMPLATE
+
+        def revision_gen_link(base_url):
+            # revision is used only to generate the body, and
+            # _content_type is set while generating headers. Get it
+            # from the BranchChange object.
+            revision._content_type = self._content_type
+            return revision.generate_browse_link(base_url)
+        self.generate_browse_link = revision_gen_link
         for line in self.generate_email(push, body_filter, values):
             yield line
 
diff --git a/contrib/mw-to-git/.perlcriticrc b/contrib/mw-to-git/.perlcriticrc
index 5a9955d757..158958d363 100644
--- a/contrib/mw-to-git/.perlcriticrc
+++ b/contrib/mw-to-git/.perlcriticrc
@@ -19,7 +19,7 @@
 [InputOutput::RequireCheckedSyscalls]
 functions = open say close
 
-# This rules demands to add a dependancy for the Readonly module. This is not
+# This rule demands to add a dependency for the Readonly module. This is not
 # wished.
 [-ValuesAndExpressions::ProhibitConstantPragma]
 
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
index 8dd74a9a40..41e74fba1e 100755
--- a/contrib/mw-to-git/git-remote-mediawiki.perl
+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
@@ -963,7 +963,7 @@ sub mw_upload_file {
 		print {*STDERR} "Check the configuration of file uploads in your mediawiki.\n";
 		return $newrevid;
 	}
-	# Deleting and uploading a file requires a priviledged user
+	# Deleting and uploading a file requires a privileged user
 	if ($file_deleted) {
 		$mediawiki = connect_maybe($mediawiki, $remotename, $url);
 		my $query = {
diff --git a/contrib/persistent-https/Makefile b/contrib/persistent-https/Makefile
index 92baa3beee..52b84ba3d4 100644
--- a/contrib/persistent-https/Makefile
+++ b/contrib/persistent-https/Makefile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-BUILD_LABEL=$(shell date +"%s")
+BUILD_LABEL=$(shell cut -d" " -f3 ../../GIT-VERSION-FILE)
 TAR_OUT=$(shell go env GOOS)_$(shell go env GOARCH).tar.gz
 
 all: git-remote-persistent-https git-remote-persistent-https--proxy \
@@ -25,8 +25,10 @@ git-remote-persistent-http: git-remote-persistent-https
 	ln -f -s git-remote-persistent-https git-remote-persistent-http
 
 git-remote-persistent-https:
+	case $$(go version) in \
+	"go version go"1.[0-5].*) EQ=" " ;; *) EQ="=" ;; esac && \
 	go build -o git-remote-persistent-https \
-		-ldflags "-X main._BUILD_EMBED_LABEL $(BUILD_LABEL)"
+		-ldflags "-X main._BUILD_EMBED_LABEL$${EQ}$(BUILD_LABEL)"
 
 clean:
 	rm -f git-remote-persistent-http* *.tar.gz
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 7a39b30ad0..dec085a235 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -4,8 +4,9 @@
 #
 # Copyright (C) 2009 Avery Pennarun <apenwarr@gmail.com>
 #
-if [ $# -eq 0 ]; then
-    set -- -h
+if test $# -eq 0
+then
+	set -- -h
 fi
 OPTS_SPEC="\
 git subtree add   --prefix=<prefix> <commit>
@@ -48,89 +49,144 @@ squash=
 message=
 prefix=
 
-debug()
-{
-	if [ -n "$debug" ]; then
+debug () {
+	if test -n "$debug"
+	then
 		printf "%s\n" "$*" >&2
 	fi
 }
 
-say()
-{
-	if [ -z "$quiet" ]; then
+say () {
+	if test -z "$quiet"
+	then
 		printf "%s\n" "$*" >&2
 	fi
 }
 
-progress()
-{
-	if [ -z "$quiet" ]; then
+progress () {
+	if test -z "$quiet"
+	then
 		printf "%s\r" "$*" >&2
 	fi
 }
 
-assert()
-{
-	if "$@"; then
-		:
-	else
+assert () {
+	if ! "$@"
+	then
 		die "assertion failed: " "$@"
 	fi
 }
 
 
-#echo "Options: $*"
-
-while [ $# -gt 0 ]; do
+while test $# -gt 0
+do
 	opt="$1"
 	shift
+
 	case "$opt" in
-		-q) quiet=1 ;;
-		-d) debug=1 ;;
-		--annotate) annotate="$1"; shift ;;
-		--no-annotate) annotate= ;;
-		-b) branch="$1"; shift ;;
-		-P) prefix="${1%/}"; shift ;;
-		-m) message="$1"; shift ;;
-		--no-prefix) prefix= ;;
-		--onto) onto="$1"; shift ;;
-		--no-onto) onto= ;;
-		--rejoin) rejoin=1 ;;
-		--no-rejoin) rejoin= ;;
-		--ignore-joins) ignore_joins=1 ;;
-		--no-ignore-joins) ignore_joins= ;;
-		--squash) squash=1 ;;
-		--no-squash) squash= ;;
-		--) break ;;
-		*) die "Unexpected option: $opt" ;;
+	-q)
+		quiet=1
+		;;
+	-d)
+		debug=1
+		;;
+	--annotate)
+		annotate="$1"
+		shift
+		;;
+	--no-annotate)
+		annotate=
+		;;
+	-b)
+		branch="$1"
+		shift
+		;;
+	-P)
+		prefix="${1%/}"
+		shift
+		;;
+	-m)
+		message="$1"
+		shift
+		;;
+	--no-prefix)
+		prefix=
+		;;
+	--onto)
+		onto="$1"
+		shift
+		;;
+	--no-onto)
+		onto=
+		;;
+	--rejoin)
+		rejoin=1
+		;;
+	--no-rejoin)
+		rejoin=
+		;;
+	--ignore-joins)
+		ignore_joins=1
+		;;
+	--no-ignore-joins)
+		ignore_joins=
+		;;
+	--squash)
+		squash=1
+		;;
+	--no-squash)
+		squash=
+		;;
+	--)
+		break
+		;;
+	*)
+		die "Unexpected option: $opt"
+		;;
 	esac
 done
 
 command="$1"
 shift
+
 case "$command" in
-	add|merge|pull) default= ;;
-	split|push) default="--default HEAD" ;;
-	*) die "Unknown command '$command'" ;;
+add|merge|pull)
+	default=
+	;;
+split|push)
+	default="--default HEAD"
+	;;
+*)
+	die "Unknown command '$command'"
+	;;
 esac
 
-if [ -z "$prefix" ]; then
+if test -z "$prefix"
+then
 	die "You must provide the --prefix option."
 fi
 
 case "$command" in
-	add) [ -e "$prefix" ] && 
-		die "prefix '$prefix' already exists." ;;
-	*)   [ -e "$prefix" ] || 
-		die "'$prefix' does not exist; use 'git subtree add'" ;;
+add)
+	test -e "$prefix" &&
+		die "prefix '$prefix' already exists."
+	;;
+*)
+	test -e "$prefix" ||
+		die "'$prefix' does not exist; use 'git subtree add'"
+	;;
 esac
 
 dir="$(dirname "$prefix/.")"
 
-if [ "$command" != "pull" -a "$command" != "add" -a "$command" != "push" ]; then
+if test "$command" != "pull" &&
+		test "$command" != "add" &&
+		test "$command" != "push"
+then
 	revs=$(git rev-parse $default --revs-only "$@") || exit $?
-	dirs="$(git rev-parse --no-revs --no-flags "$@")" || exit $?
-	if [ -n "$dirs" ]; then
+	dirs=$(git rev-parse --no-revs --no-flags "$@") || exit $?
+	if test -n "$dirs"
+	then
 		die "Error: Use --prefix instead of bare filenames."
 	fi
 fi
@@ -142,78 +198,82 @@ debug "dir: {$dir}"
 debug "opts: {$*}"
 debug
 
-cache_setup()
-{
+cache_setup () {
 	cachedir="$GIT_DIR/subtree-cache/$$"
-	rm -rf "$cachedir" || die "Can't delete old cachedir: $cachedir"
-	mkdir -p "$cachedir" || die "Can't create new cachedir: $cachedir"
-	mkdir -p "$cachedir/notree" || die "Can't create new cachedir: $cachedir/notree"
+	rm -rf "$cachedir" ||
+		die "Can't delete old cachedir: $cachedir"
+	mkdir -p "$cachedir" ||
+		die "Can't create new cachedir: $cachedir"
+	mkdir -p "$cachedir/notree" ||
+		die "Can't create new cachedir: $cachedir/notree"
 	debug "Using cachedir: $cachedir" >&2
 }
 
-cache_get()
-{
-	for oldrev in $*; do
-		if [ -r "$cachedir/$oldrev" ]; then
+cache_get () {
+	for oldrev in "$@"
+	do
+		if test -r "$cachedir/$oldrev"
+		then
 			read newrev <"$cachedir/$oldrev"
 			echo $newrev
 		fi
 	done
 }
 
-cache_miss()
-{
-	for oldrev in $*; do
-		if [ ! -r "$cachedir/$oldrev" ]; then
+cache_miss () {
+	for oldrev in "$@"
+	do
+		if ! test -r "$cachedir/$oldrev"
+		then
 			echo $oldrev
 		fi
 	done
 }
 
-check_parents()
-{
-	missed=$(cache_miss $*)
-	for miss in $missed; do
-		if [ ! -r "$cachedir/notree/$miss" ]; then
+check_parents () {
+	missed=$(cache_miss "$@")
+	for miss in $missed
+	do
+		if ! test -r "$cachedir/notree/$miss"
+		then
 			debug "  incorrect order: $miss"
 		fi
 	done
 }
 
-set_notree()
-{
+set_notree () {
 	echo "1" > "$cachedir/notree/$1"
 }
 
-cache_set()
-{
+cache_set () {
 	oldrev="$1"
 	newrev="$2"
-	if [ "$oldrev" != "latest_old" \
-	     -a "$oldrev" != "latest_new" \
-	     -a -e "$cachedir/$oldrev" ]; then
+	if test "$oldrev" != "latest_old" &&
+		test "$oldrev" != "latest_new" &&
+		test -e "$cachedir/$oldrev"
+	then
 		die "cache for $oldrev already exists!"
 	fi
 	echo "$newrev" >"$cachedir/$oldrev"
 }
 
-rev_exists()
-{
-	if git rev-parse "$1" >/dev/null 2>&1; then
+rev_exists () {
+	if git rev-parse "$1" >/dev/null 2>&1
+	then
 		return 0
 	else
 		return 1
 	fi
 }
 
-rev_is_descendant_of_branch()
-{
+rev_is_descendant_of_branch () {
 	newrev="$1"
 	branch="$2"
-	branch_hash=$(git rev-parse $branch)
-	match=$(git rev-list -1 $branch_hash ^$newrev)
+	branch_hash=$(git rev-parse "$branch")
+	match=$(git rev-list -1 "$branch_hash" "^$newrev")
 
-	if [ -z "$match" ]; then
+	if test -z "$match"
+	then
 		return 0
 	else
 		return 1
@@ -223,15 +283,14 @@ rev_is_descendant_of_branch()
 # if a commit doesn't have a parent, this might not work.  But we only want
 # to remove the parent from the rev-list, and since it doesn't exist, it won't
 # be there anyway, so do nothing in that case.
-try_remove_previous()
-{
-	if rev_exists "$1^"; then
+try_remove_previous () {
+	if rev_exists "$1^"
+	then
 		echo "^$1^"
 	fi
 }
 
-find_latest_squash()
-{
+find_latest_squash () {
 	debug "Looking for latest squash ($dir)..."
 	dir="$1"
 	sq=
@@ -239,37 +298,43 @@ find_latest_squash()
 	sub=
 	git log --grep="^git-subtree-dir: $dir/*\$" \
 		--pretty=format:'START %H%n%s%n%n%b%nEND%n' HEAD |
-	while read a b junk; do
+	while read a b junk
+	do
 		debug "$a $b $junk"
 		debug "{{$sq/$main/$sub}}"
 		case "$a" in
-			START) sq="$b" ;;
-			git-subtree-mainline:) main="$b" ;;
-			git-subtree-split:)
-				sub="$(git rev-parse "$b^0")" ||
-				    die "could not rev-parse split hash $b from commit $sq"
-				;;
-			END)
-				if [ -n "$sub" ]; then
-					if [ -n "$main" ]; then
-						# a rejoin commit?
-						# Pretend its sub was a squash.
-						sq="$sub"
-					fi
-					debug "Squash found: $sq $sub"
-					echo "$sq" "$sub"
-					break
+		START)
+			sq="$b"
+			;;
+		git-subtree-mainline:)
+			main="$b"
+			;;
+		git-subtree-split:)
+			sub="$(git rev-parse "$b^0")" ||
+			die "could not rev-parse split hash $b from commit $sq"
+			;;
+		END)
+			if test -n "$sub"
+			then
+				if test -n "$main"
+				then
+					# a rejoin commit?
+					# Pretend its sub was a squash.
+					sq="$sub"
 				fi
-				sq=
-				main=
-				sub=
-				;;
+				debug "Squash found: $sq $sub"
+				echo "$sq" "$sub"
+				break
+			fi
+			sq=
+			main=
+			sub=
+			;;
 		esac
 	done
 }
 
-find_existing_splits()
-{
+find_existing_splits () {
 	debug "Looking for prior splits..."
 	dir="$1"
 	revs="$2"
@@ -277,37 +342,43 @@ find_existing_splits()
 	sub=
 	git log --grep="^git-subtree-dir: $dir/*\$" \
 		--pretty=format:'START %H%n%s%n%n%b%nEND%n' $revs |
-	while read a b junk; do
+	while read a b junk
+	do
 		case "$a" in
-			START) sq="$b" ;;
-			git-subtree-mainline:) main="$b" ;;
-			git-subtree-split:)
-				sub="$(git rev-parse "$b^0")" ||
-				    die "could not rev-parse split hash $b from commit $sq"
-				;;
-			END)
-				debug "  Main is: '$main'"
-				if [ -z "$main" -a -n "$sub" ]; then
-					# squash commits refer to a subtree
-					debug "  Squash: $sq from $sub"
-					cache_set "$sq" "$sub"
-				fi
-				if [ -n "$main" -a -n "$sub" ]; then
-					debug "  Prior: $main -> $sub"
-					cache_set $main $sub
-					cache_set $sub $sub
-					try_remove_previous "$main"
-					try_remove_previous "$sub"
-				fi
-				main=
-				sub=
-				;;
+		START)
+			sq="$b"
+			;;
+		git-subtree-mainline:)
+			main="$b"
+			;;
+		git-subtree-split:)
+			sub="$(git rev-parse "$b^0")" ||
+			die "could not rev-parse split hash $b from commit $sq"
+			;;
+		END)
+			debug "  Main is: '$main'"
+			if test -z "$main" -a -n "$sub"
+			then
+				# squash commits refer to a subtree
+				debug "  Squash: $sq from $sub"
+				cache_set "$sq" "$sub"
+			fi
+			if test -n "$main" -a -n "$sub"
+			then
+				debug "  Prior: $main -> $sub"
+				cache_set $main $sub
+				cache_set $sub $sub
+				try_remove_previous "$main"
+				try_remove_previous "$sub"
+			fi
+			main=
+			sub=
+			;;
 		esac
 	done
 }
 
-copy_commit()
-{
+copy_commit () {
 	# We're going to set some environment vars here, so
 	# do it in a subshell to get rid of them safely later
 	debug copy_commit "{$1}" "{$2}" "{$3}"
@@ -325,66 +396,69 @@ copy_commit()
 			GIT_COMMITTER_NAME \
 			GIT_COMMITTER_EMAIL \
 			GIT_COMMITTER_DATE
-		(printf "%s" "$annotate"; cat ) |
+		(
+			printf "%s" "$annotate"
+			cat
+		) |
 		git commit-tree "$2" $3  # reads the rest of stdin
 	) || die "Can't copy commit $1"
 }
 
-add_msg()
-{
+add_msg () {
 	dir="$1"
 	latest_old="$2"
 	latest_new="$3"
-	if [ -n "$message" ]; then
+	if test -n "$message"
+	then
 		commit_message="$message"
 	else
 		commit_message="Add '$dir/' from commit '$latest_new'"
 	fi
 	cat <<-EOF
 		$commit_message
-		
+
 		git-subtree-dir: $dir
 		git-subtree-mainline: $latest_old
 		git-subtree-split: $latest_new
 	EOF
 }
 
-add_squashed_msg()
-{
-	if [ -n "$message" ]; then
+add_squashed_msg () {
+	if test -n "$message"
+	then
 		echo "$message"
 	else
 		echo "Merge commit '$1' as '$2'"
 	fi
 }
 
-rejoin_msg()
-{
+rejoin_msg () {
 	dir="$1"
 	latest_old="$2"
 	latest_new="$3"
-	if [ -n "$message" ]; then
+	if test -n "$message"
+	then
 		commit_message="$message"
 	else
 		commit_message="Split '$dir/' into commit '$latest_new'"
 	fi
 	cat <<-EOF
 		$commit_message
-		
+
 		git-subtree-dir: $dir
 		git-subtree-mainline: $latest_old
 		git-subtree-split: $latest_new
 	EOF
 }
 
-squash_msg()
-{
+squash_msg () {
 	dir="$1"
 	oldsub="$2"
 	newsub="$3"
 	newsub_short=$(git rev-parse --short "$newsub")
-	
-	if [ -n "$oldsub" ]; then
+
+	if test -n "$oldsub"
+	then
 		oldsub_short=$(git rev-parse --short "$oldsub")
 		echo "Squashed '$dir/' changes from $oldsub_short..$newsub_short"
 		echo
@@ -393,41 +467,41 @@ squash_msg()
 	else
 		echo "Squashed '$dir/' content from commit $newsub_short"
 	fi
-	
+
 	echo
 	echo "git-subtree-dir: $dir"
 	echo "git-subtree-split: $newsub"
 }
 
-toptree_for_commit()
-{
+toptree_for_commit () {
 	commit="$1"
 	git log -1 --pretty=format:'%T' "$commit" -- || exit $?
 }
 
-subtree_for_commit()
-{
+subtree_for_commit () {
 	commit="$1"
 	dir="$2"
 	git ls-tree "$commit" -- "$dir" |
-	while read mode type tree name; do
-		assert [ "$name" = "$dir" ]
-		assert [ "$type" = "tree" -o "$type" = "commit" ]
-		[ "$type" = "commit" ] && continue  # ignore submodules
+	while read mode type tree name
+	do
+		assert test "$name" = "$dir"
+		assert test "$type" = "tree" -o "$type" = "commit"
+		test "$type" = "commit" && continue  # ignore submodules
 		echo $tree
 		break
 	done
 }
 
-tree_changed()
-{
+tree_changed () {
 	tree=$1
 	shift
-	if [ $# -ne 1 ]; then
+	if test $# -ne 1
+	then
 		return 0   # weird parents, consider it changed
 	else
 		ptree=$(toptree_for_commit $1)
-		if [ "$ptree" != "$tree" ]; then
+		if test "$ptree" != "$tree"
+		then
 			return 0   # changed
 		else
 			return 1   # not changed
@@ -435,118 +509,127 @@ tree_changed()
 	fi
 }
 
-new_squash_commit()
-{
+new_squash_commit () {
 	old="$1"
 	oldsub="$2"
 	newsub="$3"
 	tree=$(toptree_for_commit $newsub) || exit $?
-	if [ -n "$old" ]; then
-		squash_msg "$dir" "$oldsub" "$newsub" | 
-			git commit-tree "$tree" -p "$old" || exit $?
+	if test -n "$old"
+	then
+		squash_msg "$dir" "$oldsub" "$newsub" |
+		git commit-tree "$tree" -p "$old" || exit $?
 	else
 		squash_msg "$dir" "" "$newsub" |
-			git commit-tree "$tree" || exit $?
+		git commit-tree "$tree" || exit $?
 	fi
 }
 
-copy_or_skip()
-{
+copy_or_skip () {
 	rev="$1"
 	tree="$2"
 	newparents="$3"
-	assert [ -n "$tree" ]
+	assert test -n "$tree"
 
 	identical=
 	nonidentical=
 	p=
 	gotparents=
-	for parent in $newparents; do
+	for parent in $newparents
+	do
 		ptree=$(toptree_for_commit $parent) || exit $?
-		[ -z "$ptree" ] && continue
-		if [ "$ptree" = "$tree" ]; then
+		test -z "$ptree" && continue
+		if test "$ptree" = "$tree"
+		then
 			# an identical parent could be used in place of this rev.
 			identical="$parent"
 		else
 			nonidentical="$parent"
 		fi
-		
+
 		# sometimes both old parents map to the same newparent;
 		# eliminate duplicates
 		is_new=1
-		for gp in $gotparents; do
-			if [ "$gp" = "$parent" ]; then
+		for gp in $gotparents
+		do
+			if test "$gp" = "$parent"
+			then
 				is_new=
 				break
 			fi
 		done
-		if [ -n "$is_new" ]; then
+		if test -n "$is_new"
+		then
 			gotparents="$gotparents $parent"
 			p="$p -p $parent"
 		fi
 	done
 
 	copycommit=
-	if [ -n "$identical" ] && [ -n "$nonidentical" ]; then
+	if test -n "$identical" && test -n "$nonidentical"
+	then
 		extras=$(git rev-list --count $identical..$nonidentical)
-		if [ "$extras" -ne 0 ]; then
+		if test "$extras" -ne 0
+		then
 			# we need to preserve history along the other branch
 			copycommit=1
 		fi
 	fi
-	if [ -n "$identical" ] && [ -z "$copycommit" ]; then
+	if test -n "$identical" && test -z "$copycommit"
+	then
 		echo $identical
 	else
-		copy_commit $rev $tree "$p" || exit $?
+		copy_commit "$rev" "$tree" "$p" || exit $?
 	fi
 }
 
-ensure_clean()
-{
-	if ! git diff-index HEAD --exit-code --quiet 2>&1; then
+ensure_clean () {
+	if ! git diff-index HEAD --exit-code --quiet 2>&1
+	then
 		die "Working tree has modifications.  Cannot add."
 	fi
-	if ! git diff-index --cached HEAD --exit-code --quiet 2>&1; then
+	if ! git diff-index --cached HEAD --exit-code --quiet 2>&1
+	then
 		die "Index has modifications.  Cannot add."
 	fi
 }
 
-ensure_valid_ref_format()
-{
+ensure_valid_ref_format () {
 	git check-ref-format "refs/heads/$1" ||
-	    die "'$1' does not look like a ref"
+		die "'$1' does not look like a ref"
 }
 
-cmd_add()
-{
-	if [ -e "$dir" ]; then
+cmd_add () {
+	if test -e "$dir"
+	then
 		die "'$dir' already exists.  Cannot add."
 	fi
 
 	ensure_clean
-	
-	if [ $# -eq 1 ]; then
-	    git rev-parse -q --verify "$1^{commit}" >/dev/null ||
-	    die "'$1' does not refer to a commit"
-
-	    "cmd_add_commit" "$@"
-	elif [ $# -eq 2 ]; then
-	    # Technically we could accept a refspec here but we're
-	    # just going to turn around and add FETCH_HEAD under the
-	    # specified directory.  Allowing a refspec might be
-	    # misleading because we won't do anything with any other
-	    # branches fetched via the refspec.
-	    ensure_valid_ref_format "$2"
-
-	    "cmd_add_repository" "$@"
+
+	if test $# -eq 1
+	then
+		git rev-parse -q --verify "$1^{commit}" >/dev/null ||
+			die "'$1' does not refer to a commit"
+
+		cmd_add_commit "$@"
+
+	elif test $# -eq 2
+	then
+		# Technically we could accept a refspec here but we're
+		# just going to turn around and add FETCH_HEAD under the
+		# specified directory.  Allowing a refspec might be
+		# misleading because we won't do anything with any other
+		# branches fetched via the refspec.
+		ensure_valid_ref_format "$2"
+
+		cmd_add_repository "$@"
 	else
-	    say "error: parameters were '$@'"
-	    die "Provide either a commit or a repository and commit."
+		say "error: parameters were '$@'"
+		die "Provide either a commit or a repository and commit."
 	fi
 }
 
-cmd_add_repository()
-{
+cmd_add_repository () {
 	echo "git fetch" "$@"
 	repository=$1
 	refspec=$2
@@ -556,60 +639,63 @@ cmd_add_repository()
 	cmd_add_commit "$@"
 }
 
-cmd_add_commit()
-{
+cmd_add_commit () {
 	revs=$(git rev-parse $default --revs-only "$@") || exit $?
 	set -- $revs
 	rev="$1"
-	
+
 	debug "Adding $dir as '$rev'..."
 	git read-tree --prefix="$dir" $rev || exit $?
 	git checkout -- "$dir" || exit $?
 	tree=$(git write-tree) || exit $?
-	
+
 	headrev=$(git rev-parse HEAD) || exit $?
-	if [ -n "$headrev" -a "$headrev" != "$rev" ]; then
+	if test -n "$headrev" && test "$headrev" != "$rev"
+	then
 		headp="-p $headrev"
 	else
 		headp=
 	fi
-	
-	if [ -n "$squash" ]; then
+
+	if test -n "$squash"
+	then
 		rev=$(new_squash_commit "" "" "$rev") || exit $?
 		commit=$(add_squashed_msg "$rev" "$dir" |
-			 git commit-tree $tree $headp -p "$rev") || exit $?
+			git commit-tree "$tree" $headp -p "$rev") || exit $?
 	else
 		revp=$(peel_committish "$rev") &&
-		commit=$(add_msg "$dir" "$headrev" "$rev" |
-			 git commit-tree $tree $headp -p "$revp") || exit $?
+		commit=$(add_msg "$dir" $headrev "$rev" |
+			git commit-tree "$tree" $headp -p "$revp") || exit $?
 	fi
 	git reset "$commit" || exit $?
-	
+
 	say "Added dir '$dir'"
 }
 
-cmd_split()
-{
+cmd_split () {
 	debug "Splitting $dir..."
 	cache_setup || exit $?
-	
-	if [ -n "$onto" ]; then
+
+	if test -n "$onto"
+	then
 		debug "Reading history for --onto=$onto..."
 		git rev-list $onto |
-		while read rev; do
+		while read rev
+		do
 			# the 'onto' history is already just the subdir, so
 			# any parent we find there can be used verbatim
 			debug "  cache: $rev"
-			cache_set $rev $rev
+			cache_set "$rev" "$rev"
 		done
 	fi
-	
-	if [ -n "$ignore_joins" ]; then
+
+	if test -n "$ignore_joins"
+	then
 		unrevs=
 	else
 		unrevs="$(find_existing_splits "$dir" "$revs")"
 	fi
-	
+
 	# We can't restrict rev-list to only $dir here, because some of our
 	# parents have the $dir contents the root, and those won't match.
 	# (and rev-list --follow doesn't seem to solve this)
@@ -618,12 +704,14 @@ cmd_split()
 	revcount=0
 	createcount=0
 	eval "$grl" |
-	while read rev parents; do
+	while read rev parents
+	do
 		revcount=$(($revcount + 1))
 		progress "$revcount/$revmax ($createcount)"
 		debug "Processing commit: $rev"
-		exists=$(cache_get $rev)
-		if [ -n "$exists" ]; then
+		exists=$(cache_get "$rev")
+		if test -n "$exists"
+		then
 			debug "  prior: $exists"
 			continue
 		fi
@@ -631,76 +719,89 @@ cmd_split()
 		debug "  parents: $parents"
 		newparents=$(cache_get $parents)
 		debug "  newparents: $newparents"
-		
-		tree=$(subtree_for_commit $rev "$dir")
+
+		tree=$(subtree_for_commit "$rev" "$dir")
 		debug "  tree is: $tree"
 
 		check_parents $parents
-		
+
 		# ugly.  is there no better way to tell if this is a subtree
 		# vs. a mainline commit?  Does it matter?
-		if [ -z $tree ]; then
-			set_notree $rev
-			if [ -n "$newparents" ]; then
-				cache_set $rev $rev
+		if test -z "$tree"
+		then
+			set_notree "$rev"
+			if test -n "$newparents"
+			then
+				cache_set "$rev" "$rev"
 			fi
 			continue
 		fi
 
 		newrev=$(copy_or_skip "$rev" "$tree" "$newparents") || exit $?
 		debug "  newrev is: $newrev"
-		cache_set $rev $newrev
-		cache_set latest_new $newrev
-		cache_set latest_old $rev
+		cache_set "$rev" "$newrev"
+		cache_set latest_new "$newrev"
+		cache_set latest_old "$rev"
 	done || exit $?
+
 	latest_new=$(cache_get latest_new)
-	if [ -z "$latest_new" ]; then
+	if test -z "$latest_new"
+	then
 		die "No new revisions were found"
 	fi
-	
-	if [ -n "$rejoin" ]; then
+
+	if test -n "$rejoin"
+	then
 		debug "Merging split branch into HEAD..."
 		latest_old=$(cache_get latest_old)
 		git merge -s ours \
-			-m "$(rejoin_msg "$dir" $latest_old $latest_new)" \
-			$latest_new >&2 || exit $?
-	fi
-	if [ -n "$branch" ]; then
-		if rev_exists "refs/heads/$branch"; then
-			if ! rev_is_descendant_of_branch $latest_new $branch; then
+			--allow-unrelated-histories \
+			-m "$(rejoin_msg "$dir" "$latest_old" "$latest_new")" \
+			"$latest_new" >&2 || exit $?
+	fi
+	if test -n "$branch"
+	then
+		if rev_exists "refs/heads/$branch"
+		then
+			if ! rev_is_descendant_of_branch "$latest_new" "$branch"
+			then
 				die "Branch '$branch' is not an ancestor of commit '$latest_new'."
 			fi
 			action='Updated'
 		else
 			action='Created'
 		fi
-		git update-ref -m 'subtree split' "refs/heads/$branch" $latest_new || exit $?
+		git update-ref -m 'subtree split' \
+			"refs/heads/$branch" "$latest_new" || exit $?
 		say "$action branch '$branch'"
 	fi
-	echo $latest_new
+	echo "$latest_new"
 	exit 0
 }
 
-cmd_merge()
-{
+cmd_merge () {
 	revs=$(git rev-parse $default --revs-only "$@") || exit $?
 	ensure_clean
-	
+
 	set -- $revs
-	if [ $# -ne 1 ]; then
+	if test $# -ne 1
+	then
 		die "You must provide exactly one revision.  Got: '$revs'"
 	fi
 	rev="$1"
-	
-	if [ -n "$squash" ]; then
+
+	if test -n "$squash"
+	then
 		first_split="$(find_latest_squash "$dir")"
-		if [ -z "$first_split" ]; then
+		if test -z "$first_split"
+		then
 			die "Can't squash-merge: '$dir' was never added."
 		fi
 		set $first_split
 		old=$1
 		sub=$2
-		if [ "$sub" = "$rev" ]; then
+		if test "$sub" = "$rev"
+		then
 			say "Subtree is already at commit $rev."
 			exit 0
 		fi
@@ -710,25 +811,29 @@ cmd_merge()
 	fi
 
 	version=$(git version)
-	if [ "$version" \< "git version 1.7" ]; then
-		if [ -n "$message" ]; then
-			git merge -s subtree --message="$message" $rev
+	if test "$version" \< "git version 1.7"
+	then
+		if test -n "$message"
+		then
+			git merge -s subtree --message="$message" "$rev"
 		else
-			git merge -s subtree $rev
+			git merge -s subtree "$rev"
 		fi
 	else
-		if [ -n "$message" ]; then
-			git merge -Xsubtree="$prefix" --message="$message" $rev
+		if test -n "$message"
+		then
+			git merge -Xsubtree="$prefix" \
+				--message="$message" "$rev"
 		else
 			git merge -Xsubtree="$prefix" $rev
 		fi
 	fi
 }
 
-cmd_pull()
-{
-	if [ $# -ne 2 ]; then
-	    die "You must provide <repository> <ref>"
+cmd_pull () {
+	if test $# -ne 2
+	then
+		die "You must provide <repository> <ref>"
 	fi
 	ensure_clean
 	ensure_valid_ref_format "$2"
@@ -738,20 +843,21 @@ cmd_pull()
 	cmd_merge "$@"
 }
 
-cmd_push()
-{
-	if [ $# -ne 2 ]; then
-	    die "You must provide <repository> <ref>"
+cmd_push () {
+	if test $# -ne 2
+	then
+		die "You must provide <repository> <ref>"
 	fi
 	ensure_valid_ref_format "$2"
-	if [ -e "$dir" ]; then
-	    repository=$1
-	    refspec=$2
-	    echo "git push using: " $repository $refspec
-	    localrev=$(git subtree split --prefix="$prefix") || die
-	    git push "$repository" $localrev:refs/heads/$refspec
+	if test -e "$dir"
+	then
+		repository=$1
+		refspec=$2
+		echo "git push using: " "$repository" "$refspec"
+		localrev=$(git subtree split --prefix="$prefix") || die
+		git push "$repository" "$localrev":"refs/heads/$refspec"
 	else
-	    die "'$dir' must already exist. Try 'git subtree add'."
+		die "'$dir' must already exist. Try 'git subtree add'."
 	fi
 }
 
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 3bf96a9bb6..3c87ebaf57 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -16,16 +16,16 @@ export TEST_DIRECTORY
 
 subtree_test_create_repo()
 {
-	test_create_repo "$1"
+	test_create_repo "$1" &&
 	(
-		cd $1
+		cd "$1" &&
 		git config log.date relative
 	)
 }
 
 create()
 {
-	echo "$1" >"$1"
+	echo "$1" >"$1" &&
 	git add "$1"
 }
 
@@ -71,12 +71,12 @@ join_commits()
 }
 
 test_create_commit() (
-	repo=$1
-	commit=$2
-	cd "$repo"
-	mkdir -p $(dirname "$commit") \
+	repo=$1 &&
+	commit=$2 &&
+	cd "$repo" &&
+	mkdir -p "$(dirname "$commit")" \
 	|| error "Could not create directory for commit"
-	echo "$commit" >"$commit"
+	echo "$commit" >"$commit" &&
 	git add "$commit" || error "Could not add commit"
 	git commit -m "$commit" || error "Could not commit"
 )
@@ -347,6 +347,22 @@ test_expect_success 'split sub dir/ with --rejoin' '
  '
 
 next_test
+test_expect_success 'split sub dir/ with --rejoin from scratch' '
+	subtree_test_create_repo "$subtree_test_count" &&
+	test_create_commit "$subtree_test_count" main1 &&
+	(
+		cd "$subtree_test_count" &&
+		mkdir "sub dir" &&
+		echo file >"sub dir"/file &&
+		git add "sub dir/file" &&
+		git commit -m"sub dir file" &&
+		split_hash=$(git subtree split --prefix="sub dir" --rejoin) &&
+		git subtree split --prefix="sub dir" --rejoin &&
+		check_equal "$(last_commit_message)" "Split '\''sub dir/'\'' into commit '\''$split_hash'\''"
+	)
+ '
+
+next_test
 test_expect_success 'split sub dir/ with --rejoin and --message' '
 	subtree_test_create_repo "$subtree_test_count" &&
 	subtree_test_create_repo "$subtree_test_count/sub proj" &&
@@ -932,7 +948,7 @@ test_expect_success 'split a new subtree without --onto option' '
 
 		# also test that we still can split out an entirely new subtree
 		# if the parent of the first commit in the tree is not empty,
-		# then the new subtree has accidently been attached to something
+		# then the new subtree has accidentally been attached to something
 		git subtree split --prefix="sub dir2" --branch subproj2-br &&
 		check_equal "$(git log --pretty=format:%P -1 subproj2-br)" ""
 	)
diff --git a/convert.c b/convert.c
index b1614bf7ff..67d69b5c0e 100644
--- a/convert.c
+++ b/convert.c
@@ -176,7 +176,9 @@ static enum eol output_eol(enum crlf_action crlf_action)
 		return EOL_LF;
 	case CRLF_UNDEFINED:
 	case CRLF_AUTO_CRLF:
+		return EOL_CRLF;
 	case CRLF_AUTO_INPUT:
+		return EOL_LF;
 	case CRLF_TEXT:
 	case CRLF_AUTO:
 		/* fall through */
@@ -254,17 +256,15 @@ static int crlf_to_git(const char *path, const char *src, size_t len,
 	if (crlf_action == CRLF_AUTO || crlf_action == CRLF_AUTO_INPUT || crlf_action == CRLF_AUTO_CRLF) {
 		if (convert_is_binary(len, &stats))
 			return 0;
-
-		if (crlf_action == CRLF_AUTO_INPUT || crlf_action == CRLF_AUTO_CRLF) {
-			/*
-			 * If the file in the index has any CR in it, do not convert.
-			 * This is the new safer autocrlf handling.
-			 */
-			if (has_cr_in_index(path))
-				return 0;
-		}
+		/*
+		 * If the file in the index has any CR in it, do not convert.
+		 * This is the new safer autocrlf handling.
+		 */
+		if (checksafe == SAFE_CRLF_RENORMALIZE)
+			checksafe = SAFE_CRLF_FALSE;
+		else if (has_cr_in_index(path))
+			return 0;
 	}
-
 	check_safe_crlf(path, crlf_action, &stats, checksafe);
 
 	/* Optimization: No CRLF? Nothing to convert, regardless. */
@@ -320,12 +320,10 @@ static int crlf_to_worktree(const char *path, const char *src, size_t len,
 		return 0;
 
 	if (crlf_action == CRLF_AUTO || crlf_action == CRLF_AUTO_INPUT || crlf_action == CRLF_AUTO_CRLF) {
-		if (crlf_action == CRLF_AUTO_INPUT || crlf_action == CRLF_AUTO_CRLF) {
-			/* If we have any CR or CRLF line endings, we do not touch it */
-			/* This is the new safer autocrlf-handling */
-			if (stats.lonecr || stats.crlf )
-				return 0;
-		}
+		/* If we have any CR or CRLF line endings, we do not touch it */
+		/* This is the new safer autocrlf-handling */
+		if (stats.lonecr || stats.crlf )
+			return 0;
 
 		if (convert_is_binary(len, &stats))
 			return 0;
@@ -786,7 +784,11 @@ static void convert_attrs(struct conv_attrs *ca, const char *path)
 		ca->drv = git_path_check_convert(ccheck + 2);
 		if (ca->crlf_action != CRLF_BINARY) {
 			enum eol eol_attr = git_path_check_eol(ccheck + 3);
-			if (eol_attr == EOL_LF)
+			if (ca->crlf_action == CRLF_AUTO && eol_attr == EOL_LF)
+				ca->crlf_action = CRLF_AUTO_INPUT;
+			else if (ca->crlf_action == CRLF_AUTO && eol_attr == EOL_CRLF)
+				ca->crlf_action = CRLF_AUTO_CRLF;
+			else if (eol_attr == EOL_LF)
 				ca->crlf_action = CRLF_TEXT_INPUT;
 			else if (eol_attr == EOL_CRLF)
 				ca->crlf_action = CRLF_TEXT_CRLF;
@@ -845,9 +847,9 @@ const char *get_convert_attr_ascii(const char *path)
 	case CRLF_AUTO:
 		return "text=auto";
 	case CRLF_AUTO_CRLF:
-		return "text=auto eol=crlf"; /* This is not supported yet */
+		return "text=auto eol=crlf";
 	case CRLF_AUTO_INPUT:
-		return "text=auto eol=lf"; /* This is not supported yet */
+		return "text=auto eol=lf";
 	}
 	return "";
 }
@@ -949,7 +951,7 @@ int renormalize_buffer(const char *path, const char *src, size_t len, struct str
 		src = dst->buf;
 		len = dst->len;
 	}
-	return ret | convert_to_git(path, src, len, dst, SAFE_CRLF_FALSE);
+	return ret | convert_to_git(path, src, len, dst, SAFE_CRLF_RENORMALIZE);
 }
 
 /*****************************************************************
diff --git a/convert.h b/convert.h
index ccf436bfbf..82871a11d5 100644
--- a/convert.h
+++ b/convert.h
@@ -7,7 +7,8 @@
 enum safe_crlf {
 	SAFE_CRLF_FALSE = 0,
 	SAFE_CRLF_FAIL = 1,
-	SAFE_CRLF_WARN = 2
+	SAFE_CRLF_WARN = 2,
+	SAFE_CRLF_RENORMALIZE = 3
 };
 
 extern enum safe_crlf safe_crlf;
diff --git a/copy.c b/copy.c
index 574fa1f09d..4de6a110f0 100644
--- a/copy.c
+++ b/copy.c
@@ -42,15 +42,15 @@ int copy_file(const char *dst, const char *src, int mode)
 	status = copy_fd(fdi, fdo);
 	switch (status) {
 	case COPY_READ_ERROR:
-		error("copy-fd: read returned %s", strerror(errno));
+		error_errno("copy-fd: read returned");
 		break;
 	case COPY_WRITE_ERROR:
-		error("copy-fd: write returned %s", strerror(errno));
+		error_errno("copy-fd: write returned");
 		break;
 	}
 	close(fdi);
 	if (close(fdo) != 0)
-		return error("%s: close error: %s", dst, strerror(errno));
+		return error_errno("%s: close error", dst);
 
 	if (!status && adjust_shared_perm(dst))
 		return -1;
diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c
index 291c0fd5e9..1e5f16a3a1 100644
--- a/credential-cache--daemon.c
+++ b/credential-cache--daemon.c
@@ -179,12 +179,12 @@ static int serve_cache_loop(int fd)
 
 		client = accept(fd, NULL, NULL);
 		if (client < 0) {
-			warning("accept failed: %s", strerror(errno));
+			warning_errno("accept failed");
 			return 1;
 		}
 		client2 = dup(client);
 		if (client2 < 0) {
-			warning("dup failed: %s", strerror(errno));
+			warning_errno("dup failed");
 			close(client);
 			return 1;
 		}
@@ -257,7 +257,7 @@ static void init_socket_directory(const char *path)
 	free(path_copy);
 }
 
-int main(int argc, const char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	const char *socket_path;
 	int ignore_sighup = 0;
diff --git a/credential-cache.c b/credential-cache.c
index 86e21de49b..cc8a6ee192 100644
--- a/credential-cache.c
+++ b/credential-cache.c
@@ -83,7 +83,7 @@ static void do_cache(const char *socket, const char *action, int timeout,
 	strbuf_release(&buf);
 }
 
-int main(int argc, const char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	char *socket_path = NULL;
 	int timeout = 900;
diff --git a/credential-store.c b/credential-store.c
index 57141679ab..55ca1b1334 100644
--- a/credential-store.c
+++ b/credential-store.c
@@ -142,7 +142,7 @@ static void lookup_credential(const struct string_list *fns, struct credential *
 			return; /* Found credential */
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	const char * const usage[] = {
 		"git credential-store [<options>] <action>",
diff --git a/credential.c b/credential.c
index 7d6501d190..aa996669fc 100644
--- a/credential.c
+++ b/credential.c
@@ -63,9 +63,12 @@ static int credential_config_callback(const char *var, const char *value,
 		key = dot + 1;
 	}
 
-	if (!strcmp(key, "helper"))
-		string_list_append(&c->helpers, value);
-	else if (!strcmp(key, "username")) {
+	if (!strcmp(key, "helper")) {
+		if (*value)
+			string_list_append(&c->helpers, value);
+		else
+			string_list_clear(&c->helpers, 0);
+	} else if (!strcmp(key, "username")) {
 		if (!c->username)
 			c->username = xstrdup(value);
 	}
diff --git a/daemon.c b/daemon.c
index 8d45c336f5..425aad0507 100644
--- a/daemon.c
+++ b/daemon.c
@@ -1,6 +1,5 @@
 #include "cache.h"
 #include "pkt-line.h"
-#include "exec_cmd.h"
 #include "run-command.h"
 #include "strbuf.h"
 #include "string-list.h"
@@ -32,7 +31,7 @@ static const char daemon_usage[] =
 "           [<directory>...]";
 
 /* List of acceptable pathname prefixes */
-static char **ok_paths;
+static const char **ok_paths;
 static int strict_paths;
 
 /* If this is set, git-daemon-export-ok is not required */
@@ -240,7 +239,7 @@ static const char *path_ok(const char *directory, struct hostinfo *hi)
 	}
 
 	if ( ok_paths && *ok_paths ) {
-		char **pp;
+		const char **pp;
 		int pathlen = strlen(path);
 
 		/* The validation is done on the paths after enter_repo
@@ -669,6 +668,17 @@ static void hostinfo_clear(struct hostinfo *hi)
 	strbuf_release(&hi->tcp_port);
 }
 
+static void set_keep_alive(int sockfd)
+{
+	int ka = 1;
+
+	if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0) {
+		if (errno != ENOTSOCK)
+			logerror("unable to set SO_KEEPALIVE on socket: %s",
+				strerror(errno));
+	}
+}
+
 static int execute(void)
 {
 	char *line = packet_buffer;
@@ -681,6 +691,7 @@ static int execute(void)
 	if (addr)
 		loginfo("Connection from %s:%s", addr, port);
 
+	set_keep_alive(0);
 	alarm(init_timeout ? init_timeout : timeout);
 	pktlen = packet_read(0, NULL, NULL, packet_buffer, sizeof(packet_buffer), 0);
 	alarm(0);
@@ -951,6 +962,8 @@ static int setup_named_sock(char *listen_addr, int listen_port, struct socketlis
 			continue;
 		}
 
+		set_keep_alive(sockfd);
+
 		if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {
 			logerror("Could not bind to %s: %s",
 				 ip2str(ai->ai_family, ai->ai_addr, ai->ai_addrlen),
@@ -1010,6 +1023,8 @@ static int setup_named_sock(char *listen_addr, int listen_port, struct socketlis
 		return 0;
 	}
 
+	set_keep_alive(sockfd);
+
 	if ( bind(sockfd, (struct sockaddr *)&sin, sizeof sin) < 0 ) {
 		logerror("Could not bind to %s: %s",
 			 ip2str(AF_INET, (struct sockaddr *)&sin, sizeof(sin)),
@@ -1178,7 +1193,7 @@ static int serve(struct string_list *listen_addr, int listen_port,
 	return service_loop(&socklist);
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	int listen_port = 0;
 	struct string_list listen_addr = STRING_LIST_INIT_NODUP;
@@ -1188,12 +1203,8 @@ int main(int argc, char **argv)
 	struct credentials *cred = NULL;
 	int i;
 
-	git_setup_gettext();
-
-	git_extract_argv0_path(argv[0]);
-
 	for (i = 1; i < argc; i++) {
-		char *arg = argv[i];
+		const char *arg = argv[i];
 		const char *v;
 
 		if (skip_prefix(arg, "--listen=", &v)) {
@@ -1367,8 +1378,7 @@ int main(int argc, char **argv)
 	if (detach) {
 		if (daemonize())
 			die("--detach not supported on this platform");
-	} else
-		sanitize_stdfds();
+	}
 
 	if (pid_file)
 		write_file(pid_file, "%"PRIuMAX, (uintmax_t) getpid());
diff --git a/date.c b/date.c
index 7c9f76998a..a996331f5b 100644
--- a/date.c
+++ b/date.c
@@ -74,6 +74,8 @@ static int local_tzoffset(unsigned long time)
 	localtime_r(&t, &tm);
 	t_local = tm_to_time_t(&tm);
 
+	if (t_local == -1)
+		return 0; /* error; just use +0000 */
 	if (t_local < t) {
 		eastwest = -1;
 		offset = t - t_local;
@@ -175,6 +177,12 @@ const char *show_date(unsigned long time, int tz, const struct date_mode *mode)
 	struct tm *tm;
 	static struct strbuf timebuf = STRBUF_INIT;
 
+	if (mode->type == DATE_UNIX) {
+		strbuf_reset(&timebuf);
+		strbuf_addf(&timebuf, "%lu", time);
+		return timebuf.buf;
+	}
+
 	if (mode->local)
 		tz = local_tzoffset(time);
 
@@ -790,6 +798,8 @@ static enum date_mode_type parse_date_type(const char *format, const char **end)
 		return DATE_NORMAL;
 	if (skip_prefix(format, "raw", end))
 		return DATE_RAW;
+	if (skip_prefix(format, "unix", end))
+		return DATE_UNIX;
 	if (skip_prefix(format, "format", end))
 		return DATE_STRFTIME;
 
diff --git a/diff-no-index.c b/diff-no-index.c
index 03daadb25a..1f8999b9ca 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -65,8 +65,7 @@ static int populate_from_stdin(struct diff_filespec *s)
 	size_t size = 0;
 
 	if (strbuf_read(&buf, 0, 0) < 0)
-		return error("error while reading from stdin %s",
-				     strerror(errno));
+		return error_errno("error while reading from stdin");
 
 	s->should_munmap = 0;
 	s->data = strbuf_detach(&buf, &size);
diff --git a/diff.c b/diff.c
index 059123c5dc..534c12e28e 100644
--- a/diff.c
+++ b/diff.c
@@ -26,6 +26,7 @@
 #endif
 
 static int diff_detect_rename_default;
+static int diff_compaction_heuristic; /* experimental */
 static int diff_rename_limit_default = 400;
 static int diff_suppress_blank_empty;
 static int diff_use_color_default = -1;
@@ -168,6 +169,11 @@ long parse_algorithm_value(const char *value)
  * never be affected by the setting of diff.renames
  * the user happens to have in the configuration file.
  */
+void init_diff_ui_defaults(void)
+{
+	diff_detect_rename_default = 1;
+}
+
 int git_diff_ui_config(const char *var, const char *value, void *cb)
 {
 	if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
@@ -184,6 +190,10 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)
 		diff_detect_rename_default = git_config_rename(var, value);
 		return 0;
 	}
+	if (!strcmp(var, "diff.compactionheuristic")) {
+		diff_compaction_heuristic = git_config_bool(var, value);
+		return 0;
+	}
 	if (!strcmp(var, "diff.autorefreshindex")) {
 		diff_auto_refresh_index = git_config_bool(var, value);
 		return 0;
@@ -1923,8 +1933,8 @@ static void show_dirstat(struct diff_options *options)
 
 		name = p->two->path ? p->two->path : p->one->path;
 
-		if (p->one->sha1_valid && p->two->sha1_valid)
-			content_changed = hashcmp(p->one->sha1, p->two->sha1);
+		if (p->one->oid_valid && p->two->oid_valid)
+			content_changed = oidcmp(&p->one->oid, &p->two->oid);
 		else
 			content_changed = 1;
 
@@ -2296,7 +2306,8 @@ static void builtin_diff(const char *name_a,
 		const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
 		show_submodule_summary(o->file, one->path ? one->path : two->path,
 				line_prefix,
-				one->sha1, two->sha1, two->dirty_submodule,
+				one->oid.hash, two->oid.hash,
+				two->dirty_submodule,
 				meta, del, add, reset);
 		return;
 	}
@@ -2374,7 +2385,7 @@ static void builtin_diff(const char *name_a,
 		if (!one->data && !two->data &&
 		    S_ISREG(one->mode) && S_ISREG(two->mode) &&
 		    !DIFF_OPT_TST(o, BINARY)) {
-			if (!hashcmp(one->sha1, two->sha1)) {
+			if (!oidcmp(&one->oid, &two->oid)) {
 				if (must_show_header)
 					fprintf(o->file, "%s", header.buf);
 				goto free_ab_and_return;
@@ -2495,7 +2506,7 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
 		return;
 	}
 
-	same_contents = !hashcmp(one->sha1, two->sha1);
+	same_contents = !oidcmp(&one->oid, &two->oid);
 
 	if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
 		data->is_binary = 1;
@@ -2628,8 +2639,8 @@ void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
 {
 	if (mode) {
 		spec->mode = canon_mode(mode);
-		hashcpy(spec->sha1, sha1);
-		spec->sha1_valid = sha1_valid;
+		hashcpy(spec->oid.hash, sha1);
+		spec->oid_valid = sha1_valid;
 	}
 }
 
@@ -2672,6 +2683,13 @@ static int reuse_worktree_file(const char *name, const unsigned char *sha1, int
 	if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1))
 		return 0;
 
+	/*
+	 * Similarly, if we'd have to convert the file contents anyway, that
+	 * makes the optimization not worthwhile.
+	 */
+	if (!want_file && would_convert_to_git(name))
+		return 0;
+
 	len = strlen(name);
 	pos = cache_name_pos(name, len);
 	if (pos < 0)
@@ -2711,7 +2729,8 @@ static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
 	if (s->dirty_submodule)
 		dirty = "-dirty";
 
-	strbuf_addf(&buf, "Subproject commit %s%s\n", sha1_to_hex(s->sha1), dirty);
+	strbuf_addf(&buf, "Subproject commit %s%s\n",
+		    oid_to_hex(&s->oid), dirty);
 	s->size = buf.len;
 	if (size_only) {
 		s->data = NULL;
@@ -2754,8 +2773,8 @@ int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
 	if (S_ISGITLINK(s->mode))
 		return diff_populate_gitlink(s, size_only);
 
-	if (!s->sha1_valid ||
-	    reuse_worktree_file(s->path, s->sha1, 0)) {
+	if (!s->oid_valid ||
+	    reuse_worktree_file(s->path, s->oid.hash, 0)) {
 		struct strbuf buf = STRBUF_INIT;
 		struct stat st;
 		int fd;
@@ -2812,9 +2831,10 @@ int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
 	else {
 		enum object_type type;
 		if (size_only || (flags & CHECK_BINARY)) {
-			type = sha1_object_info(s->sha1, &s->size);
+			type = sha1_object_info(s->oid.hash, &s->size);
 			if (type < 0)
-				die("unable to read %s", sha1_to_hex(s->sha1));
+				die("unable to read %s",
+				    oid_to_hex(&s->oid));
 			if (size_only)
 				return 0;
 			if (s->size > big_file_threshold && s->is_binary == -1) {
@@ -2822,9 +2842,9 @@ int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
 				return 0;
 			}
 		}
-		s->data = read_sha1_file(s->sha1, &type, &s->size);
+		s->data = read_sha1_file(s->oid.hash, &type, &s->size);
 		if (!s->data)
-			die("unable to read %s", sha1_to_hex(s->sha1));
+			die("unable to read %s", oid_to_hex(&s->oid));
 		s->should_free = 1;
 	}
 	return 0;
@@ -2853,7 +2873,7 @@ void diff_free_filespec_data(struct diff_filespec *s)
 static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
 			   void *blob,
 			   unsigned long size,
-			   const unsigned char *sha1,
+			   const struct object_id *oid,
 			   int mode)
 {
 	int fd;
@@ -2878,7 +2898,7 @@ static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
 		die_errno("unable to write temp-file");
 	close_tempfile(&temp->tempfile);
 	temp->name = get_tempfile_path(&temp->tempfile);
-	sha1_to_hex_r(temp->hex, sha1);
+	oid_to_hex_r(temp->hex, oid);
 	xsnprintf(temp->mode, sizeof(temp->mode), "%06o", mode);
 	strbuf_release(&buf);
 	strbuf_release(&template);
@@ -2902,8 +2922,8 @@ static struct diff_tempfile *prepare_temp_file(const char *name,
 	}
 
 	if (!S_ISGITLINK(one->mode) &&
-	    (!one->sha1_valid ||
-	     reuse_worktree_file(name, one->sha1, 1))) {
+	    (!one->oid_valid ||
+	     reuse_worktree_file(name, one->oid.hash, 1))) {
 		struct stat st;
 		if (lstat(name, &st) < 0) {
 			if (errno == ENOENT)
@@ -2915,19 +2935,19 @@ static struct diff_tempfile *prepare_temp_file(const char *name,
 			if (strbuf_readlink(&sb, name, st.st_size) < 0)
 				die_errno("readlink(%s)", name);
 			prep_temp_blob(name, temp, sb.buf, sb.len,
-				       (one->sha1_valid ?
-					one->sha1 : null_sha1),
-				       (one->sha1_valid ?
+				       (one->oid_valid ?
+					&one->oid : &null_oid),
+				       (one->oid_valid ?
 					one->mode : S_IFLNK));
 			strbuf_release(&sb);
 		}
 		else {
 			/* we can borrow from the file in the work tree */
 			temp->name = name;
-			if (!one->sha1_valid)
+			if (!one->oid_valid)
 				sha1_to_hex_r(temp->hex, null_sha1);
 			else
-				sha1_to_hex_r(temp->hex, one->sha1);
+				sha1_to_hex_r(temp->hex, one->oid.hash);
 			/* Even though we may sometimes borrow the
 			 * contents from the work tree, we always want
 			 * one->mode.  mode is trustworthy even when
@@ -2942,7 +2962,7 @@ static struct diff_tempfile *prepare_temp_file(const char *name,
 		if (diff_populate_filespec(one, 0))
 			die("cannot read data blob for %s", one->path);
 		prep_temp_blob(name, temp, one->data, one->size,
-			       one->sha1, one->mode);
+			       &one->oid, one->mode);
 	}
 	return temp;
 }
@@ -3055,7 +3075,7 @@ static void fill_metainfo(struct strbuf *msg,
 	default:
 		*must_show_header = 0;
 	}
-	if (one && two && hashcmp(one->sha1, two->sha1)) {
+	if (one && two && oidcmp(&one->oid, &two->oid)) {
 		int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
 
 		if (DIFF_OPT_TST(o, BINARY)) {
@@ -3065,8 +3085,8 @@ static void fill_metainfo(struct strbuf *msg,
 				abbrev = 40;
 		}
 		strbuf_addf(msg, "%s%sindex %s..", line_prefix, set,
-			    find_unique_abbrev(one->sha1, abbrev));
-		strbuf_addstr(msg, find_unique_abbrev(two->sha1, abbrev));
+			    find_unique_abbrev(one->oid.hash, abbrev));
+		strbuf_addstr(msg, find_unique_abbrev(two->oid.hash, abbrev));
 		if (one->mode == two->mode)
 			strbuf_addf(msg, " %06o", one->mode);
 		strbuf_addf(msg, "%s\n", reset);
@@ -3121,20 +3141,20 @@ static void run_diff_cmd(const char *pgm,
 static void diff_fill_sha1_info(struct diff_filespec *one)
 {
 	if (DIFF_FILE_VALID(one)) {
-		if (!one->sha1_valid) {
+		if (!one->oid_valid) {
 			struct stat st;
 			if (one->is_stdin) {
-				hashcpy(one->sha1, null_sha1);
+				oidclr(&one->oid);
 				return;
 			}
 			if (lstat(one->path, &st) < 0)
 				die_errno("stat '%s'", one->path);
-			if (index_path(one->sha1, one->path, &st, 0))
+			if (index_path(one->oid.hash, one->path, &st, 0))
 				die("cannot hash %s", one->path);
 		}
 	}
 	else
-		hashclr(one->sha1);
+		oidclr(&one->oid);
 }
 
 static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
@@ -3273,6 +3293,8 @@ void diff_setup(struct diff_options *options)
 	options->use_color = diff_use_color_default;
 	options->detect_rename = diff_detect_rename_default;
 	options->xdl_opts |= diff_algorithm;
+	if (diff_compaction_heuristic)
+		DIFF_XDL_SET(options, COMPACTION_HEURISTIC);
 
 	options->orderfile = diff_order_file_cfg;
 
@@ -3793,6 +3815,10 @@ int diff_opt_parse(struct diff_options *options,
 		DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
 	else if (!strcmp(arg, "--ignore-blank-lines"))
 		DIFF_XDL_SET(options, IGNORE_BLANK_LINES);
+	else if (!strcmp(arg, "--compaction-heuristic"))
+		DIFF_XDL_SET(options, COMPACTION_HEURISTIC);
+	else if (!strcmp(arg, "--no-compaction-heuristic"))
+		DIFF_XDL_CLR(options, COMPACTION_HEURISTIC);
 	else if (!strcmp(arg, "--patience"))
 		options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
 	else if (!strcmp(arg, "--histogram"))
@@ -3961,6 +3987,8 @@ int diff_opt_parse(struct diff_options *options,
 		if (!options->file)
 			die_errno("Could not open '%s'", path);
 		options->close_file = 1;
+		if (options->use_color != GIT_COLOR_ALWAYS)
+			options->use_color = GIT_COLOR_NEVER;
 		return argcount;
 	} else
 		return 0;
@@ -4102,8 +4130,9 @@ static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
 	fprintf(opt->file, "%s", diff_line_prefix(opt));
 	if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
 		fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
-			diff_unique_abbrev(p->one->sha1, opt->abbrev));
-		fprintf(opt->file, "%s ", diff_unique_abbrev(p->two->sha1, opt->abbrev));
+			diff_unique_abbrev(p->one->oid.hash, opt->abbrev));
+		fprintf(opt->file, "%s ",
+			diff_unique_abbrev(p->two->oid.hash, opt->abbrev));
 	}
 	if (p->score) {
 		fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
@@ -4152,11 +4181,11 @@ int diff_unmodified_pair(struct diff_filepair *p)
 	/* both are valid and point at the same path.  that is, we are
 	 * dealing with a change.
 	 */
-	if (one->sha1_valid && two->sha1_valid &&
-	    !hashcmp(one->sha1, two->sha1) &&
+	if (one->oid_valid && two->oid_valid &&
+	    !oidcmp(&one->oid, &two->oid) &&
 	    !one->dirty_submodule && !two->dirty_submodule)
 		return 1; /* no change */
-	if (!one->sha1_valid && !two->sha1_valid)
+	if (!one->oid_valid && !two->oid_valid)
 		return 1; /* both look at the same file on the filesystem. */
 	return 0;
 }
@@ -4217,7 +4246,7 @@ void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
 		s->path,
 		DIFF_FILE_VALID(s) ? "valid" : "invalid",
 		s->mode,
-		s->sha1_valid ? sha1_to_hex(s->sha1) : "");
+		s->oid_valid ? oid_to_hex(&s->oid) : "");
 	fprintf(stderr, "queue[%d] %s size %lu\n",
 		x, one ? one : "",
 		s->size);
@@ -4287,11 +4316,11 @@ static void diff_resolve_rename_copy(void)
 			else
 				p->status = DIFF_STATUS_RENAMED;
 		}
-		else if (hashcmp(p->one->sha1, p->two->sha1) ||
+		else if (oidcmp(&p->one->oid, &p->two->oid) ||
 			 p->one->mode != p->two->mode ||
 			 p->one->dirty_submodule ||
 			 p->two->dirty_submodule ||
-			 is_null_sha1(p->one->sha1))
+			 is_null_oid(&p->one->oid))
 			p->status = DIFF_STATUS_MODIFIED;
 		else {
 			/* This is a "no-change" entry and should not
@@ -4433,7 +4462,7 @@ static void patch_id_consume(void *priv, char *line, unsigned long len)
 }
 
 /* returns 0 upon success, and writes result into sha1 */
-static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
+static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1, int diff_header_only)
 {
 	struct diff_queue_struct *q = &diff_queued_diff;
 	int i;
@@ -4468,9 +4497,6 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
 
 		diff_fill_sha1_info(p->one);
 		diff_fill_sha1_info(p->two);
-		if (fill_mmfile(&mf1, p->one) < 0 ||
-				fill_mmfile(&mf2, p->two) < 0)
-			return error("unable to read files to diff");
 
 		len1 = remove_space(p->one->path, strlen(p->one->path));
 		len2 = remove_space(p->two->path, strlen(p->two->path));
@@ -4505,10 +4531,19 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
 					len2, p->two->path);
 		git_SHA1_Update(&ctx, buffer, len1);
 
+		if (diff_header_only)
+			continue;
+
+		if (fill_mmfile(&mf1, p->one) < 0 ||
+		    fill_mmfile(&mf2, p->two) < 0)
+			return error("unable to read files to diff");
+
 		if (diff_filespec_is_binary(p->one) ||
 		    diff_filespec_is_binary(p->two)) {
-			git_SHA1_Update(&ctx, sha1_to_hex(p->one->sha1), 40);
-			git_SHA1_Update(&ctx, sha1_to_hex(p->two->sha1), 40);
+			git_SHA1_Update(&ctx, oid_to_hex(&p->one->oid),
+					40);
+			git_SHA1_Update(&ctx, oid_to_hex(&p->two->oid),
+					40);
 			continue;
 		}
 
@@ -4525,11 +4560,11 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
 	return 0;
 }
 
-int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1)
+int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1, int diff_header_only)
 {
 	struct diff_queue_struct *q = &diff_queued_diff;
 	int i;
-	int result = diff_get_patch_id(options, sha1);
+	int result = diff_get_patch_id(options, sha1, diff_header_only);
 
 	for (i = 0; i < q->nr; i++)
 		diff_free_filepair(q->queue[i]);
@@ -4800,7 +4835,7 @@ static int diff_filespec_check_stat_unmatch(struct diff_filepair *p)
 	 */
 	if (!DIFF_FILE_VALID(p->one) || /* (1) */
 	    !DIFF_FILE_VALID(p->two) ||
-	    (p->one->sha1_valid && p->two->sha1_valid) ||
+	    (p->one->oid_valid && p->two->oid_valid) ||
 	    (p->one->mode != p->two->mode) ||
 	    diff_populate_filespec(p->one, CHECK_SIZE_ONLY) ||
 	    diff_populate_filespec(p->two, CHECK_SIZE_ONLY) ||
@@ -5096,8 +5131,9 @@ size_t fill_textconv(struct userdiff_driver *driver,
 	if (!driver->textconv)
 		die("BUG: fill_textconv called with non-textconv driver");
 
-	if (driver->textconv_cache && df->sha1_valid) {
-		*outbuf = notes_cache_get(driver->textconv_cache, df->sha1,
+	if (driver->textconv_cache && df->oid_valid) {
+		*outbuf = notes_cache_get(driver->textconv_cache,
+					  df->oid.hash,
 					  &size);
 		if (*outbuf)
 			return size;
@@ -5107,9 +5143,9 @@ size_t fill_textconv(struct userdiff_driver *driver,
 	if (!*outbuf)
 		die("unable to read files to diff");
 
-	if (driver->textconv_cache && df->sha1_valid) {
+	if (driver->textconv_cache && df->oid_valid) {
 		/* ignore errors, as we might be in a readonly repository */
-		notes_cache_put(driver->textconv_cache, df->sha1, *outbuf,
+		notes_cache_put(driver->textconv_cache, df->oid.hash, *outbuf,
 				size);
 		/*
 		 * we could save up changes and flush them all at the end,
diff --git a/diff.h b/diff.h
index e7d68edaf9..7883729edf 100644
--- a/diff.h
+++ b/diff.h
@@ -266,6 +266,7 @@ extern int parse_long_opt(const char *opt, const char **argv,
 			 const char **optarg);
 
 extern int git_diff_basic_config(const char *var, const char *value, void *cb);
+extern void init_diff_ui_defaults(void);
 extern int git_diff_ui_config(const char *var, const char *value, void *cb);
 extern void diff_setup(struct diff_options *);
 extern int diff_opt_parse(struct diff_options *, const char **, int, const char *);
@@ -341,7 +342,7 @@ extern int run_diff_files(struct rev_info *revs, unsigned int option);
 extern int run_diff_index(struct rev_info *revs, int cached);
 
 extern int do_diff_cache(const unsigned char *, struct diff_options *);
-extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
+extern int diff_flush_patch_id(struct diff_options *, unsigned char *, int);
 
 extern int diff_result_code(struct diff_options *, int);
 
diff --git a/diffcore-break.c b/diffcore-break.c
index 5473493e10..881a74f29e 100644
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -57,8 +57,8 @@ static int should_break(struct diff_filespec *src,
 		return 1; /* even their types are different */
 	}
 
-	if (src->sha1_valid && dst->sha1_valid &&
-	    !hashcmp(src->sha1, dst->sha1))
+	if (src->oid_valid && dst->oid_valid &&
+	    !oidcmp(&src->oid, &dst->oid))
 		return 0; /* they are the same */
 
 	if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 7715c13ec4..55067cab6c 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -7,6 +7,8 @@
 #include "diffcore.h"
 #include "xdiff-interface.h"
 #include "kwset.h"
+#include "commit.h"
+#include "quote.h"
 
 typedef int (*pickaxe_fn)(mmfile_t *one, mmfile_t *two,
 			  struct diff_options *o,
@@ -198,6 +200,18 @@ static void pickaxe(struct diff_queue_struct *q, struct diff_options *o,
 	*q = outq;
 }
 
+static void regcomp_or_die(regex_t *regex, const char *needle, int cflags)
+{
+	int err = regcomp(regex, needle, cflags);
+	if (err) {
+		/* The POSIX.2 people are surely sick */
+		char errbuf[1024];
+		regerror(err, regex, errbuf, 1024);
+		regfree(regex);
+		die("invalid regex: %s", errbuf);
+	}
+}
+
 void diffcore_pickaxe(struct diff_options *o)
 {
 	const char *needle = o->pickaxe;
@@ -206,18 +220,19 @@ void diffcore_pickaxe(struct diff_options *o)
 	kwset_t kws = NULL;
 
 	if (opts & (DIFF_PICKAXE_REGEX | DIFF_PICKAXE_KIND_G)) {
-		int err;
 		int cflags = REG_EXTENDED | REG_NEWLINE;
 		if (DIFF_OPT_TST(o, PICKAXE_IGNORE_CASE))
 			cflags |= REG_ICASE;
-		err = regcomp(&regex, needle, cflags);
-		if (err) {
-			/* The POSIX.2 people are surely sick */
-			char errbuf[1024];
-			regerror(err, &regex, errbuf, 1024);
-			regfree(&regex);
-			die("invalid regex: %s", errbuf);
-		}
+		regcomp_or_die(&regex, needle, cflags);
+		regexp = &regex;
+	} else if (DIFF_OPT_TST(o, PICKAXE_IGNORE_CASE) &&
+		   has_non_ascii(needle)) {
+		struct strbuf sb = STRBUF_INIT;
+		int cflags = REG_NEWLINE | REG_ICASE;
+
+		basic_regex_quote_buf(&sb, needle);
+		regcomp_or_die(&regex, sb.buf, cflags);
+		strbuf_release(&sb);
 		regexp = &regex;
 	} else {
 		kws = kwsalloc(DIFF_OPT_TST(o, PICKAXE_IGNORE_CASE)
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 7f03eb5a04..73d003a08a 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -60,7 +60,8 @@ static int add_rename_dst(struct diff_filespec *two)
 		memmove(rename_dst + first + 1, rename_dst + first,
 			(rename_dst_nr - first - 1) * sizeof(*rename_dst));
 	rename_dst[first].two = alloc_filespec(two->path);
-	fill_filespec(rename_dst[first].two, two->sha1, two->sha1_valid, two->mode);
+	fill_filespec(rename_dst[first].two, two->oid.hash, two->oid_valid,
+		      two->mode);
 	rename_dst[first].pair = NULL;
 	return 0;
 }
@@ -260,12 +261,13 @@ struct file_similarity {
 
 static unsigned int hash_filespec(struct diff_filespec *filespec)
 {
-	if (!filespec->sha1_valid) {
+	if (!filespec->oid_valid) {
 		if (diff_populate_filespec(filespec, 0))
 			return 0;
-		hash_sha1_file(filespec->data, filespec->size, "blob", filespec->sha1);
+		hash_sha1_file(filespec->data, filespec->size, "blob",
+			       filespec->oid.hash);
 	}
-	return sha1hash(filespec->sha1);
+	return sha1hash(filespec->oid.hash);
 }
 
 static int find_identical_files(struct hashmap *srcs,
@@ -287,7 +289,7 @@ static int find_identical_files(struct hashmap *srcs,
 		struct diff_filespec *source = p->filespec;
 
 		/* False hash collision? */
-		if (hashcmp(source->sha1, target->sha1))
+		if (oidcmp(&source->oid, &target->oid))
 			continue;
 		/* Non-regular files? If so, the modes must match! */
 		if (!S_ISREG(source->mode) || !S_ISREG(target->mode)) {
@@ -466,7 +468,7 @@ void diffcore_rename(struct diff_options *options)
 				 strcmp(options->single_follow, p->two->path))
 				continue; /* not interested */
 			else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
-				 is_empty_blob_sha1(p->two->sha1))
+				 is_empty_blob_sha1(p->two->oid.hash))
 				continue;
 			else if (add_rename_dst(p->two) < 0) {
 				warning("skipping rename detection, detected"
@@ -476,7 +478,7 @@ void diffcore_rename(struct diff_options *options)
 			}
 		}
 		else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
-			 is_empty_blob_sha1(p->one->sha1))
+			 is_empty_blob_sha1(p->one->oid.hash))
 			continue;
 		else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
 			/*
@@ -539,7 +541,7 @@ void diffcore_rename(struct diff_options *options)
 				rename_dst_nr * rename_src_nr, 50, 1);
 	}
 
-	mx = xcalloc(st_mult(num_create, NUM_CANDIDATE_PER_DST), sizeof(*mx));
+	mx = xcalloc(st_mult(NUM_CANDIDATE_PER_DST, num_create), sizeof(*mx));
 	for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
 		struct diff_filespec *two = rename_dst[i].two;
 		struct diff_score *m;
diff --git a/diffcore.h b/diffcore.h
index 33ea2de348..c11b8465fc 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -25,7 +25,7 @@
 struct userdiff_driver;
 
 struct diff_filespec {
-	unsigned char sha1[20];
+	struct object_id oid;
 	char *path;
 	void *data;
 	void *cnt_data;
@@ -33,7 +33,7 @@ struct diff_filespec {
 	int count;               /* Reference count */
 	int rename_used;         /* Count of rename users */
 	unsigned short mode;	 /* file mode */
-	unsigned sha1_valid : 1; /* if true, use sha1 and trust mode;
+	unsigned oid_valid : 1;  /* if true, use oid and trust mode;
 				  * if false, use the name and read from
 				  * the filesystem.
 				  */
diff --git a/dir-iterator.c b/dir-iterator.c
new file mode 100644
index 0000000000..34182a9a1c
--- /dev/null
+++ b/dir-iterator.c
@@ -0,0 +1,202 @@
+#include "cache.h"
+#include "dir.h"
+#include "iterator.h"
+#include "dir-iterator.h"
+
+struct dir_iterator_level {
+	int initialized;
+
+	DIR *dir;
+
+	/*
+	 * The length of the directory part of path at this level
+	 * (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;
+};
+
+/*
+ * The full data structure used to manage the internal directory
+ * iteration state. It includes members that are not part of the
+ * public interface.
+ */
+struct dir_iterator_int {
+	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.
+	 */
+	size_t levels_nr;
+
+	/* The number of levels that have been allocated on the stack */
+	size_t levels_alloc;
+
+	/*
+	 * A stack of levels. levels[0] is the uppermost directory
+	 * that will be included in this iteration.
+	 */
+	struct dir_iterator_level *levels;
+};
+
+int dir_iterator_advance(struct dir_iterator *dir_iterator)
+{
+	struct dir_iterator_int *iter =
+		(struct dir_iterator_int *)dir_iterator;
+
+	while (1) {
+		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;
+
+			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)
+				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 (!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;
+		}
+	}
+}
+
+int dir_iterator_abort(struct dir_iterator *dir_iterator)
+{
+	struct dir_iterator_int *iter = (struct dir_iterator_int *)dir_iterator;
+
+	for (; iter->levels_nr; iter->levels_nr--) {
+		struct dir_iterator_level *level =
+			&iter->levels[iter->levels_nr - 1];
+
+		if (level->dir && closedir(level->dir)) {
+			strbuf_setlen(&iter->base.path, level->prefix_len);
+			warning("error closing directory %s: %s",
+				iter->base.path.buf, strerror(errno));
+		}
+	}
+
+	free(iter->levels);
+	strbuf_release(&iter->base.path);
+	free(iter);
+	return ITER_DONE;
+}
+
+struct dir_iterator *dir_iterator_begin(const char *path)
+{
+	struct dir_iterator_int *iter = xcalloc(1, sizeof(*iter));
+	struct dir_iterator *dir_iterator = &iter->base;
+
+	if (!path || !*path)
+		die("BUG: empty path passed to dir_iterator_begin()");
+
+	strbuf_init(&iter->base.path, PATH_MAX);
+	strbuf_addstr(&iter->base.path, path);
+
+	ALLOC_GROW(iter->levels, 10, iter->levels_alloc);
+
+	iter->levels_nr = 1;
+	iter->levels[0].initialized = 0;
+
+	return dir_iterator;
+}
diff --git a/dir-iterator.h b/dir-iterator.h
new file mode 100644
index 0000000000..27739e6c29
--- /dev/null
+++ b/dir-iterator.h
@@ -0,0 +1,87 @@
+#ifndef DIR_ITERATOR_H
+#define DIR_ITERATOR_H
+
+/*
+ * Iterate over a directory tree.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * A typical iteration looks like this:
+ *
+ *     int ok;
+ *     struct iterator *iter = dir_iterator_begin(path);
+ *
+ *     while ((ok = dir_iterator_advance(iter)) == ITER_OK) {
+ *             if (want_to_stop_iteration()) {
+ *                     ok = dir_iterator_abort(iter);
+ *                     break;
+ *             }
+ *
+ *             // Access information about the current path:
+ *             if (S_ISDIR(iter->st.st_mode))
+ *                     printf("%s is a directory\n", iter->relative_path);
+ *     }
+ *
+ *     if (ok != ITER_DONE)
+ *             handle_error();
+ *
+ * Callers are allowed to modify iter->path while they are working,
+ * but they must restore it to its original contents before calling
+ * dir_iterator_advance() again.
+ */
+
+struct dir_iterator {
+	/* The current path: */
+	struct strbuf path;
+
+	/*
+	 * The current path relative to the starting path. This part
+	 * of the path always uses "/" characters to separate path
+	 * components:
+	 */
+	const char *relative_path;
+
+	/* The current basename: */
+	const char *basename;
+
+	/* The result of calling lstat() on path: */
+	struct stat st;
+};
+
+/*
+ * Start a directory iteration over path. Return a dir_iterator that
+ * holds the internal state of the iteration.
+ *
+ * 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.
+ */
+struct dir_iterator *dir_iterator_begin(const char *path);
+
+/*
+ * 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.
+ */
+int dir_iterator_advance(struct dir_iterator *iterator);
+
+/*
+ * End the iteration before it has been exhausted. Free the
+ * dir_iterator and any associated resources and return ITER_DONE. On
+ * error, free the dir_iterator and return ITER_ERROR.
+ */
+int dir_iterator_abort(struct dir_iterator *iterator);
+
+#endif
diff --git a/dir.c b/dir.c
index 656f272adc..0ea235f3d6 100644
--- a/dir.c
+++ b/dir.c
@@ -53,13 +53,12 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir,
 	int check_only, const struct path_simplify *simplify);
 static int get_dtype(struct dirent *de, const char *path, int len);
 
-/* helper string functions with support for the ignore_case flag */
-int strcmp_icase(const char *a, const char *b)
+int fspathcmp(const char *a, const char *b)
 {
 	return ignore_case ? strcasecmp(a, b) : strcmp(a, b);
 }
 
-int strncmp_icase(const char *a, const char *b, size_t count)
+int fspathncmp(const char *a, const char *b, size_t count)
 {
 	return ignore_case ? strncasecmp(a, b, count) : strncmp(a, b, count);
 }
@@ -795,12 +794,12 @@ int match_basename(const char *basename, int basenamelen,
 {
 	if (prefix == patternlen) {
 		if (patternlen == basenamelen &&
-		    !strncmp_icase(pattern, basename, basenamelen))
+		    !fspathncmp(pattern, basename, basenamelen))
 			return 1;
 	} else if (flags & EXC_FLAG_ENDSWITH) {
 		/* "*literal" matching against "fooliteral" */
 		if (patternlen - 1 <= basenamelen &&
-		    !strncmp_icase(pattern + 1,
+		    !fspathncmp(pattern + 1,
 				   basename + basenamelen - (patternlen - 1),
 				   patternlen - 1))
 			return 1;
@@ -837,7 +836,7 @@ int match_pathname(const char *pathname, int pathlen,
 	 */
 	if (pathlen < baselen + 1 ||
 	    (baselen && pathname[baselen] != '/') ||
-	    strncmp_icase(pathname, base, baselen))
+	    fspathncmp(pathname, base, baselen))
 		return 0;
 
 	namelen = baselen ? pathlen - baselen - 1 : pathlen;
@@ -851,7 +850,7 @@ int match_pathname(const char *pathname, int pathlen,
 		if (prefix > namelen)
 			return 0;
 
-		if (strncmp_icase(pattern, name, prefix))
+		if (fspathncmp(pattern, name, prefix))
 			return 0;
 		pattern += prefix;
 		patternlen -= prefix;
@@ -2365,7 +2364,7 @@ void write_untracked_extension(struct strbuf *out, struct untracked_cache *untra
 
 	varint_len = encode_varint(untracked->ident.len, varbuf);
 	strbuf_add(out, varbuf, varint_len);
-	strbuf_add(out, untracked->ident.buf, untracked->ident.len);
+	strbuf_addbuf(out, &untracked->ident);
 
 	strbuf_add(out, ouc, ouc_size(len));
 	free(ouc);
diff --git a/dir.h b/dir.h
index d56d2fb48f..da1a858b3a 100644
--- a/dir.h
+++ b/dir.h
@@ -262,16 +262,39 @@ extern int is_empty_dir(const char *dir);
 
 extern void setup_standard_excludes(struct dir_struct *dir);
 
+
+/* Constants for remove_dir_recursively: */
+
+/*
+ * If a non-directory is found within path, stop and return an error.
+ * (In this case some empty directories might already have been
+ * removed.)
+ */
 #define REMOVE_DIR_EMPTY_ONLY 01
+
+/*
+ * If any Git work trees are found within path, skip them without
+ * considering it an error.
+ */
 #define REMOVE_DIR_KEEP_NESTED_GIT 02
+
+/* Remove the contents of path, but leave path itself. */
 #define REMOVE_DIR_KEEP_TOPLEVEL 04
+
+/*
+ * Remove path and its contents, recursively. flags is a combination
+ * of the above REMOVE_DIR_* constants. Return 0 on success.
+ *
+ * This function uses path as temporary scratch space, but restores it
+ * before returning.
+ */
 extern int remove_dir_recursively(struct strbuf *path, int flag);
 
 /* tries to remove the path with empty directories along it, ignores ENOENT */
 extern int remove_path(const char *path);
 
-extern int strcmp_icase(const char *a, const char *b);
-extern int strncmp_icase(const char *a, const char *b, size_t count);
+extern int fspathcmp(const char *a, const char *b);
+extern int fspathncmp(const char *a, const char *b, size_t count);
 
 /*
  * The prefix part of pattern must not contains wildcards.
diff --git a/editor.c b/editor.c
index 01c644cddb..7519edecdc 100644
--- a/editor.c
+++ b/editor.c
@@ -63,7 +63,6 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en
 	if (!buffer)
 		return 0;
 	if (strbuf_read_file(buffer, path, 0) < 0)
-		return error("could not read file '%s': %s",
-				path, strerror(errno));
+		return error_errno("could not read file '%s'", path);
 	return 0;
 }
diff --git a/entry.c b/entry.c
index a4109574fa..519e04227b 100644
--- a/entry.c
+++ b/entry.c
@@ -168,8 +168,8 @@ static int write_entry(struct cache_entry *ce,
 			ret = symlink(new, path);
 			free(new);
 			if (ret)
-				return error("unable to create symlink %s (%s)",
-					     path, strerror(errno));
+				return error_errno("unable to create symlink %s",
+						   path);
 			break;
 		}
 
@@ -186,8 +186,7 @@ static int write_entry(struct cache_entry *ce,
 		fd = open_output_fd(path, ce, to_tempfile);
 		if (fd < 0) {
 			free(new);
-			return error("unable to create file %s (%s)",
-				path, strerror(errno));
+			return error_errno("unable to create file %s", path);
 		}
 
 		wrote = write_in_full(fd, new, size);
@@ -284,8 +283,7 @@ int checkout_entry(struct cache_entry *ce,
 				return error("%s is a directory", path.buf);
 			remove_subtree(&path);
 		} else if (unlink(path.buf))
-			return error("unable to unlink old '%s' (%s)",
-				     path.buf, strerror(errno));
+			return error_errno("unable to unlink old '%s'", path.buf);
 	} else if (state->not_new)
 		return 0;
 
diff --git a/environment.c b/environment.c
index 96160a75a5..ca72464a98 100644
--- a/environment.c
+++ b/environment.c
@@ -31,6 +31,7 @@ const char *git_log_output_encoding;
 const char *apply_default_whitespace;
 const char *apply_default_ignorewhitespace;
 const char *git_attributes_file;
+const char *git_hooks_path;
 int zlib_compression_level = Z_BEST_SPEED;
 int core_compression_level;
 int core_compression_seen;
diff --git a/fast-import.c b/fast-import.c
index 9fc7093406..bf53ac95da 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -164,8 +164,8 @@ Format of STDIN stream:
 #include "refs.h"
 #include "csum-file.h"
 #include "quote.h"
-#include "exec_cmd.h"
 #include "dir.h"
+#include "run-command.h"
 
 #define PACK_ID_BITS 16
 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
@@ -282,6 +282,7 @@ struct recent_command {
 /* Configured limits on output */
 static unsigned long max_depth = 10;
 static off_t max_packsize;
+static int unpack_limit = 100;
 static int force_update;
 static int pack_compression_level = Z_DEFAULT_COMPRESSION;
 static int pack_compression_seen;
@@ -300,7 +301,7 @@ static int failure;
 static FILE *pack_edges;
 static unsigned int show_stats = 1;
 static int global_argc;
-static char **global_argv;
+static const char **global_argv;
 
 /* Memory pools */
 static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool);
@@ -329,6 +330,7 @@ static const char *export_marks_file;
 static const char *import_marks_file;
 static int import_marks_file_from_stream;
 static int import_marks_file_ignore_missing;
+static int import_marks_file_done;
 static int relative_marks_paths;
 
 /* Our last blob */
@@ -414,7 +416,7 @@ static void write_crash_report(const char *err)
 	struct recent_command *rc;
 
 	if (!rpt) {
-		error("can't write crash report %s: %s", loc, strerror(errno));
+		error_errno("can't write crash report %s", loc);
 		free(loc);
 		return;
 	}
@@ -595,6 +597,33 @@ static struct object_entry *insert_object(unsigned char *sha1)
 	return e;
 }
 
+static void invalidate_pack_id(unsigned int id)
+{
+	unsigned int h;
+	unsigned long lu;
+	struct tag *t;
+
+	for (h = 0; h < ARRAY_SIZE(object_table); h++) {
+		struct object_entry *e;
+
+		for (e = object_table[h]; e; e = e->next)
+			if (e->pack_id == id)
+				e->pack_id = MAX_PACK_ID;
+	}
+
+	for (lu = 0; lu < branch_table_sz; lu++) {
+		struct branch *b;
+
+		for (b = branch_table[lu]; b; b = b->table_next_branch)
+			if (b->pack_id == id)
+				b->pack_id = MAX_PACK_ID;
+	}
+
+	for (t = first_tag; t; t = t->next_tag)
+		if (t->pack_id == id)
+			t->pack_id = MAX_PACK_ID;
+}
+
 static unsigned int hc_str(const char *s, size_t len)
 {
 	unsigned int r = 0;
@@ -950,6 +979,23 @@ static void unkeep_all_packs(void)
 	}
 }
 
+static int loosen_small_pack(const struct packed_git *p)
+{
+	struct child_process unpack = CHILD_PROCESS_INIT;
+
+	if (lseek(p->pack_fd, 0, SEEK_SET) < 0)
+		die_errno("Failed seeking to start of '%s'", p->pack_name);
+
+	unpack.in = p->pack_fd;
+	unpack.git_cmd = 1;
+	unpack.stdout_to_stderr = 1;
+	argv_array_push(&unpack.args, "unpack-objects");
+	if (!show_stats)
+		argv_array_push(&unpack.args, "-q");
+
+	return run_command(&unpack);
+}
+
 static void end_packfile(void)
 {
 	static int running;
@@ -972,6 +1018,14 @@ static void end_packfile(void)
 		fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
 				    pack_data->pack_name, object_count,
 				    cur_pack_sha1, pack_size);
+
+		if (object_count <= unpack_limit) {
+			if (!loosen_small_pack(pack_data)) {
+				invalidate_pack_id(pack_id);
+				goto discard_pack;
+			}
+		}
+
 		close(pack_data->pack_fd);
 		idx_name = keep_pack(create_index());
 
@@ -1002,6 +1056,7 @@ static void end_packfile(void)
 		pack_id++;
 	}
 	else {
+discard_pack:
 		close(pack_data->pack_fd);
 		unlink_or_warn(pack_data->pack_name);
 	}
@@ -1512,7 +1567,7 @@ static int tree_content_set(
 	t = root->tree;
 	for (i = 0; i < t->entry_count; i++) {
 		e = t->entries[i];
-		if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
+		if (e->name->str_len == n && !fspathncmp(p, e->name->str_dat, n)) {
 			if (!*slash1) {
 				if (!S_ISDIR(mode)
 						&& e->versions[1].mode == mode
@@ -1602,7 +1657,7 @@ static int tree_content_remove(
 	t = root->tree;
 	for (i = 0; i < t->entry_count; i++) {
 		e = t->entries[i];
-		if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
+		if (e->name->str_len == n && !fspathncmp(p, e->name->str_dat, n)) {
 			if (*slash1 && !S_ISDIR(e->versions[1].mode))
 				/*
 				 * If p names a file in some subdirectory, and a
@@ -1669,7 +1724,7 @@ static int tree_content_get(
 	t = root->tree;
 	for (i = 0; i < t->entry_count; i++) {
 		e = t->entries[i];
-		if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
+		if (e->name->str_len == n && !fspathncmp(p, e->name->str_dat, n)) {
 			if (!*slash1)
 				goto found_entry;
 			if (!S_ISDIR(e->versions[1].mode))
@@ -1802,12 +1857,12 @@ static void dump_marks(void)
 	static struct lock_file mark_lock;
 	FILE *f;
 
-	if (!export_marks_file)
+	if (!export_marks_file || (import_marks_file && !import_marks_file_done))
 		return;
 
 	if (hold_lock_file_for_update(&mark_lock, export_marks_file, 0) < 0) {
-		failure |= error("Unable to write marks file %s: %s",
-			export_marks_file, strerror(errno));
+		failure |= error_errno("Unable to write marks file %s",
+				       export_marks_file);
 		return;
 	}
 
@@ -1822,8 +1877,8 @@ static void dump_marks(void)
 
 	dump_marks_helper(f, 0, marks);
 	if (commit_lock_file(&mark_lock)) {
-		failure |= error("Unable to write file %s: %s",
-			export_marks_file, strerror(errno));
+		failure |= error_errno("Unable to write file %s",
+				       export_marks_file);
 		return;
 	}
 }
@@ -1835,7 +1890,7 @@ static void read_marks(void)
 	if (f)
 		;
 	else if (import_marks_file_ignore_missing && errno == ENOENT)
-		return; /* Marks file does not exist */
+		goto done; /* Marks file does not exist */
 	else
 		die_errno("cannot read '%s'", import_marks_file);
 	while (fgets(line, sizeof(line), f)) {
@@ -1865,6 +1920,8 @@ static void read_marks(void)
 		insert_mark(mark, e);
 	}
 	fclose(f);
+done:
+	import_marks_file_done = 1;
 }
 
 
@@ -3317,6 +3374,7 @@ static void parse_option(const char *option)
 static void git_pack_config(void)
 {
 	int indexversion_value;
+	int limit;
 	unsigned long packsizelimit_value;
 
 	if (!git_config_get_ulong("pack.depth", &max_depth)) {
@@ -3341,6 +3399,11 @@ static void git_pack_config(void)
 	if (!git_config_get_ulong("pack.packsizelimit", &packsizelimit_value))
 		max_packsize = packsizelimit_value;
 
+	if (!git_config_get_int("fastimport.unpacklimit", &limit))
+		unpack_limit = limit;
+	else if (!git_config_get_int("transfer.unpacklimit", &limit))
+		unpack_limit = limit;
+
 	git_config(git_default_config, NULL);
 }
 
@@ -3381,14 +3444,10 @@ static void parse_argv(void)
 		read_marks();
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	unsigned int i;
 
-	git_extract_argv0_path(argv[0]);
-
-	git_setup_gettext();
-
 	if (argc == 2 && !strcmp(argv[1], "-h"))
 		usage(fast_import_usage);
 
diff --git a/fetch-pack.c b/fetch-pack.c
index b501d5c320..85e77af61d 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -243,16 +243,21 @@ static void insert_one_alternate_ref(const struct ref *ref, void *unused)
 
 #define INITIAL_FLUSH 16
 #define PIPESAFE_FLUSH 32
-#define LARGE_FLUSH 1024
+#define LARGE_FLUSH 16384
 
 static int next_flush(struct fetch_pack_args *args, int count)
 {
-	int flush_limit = args->stateless_rpc ? LARGE_FLUSH : PIPESAFE_FLUSH;
-
-	if (count < flush_limit)
-		count <<= 1;
-	else
-		count += flush_limit;
+	if (args->stateless_rpc) {
+		if (count < LARGE_FLUSH)
+			count <<= 1;
+		else
+			count = count * 11 / 10;
+	} else {
+		if (count < PIPESAFE_FLUSH)
+			count <<= 1;
+		else
+			count += PIPESAFE_FLUSH;
+	}
 	return count;
 }
 
diff --git a/fsck.c b/fsck.c
index 3366b3fb62..c9cf3de8d3 100644
--- a/fsck.c
+++ b/fsck.c
@@ -9,6 +9,7 @@
 #include "refs.h"
 #include "utf8.h"
 #include "sha1-array.h"
+#include "decorate.h"
 
 #define FSCK_FATAL -1
 #define FSCK_INFO -2
@@ -290,35 +291,87 @@ static int report(struct fsck_options *options, struct object *object,
 
 	va_start(ap, fmt);
 	strbuf_vaddf(&sb, fmt, ap);
-	result = options->error_func(object, msg_type, sb.buf);
+	result = options->error_func(options, object, msg_type, sb.buf);
 	strbuf_release(&sb);
 	va_end(ap);
 
 	return result;
 }
 
+static char *get_object_name(struct fsck_options *options, struct object *obj)
+{
+	if (!options->object_names)
+		return NULL;
+	return lookup_decoration(options->object_names, obj);
+}
+
+static void put_object_name(struct fsck_options *options, struct object *obj,
+	const char *fmt, ...)
+{
+	va_list ap;
+	struct strbuf buf = STRBUF_INIT;
+	char *existing;
+
+	if (!options->object_names)
+		return;
+	existing = lookup_decoration(options->object_names, obj);
+	if (existing)
+		return;
+	va_start(ap, fmt);
+	strbuf_vaddf(&buf, fmt, ap);
+	add_decoration(options->object_names, obj, strbuf_detach(&buf, NULL));
+	va_end(ap);
+}
+
+static const char *describe_object(struct fsck_options *o, struct object *obj)
+{
+	static struct strbuf buf = STRBUF_INIT;
+	char *name;
+
+	strbuf_reset(&buf);
+	strbuf_addstr(&buf, oid_to_hex(&obj->oid));
+	if (o->object_names && (name = lookup_decoration(o->object_names, obj)))
+		strbuf_addf(&buf, " (%s)", name);
+
+	return buf.buf;
+}
+
 static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *options)
 {
 	struct tree_desc desc;
 	struct name_entry entry;
 	int res = 0;
+	const char *name;
 
 	if (parse_tree(tree))
 		return -1;
 
+	name = get_object_name(options, &tree->object);
 	init_tree_desc(&desc, tree->buffer, tree->size);
 	while (tree_entry(&desc, &entry)) {
+		struct object *obj;
 		int result;
 
 		if (S_ISGITLINK(entry.mode))
 			continue;
-		if (S_ISDIR(entry.mode))
-			result = options->walk(&lookup_tree(entry.sha1)->object, OBJ_TREE, data, options);
-		else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode))
-			result = options->walk(&lookup_blob(entry.sha1)->object, OBJ_BLOB, data, options);
+
+		if (S_ISDIR(entry.mode)) {
+			obj = &lookup_tree(entry.oid->hash)->object;
+			if (name)
+				put_object_name(options, obj, "%s%s/", name,
+					entry.path);
+			result = options->walk(obj, OBJ_TREE, data, options);
+		}
+		else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode)) {
+			obj = &lookup_blob(entry.oid->hash)->object;
+			if (name)
+				put_object_name(options, obj, "%s%s", name,
+					entry.path);
+			result = options->walk(obj, OBJ_BLOB, data, options);
+		}
 		else {
 			result = error("in tree %s: entry %s has bad mode %.6o",
-					oid_to_hex(&tree->object.oid), entry.path, entry.mode);
+					describe_object(options, &tree->object), entry.path, entry.mode);
 		}
 		if (result < 0)
 			return result;
@@ -330,20 +383,55 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op
 
 static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_options *options)
 {
+	int counter = 0, generation = 0, name_prefix_len = 0;
 	struct commit_list *parents;
 	int res;
 	int result;
+	const char *name;
 
 	if (parse_commit(commit))
 		return -1;
 
+	name = get_object_name(options, &commit->object);
+	if (name)
+		put_object_name(options, &commit->tree->object, "%s:", name);
+
 	result = options->walk((struct object *)commit->tree, OBJ_TREE, data, options);
 	if (result < 0)
 		return result;
 	res = result;
 
 	parents = commit->parents;
+	if (name && parents) {
+		int len = strlen(name), power;
+
+		if (len && name[len - 1] == '^') {
+			generation = 1;
+			name_prefix_len = len - 1;
+		}
+		else { /* parse ~<generation> suffix */
+			for (generation = 0, power = 1;
+			     len && isdigit(name[len - 1]);
+			     power *= 10)
+				generation += power * (name[--len] - '0');
+			if (power > 1 && len && name[len - 1] == '~')
+				name_prefix_len = len - 1;
+		}
+	}
+
 	while (parents) {
+		if (name) {
+			struct object *obj = &parents->item->object;
+
+			if (++counter > 1)
+				put_object_name(options, obj, "%s^%d",
+					name, counter);
+			else if (generation > 0)
+				put_object_name(options, obj, "%.*s~%d",
+					name_prefix_len, name, generation + 1);
+			else
+				put_object_name(options, obj, "%s^", name);
+		}
 		result = options->walk((struct object *)parents->item, OBJ_COMMIT, data, options);
 		if (result < 0)
 			return result;
@@ -356,8 +444,12 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio
 
 static int fsck_walk_tag(struct tag *tag, void *data, struct fsck_options *options)
 {
+	char *name = get_object_name(options, &tag->object);
+
 	if (parse_tag(tag))
 		return -1;
+	if (name)
+		put_object_name(options, tag->tagged, "%s", name);
 	return options->walk(tag->tagged, OBJ_ANY, data, options);
 }
 
@@ -375,7 +467,7 @@ int fsck_walk(struct object *obj, void *data, struct fsck_options *options)
 	case OBJ_TAG:
 		return fsck_walk_tag((struct tag *)obj, data, options);
 	default:
-		error("Unknown object type for %s", oid_to_hex(&obj->oid));
+		error("Unknown object type for %s", describe_object(options, obj));
 		return -1;
 	}
 }
@@ -451,11 +543,11 @@ static int fsck_tree(struct tree *item, struct fsck_options *options)
 	while (desc.size) {
 		unsigned mode;
 		const char *name;
-		const unsigned char *sha1;
+		const struct object_id *oid;
 
-		sha1 = tree_entry_extract(&desc, &name, &mode);
+		oid = tree_entry_extract(&desc, &name, &mode);
 
-		has_null_sha1 |= is_null_sha1(sha1);
+		has_null_sha1 |= is_null_oid(oid);
 		has_full_path |= !!strchr(name, '/');
 		has_empty_name |= !*name;
 		has_dot |= !strcmp(name, ".");
@@ -818,12 +910,13 @@ int fsck_object(struct object *obj, void *data, unsigned long size,
 			  obj->type);
 }
 
-int fsck_error_function(struct object *obj, int msg_type, const char *message)
+int fsck_error_function(struct fsck_options *o,
+	struct object *obj, int msg_type, const char *message)
 {
 	if (msg_type == FSCK_WARN) {
-		warning("object %s: %s", oid_to_hex(&obj->oid), message);
+		warning("object %s: %s", describe_object(o, obj), message);
 		return 0;
 	}
-	error("object %s: %s", oid_to_hex(&obj->oid), message);
+	error("object %s: %s", describe_object(o, obj), message);
 	return 1;
 }
diff --git a/fsck.h b/fsck.h
index dded84b5f9..1891c1863b 100644
--- a/fsck.h
+++ b/fsck.h
@@ -23,9 +23,11 @@ int is_valid_msg_type(const char *msg_id, const char *msg_type);
 typedef int (*fsck_walk_func)(struct object *obj, int type, void *data, struct fsck_options *options);
 
 /* callback for fsck_object, type is FSCK_ERROR or FSCK_WARN */
-typedef int (*fsck_error)(struct object *obj, int type, const char *message);
+typedef int (*fsck_error)(struct fsck_options *o,
+	struct object *obj, int type, const char *message);
 
-int fsck_error_function(struct object *obj, int type, const char *message);
+int fsck_error_function(struct fsck_options *o,
+	struct object *obj, int type, const char *message);
 
 struct fsck_options {
 	fsck_walk_func walk;
@@ -33,6 +35,7 @@ struct fsck_options {
 	unsigned strict:1;
 	int *msg_type;
 	struct sha1_array *skiplist;
+	struct decoration *object_names;
 };
 
 #define FSCK_OPTIONS_DEFAULT { NULL, fsck_error_function, 0, NULL }
diff --git a/gettext.c b/gettext.c
index a268a2c52c..db727ea020 100644
--- a/gettext.c
+++ b/gettext.c
@@ -18,6 +18,8 @@
 #	endif
 #endif
 
+static const char *charset;
+
 /*
  * Guess the user's preferred languages from the value in LANGUAGE environment
  * variable and LC_MESSAGES locale category if NO_GETTEXT is not defined.
@@ -65,7 +67,6 @@ static int test_vsnprintf(const char *fmt, ...)
 	return ret;
 }
 
-static const char *charset;
 static void init_gettext_charset(const char *domain)
 {
 	/*
@@ -172,8 +173,27 @@ int gettext_width(const char *s)
 {
 	static int is_utf8 = -1;
 	if (is_utf8 == -1)
-		is_utf8 = !strcmp(charset, "UTF-8");
+		is_utf8 = is_utf8_locale();
 
 	return is_utf8 ? utf8_strwidth(s) : strlen(s);
 }
 #endif
+
+int is_utf8_locale(void)
+{
+#ifdef NO_GETTEXT
+	if (!charset) {
+		const char *env = getenv("LC_ALL");
+		if (!env || !*env)
+			env = getenv("LC_CTYPE");
+		if (!env || !*env)
+			env = getenv("LANG");
+		if (!env)
+			env = "";
+		if (strchr(env, '.'))
+			env = strchr(env, '.') + 1;
+		charset = xstrdup(env);
+	}
+#endif
+	return is_encoding_utf8(charset);
+}
diff --git a/gettext.h b/gettext.h
index 33696a40b8..7eee64a34f 100644
--- a/gettext.h
+++ b/gettext.h
@@ -90,5 +90,6 @@ const char *Q_(const char *msgid, const char *plu, unsigned long n)
 #endif
 
 const char *get_preferred_languages(void);
+extern int is_utf8_locale(void);
 
 #endif
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 77876d433a..642cce1ac6 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -45,6 +45,8 @@ my ($diff_new_color) =
 my $normal_color = $repo->get_color("", "reset");
 
 my $diff_algorithm = $repo->config('diff.algorithm');
+my $diff_compaction_heuristic = $repo->config_bool('diff.compactionheuristic');
+my $diff_filter = $repo->config('interactive.difffilter');
 
 my $use_readkey = 0;
 my $use_termcap = 0;
@@ -748,13 +750,23 @@ sub parse_diff {
 	if (defined $diff_algorithm) {
 		splice @diff_cmd, 1, 0, "--diff-algorithm=${diff_algorithm}";
 	}
+	if ($diff_compaction_heuristic) {
+		splice @diff_cmd, 1, 0, "--compaction-heuristic";
+	}
 	if (defined $patch_mode_revision) {
 		push @diff_cmd, get_diff_reference($patch_mode_revision);
 	}
 	my @diff = run_cmd_pipe("git", @diff_cmd, "--", $path);
 	my @colored = ();
 	if ($diff_use_color) {
-		@colored = run_cmd_pipe("git", @diff_cmd, qw(--color --), $path);
+		my @display_cmd = ("git", @diff_cmd, qw(--color --), $path);
+		if (defined $diff_filter) {
+			# quotemeta is overkill, but sufficient for shell-quoting
+			my $diff = join(' ', map { quotemeta } @display_cmd);
+			@display_cmd = ("$diff | $diff_filter");
+		}
+
+		@colored = run_cmd_pipe(@display_cmd);
 	}
 	my (@hunk) = { TEXT => [], DISPLAY => [], TYPE => 'header' };
 
@@ -765,7 +777,7 @@ sub parse_diff {
 		}
 		push @{$hunk[-1]{TEXT}}, $diff[$i];
 		push @{$hunk[-1]{DISPLAY}},
-			($diff_use_color ? $colored[$i] : $diff[$i]);
+			(@colored ? $colored[$i] : $diff[$i]);
 	}
 	return @hunk;
 }
diff --git a/git-bisect.sh b/git-bisect.sh
index 5d1cb00d86..ae3cb013e7 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -33,7 +33,6 @@ Please use "git help bisect" to get the full man page.'
 
 OPTIONS_SPEC=
 . git-sh-setup
-. git-sh-i18n
 
 _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
 _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
@@ -275,10 +274,11 @@ bisect_state() {
 	check_and_set_terms $state
 	case "$#,$state" in
 	0,*)
-		die "$(gettext "Please call 'bisect_state' with at least one argument.")" ;;
+		die "Please call 'bisect_state' with at least one argument." ;;
 	1,"$TERM_BAD"|1,"$TERM_GOOD"|1,skip)
-		rev=$(git rev-parse --verify $(bisect_head)) ||
-			die "$(gettext "Bad rev input: $(bisect_head)")"
+		bisected_head=$(bisect_head)
+		rev=$(git rev-parse --verify "$bisected_head") ||
+			die "$(eval_gettext "Bad rev input: \$bisected_head")"
 		bisect_write "$state" "$rev"
 		check_expected_revs "$rev" ;;
 	2,"$TERM_BAD"|*,"$TERM_GOOD"|*,skip)
diff --git a/git-compat-util.h b/git-compat-util.h
index 1f8b5f3b1f..590bfddf73 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -409,7 +409,9 @@ extern NORETURN void usagef(const char *err, ...) __attribute__((format (printf,
 extern NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2)));
 extern NORETURN void die_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
 extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
+extern int error_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
 extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
+extern void warning_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
 
 #ifndef NO_OPENSSL
 #ifdef APPLE_COMMON_CRYPTO
@@ -472,6 +474,23 @@ static inline int skip_prefix(const char *str, const char *prefix,
 }
 
 /*
+ * Like skip_prefix, but promises never to read past "len" bytes of the input
+ * buffer, and returns the remaining number of bytes in "out" via "outlen".
+ */
+static inline int skip_prefix_mem(const char *buf, size_t len,
+				  const char *prefix,
+				  const char **out, size_t *outlen)
+{
+	size_t prefix_len = strlen(prefix);
+	if (prefix_len <= len && !memcmp(buf, prefix, prefix_len)) {
+		*out = buf + prefix_len;
+		*outlen = len - prefix_len;
+		return 1;
+	}
+	return 0;
+}
+
+/*
  * If buf ends with suffix, return 1 and subtract the length of the suffix
  * from *len. Otherwise, return 0 and leave *len untouched.
  */
@@ -1043,3 +1062,5 @@ struct tm *git_gmtime_r(const time_t *, struct tm *);
 #endif
 
 #endif
+
+extern int cmd_main(int, const char **);
diff --git a/git-difftool.perl b/git-difftool.perl
index ebd13baa6e..a5790d03a0 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -37,14 +37,6 @@ USAGE
 	exit($exitcode);
 }
 
-sub find_worktree
-{
-	# Git->repository->wc_path() does not honor changes to the working
-	# tree location made by $ENV{GIT_WORK_TREE} or the 'core.worktree'
-	# config variable.
-	return Git::command_oneline('rev-parse', '--show-toplevel');
-}
-
 sub print_tool_help
 {
 	# See the comment at the bottom of file_diff() for the reason behind
@@ -67,14 +59,14 @@ sub exit_cleanup
 
 sub use_wt_file
 {
-	my ($repo, $workdir, $file, $sha1) = @_;
+	my ($workdir, $file, $sha1) = @_;
 	my $null_sha1 = '0' x 40;
 
 	if (-l "$workdir/$file" || ! -e _) {
 		return (0, $null_sha1);
 	}
 
-	my $wt_sha1 = $repo->command_oneline('hash-object', "$workdir/$file");
+	my $wt_sha1 = Git::command_oneline('hash-object', "$workdir/$file");
 	my $use = ($sha1 eq $null_sha1) || ($sha1 eq $wt_sha1);
 	return ($use, $wt_sha1);
 }
@@ -83,20 +75,17 @@ sub changed_files
 {
 	my ($repo_path, $index, $worktree) = @_;
 	$ENV{GIT_INDEX_FILE} = $index;
-	$ENV{GIT_WORK_TREE} = $worktree;
-	my $must_unset_git_dir = 0;
-	if (not defined($ENV{GIT_DIR})) {
-		$must_unset_git_dir = 1;
-		$ENV{GIT_DIR} = $repo_path;
-	}
 
-	my @refreshargs = qw/update-index --really-refresh -q --unmerged/;
-	my @gitargs = qw/diff-files --name-only -z/;
+	my @gitargs = ('--git-dir', $repo_path, '--work-tree', $worktree);
+	my @refreshargs = (
+		@gitargs, 'update-index',
+		'--really-refresh', '-q', '--unmerged');
 	try {
 		Git::command_oneline(@refreshargs);
 	} catch Git::Error::Command with {};
 
-	my $line = Git::command_oneline(@gitargs);
+	my @diffargs = (@gitargs, 'diff-files', '--name-only', '-z');
+	my $line = Git::command_oneline(@diffargs);
 	my @files;
 	if (defined $line) {
 		@files = split('\0', $line);
@@ -105,26 +94,15 @@ sub changed_files
 	}
 
 	delete($ENV{GIT_INDEX_FILE});
-	delete($ENV{GIT_WORK_TREE});
-	delete($ENV{GIT_DIR}) if ($must_unset_git_dir);
 
 	return map { $_ => 1 } @files;
 }
 
 sub setup_dir_diff
 {
-	my ($repo, $workdir, $symlinks) = @_;
-
-	# Run the diff; exit immediately if no diff found
-	# 'Repository' and 'WorkingCopy' must be explicitly set to insure that
-	# if $GIT_DIR and $GIT_WORK_TREE are set in ENV, they are actually used
-	# by Git->repository->command*.
-	my $repo_path = $repo->repo_path();
-	my %repo_args = (Repository => $repo_path, WorkingCopy => $workdir);
-	my $diffrepo = Git->repository(%repo_args);
-
+	my ($workdir, $symlinks) = @_;
 	my @gitargs = ('diff', '--raw', '--no-abbrev', '-z', @ARGV);
-	my $diffrtn = $diffrepo->command_oneline(@gitargs);
+	my $diffrtn = Git::command_oneline(@gitargs);
 	exit(0) unless defined($diffrtn);
 
 	# Build index info for left and right sides of the diff
@@ -176,12 +154,12 @@ EOF
 
 		if ($lmode eq $symlink_mode) {
 			$symlink{$src_path}{left} =
-				$diffrepo->command_oneline('show', "$lsha1");
+				Git::command_oneline('show', $lsha1);
 		}
 
 		if ($rmode eq $symlink_mode) {
 			$symlink{$dst_path}{right} =
-				$diffrepo->command_oneline('show', "$rsha1");
+				Git::command_oneline('show', $rsha1);
 		}
 
 		if ($lmode ne $null_mode and $status !~ /^C/) {
@@ -193,8 +171,8 @@ EOF
 			if ($working_tree_dups{$dst_path}++) {
 				next;
 			}
-			my ($use, $wt_sha1) = use_wt_file($repo, $workdir,
-							  $dst_path, $rsha1);
+			my ($use, $wt_sha1) =
+				use_wt_file($workdir, $dst_path, $rsha1);
 			if ($use) {
 				push @working_tree, $dst_path;
 				$wtindex .= "$rmode $wt_sha1\t$dst_path\0";
@@ -211,44 +189,34 @@ EOF
 	mkpath($ldir) or exit_cleanup($tmpdir, 1);
 	mkpath($rdir) or exit_cleanup($tmpdir, 1);
 
-	# If $GIT_DIR is not set prior to calling 'git update-index' and
-	# 'git checkout-index', then those commands will fail if difftool
-	# is called from a directory other than the repo root.
-	my $must_unset_git_dir = 0;
-	if (not defined($ENV{GIT_DIR})) {
-		$must_unset_git_dir = 1;
-		$ENV{GIT_DIR} = $repo_path;
-	}
-
 	# Populate the left and right directories based on each index file
 	my ($inpipe, $ctx);
 	$ENV{GIT_INDEX_FILE} = "$tmpdir/lindex";
 	($inpipe, $ctx) =
-		$repo->command_input_pipe(qw(update-index -z --index-info));
+		Git::command_input_pipe('update-index', '-z', '--index-info');
 	print($inpipe $lindex);
-	$repo->command_close_pipe($inpipe, $ctx);
+	Git::command_close_pipe($inpipe, $ctx);
 
 	my $rc = system('git', 'checkout-index', '--all', "--prefix=$ldir/");
 	exit_cleanup($tmpdir, $rc) if $rc != 0;
 
 	$ENV{GIT_INDEX_FILE} = "$tmpdir/rindex";
 	($inpipe, $ctx) =
-		$repo->command_input_pipe(qw(update-index -z --index-info));
+		Git::command_input_pipe('update-index', '-z', '--index-info');
 	print($inpipe $rindex);
-	$repo->command_close_pipe($inpipe, $ctx);
+	Git::command_close_pipe($inpipe, $ctx);
 
 	$rc = system('git', 'checkout-index', '--all', "--prefix=$rdir/");
 	exit_cleanup($tmpdir, $rc) if $rc != 0;
 
 	$ENV{GIT_INDEX_FILE} = "$tmpdir/wtindex";
 	($inpipe, $ctx) =
-		$repo->command_input_pipe(qw(update-index --info-only -z --index-info));
+		Git::command_input_pipe('update-index', '--info-only', '-z', '--index-info');
 	print($inpipe $wtindex);
-	$repo->command_close_pipe($inpipe, $ctx);
+	Git::command_close_pipe($inpipe, $ctx);
 
 	# If $GIT_DIR was explicitly set just for the update/checkout
 	# commands, then it should be unset before continuing.
-	delete($ENV{GIT_DIR}) if ($must_unset_git_dir);
 	delete($ENV{GIT_INDEX_FILE});
 
 	# Changes in the working tree need special treatment since they are
@@ -415,9 +383,9 @@ sub dir_diff
 	my $rc;
 	my $error = 0;
 	my $repo = Git->repository();
-	my $workdir = find_worktree();
-	my ($a, $b, $tmpdir, @worktree) =
-		setup_dir_diff($repo, $workdir, $symlinks);
+	my $repo_path = $repo->repo_path();
+	my $workdir = $repo->wc_path();
+	my ($a, $b, $tmpdir, @worktree) = setup_dir_diff($workdir, $symlinks);
 
 	if (defined($extcmd)) {
 		$rc = system($extcmd, $a, $b);
@@ -443,10 +411,10 @@ sub dir_diff
 		next if ! -f "$b/$file";
 
 		if (!$indices_loaded) {
-			%wt_modified = changed_files($repo->repo_path(),
-				"$tmpdir/wtindex", "$workdir");
-			%tmp_modified = changed_files($repo->repo_path(),
-				"$tmpdir/wtindex", "$b");
+			%wt_modified = changed_files(
+				$repo_path, "$tmpdir/wtindex", $workdir);
+			%tmp_modified = changed_files(
+				$repo_path, "$tmpdir/wtindex", $b);
 			$indices_loaded = 1;
 		}
 
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 8643f74cb0..308eafd1d3 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -5,14 +5,11 @@
 # Resolve two or more trees.
 #
 
+. git-sh-setup
+
 LF='
 '
 
-die () {
-    echo >&2 "$*"
-    exit 1
-}
-
 # The first parameters up to -- are merge bases; the rest are heads.
 bases= head= remotes= sep_seen=
 for arg
@@ -44,6 +41,12 @@ esac
 # MRC is the current "merge reference commit"
 # MRT is the current "merge result tree"
 
+if ! git diff-index --quiet --cached HEAD --
+then
+    gettextln "Error: Your local changes to the following files would be overwritten by merge"
+    git diff-index --cached --name-only HEAD -- | sed -e 's/^/    /'
+    exit 2
+fi
 MRC=$(git rev-parse --verify -q $head)
 MRT=$(git write-tree)
 NON_FF_MERGE=0
@@ -55,8 +58,8 @@ do
 		# We allow only last one to have a hand-resolvable
 		# conflicts.  Last round failed and we still had
 		# a head to merge.
-		echo "Automated merge did not work."
-		echo "Should not be doing an Octopus."
+		gettextln "Automated merge did not work."
+		gettextln "Should not be doing an Octopus."
 		exit 2
 	esac
 
@@ -67,11 +70,11 @@ do
 		eval pretty_name=\${GITHEAD_$SHA1_UP:-$pretty_name}
 	fi
 	common=$(git merge-base --all $SHA1 $MRC) ||
-		die "Unable to find common commit with $pretty_name"
+		die "$(eval_gettext "Unable to find common commit with \$pretty_name")"
 
 	case "$LF$common$LF" in
 	*"$LF$SHA1$LF"*)
-		echo "Already up-to-date with $pretty_name"
+		eval_gettextln "Already up-to-date with \$pretty_name"
 		continue
 		;;
 	esac
@@ -83,7 +86,7 @@ do
 		# tree as the intermediate result of the merge.
 		# We still need to count this as part of the parent set.
 
-		echo "Fast-forwarding to: $pretty_name"
+		eval_gettextln "Fast-forwarding to: \$pretty_name"
 		git read-tree -u -m $head $SHA1 || exit
 		MRC=$SHA1 MRT=$(git write-tree)
 		continue
@@ -91,12 +94,12 @@ do
 
 	NON_FF_MERGE=1
 
-	echo "Trying simple merge with $pretty_name"
+	eval_gettextln "Trying simple merge with \$pretty_name"
 	git read-tree -u -m --aggressive  $common $MRT $SHA1 || exit 2
 	next=$(git write-tree 2>/dev/null)
 	if test $? -ne 0
 	then
-		echo "Simple merge did not work, trying automatic merge."
+		gettextln "Simple merge did not work, trying automatic merge."
 		git-merge-index -o git-merge-one-file -a ||
 		OCTOPUS_FAILURE=1
 		next=$(git write-tree 2>/dev/null)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 92adcc0d07..9abd00be21 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -372,3 +372,28 @@ get_merge_tool () {
 	fi
 	echo "$merge_tool"
 }
+
+mergetool_find_win32_cmd () {
+	executable=$1
+	sub_directory=$2
+
+	# Use $executable if it exists in $PATH
+	if type -p "$executable" >/dev/null 2>&1
+	then
+		printf '%s' "$executable"
+		return
+	fi
+
+	# Look for executable in the typical locations
+	for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)=' |
+		cut -d '=' -f 2- | sort -u)
+	do
+		if test -n "$directory" && test -x "$directory/$sub_directory/$executable"
+		then
+			printf '%s' "$directory/$sub_directory/$executable"
+			return
+		fi
+	done
+
+	printf '%s' "$executable"
+}
diff --git a/git-p4.py b/git-p4.py
index e752153f6f..fd5ca52462 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1167,6 +1167,15 @@ class P4UserMap:
             self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
             self.emails[output["Email"]] = output["User"]
 
+        mapUserConfigRegex = re.compile(r"^\s*(\S+)\s*=\s*(.+)\s*<(\S+)>\s*$", re.VERBOSE)
+        for mapUserConfig in gitConfigList("git-p4.mapUser"):
+            mapUser = mapUserConfigRegex.findall(mapUserConfig)
+            if mapUser and len(mapUser[0]) == 3:
+                user = mapUser[0][0]
+                fullname = mapUser[0][1]
+                email = mapUser[0][2]
+                self.users[user] = fullname + " <" + email + ">"
+                self.emails[email] = user
 
         s = ''
         for (key, val) in self.users.items():
@@ -1925,7 +1934,7 @@ class P4Submit(Command, P4UserMap):
         if self.useClientSpec:
             self.clientSpecDirs = getClientSpec()
 
-        # Check for the existance of P4 branches
+        # Check for the existence of P4 branches
         branchesDetected = (len(p4BranchesInGit().keys()) > 1)
 
         if self.useClientSpec and not branchesDetected:
@@ -2265,7 +2274,7 @@ class P4Sync(Command, P4UserMap):
         self.useClientSpec_from_options = False
         self.clientSpecDirs = None
         self.tempBranches = []
-        self.tempBranchLocation = "git-p4-tmp"
+        self.tempBranchLocation = "refs/git-p4-tmp"
         self.largeFileSystem = None
 
         if gitConfig('git-p4.largeFileSystem'):
@@ -2318,6 +2327,15 @@ class P4Sync(Command, P4UserMap):
             fnum = fnum + 1
         return files
 
+    def extractJobsFromCommit(self, commit):
+        jobs = []
+        jnum = 0
+        while commit.has_key("job%s" % jnum):
+            job = commit["job%s" % jnum]
+            jobs.append(job)
+            jnum = jnum + 1
+        return jobs
+
     def stripRepoPath(self, path, prefixes):
         """When streaming files, this is called to map a p4 depot path
            to where it should go in git.  The prefixes are either
@@ -2656,13 +2674,14 @@ class P4Sync(Command, P4UserMap):
             return True
         hasPrefix = [p for p in self.branchPrefixes
                         if p4PathStartsWith(path, p)]
-        if hasPrefix and self.verbose:
+        if not hasPrefix and self.verbose:
             print('Ignoring file outside of prefix: {0}'.format(path))
         return hasPrefix
 
     def commit(self, details, files, branch, parent = ""):
         epoch = details["time"]
         author = details["user"]
+        jobs = self.extractJobsFromCommit(details)
 
         if self.verbose:
             print('commit into {0}'.format(branch))
@@ -2690,6 +2709,8 @@ class P4Sync(Command, P4UserMap):
 
         self.gitStream.write("data <<EOT\n")
         self.gitStream.write(details["desc"])
+        if len(jobs) > 0:
+            self.gitStream.write("\nJobs: %s" % (' '.join(jobs)))
         self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s" %
                              (','.join(self.branchPrefixes), details["change"]))
         if len(details['options']) > 0:
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 9ae898bc1d..375239341f 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -9,8 +9,8 @@
 # below were not inside any function, and expected to return
 # to the function that dot-sourced us.
 #
-# However, FreeBSD /bin/sh misbehaves on such a construct and
-# continues to run the statements that follow such a "return".
+# However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
+# construct and continue to run the statements that follow such a "return".
 # As a work-around, we introduce an extra layer of a function
 # here, and immediately call it after defining it.
 git_rebase__am () {
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 655ebaa471..e2da524f5a 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -121,14 +121,14 @@ mark_action_done () {
 	sed -e 1q < "$todo" >> "$done"
 	sed -e 1d < "$todo" >> "$todo".new
 	mv -f "$todo".new "$todo"
-	new_count=$(git stripspace --strip-comments <"$done" | wc -l)
+	new_count=$(( $(git stripspace --strip-comments <"$done" | wc -l) ))
 	echo $new_count >"$msgnum"
 	total=$(($new_count + $(git stripspace --strip-comments <"$todo" | wc -l)))
 	echo $total >"$end"
 	if test "$last_count" != "$new_count"
 	then
 		last_count=$new_count
-		printf "Rebasing (%d/%d)\r" $new_count $total
+		eval_gettext "Rebasing (\$new_count/\$total)"; printf "\r"
 		test -z "$verbose" || echo
 	fi
 }
@@ -144,29 +144,28 @@ reschedule_last_action () {
 }
 
 append_todo_help () {
-	git stripspace --comment-lines >>"$todo" <<\EOF
-
+	gettext "
 Commands:
  p, pick = use commit
  r, reword = use commit, but edit the commit message
  e, edit = use commit, but stop for amending
  s, squash = use commit, but meld into previous commit
- f, fixup = like "squash", but discard this commit's log message
+ f, fixup = like \"squash\", but discard this commit's log message
  x, exec = run command (the rest of the line) using shell
  d, drop = remove commit
 
 These lines can be re-ordered; they are executed from top to bottom.
+" | git stripspace --comment-lines >>"$todo"
 
-EOF
 	if test $(get_missing_commit_check_level) = error
 	then
-		git stripspace --comment-lines >>"$todo" <<\EOF
+		gettext "
 Do not remove any line. Use 'drop' explicitly to remove a commit.
-EOF
+" | git stripspace --comment-lines >>"$todo"
 	else
-		git stripspace --comment-lines >>"$todo" <<\EOF
+		gettext "
 If you remove a line here THAT COMMIT WILL BE LOST.
-EOF
+" | git stripspace --comment-lines >>"$todo"
 	fi
 }
 
@@ -192,7 +191,6 @@ make_patch () {
 die_with_patch () {
 	echo "$1" > "$state_dir"/stopped-sha
 	make_patch "$1"
-	git rerere
 	die "$2"
 }
 
@@ -201,18 +199,20 @@ exit_with_patch () {
 	make_patch $1
 	git rev-parse --verify HEAD > "$amend"
 	gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
-	warn "You can amend the commit now, with"
-	warn
-	warn "	git commit --amend $gpg_sign_opt_quoted"
-	warn
-	warn "Once you are satisfied with your changes, run"
-	warn
-	warn "	git rebase --continue"
+	warn "$(eval_gettext "\
+You can amend the commit now, with
+
+	git commit --amend \$gpg_sign_opt_quoted
+
+Once you are satisfied with your changes, run
+
+	git rebase --continue")"
 	warn
 	exit $2
 }
 
 die_abort () {
+	apply_autostash
 	rm -rf "$state_dir"
 	die "$1"
 }
@@ -222,10 +222,12 @@ has_action () {
 }
 
 is_empty_commit() {
-	tree=$(git rev-parse -q --verify "$1"^{tree} 2>/dev/null ||
-		die "$1: not a commit that can be picked")
-	ptree=$(git rev-parse -q --verify "$1"^^{tree} 2>/dev/null ||
-		ptree=4b825dc642cb6eb9a060e54bf8d69288fbee4904)
+	tree=$(git rev-parse -q --verify "$1"^{tree} 2>/dev/null) || {
+		sha1=$1
+		die "$(eval_gettext "\$sha1: not a commit that can be picked")"
+	}
+	ptree=$(git rev-parse -q --verify "$1"^^{tree} 2>/dev/null) ||
+		ptree=4b825dc642cb6eb9a060e54bf8d69288fbee4904
 	test "$tree" = "$ptree"
 }
 
@@ -261,7 +263,7 @@ pick_one () {
 
 	case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac
 	case "$force_rebase" in '') ;; ?*) ff= ;; esac
-	output git rev-parse --verify $sha1 || die "Invalid commit name: $sha1"
+	output git rev-parse --verify $sha1 || die "$(eval_gettext "Invalid commit name: \$sha1")"
 
 	if is_empty_commit "$sha1"
 	then
@@ -303,7 +305,7 @@ pick_one_preserving_merges () {
 				git rev-parse HEAD > "$rewritten"/$current_commit
 			done <"$state_dir"/current-commit
 			rm "$state_dir"/current-commit ||
-			die "Cannot write current commit's replacement sha1"
+				die "$(gettext "Cannot write current commit's replacement sha1")"
 		fi
 	fi
 
@@ -355,9 +357,9 @@ pick_one_preserving_merges () {
 	done
 	case $fast_forward in
 	t)
-		output warn "Fast-forward to $sha1"
+		output warn "$(eval_gettext "Fast-forward to \$sha1")"
 		output git reset --hard $sha1 ||
-			die "Cannot fast-forward to $sha1"
+			die "$(eval_gettext "Cannot fast-forward to \$sha1")"
 		;;
 	f)
 		first_parent=$(expr "$new_parents" : ' \([^ ]*\)')
@@ -366,12 +368,12 @@ pick_one_preserving_merges () {
 		then
 			# detach HEAD to current parent
 			output git checkout $first_parent 2> /dev/null ||
-				die "Cannot move HEAD to $first_parent"
+				die "$(eval_gettext "Cannot move HEAD to \$first_parent")"
 		fi
 
 		case "$new_parents" in
 		' '*' '*)
-			test "a$1" = a-n && die "Refusing to squash a merge: $sha1"
+			test "a$1" = a-n && die "$(eval_gettext "Refusing to squash a merge: \$sha1")"
 
 			# redo merge
 			author_script_content=$(get_author_ident_from_commit $sha1)
@@ -385,7 +387,7 @@ pick_one_preserving_merges () {
 				$merge_args $strategy_args -m "$msg_content" $new_parents'
 			then
 				printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG
-				die_with_patch $sha1 "Error redoing merge $sha1"
+				die_with_patch $sha1 "$(eval_gettext "Error redoing merge \$sha1")"
 			fi
 			echo "$sha1 $(git rev-parse HEAD^0)" >> "$rewritten_list"
 			;;
@@ -393,19 +395,59 @@ pick_one_preserving_merges () {
 			output eval git cherry-pick \
 				${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \
 				"$strategy_args" "$@" ||
-				die_with_patch $sha1 "Could not pick $sha1"
+				die_with_patch $sha1 "$(eval_gettext "Could not pick \$sha1")"
 			;;
 		esac
 		;;
 	esac
 }
 
-nth_string () {
-	case "$1" in
-	*1[0-9]|*[04-9]) echo "$1"th;;
-	*1) echo "$1"st;;
-	*2) echo "$1"nd;;
-	*3) echo "$1"rd;;
+this_nth_commit_message () {
+	n=$1
+	case "$n" in
+	1) gettext "This is the 1st commit message:";;
+	2) gettext "This is the 2nd commit message:";;
+	3) gettext "This is the 3rd commit message:";;
+	4) gettext "This is the 4th commit message:";;
+	5) gettext "This is the 5th commit message:";;
+	6) gettext "This is the 6th commit message:";;
+	7) gettext "This is the 7th commit message:";;
+	8) gettext "This is the 8th commit message:";;
+	9) gettext "This is the 9th commit message:";;
+	10) gettext "This is the 10th commit message:";;
+	# TRANSLATORS: if the language you are translating into
+	# doesn't allow you to compose a sentence in this fashion,
+	# consider translating as if this and the following few strings
+	# were "This is the commit message ${n}:"
+	*1[0-9]|*[04-9]) eval_gettext "This is the \${n}th commit message:";;
+	*1) eval_gettext "This is the \${n}st commit message:";;
+	*2) eval_gettext "This is the \${n}nd commit message:";;
+	*3) eval_gettext "This is the \${n}rd commit message:";;
+	*) eval_gettext "This is the commit message \${n}:";;
+	esac
+}
+skip_nth_commit_message () {
+	n=$1
+	case "$n" in
+	1) gettext "The 1st commit message will be skipped:";;
+	2) gettext "The 2nd commit message will be skipped:";;
+	3) gettext "The 3rd commit message will be skipped:";;
+	4) gettext "The 4th commit message will be skipped:";;
+	5) gettext "The 5th commit message will be skipped:";;
+	6) gettext "The 6th commit message will be skipped:";;
+	7) gettext "The 7th commit message will be skipped:";;
+	8) gettext "The 8th commit message will be skipped:";;
+	9) gettext "The 9th commit message will be skipped:";;
+	10) gettext "The 10th commit message will be skipped:";;
+	# TRANSLATORS: if the language you are translating into
+	# doesn't allow you to compose a sentence in this fashion,
+	# consider translating as if this and the following few strings
+	# were "The commit message ${n} will be skipped:"
+	*1[0-9]|*[04-9]) eval_gettext "The \${n}th commit message will be skipped:";;
+	*1) eval_gettext "The \${n}st commit message will be skipped:";;
+	*2) eval_gettext "The \${n}nd commit message will be skipped:";;
+	*3) eval_gettext "The \${n}rd commit message will be skipped:";;
+	*) eval_gettext "The commit message \${n} will be skipped:";;
 	esac
 }
 
@@ -413,20 +455,23 @@ update_squash_messages () {
 	if test -f "$squash_msg"; then
 		mv "$squash_msg" "$squash_msg".bak || exit
 		count=$(($(sed -n \
-			-e "1s/^. This is a combination of \(.*\) commits\./\1/p" \
+			-e "1s/^$comment_char.*\([0-9][0-9]*\).*/\1/p" \
 			-e "q" < "$squash_msg".bak)+1))
 		{
-			printf '%s\n' "$comment_char This is a combination of $count commits."
+			printf '%s\n' "$comment_char $(eval_ngettext \
+				"This is a combination of \$count commit." \
+				"This is a combination of \$count commits." \
+				$count)"
 			sed -e 1d -e '2,/^./{
 				/^$/d
 			}' <"$squash_msg".bak
 		} >"$squash_msg"
 	else
-		commit_message HEAD > "$fixup_msg" || die "Cannot write $fixup_msg"
+		commit_message HEAD > "$fixup_msg" || die "$(gettext "Cannot write \$fixup_msg")"
 		count=2
 		{
-			printf '%s\n' "$comment_char This is a combination of 2 commits."
-			printf '%s\n' "$comment_char The first commit's message is:"
+			printf '%s\n' "$comment_char $(gettext "This is a combination of 2 commits.")"
+			printf '%s\n' "$comment_char $(gettext "This is the 1st commit message:")"
 			echo
 			cat "$fixup_msg"
 		} >"$squash_msg"
@@ -435,13 +480,13 @@ update_squash_messages () {
 	squash)
 		rm -f "$fixup_msg"
 		echo
-		printf '%s\n' "$comment_char This is the $(nth_string $count) commit message:"
+		printf '%s\n' "$comment_char $(this_nth_commit_message $count)"
 		echo
 		commit_message $2
 		;;
 	fixup)
 		echo
-		printf '%s\n' "$comment_char The $(nth_string $count) commit message will be skipped:"
+		printf '%s\n' "$comment_char $(skip_nth_commit_message $count)"
 		echo
 		# Change the space after the comment character to TAB:
 		commit_message $2 | git stripspace --comment-lines | sed -e 's/ /	/'
@@ -460,12 +505,14 @@ peek_next_command () {
 # messages, effectively causing the combined commit to be used as the
 # new basis for any further squash/fixups.  Args: sha1 rest
 die_failed_squash() {
+	sha1=$1
+	rest=$2
 	mv "$squash_msg" "$msg" || exit
 	rm -f "$fixup_msg"
 	cp "$msg" "$GIT_DIR"/MERGE_MSG || exit
 	warn
-	warn "Could not apply $1... $2"
-	die_with_patch $1 ""
+	warn "$(eval_gettext "Could not apply \$sha1... \$rest")"
+	die_with_patch $sha1 ""
 }
 
 flush_rewritten_pending() {
@@ -489,6 +536,8 @@ record_in_rewritten() {
 }
 
 do_pick () {
+	sha1=$1
+	rest=$2
 	if test "$(git rev-parse HEAD)" = "$squash_onto"
 	then
 		# Set the correct commit message and author info on the
@@ -500,15 +549,15 @@ do_pick () {
 		# resolve before manually running git commit --amend then git
 		# rebase --continue.
 		git commit --allow-empty --allow-empty-message --amend \
-			   --no-post-rewrite -n -q -C $1 &&
-			pick_one -n $1 &&
+			   --no-post-rewrite -n -q -C $sha1 &&
+			pick_one -n $sha1 &&
 			git commit --allow-empty --allow-empty-message \
-				   --amend --no-post-rewrite -n -q -C $1 \
+				   --amend --no-post-rewrite -n -q -C $sha1 \
 				   ${gpg_sign_opt:+"$gpg_sign_opt"} ||
-			die_with_patch $1 "Could not apply $1... $2"
+				   die_with_patch $sha1 "$(eval_gettext "Could not apply \$sha1... \$rest")"
 	else
-		pick_one $1 ||
-			die_with_patch $1 "Could not apply $1... $2"
+		pick_one $sha1 ||
+			die_with_patch $sha1 "$(eval_gettext "Could not apply \$sha1... \$rest")"
 	fi
 }
 
@@ -536,10 +585,11 @@ do_next () {
 		mark_action_done
 		do_pick $sha1 "$rest"
 		git commit --amend --no-post-rewrite ${gpg_sign_opt:+"$gpg_sign_opt"} || {
-			warn "Could not amend commit after successfully picking $sha1... $rest"
-			warn "This is most likely due to an empty commit message, or the pre-commit hook"
-			warn "failed. If the pre-commit hook failed, you may need to resolve the issue before"
-			warn "you are able to reword the commit."
+			warn "$(eval_gettext "\
+Could not amend commit after successfully picking \$sha1... \$rest
+This is most likely due to an empty commit message, or the pre-commit hook
+failed. If the pre-commit hook failed, you may need to resolve the issue before
+you are able to reword the commit.")"
 			exit_with_patch $sha1 1
 		}
 		record_in_rewritten $sha1
@@ -549,7 +599,8 @@ do_next () {
 
 		mark_action_done
 		do_pick $sha1 "$rest"
-		warn "Stopped at $sha1... $rest"
+		sha1_abbrev=$(git rev-parse --short $sha1)
+		warn "$(eval_gettext "Stopped at \$sha1_abbrev... \$rest")"
 		exit_with_patch $sha1 0
 		;;
 	squash|s|fixup|f)
@@ -564,7 +615,7 @@ do_next () {
 		comment_for_reflog $squash_style
 
 		test -f "$done" && has_action "$done" ||
-			die "Cannot '$squash_style' without a previous commit"
+			die "$(eval_gettext "Cannot '\$squash_style' without a previous commit")"
 
 		mark_action_done
 		update_squash_messages $squash_style $sha1
@@ -606,7 +657,7 @@ do_next () {
 	x|"exec")
 		read -r command rest < "$todo"
 		mark_action_done
-		printf 'Executing: %s\n' "$rest"
+		eval_gettextln "Executing: \$rest"
 		"${SHELL:-@SHELL_PATH@}" -c "$rest" # Actual execution
 		status=$?
 		# Run in subshell because require_clean_work_tree can die.
@@ -614,13 +665,14 @@ do_next () {
 		(require_clean_work_tree "rebase" 2>/dev/null) || dirty=t
 		if test "$status" -ne 0
 		then
-			warn "Execution failed: $rest"
+			warn "$(eval_gettext "Execution failed: \$rest")"
 			test "$dirty" = f ||
-			warn "and made changes to the index and/or the working tree"
+				warn "$(gettext "and made changes to the index and/or the working tree")"
 
-			warn "You can fix the problem, and then run"
-			warn
-			warn "	git rebase --continue"
+			warn "$(gettext "\
+You can fix the problem, and then run
+
+	git rebase --continue")"
 			warn
 			if test $status -eq 127		# command not found
 			then
@@ -629,18 +681,20 @@ do_next () {
 			exit "$status"
 		elif test "$dirty" = t
 		then
-			warn "Execution succeeded: $rest"
-			warn "but left changes to the index and/or the working tree"
-			warn "Commit or stash your changes, and then run"
-			warn
-			warn "	git rebase --continue"
+			# TRANSLATORS: after these lines is a command to be issued by the user
+			warn "$(eval_gettext "\
+Execution succeeded: \$rest
+but left changes to the index and/or the working tree
+Commit or stash your changes, and then run
+
+	git rebase --continue")"
 			warn
 			exit 1
 		fi
 		;;
 	*)
-		warn "Unknown command: $command $sha1 $rest"
-		fixtodo="Please fix this using 'git rebase --edit-todo'."
+		warn "$(eval_gettext "Unknown command: \$command \$sha1 \$rest")"
+		fixtodo="$(gettext "Please fix this using 'git rebase --edit-todo'.")"
 		if git rev-parse --verify -q "$sha1" >/dev/null
 		then
 			die_with_patch $sha1 "$fixtodo"
@@ -675,7 +729,7 @@ do_next () {
 		"$hook" rebase < "$rewritten_list"
 		true # we don't care if this hook failed
 	fi &&
-	warn "Successfully rebased and updated $head_name."
+		warn "$(eval_gettext "Successfully rebased and updated \$head_name.")"
 
 	return 1 # not failure; just to break the do_rest loop
 }
@@ -722,7 +776,7 @@ skip_unnecessary_picks () {
 		record_in_rewritten "$onto"
 		;;
 	esac ||
-	die "Could not skip unnecessary pick commands"
+		die "$(gettext "Could not skip unnecessary pick commands")"
 }
 
 transform_todo_ids () {
@@ -866,12 +920,12 @@ add_exec_commands () {
 # $3: the input filename
 check_commit_sha () {
 	badsha=0
-	if test -z $1
+	if test -z "$1"
 	then
 		badsha=1
 	else
 		sha1_verif="$(git rev-parse --verify --quiet $1^{commit})"
-		if test -z $sha1_verif
+		if test -z "$sha1_verif"
 		then
 			badsha=1
 		fi
@@ -880,9 +934,9 @@ check_commit_sha () {
 	if test $badsha -ne 0
 	then
 		line="$(sed -n -e "${2}p" "$3")"
-		warn "Warning: the SHA-1 is missing or isn't" \
-			"a commit in the following line:"
-		warn " - $line"
+		warn "$(eval_gettext "\
+Warning: the SHA-1 is missing or isn't a commit in the following line:
+ - \$line")"
 		warn
 	fi
 
@@ -913,9 +967,9 @@ check_bad_cmd_and_sha () {
 			;;
 		*)
 			line="$(sed -n -e "${lineno}p" "$1")"
-			warn "Warning: the command isn't recognized" \
-				"in the following line:"
-			warn " - $line"
+			warn "$(eval_gettext "\
+Warning: the command isn't recognized in the following line:
+ - \$line")"
 			warn
 			retval=1
 			;;
@@ -952,7 +1006,7 @@ warn_lines () {
 # Switch to the branch in $into and notify it in the reflog
 checkout_onto () {
 	GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name"
-	output git checkout $onto || die_abort "could not detach HEAD"
+	output git checkout $onto || die_abort "$(gettext "could not detach HEAD")"
 	git update-ref ORIG_HEAD $orig_head
 }
 
@@ -990,28 +1044,26 @@ check_todo_list () {
 		then
 			test "$check_level" = error && raise_error=t
 
-			warn "Warning: some commits may have been dropped" \
-				"accidentally."
-			warn "Dropped commits (newer to older):"
+			warn "$(gettext "\
+Warning: some commits may have been dropped accidentally.
+Dropped commits (newer to older):")"
 
 			# Make the list user-friendly and display
 			opt="--no-walk=sorted --format=oneline --abbrev-commit --stdin"
 			git rev-list $opt <"$todo".miss | warn_lines
 
-			warn "To avoid this message, use \"drop\" to" \
-				"explicitly remove a commit."
-			warn
-			warn "Use 'git config rebase.missingCommitsCheck' to change" \
-				"the level of warnings."
-			warn "The possible behaviours are: ignore, warn, error."
+			warn "$(gettext "\
+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.")"
 			warn
 		fi
 		;;
 	ignore)
 		;;
 	*)
-		warn "Unrecognized setting $check_level for option" \
-			"rebase.missingCommitsCheck. Ignoring."
+		warn "$(eval_gettext "Unrecognized setting \$check_level for option rebase.missingCommitsCheck. Ignoring.")"
 		;;
 	esac
 
@@ -1028,8 +1080,8 @@ check_todo_list () {
 		# placed before the commit of the next action
 		checkout_onto
 
-		warn "You can fix this with 'git rebase --edit-todo'."
-		die "Or you can abort the rebase with 'git rebase --abort'."
+		warn "$(gettext "You can fix this with 'git rebase --edit-todo'.")"
+		die "$(gettext "Or you can abort the rebase with 'git rebase --abort'.")"
 	fi
 }
 
@@ -1038,8 +1090,8 @@ check_todo_list () {
 # below were not inside any function, and expected to return
 # to the function that dot-sourced us.
 #
-# However, FreeBSD /bin/sh misbehaves on such a construct and
-# continues to run the statements that follow such a "return".
+# However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
+# construct and continue to run the statements that follow such a "return".
 # As a work-around, we introduce an extra layer of a function
 # here, and immediately call it after defining it.
 git_rebase__interactive () {
@@ -1053,41 +1105,43 @@ continue)
 
 		test ! -f "$GIT_DIR"/CHERRY_PICK_HEAD ||
 		rm "$GIT_DIR"/CHERRY_PICK_HEAD ||
-		die "Could not remove CHERRY_PICK_HEAD"
+		die "$(gettext "Could not remove CHERRY_PICK_HEAD")"
 	else
 		if ! test -f "$author_script"
 		then
 			gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
-			die "You have staged changes in your working tree. If these changes are meant to be
+			die "$(eval_gettext "\
+You have staged changes in your working tree.
+If these changes are meant to be
 squashed into the previous commit, run:
 
-  git commit --amend $gpg_sign_opt_quoted
+  git commit --amend \$gpg_sign_opt_quoted
 
 If they are meant to go into a new commit, run:
 
-  git commit $gpg_sign_opt_quoted
+  git commit \$gpg_sign_opt_quoted
 
 In both case, once you're done, continue with:
 
   git rebase --continue
-"
+")"
 		fi
 		. "$author_script" ||
-			die "Error trying to find the author identity to amend commit"
+			die "$(gettext "Error trying to find the author identity to amend commit")"
 		if test -f "$amend"
 		then
 			current_head=$(git rev-parse --verify HEAD)
 			test "$current_head" = $(cat "$amend") ||
-			die "\
-You have uncommitted changes in your working tree. Please, commit them
-first and then run 'git rebase --continue' again."
+			die "$(gettext "\
+You have uncommitted changes in your working tree. Please commit them
+first and then run 'git rebase --continue' again.")"
 			do_with_author git commit --amend --no-verify -F "$msg" -e \
 				${gpg_sign_opt:+"$gpg_sign_opt"} ||
-				die "Could not commit staged changes."
+				die "$(gettext "Could not commit staged changes.")"
 		else
 			do_with_author git commit --no-verify -F "$msg" -e \
 				${gpg_sign_opt:+"$gpg_sign_opt"} ||
-				die "Could not commit staged changes."
+				die "$(gettext "Could not commit staged changes.")"
 		fi
 	fi
 
@@ -1111,16 +1165,15 @@ edit-todo)
 	mv -f "$todo".new "$todo"
 	collapse_todo_ids
 	append_todo_help
-	git stripspace --comment-lines >>"$todo" <<\EOF
-
+	gettext "
 You are editing the todo file of an ongoing interactive rebase.
 To continue rebase after editing, run:
     git rebase --continue
 
-EOF
+" | git stripspace --comment-lines >>"$todo"
 
 	git_sequence_editor "$todo" ||
-		die "Could not execute editor"
+		die "$(gettext "Could not execute editor")"
 	expand_todo_ids
 
 	exit
@@ -1128,7 +1181,7 @@ EOF
 esac
 
 git var GIT_COMMITTER_IDENT >/dev/null ||
-	die "You need to set your committer info first"
+	die "$(gettext "You need to set your committer info first")"
 
 comment_for_reflog start
 
@@ -1136,15 +1189,15 @@ if test ! -z "$switch_to"
 then
 	GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to"
 	output git checkout "$switch_to" -- ||
-	die "Could not checkout $switch_to"
+		die "$(eval_gettext "Could not checkout \$switch_to")"
 
 	comment_for_reflog start
 fi
 
-orig_head=$(git rev-parse --verify HEAD) || die "No HEAD?"
-mkdir -p "$state_dir" || die "Could not create temporary $state_dir"
+orig_head=$(git rev-parse --verify HEAD) || die "$(gettext "No HEAD?")"
+mkdir -p "$state_dir" || die "$(eval_gettext "Could not create temporary \$state_dir")"
 
-: > "$state_dir"/interactive || die "Could not mark as interactive"
+: > "$state_dir"/interactive || die "$(gettext "Could not mark as interactive")"
 write_basic_state
 if test t = "$preserve_merges"
 then
@@ -1154,12 +1207,12 @@ then
 		for c in $(git merge-base --all $orig_head $upstream)
 		do
 			echo $onto > "$rewritten"/$c ||
-				die "Could not init rewritten commits"
+				die "$(gettext "Could not init rewritten commits")"
 		done
 	else
 		mkdir "$rewritten" &&
 		echo $onto > "$rewritten"/root ||
-			die "Could not init rewritten commits"
+			die "$(gettext "Could not init rewritten commits")"
 	fi
 	# No cherry-pick because our first pass is to determine
 	# parents to rewrite and skipping dropped commits would
@@ -1258,18 +1311,20 @@ todocount=${todocount##* }
 
 cat >>"$todo" <<EOF
 
-$comment_char Rebase $shortrevisions onto $shortonto ($todocount command(s))
+$comment_char $(eval_ngettext \
+	"Rebase \$shortrevisions onto \$shortonto (\$todocount command)" \
+	"Rebase \$shortrevisions onto \$shortonto (\$todocount commands)" \
+	"$todocount")
 EOF
 append_todo_help
-git stripspace --comment-lines >>"$todo" <<\EOF
-
+gettext "
 However, if you remove everything, the rebase will be aborted.
 
-EOF
+" | git stripspace --comment-lines >>"$todo"
 
 if test -z "$keep_empty"
 then
-	printf '%s\n' "$comment_char Note that empty commits are commented out" >>"$todo"
+	printf '%s\n' "$comment_char $(gettext "Note that empty commits are commented out")" >>"$todo"
 fi
 
 
@@ -1279,7 +1334,7 @@ has_action "$todo" ||
 cp "$todo" "$todo".backup
 collapse_todo_ids
 git_sequence_editor "$todo" ||
-	die_abort "Could not execute editor"
+	die_abort "$(gettext "Could not execute editor")"
 
 has_action "$todo" ||
 	return 2
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index 2cc2a6d273..06a4723d4d 100644
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -67,7 +67,9 @@ call_merge () {
 		GIT_MERGE_VERBOSITY=1 && export GIT_MERGE_VERBOSITY
 	fi
 	test -z "$strategy" && strategy=recursive
-	eval 'git-merge-$strategy' $strategy_opts '"$cmt^" -- "$hd" "$cmt"'
+	# If cmt doesn't have a parent, don't include it as a base
+	base=$(git rev-parse --verify --quiet $cmt^)
+	eval 'git-merge-$strategy' $strategy_opts $base ' -- "$hd" "$cmt"'
 	rv=$?
 	case "$rv" in
 	0)
@@ -105,8 +107,8 @@ finish_rb_merge () {
 # below were not inside any function, and expected to return
 # to the function that dot-sourced us.
 #
-# However, FreeBSD /bin/sh misbehaves on such a construct and
-# continues to run the statements that follow such a "return".
+# However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
+# construct and continue to run the statements that follow such a "return".
 # As a work-around, we introduce an extra layer of a function
 # here, and immediately call it after defining it.
 git_rebase__merge () {
diff --git a/git-rebase.sh b/git-rebase.sh
index cf60c43908..04f6e44bc8 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -45,7 +45,6 @@ skip!              skip current patch and continue
 edit-todo!         edit the todo list during an interactive rebase
 "
 . git-sh-setup
-. git-sh-i18n
 set_reflog_action rebase
 require_work_tree_exists
 cd_to_toplevel
@@ -87,7 +86,10 @@ preserve_merges=
 autosquash=
 keep_empty=
 test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t
-gpg_sign_opt=
+case "$(git config --bool commit.gpgsign)" in
+true)	gpg_sign_opt=-S ;;
+*)	gpg_sign_opt= ;;
+esac
 
 read_basic_state () {
 	test -f "$state_dir/head-name" &&
@@ -151,7 +153,7 @@ move_to_original_branch () {
 		git symbolic-ref \
 			-m "rebase finished: returning to $head_name" \
 			HEAD $head_name ||
-		die "$(gettext "Could not move back to $head_name")"
+		die "$(eval_gettext "Could not move back to \$head_name")"
 		;;
 	esac
 }
@@ -248,6 +250,7 @@ do
 		;;
 	--exec=*)
 		cmd="${cmd}exec ${1#--exec=}${LF}"
+		test -z "$interactive_rebase" && interactive_rebase=implied
 		;;
 	--interactive)
 		interactive_rebase=explicit
@@ -348,12 +351,6 @@ do
 done
 test $# -gt 2 && usage
 
-if test -n "$cmd" &&
-   test "$interactive_rebase" != explicit
-then
-	die "$(gettext "The --exec option must be used with the --interactive option")"
-fi
-
 if test -n "$action"
 then
 	test -z "$in_progress" && die "$(gettext "No rebase in progress?")"
@@ -451,7 +448,7 @@ then
 		then
 			. git-parse-remote
 			error_on_missing_default_upstream "rebase" "rebase" \
-				"against" "git rebase <branch>"
+				"against" "git rebase $(gettext '<branch>')"
 		fi
 
 		test "$fork_point" = auto && fork_point=t
diff --git a/git-send-email.perl b/git-send-email.perl
index 69587856df..da81be40cb 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -621,6 +621,8 @@ if (@rev_list_opts) {
 	push @files, $repo->command('format-patch', '-o', tempdir(CLEANUP => 1), @rev_list_opts);
 }
 
+@files = handle_backup_files(@files);
+
 if ($validate) {
 	foreach my $f (@files) {
 		unless (-p $f) {
@@ -1727,6 +1729,44 @@ sub validate_patch {
 	return;
 }
 
+sub handle_backup {
+	my ($last, $lastlen, $file, $known_suffix) = @_;
+	my ($suffix, $skip);
+
+	$skip = 0;
+	if (defined $last &&
+	    ($lastlen < length($file)) &&
+	    (substr($file, 0, $lastlen) eq $last) &&
+	    ($suffix = substr($file, $lastlen)) !~ /^[a-z0-9]/i) {
+		if (defined $known_suffix && $suffix eq $known_suffix) {
+			print "Skipping $file with backup suffix '$known_suffix'.\n";
+			$skip = 1;
+		} else {
+			my $answer = ask("Do you really want to send $file? (y|N): ",
+					 valid_re => qr/^(?:y|n)/i,
+					 default => 'n');
+			$skip = ($answer ne 'y');
+			if ($skip) {
+				$known_suffix = $suffix;
+			}
+		}
+	}
+	return ($skip, $known_suffix);
+}
+
+sub handle_backup_files {
+	my @file = @_;
+	my ($last, $lastlen, $known_suffix, $skip, @result);
+	for my $file (@file) {
+		($skip, $known_suffix) = handle_backup($last, $lastlen,
+						       $file, $known_suffix);
+		push @result, $file unless $skip;
+		$last = $file;
+		$lastlen = length($file);
+	}
+	return @result;
+}
+
 sub file_has_nonascii {
 	my $fn = shift;
 	open(my $fh, '<', $fn)
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index e6c3116e18..1ef1889dbd 100644
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -53,6 +53,13 @@ gettext_without_eval_gettext)
 			git sh-i18n--envsubst "$1"
 		)
 	}
+
+	eval_ngettext () {
+		ngettext "$1" "$2" "$3" | (
+			export PATH $(git sh-i18n--envsubst --variables "$2");
+			git sh-i18n--envsubst "$2"
+		)
+	}
 	;;
 poison)
 	# Emit garbage so that tests that incorrectly rely on translatable
@@ -64,6 +71,10 @@ poison)
 	eval_gettext () {
 		printf "%s" "# GETTEXT POISON #"
 	}
+
+	eval_ngettext () {
+		printf "%s" "# GETTEXT POISON #"
+	}
 	;;
 *)
 	gettext () {
@@ -76,6 +87,13 @@ poison)
 			git sh-i18n--envsubst "$1"
 		)
 	}
+
+	eval_ngettext () {
+		(test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | (
+			export PATH $(git sh-i18n--envsubst --variables "$2");
+			git sh-i18n--envsubst "$2"
+		)
+	}
 	;;
 esac
 
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index c48139a494..a8a4576342 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -2,6 +2,9 @@
 # to set up some variables pointing at the normal git directories and
 # a few helper shell functions.
 
+# Source git-sh-i18n for gettext support.
+. git-sh-i18n
+
 # Having this variable in your environment would break scripts because
 # you would cause "cd" to be taken to unexpected places.  If you
 # like CDPATH, define it for your interactive shell sessions without
@@ -83,16 +86,16 @@ if test -n "$OPTIONS_SPEC"; then
 else
 	dashless=$(basename -- "$0" | sed -e 's/-/ /')
 	usage() {
-		die "usage: $dashless $USAGE"
+		die "$(eval_gettext "usage: \$dashless \$USAGE")"
 	}
 
 	if [ -z "$LONG_USAGE" ]
 	then
-		LONG_USAGE="usage: $dashless $USAGE"
+		LONG_USAGE="$(eval_gettext "usage: \$dashless \$USAGE")"
 	else
-		LONG_USAGE="usage: $dashless $USAGE
+		LONG_USAGE="$(eval_gettext "usage: \$dashless \$USAGE
 
-$LONG_USAGE"
+$LONG_USAGE")"
 	fi
 
 	case "$1" in
@@ -160,9 +163,11 @@ git_pager() {
 	else
 		GIT_PAGER=cat
 	fi
-	: ${LESS=-FRX}
-	: ${LV=-c}
-	export LESS LV
+	for vardef in @@PAGER_ENV@@
+	do
+		var=${vardef%%=*}
+		eval ": \"\${$vardef}\" && export $var"
+	done
 
 	eval "$GIT_PAGER" '"$@"'
 }
@@ -182,7 +187,7 @@ is_bare_repository () {
 cd_to_toplevel () {
 	cdup=$(git rev-parse --show-toplevel) &&
 	cd "$cdup" || {
-		echo >&2 "Cannot chdir to $cdup, the toplevel of the working tree"
+		gettextln "Cannot chdir to \$cdup, the toplevel of the working tree" >&2
 		exit 1
 	}
 }
@@ -190,13 +195,16 @@ cd_to_toplevel () {
 require_work_tree_exists () {
 	if test "z$(git rev-parse --is-bare-repository)" != zfalse
 	then
-		die "fatal: $0 cannot be used without a working tree."
+		program_name=$0
+		die "$(gettext "fatal: \$program_name cannot be used without a working tree.")"
 	fi
 }
 
 require_work_tree () {
-	test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true ||
-	die "fatal: $0 cannot be used without a working tree."
+	test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true || {
+		program_name=$0
+		die "$(gettext "fatal: \$program_name cannot be used without a working tree.")"
+	}
 }
 
 require_clean_work_tree () {
@@ -206,24 +214,49 @@ require_clean_work_tree () {
 
 	if ! git diff-files --quiet --ignore-submodules
 	then
-		echo >&2 "Cannot $1: You have unstaged changes."
+		action=$1
+		case "$action" in
+		rebase)
+			gettextln "Cannot rebase: You have unstaged changes." >&2
+			;;
+		"rewrite branches")
+			gettextln "Cannot rewrite branches: You have unstaged changes." >&2
+			;;
+		"pull with rebase")
+			gettextln "Cannot pull with rebase: You have unstaged changes." >&2
+			;;
+		*)
+			eval_gettextln "Cannot \$action: You have unstaged changes." >&2
+			;;
+		esac
 		err=1
 	fi
 
 	if ! git diff-index --cached --quiet --ignore-submodules HEAD --
 	then
-		if [ $err = 0 ]
+		if test $err = 0
 		then
-		    echo >&2 "Cannot $1: Your index contains uncommitted changes."
+			action=$1
+			case "$action" in
+			rebase)
+				gettextln "Cannot rebase: Your index contains uncommitted changes." >&2
+				;;
+			"pull with rebase")
+				gettextln "Cannot pull with rebase: Your index contains uncommitted changes." >&2
+				;;
+			*)
+				eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2
+				;;
+			esac
 		else
-		    echo >&2 "Additionally, your index contains uncommitted changes."
+		    gettextln "Additionally, your index contains uncommitted changes." >&2
 		fi
 		err=1
 	fi
 
-	if [ $err = 1 ]
+	if test $err = 1
 	then
-		test -n "$2" && echo >&2 "$2"
+		test -n "$2" && echo "$2" >&2
 		exit 1
 	fi
 }
@@ -336,15 +369,15 @@ git_dir_init () {
 	then
 		test -z "$(git rev-parse --show-cdup)" || {
 			exit=$?
-			echo >&2 "You need to run this command from the toplevel of the working tree."
+			gettextln "You need to run this command from the toplevel of the working tree." >&2
 			exit $exit
 		}
 	fi
 	test -n "$GIT_DIR" && GIT_DIR=$(cd "$GIT_DIR" && pwd) || {
-		echo >&2 "Unable to determine absolute path of git directory"
+		gettextln "Unable to determine absolute path of git directory" >&2
 		exit 1
 	}
-	: ${GIT_OBJECT_DIRECTORY="$(git rev-parse --git-path objects)"}
+	: "${GIT_OBJECT_DIRECTORY="$(git rev-parse --git-path objects)"}"
 }
 
 if test -z "$NONGIT_OK"
diff --git a/git-stash.sh b/git-stash.sh
index c7c65e25f5..826af183d4 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -15,7 +15,6 @@ SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=
 START_DIR=$(pwd)
 . git-sh-setup
-. git-sh-i18n
 require_work_tree
 cd_to_toplevel
 
@@ -185,7 +184,7 @@ store_stash () {
 
 	git update-ref --create-reflog -m "$stash_msg" $ref_stash $w_commit
 	ret=$?
-	test $ret != 0 && test -z $quiet &&
+	test $ret != 0 && test -z "$quiet" &&
 	die "$(eval_gettext "Cannot update \$ref_stash with \$w_commit")"
 	return $ret
 }
@@ -266,7 +265,7 @@ save_stash () {
 	create_stash "$stash_msg" $untracked
 	store_stash -m "$stash_msg" -q $w_commit ||
 	die "$(gettext "Cannot save the current status")"
-	say Saved working directory and index state "$stash_msg"
+	say "$(eval_gettext "Saved working directory and index state \$stash_msg")"
 
 	if test -z "$patch_mode"
 	then
@@ -277,7 +276,7 @@ save_stash () {
 			git clean --force --quiet -d $CLEAN_X_OPTION
 		fi
 
-		if test "$keep_index" = "t" && test -n $i_tree
+		if test "$keep_index" = "t" && test -n "$i_tree"
 		then
 			git read-tree --reset -u $i_tree
 		fi
@@ -549,7 +548,7 @@ pop_stash() {
 		drop_stash "$@"
 	else
 		status=$?
-		say "The stash is kept in case you need it again."
+		say "$(gettext "The stash is kept in case you need it again.")"
 		exit $status
 	fi
 }
diff --git a/git-submodule.sh b/git-submodule.sh
index d56207ea05..b57f87de65 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -9,14 +9,13 @@ USAGE="[--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <re
    or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
    or: $dashless [--quiet] init [--] [<path>...]
    or: $dashless [--quiet] deinit [-f|--force] (--all| [--] <path>...)
-   or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--reference <repository>] [--recursive] [--] [<path>...]
+   or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--] [<path>...]
    or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
    or: $dashless [--quiet] foreach [--recursive] <command>
    or: $dashless [--quiet] sync [--recursive] [--] [<path>...]"
 OPTIONS_SPEC=
 SUBDIRECTORY_OK=Yes
 . git-sh-setup
-. git-sh-i18n
 . git-parse-remote
 require_work_tree
 wt_prefix=$(git rev-parse --show-prefix)
@@ -46,119 +45,11 @@ prefix=
 custom_name=
 depth=
 
-# The function takes at most 2 arguments. The first argument is the
-# URL that navigates to the submodule origin repo. When relative, this URL
-# is relative to the superproject origin URL repo. The second up_path
-# argument, if specified, is the relative path that navigates
-# from the submodule working tree to the superproject working tree.
-#
-# The output of the function is the origin URL of the submodule.
-#
-# The output will either be an absolute URL or filesystem path (if the
-# superproject origin URL is an absolute URL or filesystem path,
-# respectively) or a relative file system path (if the superproject
-# origin URL is a relative file system path).
-#
-# When the output is a relative file system path, the path is either
-# relative to the submodule working tree, if up_path is specified, or to
-# the superproject working tree otherwise.
-resolve_relative_url ()
-{
-	remote=$(get_default_remote)
-	remoteurl=$(git config "remote.$remote.url") ||
-		remoteurl=$(pwd) # the repository is its own authoritative upstream
-	url="$1"
-	remoteurl=${remoteurl%/}
-	sep=/
-	up_path="$2"
-
-	case "$remoteurl" in
-	*:*|/*)
-		is_relative=
-		;;
-	./*|../*)
-		is_relative=t
-		;;
-	*)
-		is_relative=t
-		remoteurl="./$remoteurl"
-		;;
-	esac
-
-	while test -n "$url"
-	do
-		case "$url" in
-		../*)
-			url="${url#../}"
-			case "$remoteurl" in
-			*/*)
-				remoteurl="${remoteurl%/*}"
-				;;
-			*:*)
-				remoteurl="${remoteurl%:*}"
-				sep=:
-				;;
-			*)
-				if test -z "$is_relative" || test "." = "$remoteurl"
-				then
-					die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")"
-				else
-					remoteurl=.
-				fi
-				;;
-			esac
-			;;
-		./*)
-			url="${url#./}"
-			;;
-		*)
-			break;;
-		esac
-	done
-	remoteurl="$remoteurl$sep${url%/}"
-	echo "${is_relative:+${up_path}}${remoteurl#./}"
-}
-
-# Resolve a path to be relative to another path.  This is intended for
-# converting submodule paths when git-submodule is run in a subdirectory
-# and only handles paths where the directory separator is '/'.
-#
-# The output is the first argument as a path relative to the second argument,
-# which defaults to $wt_prefix if it is omitted.
-relative_path ()
-{
-	local target curdir result
-	target=$1
-	curdir=${2-$wt_prefix}
-	curdir=${curdir%/}
-	result=
-
-	while test -n "$curdir"
-	do
-		case "$target" in
-		"$curdir/"*)
-			target=${target#"$curdir"/}
-			break
-			;;
-		esac
-
-		result="${result}../"
-		if test "$curdir" = "${curdir%/*}"
-		then
-			curdir=
-		else
-			curdir="${curdir%/*}"
-		fi
-	done
-
-	echo "$result$target"
-}
-
 die_if_unmatched ()
 {
 	if test "$1" = "#unmatched"
 	then
-		exit 1
+		exit ${2:-1}
 	fi
 }
 
@@ -192,6 +83,17 @@ isnumber()
 	n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1"
 }
 
+# Sanitize the local git environment for use within a submodule. We
+# can't simply use clear_local_git_env since we want to preserve some
+# of the settings from GIT_CONFIG_PARAMETERS.
+sanitize_submodule_env()
+{
+	save_config=$GIT_CONFIG_PARAMETERS
+	clear_local_git_env
+	GIT_CONFIG_PARAMETERS=$save_config
+	export GIT_CONFIG_PARAMETERS
+}
+
 #
 # Add a new submodule to the working tree, .gitmodules and the index
 #
@@ -281,7 +183,7 @@ cmd_add()
 		die "$(gettext "Relative path can only be used from the toplevel of the working tree")"
 
 		# dereference source url relative to parent's url
-		realrepo=$(resolve_relative_url "$repo") || exit
+		realrepo=$(git submodule--helper resolve-relative-url "$repo") || exit
 		;;
 	*:*|/*)
 		# absolute url
@@ -337,19 +239,20 @@ Use -f if you really want to add it." >&2
 		then
 			if test -z "$force"
 			then
-				echo >&2 "$(eval_gettext "A git directory for '\$sm_name' is found locally with remote(s):")"
+				eval_gettextln >&2 "A git directory for '\$sm_name' is found locally with remote(s):"
 				GIT_DIR=".git/modules/$sm_name" GIT_WORK_TREE=. git remote -v | grep '(fetch)' | sed -e s,^,"  ", -e s,' (fetch)',, >&2
-				echo >&2 "$(eval_gettext "If you want to reuse this local git directory instead of cloning again from")"
-				echo >&2 "  $realrepo"
-				echo >&2 "$(eval_gettext "use the '--force' option. If the local git directory is not the correct repo")"
-				die "$(eval_gettext "or you are unsure what this means choose another name with the '--name' option.")"
+				die "$(eval_gettextln "\
+If you want to reuse this local git directory instead of cloning again from
+  \$realrepo
+use the '--force' option. If the local git directory is not the correct repo
+or you are unsure what this means choose another name with the '--name' option.")"
 			else
-				echo "$(eval_gettext "Reactivating local git directory for submodule '\$sm_name'.")"
+				eval_gettextln "Reactivating local git directory for submodule '\$sm_name'."
 			fi
 		fi
-		git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" "$reference" "$depth" || exit
+		git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" ${reference:+"$reference"} ${depth:+"$depth"} || exit
 		(
-			clear_local_git_env
+			sanitize_submodule_env
 			cd "$sm_path" &&
 			# ash fails to wordsplit ${branch:+-b "$branch"...}
 			case "$branch" in
@@ -407,20 +310,23 @@ cmd_foreach()
 	# command in the subshell (and a recursive call to this function)
 	exec 3<&0
 
-	git submodule--helper list --prefix "$wt_prefix"|
+	{
+		git submodule--helper list --prefix "$wt_prefix" ||
+		echo "#unmatched" $?
+	} |
 	while read mode sha1 stage sm_path
 	do
-		die_if_unmatched "$mode"
+		die_if_unmatched "$mode" "$sha1"
 		if test -e "$sm_path"/.git
 		then
-			displaypath=$(relative_path "$prefix$sm_path")
+			displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
 			say "$(eval_gettext "Entering '\$displaypath'")"
 			name=$(git submodule--helper name "$sm_path")
 			(
 				prefix="$prefix$sm_path/"
-				clear_local_git_env
+				sanitize_submodule_env
 				cd "$sm_path" &&
-				sm_path=$(relative_path "$sm_path") &&
+				sm_path=$(git submodule--helper relative-path "$sm_path" "$wt_prefix") &&
 				# we make $path available to scripts ...
 				path=$sm_path &&
 				if test $# -eq 1
@@ -467,57 +373,12 @@ cmd_init()
 		shift
 	done
 
-	git submodule--helper list --prefix "$wt_prefix" "$@" |
-	while read mode sha1 stage sm_path
-	do
-		die_if_unmatched "$mode"
-		name=$(git submodule--helper name "$sm_path") || exit
-
-		displaypath=$(relative_path "$prefix$sm_path")
-
-		# Copy url setting when it is not set yet
-		if test -z "$(git config "submodule.$name.url")"
-		then
-			url=$(git config -f .gitmodules submodule."$name".url)
-			test -z "$url" &&
-			die "$(eval_gettext "No url found for submodule path '\$displaypath' in .gitmodules")"
-
-			# Possibly a url relative to parent
-			case "$url" in
-			./*|../*)
-				url=$(resolve_relative_url "$url") || exit
-				;;
-			esac
-			git config submodule."$name".url "$url" ||
-			die "$(eval_gettext "Failed to register url for submodule path '\$displaypath'")"
-
-			say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$displaypath'")"
-		fi
-
-		# Copy "update" setting when it is not set yet
-		if upd="$(git config -f .gitmodules submodule."$name".update)" &&
-		   test -n "$upd" &&
-		   test -z "$(git config submodule."$name".update)"
-		then
-			case "$upd" in
-			checkout | rebase | merge | none)
-				;; # known modes of updating
-			*)
-				echo >&2 "warning: unknown update mode '$upd' suggested for submodule '$name'"
-				upd=none
-				;;
-			esac
-			git config submodule."$name".update "$upd" ||
-			die "$(eval_gettext "Failed to register update mode for submodule path '\$displaypath'")"
-		fi
-	done
+	git ${wt_prefix:+-C "$wt_prefix"} submodule--helper init ${GIT_QUIET:+--quiet} ${prefix:+--prefix "$prefix"} "$@"
 }
 
 #
 # Unregister submodules from .git/config and remove their work tree
 #
-# $@ = requested paths (use '.' to deinit all submodules)
-#
 cmd_deinit()
 {
 	# parse $args after "submodule ... deinit".
@@ -558,13 +419,16 @@ cmd_deinit()
 		die "$(eval_gettext "Use '--all' if you really want to deinitialize all submodules")"
 	fi
 
-	git submodule--helper list --prefix "$wt_prefix" "$@" |
+	{
+		git submodule--helper list --prefix "$wt_prefix" "$@" ||
+		echo "#unmatched" $?
+	} |
 	while read mode sha1 stage sm_path
 	do
-		die_if_unmatched "$mode"
+		die_if_unmatched "$mode" "$sha1"
 		name=$(git submodule--helper name "$sm_path") || exit
 
-		displaypath=$(relative_path "$sm_path")
+		displaypath=$(git submodule--helper relative-path "$sm_path" "$wt_prefix")
 
 		# Remove the submodule work tree (unless the user already did it)
 		if test -d "$sm_path"
@@ -572,8 +436,9 @@ cmd_deinit()
 			# Protect submodules containing a .git directory
 			if test -d "$sm_path/.git"
 			then
-				echo >&2 "$(eval_gettext "Submodule work tree '\$displaypath' contains a .git directory")"
-				die "$(eval_gettext "(use 'rm -rf' if you really want to remove it including all of its history)")"
+				die "$(eval_gettext "\
+Submodule work tree '\$displaypath' contains a .git directory
+(use 'rm -rf' if you really want to remove it including all of its history)")"
 			fi
 
 			if test -z "$force"
@@ -601,20 +466,21 @@ cmd_deinit()
 }
 
 is_tip_reachable () (
-	clear_local_git_env
+	sanitize_submodule_env &&
 	cd "$1" &&
 	rev=$(git rev-list -n 1 "$2" --not --all 2>/dev/null) &&
 	test -z "$rev"
 )
 
 fetch_in_submodule () (
-	clear_local_git_env
+	sanitize_submodule_env &&
 	cd "$1" &&
 	case "$2" in
 	'')
 		git fetch ;;
 	*)
-		git fetch $(get_default_remote) "$2" ;;
+		shift
+		git fetch $(get_default_remote) "$@" ;;
 	esac
 )
 
@@ -664,6 +530,12 @@ cmd_update()
 		--checkout)
 			update="checkout"
 			;;
+		--recommend-shallow)
+			recommend_shallow="--recommend-shallow"
+			;;
+		--no-recommend-shallow)
+			recommend_shallow="--no-recommend-shallow"
+			;;
 		--depth)
 			case "$2" in '') usage ;; esac
 			depth="--depth=$2"
@@ -672,6 +544,14 @@ cmd_update()
 		--depth=*)
 			depth=$1
 			;;
+		-j|--jobs)
+			case "$2" in '') usage ;; esac
+			jobs="--jobs=$2"
+			shift
+			;;
+		--jobs=*)
+			jobs=$1
+			;;
 		--)
 			shift
 			break
@@ -691,20 +571,24 @@ cmd_update()
 		cmd_init "--" "$@" || return
 	fi
 
-	cloned_modules=
-	git submodule--helper list --prefix "$wt_prefix" "$@" | {
+	{
+	git submodule--helper update-clone ${GIT_QUIET:+--quiet} \
+		${wt_prefix:+--prefix "$wt_prefix"} \
+		${prefix:+--recursive-prefix "$prefix"} \
+		${update:+--update "$update"} \
+		${reference:+--reference "$reference"} \
+		${depth:+--depth "$depth"} \
+		${recommend_shallow:+"$recommend_shallow"} \
+		${jobs:+$jobs} \
+		"$@" || echo "#unmatched" $?
+	} | {
 	err=
-	while read mode sha1 stage sm_path
+	while read mode sha1 stage just_cloned sm_path
 	do
-		die_if_unmatched "$mode"
-		if test "$stage" = U
-		then
-			echo >&2 "Skipping unmerged submodule $prefix$sm_path"
-			continue
-		fi
+		die_if_unmatched "$mode" "$sha1"
+
 		name=$(git submodule--helper name "$sm_path") || exit
 		url=$(git config submodule."$name".url)
-		branch=$(get_submodule_config "$name" branch master)
 		if ! test -z "$update"
 		then
 			update_module=$update
@@ -716,47 +600,31 @@ cmd_update()
 			fi
 		fi
 
-		displaypath=$(relative_path "$prefix$sm_path")
+		displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
 
-		if test "$update_module" = "none"
+		if test $just_cloned -eq 1
 		then
-			echo "Skipping submodule '$displaypath'"
-			continue
-		fi
-
-		if test -z "$url"
-		then
-			# Only mention uninitialized submodules when its
-			# path have been specified
-			test "$#" != "0" &&
-			say "$(eval_gettext "Submodule path '\$displaypath' not initialized
-Maybe you want to use 'update --init'?")"
-			continue
-		fi
-
-		if ! test -d "$sm_path"/.git && ! test -f "$sm_path"/.git
-		then
-			git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$prefix" --path "$sm_path" --name "$name" --url "$url" "$reference" "$depth" || exit
-			cloned_modules="$cloned_modules;$name"
 			subsha1=
+			update_module=checkout
 		else
-			subsha1=$(clear_local_git_env; cd "$sm_path" &&
+			subsha1=$(sanitize_submodule_env; cd "$sm_path" &&
 				git rev-parse --verify HEAD) ||
 			die "$(eval_gettext "Unable to find current revision in submodule path '\$displaypath'")"
 		fi
 
 		if test -n "$remote"
 		then
+			branch=$(git submodule--helper remote-branch "$sm_path")
 			if test -z "$nofetch"
 			then
 				# Fetch remote before determining tracking $sha1
-				(clear_local_git_env; cd "$sm_path" && git-fetch) ||
+				fetch_in_submodule "$sm_path" $depth ||
 				die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
 			fi
-			remote_name=$(clear_local_git_env; cd "$sm_path" && get_default_remote)
-			sha1=$(clear_local_git_env; cd "$sm_path" &&
+			remote_name=$(sanitize_submodule_env; cd "$sm_path" && get_default_remote)
+			sha1=$(sanitize_submodule_env; cd "$sm_path" &&
 				git rev-parse --verify "${remote_name}/${branch}") ||
-			die "$(eval_gettext "Unable to find current ${remote_name}/${branch} revision in submodule path '\$sm_path'")"
+			die "$(eval_gettext "Unable to find current \${remote_name}/\${branch} revision in submodule path '\$sm_path'")"
 		fi
 
 		if test "$subsha1" != "$sha1" || test -n "$force"
@@ -773,23 +641,16 @@ Maybe you want to use 'update --init'?")"
 				# Run fetch only if $sha1 isn't present or it
 				# is not reachable from a ref.
 				is_tip_reachable "$sm_path" "$sha1" ||
-				fetch_in_submodule "$sm_path" ||
+				fetch_in_submodule "$sm_path" $depth ||
 				die "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")"
 
 				# Now we tried the usual fetch, but $sha1 may
 				# not be reachable from any of the refs
 				is_tip_reachable "$sm_path" "$sha1" ||
-				fetch_in_submodule "$sm_path" "$sha1" ||
-				die "$(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain $sha1. Direct fetching of that commit failed.")"
+				fetch_in_submodule "$sm_path" $depth "$sha1" ||
+				die "$(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain \$sha1. Direct fetching of that commit failed.")"
 			fi
 
-			# Is this something we just cloned?
-			case ";$cloned_modules;" in
-			*";$name;"*)
-				# then there is no local change to integrate
-				update_module=checkout ;;
-			esac
-
 			must_die_on_failure=
 			case "$update_module" in
 			checkout)
@@ -819,7 +680,7 @@ Maybe you want to use 'update --init'?")"
 				die "$(eval_gettext "Invalid update mode '$update_module' for submodule '$name'")"
 			esac
 
-			if (clear_local_git_env; cd "$sm_path" && $command "$sha1")
+			if (sanitize_submodule_env; cd "$sm_path" && $command "$sha1")
 			then
 				say "$say_msg"
 			elif test -n "$must_die_on_failure"
@@ -834,8 +695,9 @@ Maybe you want to use 'update --init'?")"
 		if test -n "$recursive"
 		then
 			(
-				prefix="$prefix$sm_path/"
-				clear_local_git_env
+				prefix=$(git submodule--helper relative-path "$prefix$sm_path/" "$wt_prefix")
+				wt_prefix=
+				sanitize_submodule_env
 				cd "$sm_path" &&
 				eval cmd_update
 			)
@@ -843,7 +705,7 @@ Maybe you want to use 'update --init'?")"
 			if test $res -gt 0
 			then
 				die_msg="$(eval_gettext "Failed to recurse into submodule path '\$displaypath'")"
-				if test $res -eq 1
+				if test $res -ne 2
 				then
 					err="${err};$die_msg"
 					continue
@@ -873,7 +735,7 @@ Maybe you want to use 'update --init'?")"
 
 set_name_rev () {
 	revname=$( (
-		clear_local_git_env
+		sanitize_submodule_env
 		cd "$1" && {
 			git describe "$2" 2>/dev/null ||
 			git describe --tags "$2" 2>/dev/null ||
@@ -1017,7 +879,7 @@ cmd_summary() {
 		! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
 		missing_dst=t
 
-		display_name=$(relative_path "$name")
+		display_name=$(git submodule--helper relative-path "$name" "$wt_prefix")
 
 		total_commits=
 		case "$missing_src,$missing_dst" in
@@ -1129,13 +991,16 @@ cmd_status()
 		shift
 	done
 
-	git submodule--helper list --prefix "$wt_prefix" "$@" |
+	{
+		git submodule--helper list --prefix "$wt_prefix" "$@" ||
+		echo "#unmatched" $?
+	} |
 	while read mode sha1 stage sm_path
 	do
-		die_if_unmatched "$mode"
+		die_if_unmatched "$mode" "$sha1"
 		name=$(git submodule--helper name "$sm_path") || exit
 		url=$(git config submodule."$name".url)
-		displaypath=$(relative_path "$prefix$sm_path")
+		displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
 		if test "$stage" = U
 		then
 			say "U$sha1 $displaypath"
@@ -1157,7 +1022,7 @@ cmd_status()
 		else
 			if test -z "$cached"
 			then
-				sha1=$(clear_local_git_env; cd "$sm_path" && git rev-parse --verify HEAD)
+				sha1=$(sanitize_submodule_env; cd "$sm_path" && git rev-parse --verify HEAD)
 			fi
 			set_name_rev "$sm_path" "$sha1"
 			say "+$sha1 $displaypath$revname"
@@ -1167,7 +1032,7 @@ cmd_status()
 		then
 			(
 				prefix="$displaypath/"
-				clear_local_git_env
+				sanitize_submodule_env
 				wt_prefix=
 				cd "$sm_path" &&
 				eval cmd_status
@@ -1207,10 +1072,13 @@ cmd_sync()
 		esac
 	done
 	cd_to_toplevel
-	git submodule--helper list --prefix "$wt_prefix" "$@" |
+	{
+		git submodule--helper list --prefix "$wt_prefix" "$@" ||
+		echo "#unmatched" $?
+	} |
 	while read mode sha1 stage sm_path
 	do
-		die_if_unmatched "$mode"
+		die_if_unmatched "$mode" "$sha1"
 		name=$(git submodule--helper name "$sm_path")
 		url=$(git config -f .gitmodules --get submodule."$name".url)
 
@@ -1223,9 +1091,9 @@ cmd_sync()
 			# guarantee a trailing /
 			up_path=${up_path%/}/ &&
 			# path from submodule work tree to submodule origin repo
-			sub_origin_url=$(resolve_relative_url "$url" "$up_path") &&
+			sub_origin_url=$(git submodule--helper resolve-relative-url "$url" "$up_path") &&
 			# path from superproject work tree to submodule origin repo
-			super_config_url=$(resolve_relative_url "$url") || exit
+			super_config_url=$(git submodule--helper resolve-relative-url "$url") || exit
 			;;
 		*)
 			sub_origin_url="$url"
@@ -1235,14 +1103,14 @@ cmd_sync()
 
 		if git config "submodule.$name.url" >/dev/null 2>/dev/null
 		then
-			displaypath=$(relative_path "$prefix$sm_path")
+			displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
 			say "$(eval_gettext "Synchronizing submodule url for '\$displaypath'")"
 			git config submodule."$name".url "$super_config_url"
 
 			if test -e "$sm_path"/.git
 			then
 			(
-				clear_local_git_env
+				sanitize_submodule_env
 				cd "$sm_path"
 				remote=$(get_default_remote)
 				git config remote."$remote".url "$sub_origin_url"
diff --git a/git-svn.perl b/git-svn.perl
index 05eced06cd..4d41d220a0 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -339,7 +339,7 @@ if ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
 			die "failed to open $ENV{GIT_DIR}: $!\n";
 		$ENV{GIT_DIR} = $1 if <$fh> =~ /^gitdir: (.+)$/;
 	}
-} else {
+} elsif ($cmd) {
 	my ($git_dir, $cdup);
 	git_cmd_try {
 		$git_dir = command_oneline([qw/rev-parse --git-dir/]);
@@ -356,7 +356,7 @@ if ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
 
 my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
 
-read_git_config(\%opts);
+read_git_config(\%opts) if $ENV{GIT_DIR};
 if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
 	Getopt::Long::Configure('pass_through');
 }
@@ -507,7 +507,10 @@ sub init_subdir {
 
 sub cmd_clone {
 	my ($url, $path) = @_;
-	if (!defined $path &&
+	if (!$url) {
+		die "SVN repository location required ",
+		    "as a command-line argument\n";
+	} elsif (!defined $path &&
 	    (defined $_trunk || @_branches || @_tags ||
 	     defined $_stdlayout) &&
 	    $url !~ m#^[a-z\+]+://#) {
diff --git a/git.c b/git.c
index 968a8a4645..0f1937fd0c 100644
--- a/git.c
+++ b/git.c
@@ -609,48 +609,15 @@ static int run_argv(int *argcp, const char ***argv)
 	return done_alias;
 }
 
-/*
- * Many parts of Git have subprograms communicate via pipe, expect the
- * upstream of a pipe to die with SIGPIPE when the downstream of a
- * pipe does not need to read all that is written.  Some third-party
- * programs that ignore or block SIGPIPE for their own reason forget
- * to restore SIGPIPE handling to the default before spawning Git and
- * break this carefully orchestrated machinery.
- *
- * Restore the way SIGPIPE is handled to default, which is what we
- * expect.
- */
-static void restore_sigpipe_to_default(void)
-{
-	sigset_t unblock;
-
-	sigemptyset(&unblock);
-	sigaddset(&unblock, SIGPIPE);
-	sigprocmask(SIG_UNBLOCK, &unblock, NULL);
-	signal(SIGPIPE, SIG_DFL);
-}
-
-int main(int argc, char **av)
+int cmd_main(int argc, const char **argv)
 {
-	const char **argv = (const char **) av;
 	const char *cmd;
 	int done_help = 0;
 
-	cmd = git_extract_argv0_path(argv[0]);
+	cmd = argv[0];
 	if (!cmd)
 		cmd = "git-help";
 
-	/*
-	 * 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_setup_gettext();
-
 	trace_command_performance(argv);
 
 	/*
diff --git a/git.spec.in b/git.spec.in
deleted file mode 100644
index bfd1cfb63f..0000000000
--- a/git.spec.in
+++ /dev/null
@@ -1,330 +0,0 @@
-# Pass --without docs to rpmbuild if you don't want the documentation
-
-Name: 		git
-Version: 	@@VERSION@@
-Release: 	1%{?dist}
-Summary:  	Core git tools
-License: 	GPL
-Group: 		Development/Tools
-URL: 		http://kernel.org/pub/software/scm/git/
-Source: 	http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
-BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, gettext  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires:	perl-Git = %{version}-%{release}
-Requires:	zlib >= 1.2, rsync, less, openssh-clients, expat
-Provides:	git-core = %{version}-%{release}
-Obsoletes:	git-core <= 1.5.4.2
-Obsoletes:	git-p4
-
-%description
-Git is a fast, scalable, distributed revision control system with an
-unusually rich command set that provides both high-level operations
-and full access to internals.
-
-The git rpm installs the core tools with minimal dependencies.  To
-install all git packages, including tools for integrating with other
-SCMs, install the git-all meta-package.
-
-%package all
-Summary:	Meta-package to pull in all git tools
-Group:		Development/Tools
-Requires:	git = %{version}-%{release}
-Requires:	git-svn = %{version}-%{release}
-Requires:	git-cvs = %{version}-%{release}
-Requires:	git-arch = %{version}-%{release}
-Requires:	git-email = %{version}-%{release}
-Requires:	gitk = %{version}-%{release}
-Requires:	gitweb = %{version}-%{release}
-Requires:	git-gui = %{version}-%{release}
-Obsoletes:	git <= 1.5.4.2
-
-%description all
-Git is a fast, scalable, distributed revision control system with an
-unusually rich command set that provides both high-level operations
-and full access to internals.
-
-This is a dummy package which brings in all subpackages.
-
-%package svn
-Summary:        Git tools for importing Subversion repositories
-Group:          Development/Tools
-Requires:       git = %{version}-%{release}, subversion
-%description svn
-Git tools for importing Subversion repositories.
-
-%package cvs
-Summary:        Git tools for importing CVS repositories
-Group:          Development/Tools
-Requires:       git = %{version}-%{release}, cvs, cvsps
-%description cvs
-Git tools for importing CVS repositories.
-
-%package arch
-Summary:        Git tools for importing Arch repositories
-Group:          Development/Tools
-Requires:       git = %{version}-%{release}, tla
-%description arch
-Git tools for importing Arch repositories.
-
-%package email
-Summary:        Git tools for sending email
-Group:          Development/Tools
-Requires:	git = %{version}-%{release}
-%description email
-Git tools for sending email.
-
-%package gui
-Summary:        Git GUI tool
-Group:          Development/Tools
-Requires:       git = %{version}-%{release}, tk >= 8.4
-%description gui
-Git GUI tool
-
-%package -n gitk
-Summary:        Git revision tree visualiser ('gitk')
-Group:          Development/Tools
-Requires:       git = %{version}-%{release}, tk >= 8.4
-%description -n gitk
-Git revision tree visualiser ('gitk')
-
-%package -n gitweb
-Summary:	Git web interface
-Group:          Development/Tools
-Requires:       git = %{version}-%{release}
-%description -n gitweb
-Browsing git repository on the web
-
-%package -n perl-Git
-Summary:        Perl interface to Git
-Group:          Development/Libraries
-Requires:       git = %{version}-%{release}
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires:  perl(Error)
-BuildRequires:  perl(ExtUtils::MakeMaker)
-
-%description -n perl-Git
-Perl interface to Git
-
-%define path_settings ETC_GITCONFIG=/etc/gitconfig prefix=%{_prefix} mandir=%{_mandir} htmldir=%{_docdir}/%{name}-%{version}
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
-%prep
-%setup -q
-
-%build
-make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
-     %{path_settings} \
-     all %{!?_without_docs: doc}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
-     %{path_settings} \
-     INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
-test ! -d $RPM_BUILD_ROOT%{python_sitelib} || rm -fr $RPM_BUILD_ROOT%{python_sitelib}
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
-
-(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@)               > bin-man-doc-files
-(find $RPM_BUILD_ROOT%{_libexecdir}/git-core -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@)               >> bin-man-doc-files
-(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files
-%if %{!?_without_docs:1}0
-(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
-%else
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-%endif
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f bin-man-doc-files
-%defattr(-,root,root)
-%{_datadir}/git-core/
-%doc README.md COPYING Documentation/*.txt
-%{!?_without_docs: %doc Documentation/*.html Documentation/howto}
-%{!?_without_docs: %doc Documentation/technical}
-%{_sysconfdir}/bash_completion.d
-
-%files svn
-%defattr(-,root,root)
-%{_libexecdir}/git-core/*svn*
-%doc Documentation/*svn*.txt
-%{!?_without_docs: %{_mandir}/man1/*svn*.1*}
-%{!?_without_docs: %doc Documentation/*svn*.html }
-
-%files cvs
-%defattr(-,root,root)
-%doc Documentation/*git-cvs*.txt
-%{_bindir}/git-cvsserver
-%{_libexecdir}/git-core/*cvs*
-%{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
-%{!?_without_docs: %doc Documentation/*git-cvs*.html }
-
-%files arch
-%defattr(-,root,root)
-%doc Documentation/git-archimport.txt
-%{_libexecdir}/git-core/git-archimport
-%{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
-%{!?_without_docs: %doc Documentation/git-archimport.html }
-
-%files email
-%defattr(-,root,root)
-%doc Documentation/*email*.txt
-%{_libexecdir}/git-core/*email*
-%{!?_without_docs: %{_mandir}/man1/*email*.1*}
-%{!?_without_docs: %doc Documentation/*email*.html }
-
-%files gui
-%defattr(-,root,root)
-%{_libexecdir}/git-core/git-gui
-%{_libexecdir}/git-core/git-citool
-%{_libexecdir}/git-core/git-gui--askpass
-%{_datadir}/git-gui/
-%{!?_without_docs: %{_mandir}/man1/git-gui.1*}
-%{!?_without_docs: %doc Documentation/git-gui.html}
-%{!?_without_docs: %{_mandir}/man1/git-citool.1*}
-%{!?_without_docs: %doc Documentation/git-citool.html}
-
-%files -n gitk
-%defattr(-,root,root)
-%doc Documentation/*gitk*.txt
-%{_bindir}/*gitk*
-%{_datadir}/gitk/
-%{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
-%{!?_without_docs: %doc Documentation/*gitk*.html }
-
-%files -n gitweb
-%defattr(-,root,root)
-%doc gitweb/README gitweb/INSTALL Documentation/*gitweb*.txt
-%{_datadir}/gitweb
-%{!?_without_docs: %{_mandir}/man1/*gitweb*.1*}
-%{!?_without_docs: %{_mandir}/man5/*gitweb*.5*}
-%{!?_without_docs: %doc Documentation/*gitweb*.html }
-
-%files -n perl-Git -f perl-files
-%defattr(-,root,root)
-
-%files all
-# No files for you!
-
-%changelog
-* Sun Sep 18 2011 Jakub Narebski <jnareb@gmail.com>
-- Add gitweb manpages to 'gitweb' subpackage
-
-* Wed Jun 30 2010 Junio C Hamano <gitster@pobox.com>
-- Add 'gitweb' subpackage.
-
-* Fri Mar 26 2010 Ian Ward Comfort <icomfort@stanford.edu>
-- Ship bash completion support from contrib/ in the core package.
-
-* Sun Jan 31 2010 Junio C Hamano <gitster@pobox.com>
-- Do not use %define inside %{!?...} construct.
-
-* Sat Jan 30 2010 Junio C Hamano <gitster@pobox.com>
-- We don't ship Python bits until a real foreign scm interface comes.
-
-* Mon Feb 04 2009 David J. Mellor <dmellor@whistlingcat.com>
-- fixed broken git help -w after renaming the git-core package to git.
-
-* Fri Sep 12 2008 Quy Tonthat <qtonthat@gmail.com>
-- move git-cvsserver to bindir.
-
-* Sun Jun 15 2008 Junio C Hamano <gitster@pobox.com>
-- Remove curl from Requires list.
-
-* Fri Feb 15 2008 Kristian Høgsberg <krh@redhat.com>
-- Rename git-core to just git and rename meta package from git to git-all.
-
-* Sun Feb 03 2008 James Bowes <jbowes@dangerouslyinc.com>
-- Add a BuildRequires for gettext
-
-* Fri Jan 11 2008 Junio C Hamano <gitster@pobox.com>
-- Include gitk message files
-
-* Sun Jan 06 2008 James Bowes <jbowes@dangerouslyinc.com>
-- Make the metapackage require the same version of the subpackages.
-
-* Wed Dec 12 2007 Junio C Hamano <gitster@pobox.com>
-- Adjust htmldir to point at /usr/share/doc/git-core-$version/
-
-* Sun Jul 15 2007 Sean Estabrooks <seanlkml@sympatico.ca>
-- Removed p4import.
-
-* Tue Jun 26 2007 Quy Tonthat <qtonthat@gmail.com>
-- Fixed problems looking for wrong manpages.
-
-* Thu Jun 21 2007 Shawn O. Pearce <spearce@spearce.org>
-- Added documentation files for git-gui
-
-* Tue May 13 2007 Quy Tonthat <qtonthat@gmail.com>
-- Added lib files for git-gui
-- Added Documentation/technical (As needed by Git Users Manual)
-
-* Tue May 8 2007 Quy Tonthat <qtonthat@gmail.com>
-- Added howto files
-
-* Tue Mar 27 2007 Eygene Ryabinkin <rea-git@codelabs.ru>
-- Added the git-p4 package: Perforce import stuff.
-
-* Mon Feb 13 2007 Nicolas Pitre <nico@fluxnic.net>
-- Update core package description (Git isn't as stupid as it used to be)
-
-* Mon Feb 12 2007 Junio C Hamano <junkio@cox.net>
-- Add git-gui and git-citool.
-
-* Mon Nov 14 2005 H. Peter Anvin <hpa@zytor.com> 0.99.9j-1
-- Change subpackage names to git-<name> instead of git-core-<name>
-- Create empty root package which brings in all subpackages
-- Rename git-tk -> gitk
-
-* Thu Nov 10 2005 Chris Wright <chrisw@osdl.org> 0.99.9g-1
-- zlib dependency fix
-- Minor cleanups from split
-- Move arch import to separate package as well
-
-* Tue Sep 27 2005 Jim Radford <radford@blackbean.org>
-- Move programs with non-standard dependencies (svn, cvs, email)
-  into separate packages
-
-* Tue Sep 27 2005 H. Peter Anvin <hpa@zytor.com>
-- parallelize build
-- COPTS -> CFLAGS
-
-* Fri Sep 16 2005 Chris Wright <chrisw@osdl.org> 0.99.6-1
-- update to 0.99.6
-
-* Fri Sep 16 2005 Horst H. von Brand <vonbrand@inf.utfsm.cl>
-- Linus noticed that less is required, added to the dependencies
-
-* Sun Sep 11 2005 Horst H. von Brand <vonbrand@inf.utfsm.cl>
-- Updated dependencies
-- Don't assume manpages are gzipped
-
-* Thu Aug 18 2005 Chris Wright <chrisw@osdl.org> 0.99.4-4
-- drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires
-- use RPM_OPT_FLAGS in spec file, drop patch0
-
-* Wed Aug 17 2005 Tom "spot" Callaway <tcallawa@redhat.com> 0.99.4-3
-- use dist tag to differentiate between branches
-- use rpm optflags by default (patch0)
-- own %{_datadir}/git-core/
-
-* Mon Aug 15 2005 Chris Wright <chrisw@osdl.org>
-- update spec file to fix Buildroot, Requires, and drop Vendor
-
-* Sun Aug 07 2005 Horst H. von Brand <vonbrand@inf.utfsm.cl>
-- Redid the description
-- Cut overlong make line, loosened changelog a bit
-- I think Junio (or perhaps OSDL?) should be vendor...
-
-* Thu Jul 14 2005 Eric Biederman <ebiederm@xmission.com>
-- Add the man pages, and the --without docs build option
-
-* Wed Jul 7 2005 Chris Wright <chris@osdl.org>
-- initial git spec file
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 2fddf750fa..33d701d852 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2090,7 +2090,7 @@ sub format_ref_marker {
 				-href => href(
 					action=>$dest_action,
 					hash=>$dest
-				)}, $name);
+				)}, esc_html($name));
 
 			$markers .= " <span class=\"".esc_attr($class)."\" title=\"".esc_attr($ref)."\">" .
 				$link . "</span>";
diff --git a/gpg-interface.c b/gpg-interface.c
index f6d9d87270..8672edaf48 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -3,6 +3,7 @@
 #include "strbuf.h"
 #include "gpg-interface.h"
 #include "sigchain.h"
+#include "tempfile.h"
 
 static char *configured_signing_key;
 static const char *gpg_program = "gpg";
@@ -150,42 +151,30 @@ const char *get_signing_key(void)
 int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key)
 {
 	struct child_process gpg = CHILD_PROCESS_INIT;
-	const char *args[4];
-	ssize_t len;
+	int ret;
 	size_t i, j, bottom;
+	struct strbuf gpg_status = STRBUF_INIT;
 
-	gpg.argv = args;
-	gpg.in = -1;
-	gpg.out = -1;
-	args[0] = gpg_program;
-	args[1] = "-bsau";
-	args[2] = signing_key;
-	args[3] = NULL;
+	argv_array_pushl(&gpg.args,
+			 gpg_program,
+			 "--status-fd=2",
+			 "-bsau", signing_key,
+			 NULL);
 
-	if (start_command(&gpg))
-		return error(_("could not run gpg."));
+	bottom = signature->len;
 
 	/*
 	 * When the username signingkey is bad, program could be terminated
 	 * because gpg exits without reading and then write gets SIGPIPE.
 	 */
 	sigchain_push(SIGPIPE, SIG_IGN);
-
-	if (write_in_full(gpg.in, buffer->buf, buffer->len) != buffer->len) {
-		close(gpg.in);
-		close(gpg.out);
-		finish_command(&gpg);
-		return error(_("gpg did not accept the data"));
-	}
-	close(gpg.in);
-
-	bottom = signature->len;
-	len = strbuf_read(signature, gpg.out, 1024);
-	close(gpg.out);
-
+	ret = pipe_command(&gpg, buffer->buf, buffer->len,
+			   signature, 1024, &gpg_status, 0);
 	sigchain_pop(SIGPIPE);
 
-	if (finish_command(&gpg) || !len || len < 0)
+	ret |= !strstr(gpg_status.buf, "\n[GNUPG:] SIG_CREATED ");
+	strbuf_release(&gpg_status);
+	if (ret)
 		return error(_("gpg failed to sign the data"));
 
 	/* Strip CR from the line endings, in case we are on Windows. */
@@ -210,50 +199,39 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
 			 struct strbuf *gpg_output, struct strbuf *gpg_status)
 {
 	struct child_process gpg = CHILD_PROCESS_INIT;
-	const char *args_gpg[] = {NULL, "--status-fd=1", "--keyid-format=long", "--verify", "FILE", "-", NULL};
-	char path[PATH_MAX];
+	static struct tempfile temp;
 	int fd, ret;
 	struct strbuf buf = STRBUF_INIT;
-	struct strbuf *pbuf = &buf;
 
-	args_gpg[0] = gpg_program;
-	fd = git_mkstemp(path, PATH_MAX, ".git_vtag_tmpXXXXXX");
+	fd = mks_tempfile_t(&temp, ".git_vtag_tmpXXXXXX");
 	if (fd < 0)
-		return error(_("could not create temporary file '%s': %s"),
-			     path, strerror(errno));
-	if (write_in_full(fd, signature, signature_size) < 0)
-		return error(_("failed writing detached signature to '%s': %s"),
-			     path, strerror(errno));
+		return error_errno(_("could not create temporary file"));
+	if (write_in_full(fd, signature, signature_size) < 0) {
+		error_errno(_("failed writing detached signature to '%s'"),
+			    temp.filename.buf);
+		delete_tempfile(&temp);
+		return -1;
+	}
 	close(fd);
 
-	gpg.argv = args_gpg;
-	gpg.in = -1;
-	gpg.out = -1;
-	if (gpg_output)
-		gpg.err = -1;
-	args_gpg[4] = path;
-	if (start_command(&gpg)) {
-		unlink(path);
-		return error(_("could not run gpg."));
-	}
+	argv_array_pushl(&gpg.args,
+			 gpg_program,
+			 "--status-fd=1",
+			 "--keyid-format=long",
+			 "--verify", temp.filename.buf, "-",
+			 NULL);
 
-	write_in_full(gpg.in, payload, payload_size);
-	close(gpg.in);
+	if (!gpg_status)
+		gpg_status = &buf;
 
-	if (gpg_output) {
-		strbuf_read(gpg_output, gpg.err, 0);
-		close(gpg.err);
-	}
-	if (gpg_status)
-		pbuf = gpg_status;
-	strbuf_read(pbuf, gpg.out, 0);
-	close(gpg.out);
-
-	ret = finish_command(&gpg);
+	sigchain_push(SIGPIPE, SIG_IGN);
+	ret = pipe_command(&gpg, payload, payload_size,
+			   gpg_status, 0, gpg_output, 0);
+	sigchain_pop(SIGPIPE);
 
-	unlink_or_warn(path);
+	delete_tempfile(&temp);
 
-	ret |= !strstr(pbuf->buf, "\n[GNUPG:] GOODSIG ");
+	ret |= !strstr(gpg_status->buf, "\n[GNUPG:] GOODSIG ");
 	strbuf_release(&buf); /* no matter it was used or not */
 
 	return ret;
diff --git a/graph.c b/graph.c
index 1350bdde3b..dd1720148d 100644
--- a/graph.c
+++ b/graph.c
@@ -17,8 +17,8 @@
 static void graph_padding_line(struct git_graph *graph, struct strbuf *sb);
 
 /*
- * Print a strbuf to stdout.  If the graph is non-NULL, all lines but the
- * first will be prefixed with the graph output.
+ * Print a strbuf.  If the graph is non-NULL, all lines but the first will be
+ * prefixed with the graph output.
  *
  * If the strbuf ends with a newline, the output will end after this
  * newline.  A new graph line will not be printed after the final newline.
@@ -669,6 +669,13 @@ static void graph_output_padding_line(struct git_graph *graph,
 	graph_pad_horizontally(graph, sb, graph->num_new_columns * 2);
 }
 
+
+int graph_width(struct git_graph *graph)
+{
+	return graph->width;
+}
+
+
 static void graph_output_skip_line(struct git_graph *graph, struct strbuf *sb)
 {
 	/*
@@ -1193,9 +1200,10 @@ void graph_show_commit(struct git_graph *graph)
 
 	while (!shown_commit_line && !graph_is_commit_finished(graph)) {
 		shown_commit_line = graph_next_line(graph, &msgbuf);
-		fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
+		fwrite(msgbuf.buf, sizeof(char), msgbuf.len,
+			graph->revs->diffopt.file);
 		if (!shown_commit_line)
-			putchar('\n');
+			putc('\n', graph->revs->diffopt.file);
 		strbuf_setlen(&msgbuf, 0);
 	}
 
@@ -1210,7 +1218,7 @@ void graph_show_oneline(struct git_graph *graph)
 		return;
 
 	graph_next_line(graph, &msgbuf);
-	fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
+	fwrite(msgbuf.buf, sizeof(char), msgbuf.len, graph->revs->diffopt.file);
 	strbuf_release(&msgbuf);
 }
 
@@ -1222,7 +1230,7 @@ void graph_show_padding(struct git_graph *graph)
 		return;
 
 	graph_padding_line(graph, &msgbuf);
-	fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
+	fwrite(msgbuf.buf, sizeof(char), msgbuf.len, graph->revs->diffopt.file);
 	strbuf_release(&msgbuf);
 }
 
@@ -1239,12 +1247,13 @@ int graph_show_remainder(struct git_graph *graph)
 
 	for (;;) {
 		graph_next_line(graph, &msgbuf);
-		fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
+		fwrite(msgbuf.buf, sizeof(char), msgbuf.len,
+			graph->revs->diffopt.file);
 		strbuf_setlen(&msgbuf, 0);
 		shown = 1;
 
 		if (!graph_is_commit_finished(graph))
-			putchar('\n');
+			putc('\n', graph->revs->diffopt.file);
 		else
 			break;
 	}
@@ -1259,7 +1268,8 @@ static void graph_show_strbuf(struct git_graph *graph, struct strbuf const *sb)
 	char *p;
 
 	if (!graph) {
-		fwrite(sb->buf, sizeof(char), sb->len, stdout);
+		fwrite(sb->buf, sizeof(char), sb->len,
+			graph->revs->diffopt.file);
 		return;
 	}
 
@@ -1277,7 +1287,7 @@ static void graph_show_strbuf(struct git_graph *graph, struct strbuf const *sb)
 		} else {
 			len = (sb->buf + sb->len) - p;
 		}
-		fwrite(p, sizeof(char), len, stdout);
+		fwrite(p, sizeof(char), len, graph->revs->diffopt.file);
 		if (next_p && *next_p != '\0')
 			graph_show_oneline(graph);
 		p = next_p;
@@ -1297,7 +1307,8 @@ void graph_show_commit_msg(struct git_graph *graph,
 		 * CMIT_FMT_USERFORMAT are already missing a terminating
 		 * newline.  All of the other formats should have it.
 		 */
-		fwrite(sb->buf, sizeof(char), sb->len, stdout);
+		fwrite(sb->buf, sizeof(char), sb->len,
+			graph->revs->diffopt.file);
 		return;
 	}
 
@@ -1318,7 +1329,7 @@ void graph_show_commit_msg(struct git_graph *graph,
 		 * new line.
 		 */
 		if (!newline_terminated)
-			putchar('\n');
+			putc('\n', graph->revs->diffopt.file);
 
 		graph_show_remainder(graph);
 
@@ -1326,6 +1337,6 @@ void graph_show_commit_msg(struct git_graph *graph,
 		 * If sb ends with a newline, our output should too.
 		 */
 		if (newline_terminated)
-			putchar('\n');
+			putc('\n', graph->revs->diffopt.file);
 	}
 }
diff --git a/graph.h b/graph.h
index 0be62bd8b1..3f48c19b62 100644
--- a/graph.h
+++ b/graph.h
@@ -68,6 +68,11 @@ int graph_next_line(struct git_graph *graph, struct strbuf *sb);
 
 
 /*
+ * Return current width of the graph in on-screen characters.
+ */
+int graph_width(struct git_graph *graph);
+
+/*
  * graph_show_*: helper functions for printing to stdout
  */
 
diff --git a/grep.c b/grep.c
index 528b652f71..d7d00b87cb 100644
--- a/grep.c
+++ b/grep.c
@@ -4,6 +4,8 @@
 #include "xdiff-interface.h"
 #include "diff.h"
 #include "diffcore.h"
+#include "commit.h"
+#include "quote.h"
 
 static int grep_source_load(struct grep_source *gs);
 static int grep_source_is_binary(struct grep_source *gs);
@@ -161,17 +163,7 @@ void grep_init(struct grep_opt *opt, const char *prefix)
 	color_set(opt->color_sep, def->color_sep);
 }
 
-void grep_commit_pattern_type(enum grep_pattern_type pattern_type, struct grep_opt *opt)
-{
-	if (pattern_type != GREP_PATTERN_TYPE_UNSPECIFIED)
-		grep_set_pattern_type_option(pattern_type, opt);
-	else if (opt->pattern_type_option != GREP_PATTERN_TYPE_UNSPECIFIED)
-		grep_set_pattern_type_option(opt->pattern_type_option, opt);
-	else if (opt->extended_regexp_option)
-		grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE, opt);
-}
-
-void grep_set_pattern_type_option(enum grep_pattern_type pattern_type, struct grep_opt *opt)
+static void grep_set_pattern_type_option(enum grep_pattern_type pattern_type, struct grep_opt *opt)
 {
 	switch (pattern_type) {
 	case GREP_PATTERN_TYPE_UNSPECIFIED:
@@ -203,6 +195,16 @@ void grep_set_pattern_type_option(enum grep_pattern_type pattern_type, struct gr
 	}
 }
 
+void grep_commit_pattern_type(enum grep_pattern_type pattern_type, struct grep_opt *opt)
+{
+	if (pattern_type != GREP_PATTERN_TYPE_UNSPECIFIED)
+		grep_set_pattern_type_option(pattern_type, opt);
+	else if (opt->pattern_type_option != GREP_PATTERN_TYPE_UNSPECIFIED)
+		grep_set_pattern_type_option(opt->pattern_type_option, opt);
+	else if (opt->extended_regexp_option)
+		grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE, opt);
+}
+
 static struct grep_pat *create_grep_pat(const char *pat, size_t patlen,
 					const char *origin, int no,
 					enum grep_pat_token t,
@@ -322,11 +324,16 @@ static void compile_pcre_regexp(struct grep_pat *p, const struct grep_opt *opt)
 	int erroffset;
 	int options = PCRE_MULTILINE;
 
-	if (opt->ignore_case)
+	if (opt->ignore_case) {
+		if (has_non_ascii(p->pattern))
+			p->pcre_tables = pcre_maketables();
 		options |= PCRE_CASELESS;
+	}
+	if (is_utf8_locale() && has_non_ascii(p->pattern))
+		options |= PCRE_UTF8;
 
 	p->pcre_regexp = pcre_compile(p->pattern, options, &error, &erroffset,
-			NULL);
+				      p->pcre_tables);
 	if (!p->pcre_regexp)
 		compile_regexp_failed(p, error);
 
@@ -360,6 +367,7 @@ static void free_pcre_regexp(struct grep_pat *p)
 {
 	pcre_free(p->pcre_regexp);
 	pcre_free(p->pcre_extra_info);
+	pcre_free((void *)p->pcre_tables);
 }
 #else /* !USE_LIBPCRE */
 static void compile_pcre_regexp(struct grep_pat *p, const struct grep_opt *opt)
@@ -396,26 +404,68 @@ static int is_fixed(const char *s, size_t len)
 	return 1;
 }
 
+static void compile_fixed_regexp(struct grep_pat *p, struct grep_opt *opt)
+{
+	struct strbuf sb = STRBUF_INIT;
+	int err;
+	int regflags;
+
+	basic_regex_quote_buf(&sb, p->pattern);
+	regflags = opt->regflags & ~REG_EXTENDED;
+	if (opt->ignore_case)
+		regflags |= REG_ICASE;
+	err = regcomp(&p->regexp, sb.buf, regflags);
+	if (opt->debug)
+		fprintf(stderr, "fixed %s\n", sb.buf);
+	strbuf_release(&sb);
+	if (err) {
+		char errbuf[1024];
+		regerror(err, &p->regexp, errbuf, sizeof(errbuf));
+		regfree(&p->regexp);
+		compile_regexp_failed(p, errbuf);
+	}
+}
+
 static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
 {
+	int icase, ascii_only;
 	int err;
 
 	p->word_regexp = opt->word_regexp;
 	p->ignore_case = opt->ignore_case;
+	icase	       = opt->regflags & REG_ICASE || p->ignore_case;
+	ascii_only     = !has_non_ascii(p->pattern);
 
+	/*
+	 * Even when -F (fixed) asks us to do a non-regexp search, we
+	 * may not be able to correctly case-fold when -i
+	 * (ignore-case) is asked (in which case, we'll synthesize a
+	 * regexp to match the pattern that matches regexp special
+	 * characters literally, while ignoring case differences).  On
+	 * the other hand, even without -F, if the pattern does not
+	 * have any regexp special characters and there is no need for
+	 * case-folding search, we can internally turn it into a
+	 * simple string match using kws.  p->fixed tells us if we
+	 * want to use kws.
+	 */
 	if (opt->fixed || is_fixed(p->pattern, p->patternlen))
-		p->fixed = 1;
+		p->fixed = !icase || ascii_only;
 	else
 		p->fixed = 0;
 
 	if (p->fixed) {
-		if (opt->regflags & REG_ICASE || p->ignore_case)
-			p->kws = kwsalloc(tolower_trans_tbl);
-		else
-			p->kws = kwsalloc(NULL);
+		p->kws = kwsalloc(icase ? tolower_trans_tbl : NULL);
 		kwsincr(p->kws, p->pattern, p->patternlen);
 		kwsprep(p->kws);
 		return;
+	} else if (opt->fixed) {
+		/*
+		 * We come here when the pattern has the non-ascii
+		 * characters we cannot case-fold, and asked to
+		 * ignore-case.
+		 */
+		compile_fixed_regexp(p, opt);
+		return;
 	}
 
 	if (opt->pcre) {
@@ -643,10 +693,10 @@ static struct grep_expr *prep_header_patterns(struct grep_opt *opt)
 
 	for (p = opt->header_list; p; p = p->next) {
 		if (p->token != GREP_PATTERN_HEAD)
-			die("bug: a non-header pattern in grep header list.");
+			die("BUG: a non-header pattern in grep header list.");
 		if (p->field < GREP_HEADER_FIELD_MIN ||
 		    GREP_HEADER_FIELD_MAX <= p->field)
-			die("bug: unknown header field %d", p->field);
+			die("BUG: unknown header field %d", p->field);
 		compile_regexp(p, opt);
 	}
 
@@ -659,7 +709,7 @@ static struct grep_expr *prep_header_patterns(struct grep_opt *opt)
 
 		h = compile_pattern_atom(&pp);
 		if (!h || pp != p->next)
-			die("bug: malformed header expr");
+			die("BUG: malformed header expr");
 		if (!header_group[p->field]) {
 			header_group[p->field] = h;
 			continue;
@@ -1396,9 +1446,17 @@ static int fill_textconv_grep(struct userdiff_driver *driver,
 	return 0;
 }
 
+static int is_empty_line(const char *bol, const char *eol)
+{
+	while (bol < eol && isspace(*bol))
+		bol++;
+	return bol == eol;
+}
+
 static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int collect_hits)
 {
 	char *bol;
+	char *peek_bol = NULL;
 	unsigned long left;
 	unsigned lno = 1;
 	unsigned last_hit = 0;
@@ -1456,7 +1514,7 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
 		case GREP_BINARY_TEXT:
 			break;
 		default:
-			die("bug: unknown binary handling mode");
+			die("BUG: unknown binary handling mode");
 		}
 	}
 
@@ -1543,8 +1601,24 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
 				show_function = 1;
 			goto next_line;
 		}
-		if (show_function && match_funcname(opt, gs, bol, eol))
-			show_function = 0;
+		if (show_function && (!peek_bol || peek_bol < bol)) {
+			unsigned long peek_left = left;
+			char *peek_eol = eol;
+
+			/*
+			 * Trailing empty lines are not interesting.
+			 * Peek past them to see if they belong to the
+			 * body of the current function.
+			 */
+			peek_bol = bol;
+			while (is_empty_line(peek_bol, peek_eol)) {
+				peek_bol = peek_eol + 1;
+				peek_eol = end_of_line(peek_bol, &peek_left);
+			}
+
+			if (match_funcname(opt, gs, peek_bol, peek_eol))
+				show_function = 0;
+		}
 		if (show_function ||
 		    (last_hit && lno <= last_hit + opt->post_context)) {
 			/* If the last hit is within the post context,
@@ -1732,7 +1806,7 @@ static int grep_source_load_file(struct grep_source *gs)
 	if (lstat(filename, &st) < 0) {
 	err_ret:
 		if (errno != ENOENT)
-			error(_("'%s': %s"), filename, strerror(errno));
+			error_errno(_("failed to stat '%s'"), filename);
 		return -1;
 	}
 	if (!S_ISREG(st.st_mode))
@@ -1743,7 +1817,7 @@ static int grep_source_load_file(struct grep_source *gs)
 		goto err_ret;
 	data = xmallocz(size);
 	if (st.st_size != read_in_full(i, data, size)) {
-		error(_("'%s': short read %s"), filename, strerror(errno));
+		error_errno(_("'%s': short read"), filename);
 		close(i);
 		free(data);
 		return -1;
diff --git a/grep.h b/grep.h
index 95f197a8d9..5856a23e46 100644
--- a/grep.h
+++ b/grep.h
@@ -48,6 +48,7 @@ struct grep_pat {
 	regex_t regexp;
 	pcre *pcre_regexp;
 	pcre_extra *pcre_extra_info;
+	const unsigned char *pcre_tables;
 	kwset_t kws;
 	unsigned fixed:1;
 	unsigned ignore_case:1;
@@ -144,7 +145,6 @@ struct grep_opt {
 extern void init_grep_defaults(void);
 extern int grep_config(const char *var, const char *value, void *);
 extern void grep_init(struct grep_opt *, const char *prefix);
-void grep_set_pattern_type_option(enum grep_pattern_type, struct grep_opt *opt);
 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);
diff --git a/help.c b/help.c
index 19328ea992..2ff3b5a774 100644
--- a/help.c
+++ b/help.c
@@ -419,6 +419,12 @@ int cmd_version(int argc, const char **argv, const char *prefix)
 	 * with external projects that rely on the output of "git version".
 	 */
 	printf("git version %s\n", git_version_string);
+	while (*++argv) {
+		if (!strcmp(*argv, "--build-options")) {
+			printf("sizeof-long: %d\n", (int)sizeof(long));
+			/* NEEDSWORK: also save and output GIT-BUILD_OPTIONS? */
+		}
+	}
 	return 0;
 }
 
diff --git a/hex.c b/hex.c
index 0519f853b2..9619b67af0 100644
--- a/hex.c
+++ b/hex.c
@@ -77,6 +77,11 @@ char *sha1_to_hex_r(char *buffer, const unsigned char *sha1)
 	return buffer;
 }
 
+char *oid_to_hex_r(char *buffer, const struct object_id *oid)
+{
+	return sha1_to_hex_r(buffer, oid->hash);
+}
+
 char *sha1_to_hex(const unsigned char *sha1)
 {
 	static int bufno;
diff --git a/http-backend.c b/http-backend.c
index 8870a2681e..adc8c8c3da 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -75,55 +75,57 @@ static void format_write(int fd, const char *fmt, ...)
 	write_or_die(fd, buffer, n);
 }
 
-static void http_status(unsigned code, const char *msg)
+static void http_status(struct strbuf *hdr, unsigned code, const char *msg)
 {
-	format_write(1, "Status: %u %s\r\n", code, msg);
+	strbuf_addf(hdr, "Status: %u %s\r\n", code, msg);
 }
 
-static void hdr_str(const char *name, const char *value)
+static void hdr_str(struct strbuf *hdr, const char *name, const char *value)
 {
-	format_write(1, "%s: %s\r\n", name, value);
+	strbuf_addf(hdr, "%s: %s\r\n", name, value);
 }
 
-static void hdr_int(const char *name, uintmax_t value)
+static void hdr_int(struct strbuf *hdr, const char *name, uintmax_t value)
 {
-	format_write(1, "%s: %" PRIuMAX "\r\n", name, value);
+	strbuf_addf(hdr, "%s: %" PRIuMAX "\r\n", name, value);
 }
 
-static void hdr_date(const char *name, unsigned long when)
+static void hdr_date(struct strbuf *hdr, const char *name, unsigned long when)
 {
 	const char *value = show_date(when, 0, DATE_MODE(RFC2822));
-	hdr_str(name, value);
+	hdr_str(hdr, name, value);
 }
 
-static void hdr_nocache(void)
+static void hdr_nocache(struct strbuf *hdr)
 {
-	hdr_str("Expires", "Fri, 01 Jan 1980 00:00:00 GMT");
-	hdr_str("Pragma", "no-cache");
-	hdr_str("Cache-Control", "no-cache, max-age=0, must-revalidate");
+	hdr_str(hdr, "Expires", "Fri, 01 Jan 1980 00:00:00 GMT");
+	hdr_str(hdr, "Pragma", "no-cache");
+	hdr_str(hdr, "Cache-Control", "no-cache, max-age=0, must-revalidate");
 }
 
-static void hdr_cache_forever(void)
+static void hdr_cache_forever(struct strbuf *hdr)
 {
 	unsigned long now = time(NULL);
-	hdr_date("Date", now);
-	hdr_date("Expires", now + 31536000);
-	hdr_str("Cache-Control", "public, max-age=31536000");
+	hdr_date(hdr, "Date", now);
+	hdr_date(hdr, "Expires", now + 31536000);
+	hdr_str(hdr, "Cache-Control", "public, max-age=31536000");
 }
 
-static void end_headers(void)
+static void end_headers(struct strbuf *hdr)
 {
-	write_or_die(1, "\r\n", 2);
+	strbuf_add(hdr, "\r\n", 2);
+	write_or_die(1, hdr->buf, hdr->len);
+	strbuf_release(hdr);
 }
 
-__attribute__((format (printf, 1, 2)))
-static NORETURN void not_found(const char *err, ...)
+__attribute__((format (printf, 2, 3)))
+static NORETURN void not_found(struct strbuf *hdr, const char *err, ...)
 {
 	va_list params;
 
-	http_status(404, "Not Found");
-	hdr_nocache();
-	end_headers();
+	http_status(hdr, 404, "Not Found");
+	hdr_nocache(hdr);
+	end_headers(hdr);
 
 	va_start(params, err);
 	if (err && *err)
@@ -132,14 +134,14 @@ static NORETURN void not_found(const char *err, ...)
 	exit(0);
 }
 
-__attribute__((format (printf, 1, 2)))
-static NORETURN void forbidden(const char *err, ...)
+__attribute__((format (printf, 2, 3)))
+static NORETURN void forbidden(struct strbuf *hdr, const char *err, ...)
 {
 	va_list params;
 
-	http_status(403, "Forbidden");
-	hdr_nocache();
-	end_headers();
+	http_status(hdr, 403, "Forbidden");
+	hdr_nocache(hdr);
+	end_headers(hdr);
 
 	va_start(params, err);
 	if (err && *err)
@@ -148,21 +150,23 @@ static NORETURN void forbidden(const char *err, ...)
 	exit(0);
 }
 
-static void select_getanyfile(void)
+static void select_getanyfile(struct strbuf *hdr)
 {
 	if (!getanyfile)
-		forbidden("Unsupported service: getanyfile");
+		forbidden(hdr, "Unsupported service: getanyfile");
 }
 
-static void send_strbuf(const char *type, struct strbuf *buf)
+static void send_strbuf(struct strbuf *hdr,
+			const char *type, struct strbuf *buf)
 {
-	hdr_int(content_length, buf->len);
-	hdr_str(content_type, type);
-	end_headers();
+	hdr_int(hdr, content_length, buf->len);
+	hdr_str(hdr, content_type, type);
+	end_headers(hdr);
 	write_or_die(1, buf->buf, buf->len);
 }
 
-static void send_local_file(const char *the_type, const char *name)
+static void send_local_file(struct strbuf *hdr, const char *the_type,
+				const char *name)
 {
 	char *p = git_pathdup("%s", name);
 	size_t buf_alloc = 8192;
@@ -172,14 +176,14 @@ static void send_local_file(const char *the_type, const char *name)
 
 	fd = open(p, O_RDONLY);
 	if (fd < 0)
-		not_found("Cannot open '%s': %s", p, strerror(errno));
+		not_found(hdr, "Cannot open '%s': %s", p, strerror(errno));
 	if (fstat(fd, &sb) < 0)
 		die_errno("Cannot stat '%s'", p);
 
-	hdr_int(content_length, sb.st_size);
-	hdr_str(content_type, the_type);
-	hdr_date(last_modified, sb.st_mtime);
-	end_headers();
+	hdr_int(hdr, content_length, sb.st_size);
+	hdr_str(hdr, content_type, the_type);
+	hdr_date(hdr, last_modified, sb.st_mtime);
+	end_headers(hdr);
 
 	for (;;) {
 		ssize_t n = xread(fd, buf, buf_alloc);
@@ -194,32 +198,32 @@ static void send_local_file(const char *the_type, const char *name)
 	free(p);
 }
 
-static void get_text_file(char *name)
+static void get_text_file(struct strbuf *hdr, char *name)
 {
-	select_getanyfile();
-	hdr_nocache();
-	send_local_file("text/plain", name);
+	select_getanyfile(hdr);
+	hdr_nocache(hdr);
+	send_local_file(hdr, "text/plain", name);
 }
 
-static void get_loose_object(char *name)
+static void get_loose_object(struct strbuf *hdr, char *name)
 {
-	select_getanyfile();
-	hdr_cache_forever();
-	send_local_file("application/x-git-loose-object", name);
+	select_getanyfile(hdr);
+	hdr_cache_forever(hdr);
+	send_local_file(hdr, "application/x-git-loose-object", name);
 }
 
-static void get_pack_file(char *name)
+static void get_pack_file(struct strbuf *hdr, char *name)
 {
-	select_getanyfile();
-	hdr_cache_forever();
-	send_local_file("application/x-git-packed-objects", name);
+	select_getanyfile(hdr);
+	hdr_cache_forever(hdr);
+	send_local_file(hdr, "application/x-git-packed-objects", name);
 }
 
-static void get_idx_file(char *name)
+static void get_idx_file(struct strbuf *hdr, char *name)
 {
-	select_getanyfile();
-	hdr_cache_forever();
-	send_local_file("application/x-git-packed-objects-toc", name);
+	select_getanyfile(hdr);
+	hdr_cache_forever(hdr);
+	send_local_file(hdr, "application/x-git-packed-objects-toc", name);
 }
 
 static void http_config(void)
@@ -241,14 +245,14 @@ static void http_config(void)
 	strbuf_release(&var);
 }
 
-static struct rpc_service *select_service(const char *name)
+static struct rpc_service *select_service(struct strbuf *hdr, const char *name)
 {
 	const char *svc_name;
 	struct rpc_service *svc = NULL;
 	int i;
 
 	if (!skip_prefix(name, "git-", &svc_name))
-		forbidden("Unsupported service: '%s'", name);
+		forbidden(hdr, "Unsupported service: '%s'", name);
 
 	for (i = 0; i < ARRAY_SIZE(rpc_service); i++) {
 		struct rpc_service *s = &rpc_service[i];
@@ -259,14 +263,14 @@ static struct rpc_service *select_service(const char *name)
 	}
 
 	if (!svc)
-		forbidden("Unsupported service: '%s'", name);
+		forbidden(hdr, "Unsupported service: '%s'", name);
 
 	if (svc->enabled < 0) {
 		const char *user = getenv("REMOTE_USER");
 		svc->enabled = (user && *user) ? 1 : 0;
 	}
 	if (!svc->enabled)
-		forbidden("Service not enabled: '%s'", svc->name);
+		forbidden(hdr, "Service not enabled: '%s'", svc->name);
 	return svc;
 }
 
@@ -442,23 +446,23 @@ static int show_text_ref(const char *name, const struct object_id *oid,
 	return 0;
 }
 
-static void get_info_refs(char *arg)
+static void get_info_refs(struct strbuf *hdr, char *arg)
 {
 	const char *service_name = get_parameter("service");
 	struct strbuf buf = STRBUF_INIT;
 
-	hdr_nocache();
+	hdr_nocache(hdr);
 
 	if (service_name) {
 		const char *argv[] = {NULL /* service name */,
 			"--stateless-rpc", "--advertise-refs",
 			".", NULL};
-		struct rpc_service *svc = select_service(service_name);
+		struct rpc_service *svc = select_service(hdr, service_name);
 
 		strbuf_addf(&buf, "application/x-git-%s-advertisement",
 			svc->name);
-		hdr_str(content_type, buf.buf);
-		end_headers();
+		hdr_str(hdr, content_type, buf.buf);
+		end_headers(hdr);
 
 		packet_write(1, "# service=git-%s\n", svc->name);
 		packet_flush(1);
@@ -467,9 +471,9 @@ static void get_info_refs(char *arg)
 		run_service(argv, 0);
 
 	} else {
-		select_getanyfile();
+		select_getanyfile(hdr);
 		for_each_namespaced_ref(show_text_ref, &buf);
-		send_strbuf("text/plain", &buf);
+		send_strbuf(hdr, "text/plain", &buf);
 	}
 	strbuf_release(&buf);
 }
@@ -484,9 +488,9 @@ static int show_head_ref(const char *refname, const struct object_id *oid,
 		const char *target = resolve_ref_unsafe(refname,
 							RESOLVE_REF_READING,
 							unused.hash, NULL);
-		const char *target_nons = strip_namespace(target);
 
-		strbuf_addf(buf, "ref: %s\n", target_nons);
+		if (target)
+			strbuf_addf(buf, "ref: %s\n", strip_namespace(target));
 	} else {
 		strbuf_addf(buf, "%s\n", oid_to_hex(oid));
 	}
@@ -494,24 +498,24 @@ static int show_head_ref(const char *refname, const struct object_id *oid,
 	return 0;
 }
 
-static void get_head(char *arg)
+static void get_head(struct strbuf *hdr, char *arg)
 {
 	struct strbuf buf = STRBUF_INIT;
 
-	select_getanyfile();
+	select_getanyfile(hdr);
 	head_ref_namespaced(show_head_ref, &buf);
-	send_strbuf("text/plain", &buf);
+	send_strbuf(hdr, "text/plain", &buf);
 	strbuf_release(&buf);
 }
 
-static void get_info_packs(char *arg)
+static void get_info_packs(struct strbuf *hdr, char *arg)
 {
 	size_t objdirlen = strlen(get_object_directory());
 	struct strbuf buf = STRBUF_INIT;
 	struct packed_git *p;
 	size_t cnt = 0;
 
-	select_getanyfile();
+	select_getanyfile(hdr);
 	prepare_packed_git();
 	for (p = packed_git; p; p = p->next) {
 		if (p->pack_local)
@@ -525,12 +529,12 @@ static void get_info_packs(char *arg)
 	}
 	strbuf_addch(&buf, '\n');
 
-	hdr_nocache();
-	send_strbuf("text/plain; charset=utf-8", &buf);
+	hdr_nocache(hdr);
+	send_strbuf(hdr, "text/plain; charset=utf-8", &buf);
 	strbuf_release(&buf);
 }
 
-static void check_content_type(const char *accepted_type)
+static void check_content_type(struct strbuf *hdr, const char *accepted_type)
 {
 	const char *actual_type = getenv("CONTENT_TYPE");
 
@@ -538,9 +542,9 @@ static void check_content_type(const char *accepted_type)
 		actual_type = "";
 
 	if (strcmp(actual_type, accepted_type)) {
-		http_status(415, "Unsupported Media Type");
-		hdr_nocache();
-		end_headers();
+		http_status(hdr, 415, "Unsupported Media Type");
+		hdr_nocache(hdr);
+		end_headers(hdr);
 		format_write(1,
 			"Expected POST with Content-Type '%s',"
 			" but received '%s' instead.\n",
@@ -549,23 +553,23 @@ static void check_content_type(const char *accepted_type)
 	}
 }
 
-static void service_rpc(char *service_name)
+static void service_rpc(struct strbuf *hdr, char *service_name)
 {
 	const char *argv[] = {NULL, "--stateless-rpc", ".", NULL};
-	struct rpc_service *svc = select_service(service_name);
+	struct rpc_service *svc = select_service(hdr, service_name);
 	struct strbuf buf = STRBUF_INIT;
 
 	strbuf_reset(&buf);
 	strbuf_addf(&buf, "application/x-git-%s-request", svc->name);
-	check_content_type(buf.buf);
+	check_content_type(hdr, buf.buf);
 
-	hdr_nocache();
+	hdr_nocache(hdr);
 
 	strbuf_reset(&buf);
 	strbuf_addf(&buf, "application/x-git-%s-result", svc->name);
-	hdr_str(content_type, buf.buf);
+	hdr_str(hdr, content_type, buf.buf);
 
-	end_headers();
+	end_headers(hdr);
 
 	argv[0] = svc->name;
 	run_service(argv, svc->buffer_input);
@@ -576,11 +580,13 @@ static int dead;
 static NORETURN void die_webcgi(const char *err, va_list params)
 {
 	if (dead <= 1) {
+		struct strbuf hdr = STRBUF_INIT;
+
 		vreportf("fatal: ", err, params);
 
-		http_status(500, "Internal Server Error");
-		hdr_nocache();
-		end_headers();
+		http_status(&hdr, 500, "Internal Server Error");
+		hdr_nocache(&hdr);
+		end_headers(&hdr);
 	}
 	exit(0); /* we successfully reported a failure ;-) */
 }
@@ -617,7 +623,7 @@ static char* getdir(void)
 static struct service_cmd {
 	const char *method;
 	const char *pattern;
-	void (*imp)(char *);
+	void (*imp)(struct strbuf *, char *);
 } services[] = {
 	{"GET", "/HEAD$", get_head},
 	{"GET", "/info/refs$", get_info_refs},
@@ -632,17 +638,30 @@ static struct service_cmd {
 	{"POST", "/git-receive-pack$", service_rpc}
 };
 
-int main(int argc, char **argv)
+static int bad_request(struct strbuf *hdr, const struct service_cmd *c)
+{
+	const char *proto = getenv("SERVER_PROTOCOL");
+
+	if (proto && !strcmp(proto, "HTTP/1.1")) {
+		http_status(hdr, 405, "Method Not Allowed");
+		hdr_str(hdr, "Allow",
+			!strcmp(c->method, "GET") ? "GET, HEAD" : c->method);
+	} else
+		http_status(hdr, 400, "Bad Request");
+	hdr_nocache(hdr);
+	end_headers(hdr);
+	return 0;
+}
+
+int cmd_main(int argc, const char **argv)
 {
 	char *method = getenv("REQUEST_METHOD");
 	char *dir;
 	struct service_cmd *cmd = NULL;
 	char *cmd_arg = NULL;
 	int i;
+	struct strbuf hdr = STRBUF_INIT;
 
-	git_setup_gettext();
-
-	git_extract_argv0_path(argv[0]);
 	set_die_routine(die_webcgi);
 	set_die_is_recursing_routine(die_webcgi_recursing);
 
@@ -662,18 +681,8 @@ int main(int argc, char **argv)
 		if (!regexec(&re, dir, 1, out, 0)) {
 			size_t n;
 
-			if (strcmp(method, c->method)) {
-				const char *proto = getenv("SERVER_PROTOCOL");
-				if (proto && !strcmp(proto, "HTTP/1.1")) {
-					http_status(405, "Method Not Allowed");
-					hdr_str("Allow", !strcmp(c->method, "GET") ?
-						"GET, HEAD" : c->method);
-				} else
-					http_status(400, "Bad Request");
-				hdr_nocache();
-				end_headers();
-				return 0;
-			}
+			if (strcmp(method, c->method))
+				return bad_request(&hdr, c);
 
 			cmd = c;
 			n = out[0].rm_eo - out[0].rm_so;
@@ -685,19 +694,19 @@ int main(int argc, char **argv)
 	}
 
 	if (!cmd)
-		not_found("Request not supported: '%s'", dir);
+		not_found(&hdr, "Request not supported: '%s'", dir);
 
 	setup_path();
 	if (!enter_repo(dir, 0))
-		not_found("Not a git repository: '%s'", dir);
+		not_found(&hdr, "Not a git repository: '%s'", dir);
 	if (!getenv("GIT_HTTP_EXPORT_ALL") &&
 	    access("git-daemon-export-ok", F_OK) )
-		not_found("Repository not exported: '%s'", dir);
+		not_found(&hdr, "Repository not exported: '%s'", dir);
 
 	http_config();
 	max_request_buffer = git_env_ulong("GIT_HTTP_MAX_REQUEST_BUFFER",
 					   max_request_buffer);
 
-	cmd->imp(cmd_arg);
+	cmd->imp(&hdr, cmd_arg);
 	return 0;
 }
diff --git a/http-fetch.c b/http-fetch.c
index ba3ea10670..3b556d6619 100644
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -6,7 +6,7 @@
 static const char http_fetch_usage[] = "git http-fetch "
 "[-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin] commit-id url";
 
-int main(int argc, const char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	struct walker *walker;
 	int commits_on_stdin = 0;
@@ -22,10 +22,6 @@ int main(int argc, const char **argv)
 	int get_verbosely = 0;
 	int get_recover = 0;
 
-	git_setup_gettext();
-
-	git_extract_argv0_path(argv[0]);
-
 	while (arg < argc && argv[arg][0] == '-') {
 		if (argv[arg][1] == 't') {
 			get_tree = 1;
diff --git a/http-push.c b/http-push.c
index bd60668707..704b1c837c 100644
--- a/http-push.c
+++ b/http-push.c
@@ -211,7 +211,7 @@ static void curl_setup_http(CURL *curl, const char *url,
 static struct curl_slist *get_dav_token_headers(struct remote_lock *lock, enum dav_header_flag options)
 {
 	struct strbuf buf = STRBUF_INIT;
-	struct curl_slist *dav_headers = NULL;
+	struct curl_slist *dav_headers = http_copy_default_headers();
 
 	if (options & DAV_HEADER_IF) {
 		strbuf_addf(&buf, "If: (<%s>)", lock->token);
@@ -417,7 +417,7 @@ static void start_put(struct transfer_request *request)
 static void start_move(struct transfer_request *request)
 {
 	struct active_request_slot *slot;
-	struct curl_slist *dav_headers = NULL;
+	struct curl_slist *dav_headers = http_copy_default_headers();
 
 	slot = get_active_slot();
 	slot->callback_func = process_response;
@@ -845,7 +845,7 @@ static struct remote_lock *lock_remote(const char *path, long timeout)
 	char *ep;
 	char timeout_header[25];
 	struct remote_lock *lock = NULL;
-	struct curl_slist *dav_headers = NULL;
+	struct curl_slist *dav_headers = http_copy_default_headers();
 	struct xml_ctx ctx;
 	char *escaped;
 
@@ -1126,7 +1126,7 @@ static void remote_ls(const char *path, int flags,
 	struct slot_results results;
 	struct strbuf in_buffer = STRBUF_INIT;
 	struct buffer out_buffer = { STRBUF_INIT, 0 };
-	struct curl_slist *dav_headers = NULL;
+	struct curl_slist *dav_headers = http_copy_default_headers();
 	struct xml_ctx ctx;
 	struct remote_ls_ctx ls;
 
@@ -1137,7 +1137,7 @@ static void remote_ls(const char *path, int flags,
 	ls.userData = userData;
 	ls.userFunc = userFunc;
 
-	strbuf_addf(&out_buffer.buf, PROPFIND_ALL_REQUEST);
+	strbuf_addstr(&out_buffer.buf, PROPFIND_ALL_REQUEST);
 
 	dav_headers = curl_slist_append(dav_headers, "Depth: 1");
 	dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml");
@@ -1204,7 +1204,7 @@ static int locking_available(void)
 	struct slot_results results;
 	struct strbuf in_buffer = STRBUF_INIT;
 	struct buffer out_buffer = { STRBUF_INIT, 0 };
-	struct curl_slist *dav_headers = NULL;
+	struct curl_slist *dav_headers = http_copy_default_headers();
 	struct xml_ctx ctx;
 	int lock_flags = 0;
 	char *escaped;
@@ -1312,10 +1312,10 @@ static struct object_list **process_tree(struct tree *tree,
 	while (tree_entry(&desc, &entry))
 		switch (object_type(entry.mode)) {
 		case OBJ_TREE:
-			p = process_tree(lookup_tree(entry.sha1), p);
+			p = process_tree(lookup_tree(entry.oid->hash), p);
 			break;
 		case OBJ_BLOB:
-			p = process_blob(lookup_blob(entry.sha1), p);
+			p = process_blob(lookup_blob(entry.oid->hash), p);
 			break;
 		default:
 			/* Subproject commit - not in this repository */
@@ -1692,12 +1692,12 @@ static void run_request_queue(void)
 #endif
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	struct transfer_request *request;
 	struct transfer_request *next_request;
 	int nr_refspec = 0;
-	char **refspec = NULL;
+	const char **refspec = NULL;
 	struct remote_lock *ref_lock = NULL;
 	struct remote_lock *info_ref_lock = NULL;
 	struct rev_info revs;
@@ -1709,15 +1709,11 @@ int main(int argc, char **argv)
 	int new_refs;
 	struct ref *ref, *local_refs;
 
-	git_setup_gettext();
-
-	git_extract_argv0_path(argv[0]);
-
 	repo = xcalloc(1, sizeof(*repo));
 
 	argv++;
 	for (i = 1; i < argc; i++, argv++) {
-		char *arg = *argv;
+		const char *arg = *argv;
 
 		if (*arg == '-') {
 			if (!strcmp(arg, "--all")) {
diff --git a/http-walker.c b/http-walker.c
index 2c721f0c30..0b2425531a 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -2,6 +2,7 @@
 #include "commit.h"
 #include "walker.h"
 #include "http.h"
+#include "list.h"
 
 struct alt_base {
 	char *base;
@@ -23,7 +24,7 @@ struct object_request {
 	struct alt_base *repo;
 	enum object_request_state state;
 	struct http_object_request *req;
-	struct object_request *next;
+	struct list_head node;
 };
 
 struct alternates_request {
@@ -41,7 +42,7 @@ struct walker_data {
 	struct alt_base *alt;
 };
 
-static struct object_request *object_queue_head;
+static LIST_HEAD(object_queue_head);
 
 static void fetch_alternates(struct walker *walker, const char *base);
 
@@ -110,19 +111,10 @@ static void process_object_response(void *callback_data)
 
 static void release_object_request(struct object_request *obj_req)
 {
-	struct object_request *entry = object_queue_head;
-
 	if (obj_req->req !=NULL && obj_req->req->localfile != -1)
 		error("fd leakage in release: %d", obj_req->req->localfile);
-	if (obj_req == object_queue_head) {
-		object_queue_head = obj_req->next;
-	} else {
-		while (entry->next != NULL && entry->next != obj_req)
-			entry = entry->next;
-		if (entry->next == obj_req)
-			entry->next = entry->next->next;
-	}
 
+	list_del(&obj_req->node);
 	free(obj_req);
 }
 
@@ -130,8 +122,10 @@ static void release_object_request(struct object_request *obj_req)
 static int fill_active_slot(struct walker *walker)
 {
 	struct object_request *obj_req;
+	struct list_head *pos, *tmp, *head = &object_queue_head;
 
-	for (obj_req = object_queue_head; obj_req; obj_req = obj_req->next) {
+	list_for_each_safe(pos, tmp, head) {
+		obj_req = list_entry(pos, struct object_request, node);
 		if (obj_req->state == WAITING) {
 			if (has_sha1_file(obj_req->sha1))
 				obj_req->state = COMPLETE;
@@ -148,7 +142,6 @@ static int fill_active_slot(struct walker *walker)
 static void prefetch(struct walker *walker, unsigned char *sha1)
 {
 	struct object_request *newreq;
-	struct object_request *tail;
 	struct walker_data *data = walker->data;
 
 	newreq = xmalloc(sizeof(*newreq));
@@ -157,18 +150,9 @@ static void prefetch(struct walker *walker, unsigned char *sha1)
 	newreq->repo = data->alt;
 	newreq->state = WAITING;
 	newreq->req = NULL;
-	newreq->next = NULL;
 
 	http_is_verbose = walker->get_verbosely;
-
-	if (object_queue_head == NULL) {
-		object_queue_head = newreq;
-	} else {
-		tail = object_queue_head;
-		while (tail->next != NULL)
-			tail = tail->next;
-		tail->next = newreq;
-	}
+	list_add_tail(&newreq->node, &object_queue_head);
 
 #ifdef USE_CURL_MULTI
 	fill_active_slots();
@@ -447,15 +431,19 @@ static void abort_object_request(struct object_request *obj_req)
 	release_object_request(obj_req);
 }
 
-static int fetch_object(struct walker *walker, struct alt_base *repo, unsigned char *sha1)
+static int fetch_object(struct walker *walker, unsigned char *sha1)
 {
 	char *hex = sha1_to_hex(sha1);
 	int ret = 0;
-	struct object_request *obj_req = object_queue_head;
+	struct object_request *obj_req = NULL;
 	struct http_object_request *req;
+	struct list_head *pos, *head = &object_queue_head;
 
-	while (obj_req != NULL && hashcmp(obj_req->sha1, sha1))
-		obj_req = obj_req->next;
+	list_for_each(pos, head) {
+		obj_req = list_entry(pos, struct object_request, node);
+		if (!hashcmp(obj_req->sha1, sha1))
+			break;
+	}
 	if (obj_req == NULL)
 		return error("Couldn't find request for %s in the queue", hex);
 
@@ -488,6 +476,15 @@ static int fetch_object(struct walker *walker, struct alt_base *repo, unsigned c
 		req->localfile = -1;
 	}
 
+	/*
+	 * we turned off CURLOPT_FAILONERROR to avoid losing a
+	 * persistent connection and got CURLE_OK.
+	 */
+	if (req->http_code == 404 && req->curl_result == CURLE_OK &&
+			(starts_with(req->url, "http://") ||
+			 starts_with(req->url, "https://")))
+		req->curl_result = CURLE_HTTP_RETURNED_ERROR;
+
 	if (obj_req->state == ABORTED) {
 		ret = error("Request for %s aborted", hex);
 	} else if (req->curl_result != CURLE_OK &&
@@ -518,7 +515,7 @@ static int fetch(struct walker *walker, unsigned char *sha1)
 	struct walker_data *data = walker->data;
 	struct alt_base *altbase = data->alt;
 
-	if (!fetch_object(walker, altbase, sha1))
+	if (!fetch_object(walker, sha1))
 		return 0;
 	while (altbase) {
 		if (!http_fetch_pack(walker, altbase, sha1))
diff --git a/http.c b/http.c
index 1044f9ba0e..cd40b012f8 100644
--- a/http.c
+++ b/http.c
@@ -11,6 +11,7 @@
 #include "gettext.h"
 #include "transport.h"
 
+static struct trace_key trace_curl = TRACE_KEY_INIT(CURL);
 #if LIBCURL_VERSION_NUM >= 0x070a08
 long int git_curl_ipresolve = CURL_IPRESOLVE_WHATEVER;
 #else
@@ -114,6 +115,7 @@ static unsigned long http_auth_methods = CURLAUTH_ANY;
 
 static struct curl_slist *pragma_header;
 static struct curl_slist *no_pragma_header;
+static struct curl_slist *extra_http_headers;
 
 static struct active_request_slot *active_queue_head;
 
@@ -323,6 +325,19 @@ static int http_options(const char *var, const char *value, void *cb)
 #endif
 	}
 
+	if (!strcmp("http.extraheader", var)) {
+		if (!value) {
+			return config_error_nonbool(var);
+		} else if (!*value) {
+			curl_slist_free_all(extra_http_headers);
+			extra_http_headers = NULL;
+		} else {
+			extra_http_headers =
+				curl_slist_append(extra_http_headers, value);
+		}
+		return 0;
+	}
+
 	/* Fall back on the default ones */
 	return git_default_config(var, value, cb);
 }
@@ -446,8 +461,7 @@ static int sockopt_callback(void *client, curl_socket_t fd, curlsocktype type)
 
 	rc = setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&ka, len);
 	if (rc < 0)
-		warning("unable to set SO_KEEPALIVE on socket %s",
-			strerror(errno));
+		warning_errno("unable to set SO_KEEPALIVE on socket");
 
 	return 0; /* CURL_SOCKOPT_OK only exists since curl 7.21.5 */
 }
@@ -464,6 +478,125 @@ static void set_curl_keepalive(CURL *c)
 }
 #endif
 
+static void redact_sensitive_header(struct strbuf *header)
+{
+	const char *sensitive_header;
+
+	if (skip_prefix(header->buf, "Authorization:", &sensitive_header) ||
+	    skip_prefix(header->buf, "Proxy-Authorization:", &sensitive_header)) {
+		/* The first token is the type, which is OK to log */
+		while (isspace(*sensitive_header))
+			sensitive_header++;
+		while (*sensitive_header && !isspace(*sensitive_header))
+			sensitive_header++;
+		/* Everything else is opaque and possibly sensitive */
+		strbuf_setlen(header,  sensitive_header - header->buf);
+		strbuf_addstr(header, " <redacted>");
+	}
+}
+
+static void curl_dump_header(const char *text, unsigned char *ptr, size_t size, int hide_sensitive_header)
+{
+	struct strbuf out = STRBUF_INIT;
+	struct strbuf **headers, **header;
+
+	strbuf_addf(&out, "%s, %10.10ld bytes (0x%8.8lx)\n",
+		text, (long)size, (long)size);
+	trace_strbuf(&trace_curl, &out);
+	strbuf_reset(&out);
+	strbuf_add(&out, ptr, size);
+	headers = strbuf_split_max(&out, '\n', 0);
+
+	for (header = headers; *header; header++) {
+		if (hide_sensitive_header)
+			redact_sensitive_header(*header);
+		strbuf_insert((*header), 0, text, strlen(text));
+		strbuf_insert((*header), strlen(text), ": ", 2);
+		strbuf_rtrim((*header));
+		strbuf_addch((*header), '\n');
+		trace_strbuf(&trace_curl, (*header));
+	}
+	strbuf_list_free(headers);
+	strbuf_release(&out);
+}
+
+static void curl_dump_data(const char *text, unsigned char *ptr, size_t size)
+{
+	size_t i;
+	struct strbuf out = STRBUF_INIT;
+	unsigned int width = 60;
+
+	strbuf_addf(&out, "%s, %10.10ld bytes (0x%8.8lx)\n",
+		text, (long)size, (long)size);
+	trace_strbuf(&trace_curl, &out);
+
+	for (i = 0; i < size; i += width) {
+		size_t w;
+
+		strbuf_reset(&out);
+		strbuf_addf(&out, "%s: ", text);
+		for (w = 0; (w < width) && (i + w < size); w++) {
+			unsigned char ch = ptr[i + w];
+
+			strbuf_addch(&out,
+				       (ch >= 0x20) && (ch < 0x80)
+				       ? ch : '.');
+		}
+		strbuf_addch(&out, '\n');
+		trace_strbuf(&trace_curl, &out);
+	}
+	strbuf_release(&out);
+}
+
+static int curl_trace(CURL *handle, curl_infotype type, char *data, size_t size, void *userp)
+{
+	const char *text;
+	enum { NO_FILTER = 0, DO_FILTER = 1 };
+
+	switch (type) {
+	case CURLINFO_TEXT:
+		trace_printf_key(&trace_curl, "== Info: %s", data);
+	default:		/* we ignore unknown types by default */
+		return 0;
+
+	case CURLINFO_HEADER_OUT:
+		text = "=> Send header";
+		curl_dump_header(text, (unsigned char *)data, size, DO_FILTER);
+		break;
+	case CURLINFO_DATA_OUT:
+		text = "=> Send data";
+		curl_dump_data(text, (unsigned char *)data, size);
+		break;
+	case CURLINFO_SSL_DATA_OUT:
+		text = "=> Send SSL data";
+		curl_dump_data(text, (unsigned char *)data, size);
+		break;
+	case CURLINFO_HEADER_IN:
+		text = "<= Recv header";
+		curl_dump_header(text, (unsigned char *)data, size, NO_FILTER);
+		break;
+	case CURLINFO_DATA_IN:
+		text = "<= Recv data";
+		curl_dump_data(text, (unsigned char *)data, size);
+		break;
+	case CURLINFO_SSL_DATA_IN:
+		text = "<= Recv SSL data";
+		curl_dump_data(text, (unsigned char *)data, size);
+		break;
+	}
+	return 0;
+}
+
+void setup_curl_trace(CURL *handle)
+{
+	if (!trace_want(&trace_curl))
+		return;
+	curl_easy_setopt(handle, CURLOPT_VERBOSE, 1L);
+	curl_easy_setopt(handle, CURLOPT_DEBUGFUNCTION, curl_trace);
+	curl_easy_setopt(handle, CURLOPT_DEBUGDATA, NULL);
+}
+
+
 static CURL *get_curl_handle(void)
 {
 	CURL *result = curl_easy_init();
@@ -562,9 +695,9 @@ static CURL *get_curl_handle(void)
 		warning("protocol restrictions not applied to curl redirects because\n"
 			"your curl version is too old (>= 7.19.4)");
 #endif
-
 	if (getenv("GIT_CURL_VERBOSE"))
-		curl_easy_setopt(result, CURLOPT_VERBOSE, 1);
+		curl_easy_setopt(result, CURLOPT_VERBOSE, 1L);
+	setup_curl_trace(result);
 
 	curl_easy_setopt(result, CURLOPT_USERAGENT,
 		user_agent ? user_agent : git_user_agent());
@@ -678,8 +811,10 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
 	if (remote)
 		var_override(&http_proxy_authmethod, remote->http_proxy_authmethod);
 
-	pragma_header = curl_slist_append(pragma_header, "Pragma: no-cache");
-	no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:");
+	pragma_header = curl_slist_append(http_copy_default_headers(),
+		"Pragma: no-cache");
+	no_pragma_header = curl_slist_append(http_copy_default_headers(),
+		"Pragma:");
 
 #ifdef USE_CURL_MULTI
 	{
@@ -765,6 +900,9 @@ void http_cleanup(void)
 #endif
 	curl_global_cleanup();
 
+	curl_slist_free_all(extra_http_headers);
+	extra_http_headers = NULL;
+
 	curl_slist_free_all(pragma_header);
 	pragma_header = NULL;
 
@@ -1087,7 +1225,7 @@ void append_remote_object_url(struct strbuf *buf, const char *url,
 
 	strbuf_addf(buf, "objects/%.*s/", 2, hex);
 	if (!only_two_digit_prefix)
-		strbuf_addf(buf, "%s", hex+2);
+		strbuf_addstr(buf, hex + 2);
 }
 
 char *get_remote_object_url(const char *url, const char *hex,
@@ -1163,6 +1301,16 @@ int run_one_slot(struct active_request_slot *slot,
 	return handle_curl_result(results);
 }
 
+struct curl_slist *http_copy_default_headers(void)
+{
+	struct curl_slist *headers = NULL, *h;
+
+	for (h = extra_http_headers; h; h = h->next)
+		headers = curl_slist_append(headers, h->data);
+
+	return headers;
+}
+
 static CURLcode curlinfo_strbuf(CURL *curl, CURLINFO info, struct strbuf *buf)
 {
 	char *ptr;
@@ -1380,7 +1528,7 @@ static int http_request(const char *url,
 {
 	struct active_request_slot *slot;
 	struct slot_results results;
-	struct curl_slist *headers = NULL;
+	struct curl_slist *headers = http_copy_default_headers();
 	struct strbuf buf = STRBUF_INIT;
 	const char *accept_language;
 	int ret;
@@ -1827,8 +1975,19 @@ static size_t fwrite_sha1_file(char *ptr, size_t eltsize, size_t nmemb,
 	unsigned char expn[4096];
 	size_t size = eltsize * nmemb;
 	int posn = 0;
-	struct http_object_request *freq =
-		(struct http_object_request *)data;
+	struct http_object_request *freq = data;
+	struct active_request_slot *slot = freq->slot;
+
+	if (slot) {
+		CURLcode c = curl_easy_getinfo(slot->curl, CURLINFO_HTTP_CODE,
+						&slot->http_code);
+		if (c != CURLE_OK)
+			die("BUG: curl_easy_getinfo for HTTP code failed: %s",
+				curl_easy_strerror(c));
+		if (slot->http_code >= 400)
+			return size;
+	}
+
 	do {
 		ssize_t retval = xwrite(freq->localfile,
 					(char *) ptr + posn, size - posn);
@@ -1894,8 +2053,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
 	}
 
 	if (freq->localfile < 0) {
-		error("Couldn't create temporary file %s: %s",
-		      freq->tmpfile, strerror(errno));
+		error_errno("Couldn't create temporary file %s", freq->tmpfile);
 		goto abort;
 	}
 
@@ -1940,8 +2098,8 @@ struct http_object_request *new_http_object_request(const char *base_url,
 			prev_posn = 0;
 			lseek(freq->localfile, 0, SEEK_SET);
 			if (ftruncate(freq->localfile, 0) < 0) {
-				error("Couldn't truncate temporary file %s: %s",
-					  freq->tmpfile, strerror(errno));
+				error_errno("Couldn't truncate temporary file %s",
+					    freq->tmpfile);
 				goto abort;
 			}
 		}
@@ -1950,6 +2108,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
 	freq->slot = get_active_slot();
 
 	curl_easy_setopt(freq->slot->curl, CURLOPT_FILE, freq);
+	curl_easy_setopt(freq->slot->curl, CURLOPT_FAILONERROR, 0);
 	curl_easy_setopt(freq->slot->curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file);
 	curl_easy_setopt(freq->slot->curl, CURLOPT_ERRORBUFFER, freq->errorstr);
 	curl_easy_setopt(freq->slot->curl, CURLOPT_URL, freq->url);
diff --git a/http.h b/http.h
index 4ef4bbda7d..5ab9d9c329 100644
--- a/http.h
+++ b/http.h
@@ -106,6 +106,7 @@ extern void step_active_slots(void);
 extern void http_init(struct remote *remote, const char *url,
 		      int proactive_auth);
 extern void http_cleanup(void);
+extern struct curl_slist *http_copy_default_headers(void);
 
 extern long int git_curl_ipresolve;
 extern int active_requests;
@@ -224,4 +225,6 @@ 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);
 
+/* setup routine for curl_easy_setopt CURLOPT_DEBUGFUNCTION */
+void setup_curl_trace(CURL *handle);
 #endif /* HTTP_H */
diff --git a/ident.c b/ident.c
index 4fd82d1043..e20a772dde 100644
--- a/ident.c
+++ b/ident.c
@@ -75,14 +75,12 @@ static int add_mailname_host(struct strbuf *buf)
 	mailname = fopen("/etc/mailname", "r");
 	if (!mailname) {
 		if (errno != ENOENT)
-			warning("cannot open /etc/mailname: %s",
-				strerror(errno));
+			warning_errno("cannot open /etc/mailname");
 		return -1;
 	}
 	if (strbuf_getline(&mailnamebuf, mailname) == EOF) {
 		if (ferror(mailname))
-			warning("cannot read /etc/mailname: %s",
-				strerror(errno));
+			warning_errno("cannot read /etc/mailname");
 		strbuf_release(&mailnamebuf);
 		fclose(mailname);
 		return -1;
@@ -125,7 +123,7 @@ static void add_domainname(struct strbuf *out, int *is_bogus)
 	char buf[1024];
 
 	if (gethostname(buf, sizeof(buf))) {
-		warning("cannot get host name: %s", strerror(errno));
+		warning_errno("cannot get host name");
 		strbuf_addstr(out, "(none)");
 		*is_bogus = 1;
 		return;
@@ -186,6 +184,11 @@ static const char *ident_default_date(void)
 	return git_default_date.buf;
 }
 
+void reset_ident_date(void)
+{
+	strbuf_reset(&git_default_date);
+}
+
 static int crud(unsigned char c)
 {
 	return  c <= 32  ||
diff --git a/imap-send.c b/imap-send.c
index 938c691585..0f5f4760e9 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -511,7 +511,7 @@ static int nfsnprintf(char *buf, int blen, const char *fmt, ...)
 
 	va_start(va, fmt);
 	if (blen <= 0 || (unsigned)(ret = vsnprintf(buf, blen, fmt, va)) >= (unsigned)blen)
-		die("Fatal: buffer too small. Please report a bug.");
+		die("BUG: buffer too small. Please report a bug.");
 	va_end(va);
 	return ret;
 }
@@ -1443,6 +1443,7 @@ static CURL *setup_curl(struct imap_server_conf *srvc)
 
 	if (0 < verbosity || getenv("GIT_CURL_VERBOSE"))
 		curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+	setup_curl_trace(curl);
 
 	return curl;
 }
@@ -1494,16 +1495,12 @@ static int curl_append_msgs_to_imap(struct imap_server_conf *server,
 }
 #endif
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	struct strbuf all_msgs = STRBUF_INIT;
 	int total;
 	int nongit_ok;
 
-	git_extract_argv0_path(argv[0]);
-
-	git_setup_gettext();
-
 	setup_git_directory_gently(&nongit_ok);
 	git_imap_config();
 
diff --git a/iterator.h b/iterator.h
new file mode 100644
index 0000000000..0f6900e43a
--- /dev/null
+++ b/iterator.h
@@ -0,0 +1,81 @@
+#ifndef ITERATOR_H
+#define ITERATOR_H
+
+/*
+ * Generic constants related to iterators.
+ */
+
+/*
+ * The attempt to advance the iterator was successful; the iterator
+ * reflects the new current entry.
+ */
+#define ITER_OK 0
+
+/*
+ * The iterator is exhausted and has been freed.
+ */
+#define ITER_DONE -1
+
+/*
+ * The iterator experienced an error. The iteration has been aborted
+ * and the iterator has been freed.
+ */
+#define ITER_ERROR -2
+
+/*
+ * Return values for selector functions for merge iterators. The
+ * numerical values of these constants are important and must be
+ * compatible with ITER_DONE and ITER_ERROR.
+ */
+enum iterator_selection {
+	/* End the iteration without an error: */
+	ITER_SELECT_DONE = ITER_DONE,
+
+	/* Report an error and abort the iteration: */
+	ITER_SELECT_ERROR = ITER_ERROR,
+
+	/*
+	 * The next group of constants are masks that are useful
+	 * mainly internally.
+	 */
+
+	/* The LSB selects whether iter0/iter1 is the "current" iterator: */
+	ITER_CURRENT_SELECTION_MASK = 0x01,
+
+	/* iter0 is the "current" iterator this round: */
+	ITER_CURRENT_SELECTION_0 = 0x00,
+
+	/* iter1 is the "current" iterator this round: */
+	ITER_CURRENT_SELECTION_1 = 0x01,
+
+	/* Yield the value from the current iterator? */
+	ITER_YIELD_CURRENT = 0x02,
+
+	/* Discard the value from the secondary iterator? */
+	ITER_SKIP_SECONDARY = 0x04,
+
+	/*
+	 * The constants that a selector function should usually
+	 * return.
+	 */
+
+	/* Yield the value from iter0: */
+	ITER_SELECT_0 = ITER_CURRENT_SELECTION_0 | ITER_YIELD_CURRENT,
+
+	/* Yield the value from iter0 and discard the one from iter1: */
+	ITER_SELECT_0_SKIP_1 = ITER_SELECT_0 | ITER_SKIP_SECONDARY,
+
+	/* Discard the value from iter0 without yielding anything this round: */
+	ITER_SKIP_0 = ITER_CURRENT_SELECTION_1 | ITER_SKIP_SECONDARY,
+
+	/* Yield the value from iter1: */
+	ITER_SELECT_1 = ITER_CURRENT_SELECTION_1 | ITER_YIELD_CURRENT,
+
+	/* Yield the value from iter1 and discard the one from iter0: */
+	ITER_SELECT_1_SKIP_0 = ITER_SELECT_1 | ITER_SKIP_SECONDARY,
+
+	/* Discard the value from iter1 without yielding anything this round: */
+	ITER_SKIP_1 = ITER_CURRENT_SELECTION_0 | ITER_SKIP_SECONDARY
+};
+
+#endif /* ITERATOR_H */
diff --git a/line-log.c b/line-log.c
index bbe31ed6fb..916e724870 100644
--- a/line-log.c
+++ b/line-log.c
@@ -480,8 +480,7 @@ static struct commit *check_single_commit(struct rev_info *revs)
 		struct object *obj = revs->pending.objects[i].item;
 		if (obj->flags & UNINTERESTING)
 			continue;
-		while (obj->type == OBJ_TAG)
-			obj = deref_tag(obj, NULL, 0);
+		obj = deref_tag(obj, NULL, 0);
 		if (obj->type != OBJ_COMMIT)
 			die("Non commit %s?", revs->pending.objects[i].name);
 		if (commit)
@@ -520,7 +519,7 @@ static void fill_line_ends(struct diff_filespec *spec, long *lines,
 	char *data = NULL;
 
 	if (diff_populate_filespec(spec, 0))
-		die("Cannot read blob %s", sha1_to_hex(spec->sha1));
+		die("Cannot read blob %s", oid_to_hex(&spec->oid));
 
 	ALLOC_ARRAY(ends, size);
 	ends[cur++] = 0;
@@ -841,7 +840,7 @@ static char *get_nth_line(long line, unsigned long *ends, void *data)
 
 static void print_line(const char *prefix, char first,
 		       long line, unsigned long *ends, void *data,
-		       const char *color, const char *reset)
+		       const char *color, const char *reset, FILE *file)
 {
 	char *begin = get_nth_line(line, ends, data);
 	char *end = get_nth_line(line+1, ends, data);
@@ -852,14 +851,14 @@ static void print_line(const char *prefix, char first,
 		had_nl = 1;
 	}
 
-	fputs(prefix, stdout);
-	fputs(color, stdout);
-	putchar(first);
-	fwrite(begin, 1, end-begin, stdout);
-	fputs(reset, stdout);
-	putchar('\n');
+	fputs(prefix, file);
+	fputs(color, file);
+	putc(first, file);
+	fwrite(begin, 1, end-begin, file);
+	fputs(reset, file);
+	putc('\n', file);
 	if (!had_nl)
-		fputs("\\ No newline at end of file\n", stdout);
+		fputs("\\ No newline at end of file\n", file);
 }
 
 static char *output_prefix(struct diff_options *opt)
@@ -894,16 +893,16 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
 	if (!pair || !diff)
 		return;
 
-	if (pair->one->sha1_valid)
+	if (pair->one->oid_valid)
 		fill_line_ends(pair->one, &p_lines, &p_ends);
 	fill_line_ends(pair->two, &t_lines, &t_ends);
 
-	printf("%s%sdiff --git a/%s b/%s%s\n", prefix, c_meta, pair->one->path, pair->two->path, c_reset);
-	printf("%s%s--- %s%s%s\n", prefix, c_meta,
-	       pair->one->sha1_valid ? "a/" : "",
-	       pair->one->sha1_valid ? pair->one->path : "/dev/null",
+	fprintf(opt->file, "%s%sdiff --git a/%s b/%s%s\n", prefix, c_meta, pair->one->path, pair->two->path, c_reset);
+	fprintf(opt->file, "%s%s--- %s%s%s\n", prefix, c_meta,
+	       pair->one->oid_valid ? "a/" : "",
+	       pair->one->oid_valid ? pair->one->path : "/dev/null",
 	       c_reset);
-	printf("%s%s+++ b/%s%s\n", prefix, c_meta, pair->two->path, c_reset);
+	fprintf(opt->file, "%s%s+++ b/%s%s\n", prefix, c_meta, pair->two->path, c_reset);
 	for (i = 0; i < range->ranges.nr; i++) {
 		long p_start, p_end;
 		long t_start = range->ranges.ranges[i].start;
@@ -945,7 +944,7 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
 		}
 
 		/* Now output a diff hunk for this range */
-		printf("%s%s@@ -%ld,%ld +%ld,%ld @@%s\n",
+		fprintf(opt->file, "%s%s@@ -%ld,%ld +%ld,%ld @@%s\n",
 		       prefix, c_frag,
 		       p_start+1, p_end-p_start, t_start+1, t_end-t_start,
 		       c_reset);
@@ -953,18 +952,18 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
 			int k;
 			for (; t_cur < diff->target.ranges[j].start; t_cur++)
 				print_line(prefix, ' ', t_cur, t_ends, pair->two->data,
-					   c_context, c_reset);
+					   c_context, c_reset, opt->file);
 			for (k = diff->parent.ranges[j].start; k < diff->parent.ranges[j].end; k++)
 				print_line(prefix, '-', k, p_ends, pair->one->data,
-					   c_old, c_reset);
+					   c_old, c_reset, opt->file);
 			for (; t_cur < diff->target.ranges[j].end && t_cur < t_end; t_cur++)
 				print_line(prefix, '+', t_cur, t_ends, pair->two->data,
-					   c_new, c_reset);
+					   c_new, c_reset, opt->file);
 			j++;
 		}
 		for (; t_cur < t_end; t_cur++)
 			print_line(prefix, ' ', t_cur, t_ends, pair->two->data,
-				   c_context, c_reset);
+				   c_context, c_reset, opt->file);
 	}
 
 	free(p_ends);
@@ -977,7 +976,7 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
  */
 static void dump_diff_hacky(struct rev_info *rev, struct line_log_data *range)
 {
-	puts(output_prefix(&rev->diffopt));
+	fprintf(rev->diffopt.file, "%s\n", output_prefix(&rev->diffopt));
 	while (range) {
 		dump_diff_hacky_one(rev, range);
 		range = range->next;
@@ -1011,12 +1010,12 @@ static int process_diff_filepair(struct rev_info *rev,
 	if (rg->ranges.nr == 0)
 		return 0;
 
-	assert(pair->two->sha1_valid);
+	assert(pair->two->oid_valid);
 	diff_populate_filespec(pair->two, 0);
 	file_target.ptr = pair->two->data;
 	file_target.size = pair->two->size;
 
-	if (pair->one->sha1_valid) {
+	if (pair->one->oid_valid) {
 		diff_populate_filespec(pair->one, 0);
 		file_parent.ptr = pair->one->data;
 		file_parent.size = pair->one->size;
diff --git a/list-objects.c b/list-objects.c
index 917cc5d7c9..f3ca6aafb7 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -110,16 +110,16 @@ static void process_tree(struct rev_info *revs,
 
 		if (S_ISDIR(entry.mode))
 			process_tree(revs,
-				     lookup_tree(entry.sha1),
+				     lookup_tree(entry.oid->hash),
 				     show, base, entry.path,
 				     cb_data);
 		else if (S_ISGITLINK(entry.mode))
-			process_gitlink(revs, entry.sha1,
+			process_gitlink(revs, entry.oid->hash,
 					show, base, entry.path,
 					cb_data);
 		else
 			process_blob(revs,
-				     lookup_blob(entry.sha1),
+				     lookup_blob(entry.oid->hash),
 				     show, base, entry.path,
 				     cb_data);
 	}
diff --git a/list.h b/list.h
new file mode 100644
index 0000000000..a226a870dc
--- /dev/null
+++ b/list.h
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2002 Free Software Foundation, Inc.
+ * (originally part of the GNU C Library and Userspace RCU)
+ * Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
+ *
+ * Copyright (C) 2009 Pierre-Marc Fournier
+ * Conversion to RCU list.
+ * Copyright (C) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIST_H
+#define LIST_H	1
+
+/*
+ * The definitions of this file are adopted from those which can be
+ * found in the Linux kernel headers to enable people familiar with the
+ * latter find their way in these sources as well.
+ */
+
+/* Basic type for the double-link list. */
+struct list_head {
+	struct list_head *next, *prev;
+};
+
+/* avoid conflicts with BSD-only sys/queue.h */
+#undef LIST_HEAD
+/* Define a variable with the head and tail of the list. */
+#define LIST_HEAD(name) \
+	struct list_head name = { &(name), &(name) }
+
+/* Initialize a new list head. */
+#define INIT_LIST_HEAD(ptr) \
+	(ptr)->next = (ptr)->prev = (ptr)
+
+#define LIST_HEAD_INIT(name) { &(name), &(name) }
+
+/* Add new element at the head of the list. */
+static inline void list_add(struct list_head *newp, struct list_head *head)
+{
+	head->next->prev = newp;
+	newp->next = head->next;
+	newp->prev = head;
+	head->next = newp;
+}
+
+/* Add new element at the tail of the list. */
+static inline void list_add_tail(struct list_head *newp, struct list_head *head)
+{
+	head->prev->next = newp;
+	newp->next = head;
+	newp->prev = head->prev;
+	head->prev = newp;
+}
+
+/* Remove element from list. */
+static inline void __list_del(struct list_head *prev, struct list_head *next)
+{
+	next->prev = prev;
+	prev->next = next;
+}
+
+/* Remove element from list. */
+static inline void list_del(struct list_head *elem)
+{
+	__list_del(elem->prev, elem->next);
+}
+
+/* Remove element from list, initializing the element's list pointers. */
+static inline void list_del_init(struct list_head *elem)
+{
+	list_del(elem);
+	INIT_LIST_HEAD(elem);
+}
+
+/* Delete from list, add to another list as head. */
+static inline void list_move(struct list_head *elem, struct list_head *head)
+{
+	__list_del(elem->prev, elem->next);
+	list_add(elem, head);
+}
+
+/* Replace an old entry. */
+static inline void list_replace(struct list_head *old, struct list_head *newp)
+{
+	newp->next = old->next;
+	newp->prev = old->prev;
+	newp->prev->next = newp;
+	newp->next->prev = newp;
+}
+
+/* Join two lists. */
+static inline void list_splice(struct list_head *add, struct list_head *head)
+{
+	/* Do nothing if the list which gets added is empty. */
+	if (add != add->next) {
+		add->next->prev = head;
+		add->prev->next = head->next;
+		head->next->prev = add->prev;
+		head->next = add->next;
+	}
+}
+
+/* Get typed element from list at a given position. */
+#define list_entry(ptr, type, member) \
+	((type *) ((char *) (ptr) - offsetof(type, member)))
+
+/* Get first entry from a list. */
+#define list_first_entry(ptr, type, member) \
+	list_entry((ptr)->next, type, member)
+
+/* Iterate forward over the elements of the list. */
+#define list_for_each(pos, head) \
+	for (pos = (head)->next; pos != (head); pos = pos->next)
+
+/*
+ * Iterate forward over the elements list. The list elements can be
+ * removed from the list while doing this.
+ */
+#define list_for_each_safe(pos, p, head) \
+	for (pos = (head)->next, p = pos->next; \
+		pos != (head); \
+		pos = p, p = pos->next)
+
+/* Iterate backward over the elements of the list. */
+#define list_for_each_prev(pos, head) \
+	for (pos = (head)->prev; pos != (head); pos = pos->prev)
+
+/*
+ * Iterate backwards over the elements list. The list elements can be
+ * removed from the list while doing this.
+ */
+#define list_for_each_prev_safe(pos, p, head) \
+	for (pos = (head)->prev, p = pos->prev; \
+		pos != (head); \
+		pos = p, p = pos->prev)
+
+static inline int list_empty(struct list_head *head)
+{
+	return head == head->next;
+}
+
+static inline void list_replace_init(struct list_head *old,
+				     struct list_head *newp)
+{
+	struct list_head *head = old->next;
+
+	list_del(old);
+	list_add_tail(newp, head);
+	INIT_LIST_HEAD(old);
+}
+
+#endif /* LIST_H */
diff --git a/ll-merge.c b/ll-merge.c
index ff4a43a982..ad8be42f91 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -47,7 +47,9 @@ static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
 	assert(opts);
 
 	/*
-	 * The tentative merge result is the or common ancestor for an internal merge.
+	 * The tentative merge result is the common ancestor for an
+	 * internal merge.  For the final merge, it is "ours" by
+	 * default but -Xours/-Xtheirs can tweak the choice.
 	 */
 	if (opts->virtual_ancestor) {
 		stolen = orig;
@@ -383,8 +385,12 @@ int ll_merge(mmbuffer_t *result_buf,
 		}
 	}
 	driver = find_ll_merge_driver(ll_driver_name);
-	if (opts->virtual_ancestor && driver->recursive)
-		driver = find_ll_merge_driver(driver->recursive);
+
+	if (opts->virtual_ancestor) {
+		if (driver->recursive)
+			driver = find_ll_merge_driver(driver->recursive);
+		marker_size += 2;
+	}
 	return driver->fn(driver, result_buf, path, ancestor, ancestor_label,
 			  ours, our_label, theirs, their_label,
 			  opts, marker_size);
diff --git a/log-tree.c b/log-tree.c
index 60f983934d..bfb735c845 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -159,12 +159,12 @@ void load_ref_decorations(int flags)
 	}
 }
 
-static void show_parents(struct commit *commit, int abbrev)
+static void show_parents(struct commit *commit, int abbrev, FILE *file)
 {
 	struct commit_list *p;
 	for (p = commit->parents; p ; p = p->next) {
 		struct commit *parent = p->item;
-		printf(" %s", find_unique_abbrev(parent->object.oid.hash, abbrev));
+		fprintf(file, " %s", find_unique_abbrev(parent->object.oid.hash, abbrev));
 	}
 }
 
@@ -172,7 +172,7 @@ static void show_children(struct rev_info *opt, struct commit *commit, int abbre
 {
 	struct commit_list *p = lookup_decoration(&opt->children, &commit->object);
 	for ( ; p; p = p->next) {
-		printf(" %s", find_unique_abbrev(p->item->object.oid.hash, abbrev));
+		fprintf(opt->diffopt.file, " %s", find_unique_abbrev(p->item->object.oid.hash, abbrev));
 	}
 }
 
@@ -263,8 +263,6 @@ void format_decorations_extended(struct strbuf *sb,
 
 			if (current_and_HEAD &&
 			    decoration->type == DECORATION_REF_HEAD) {
-				strbuf_addstr(sb, color_reset);
-				strbuf_addstr(sb, color_commit);
 				strbuf_addstr(sb, " -> ");
 				strbuf_addstr(sb, color_reset);
 				strbuf_addstr(sb, decorate_get_color(use_color, current_and_HEAD->type));
@@ -286,11 +284,11 @@ void show_decorations(struct rev_info *opt, struct commit *commit)
 	struct strbuf sb = STRBUF_INIT;
 
 	if (opt->show_source && commit->util)
-		printf("\t%s", (char *) commit->util);
+		fprintf(opt->diffopt.file, "\t%s", (char *) commit->util);
 	if (!opt->show_decorations)
 		return;
 	format_decorations(&sb, commit, opt->diffopt.use_color);
-	fputs(sb.buf, stdout);
+	fputs(sb.buf, opt->diffopt.file);
 	strbuf_release(&sb);
 }
 
@@ -364,18 +362,18 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit,
 		subject = "Subject: ";
 	}
 
-	printf("From %s Mon Sep 17 00:00:00 2001\n", name);
+	fprintf(opt->diffopt.file, "From %s Mon Sep 17 00:00:00 2001\n", name);
 	graph_show_oneline(opt->graph);
 	if (opt->message_id) {
-		printf("Message-Id: <%s>\n", opt->message_id);
+		fprintf(opt->diffopt.file, "Message-Id: <%s>\n", opt->message_id);
 		graph_show_oneline(opt->graph);
 	}
 	if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) {
 		int i, n;
 		n = opt->ref_message_ids->nr;
-		printf("In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string);
+		fprintf(opt->diffopt.file, "In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string);
 		for (i = 0; i < n; i++)
-			printf("%s<%s>\n", (i > 0 ? "\t" : "References: "),
+			fprintf(opt->diffopt.file, "%s<%s>\n", (i > 0 ? "\t" : "References: "),
 			       opt->ref_message_ids->items[i].string);
 		graph_show_oneline(opt->graph);
 	}
@@ -432,7 +430,7 @@ static void show_sig_lines(struct rev_info *opt, int status, const char *bol)
 	reset = diff_get_color_opt(&opt->diffopt, DIFF_RESET);
 	while (*bol) {
 		eol = strchrnul(bol, '\n');
-		printf("%s%.*s%s%s", color, (int)(eol - bol), bol, reset,
+		fprintf(opt->diffopt.file, "%s%.*s%s%s", color, (int)(eol - bol), bol, reset,
 		       *eol ? "\n" : "");
 		graph_show_oneline(opt->graph);
 		bol = (*eol) ? (eol + 1) : eol;
@@ -553,17 +551,17 @@ void show_log(struct rev_info *opt)
 
 		if (!opt->graph)
 			put_revision_mark(opt, commit);
-		fputs(find_unique_abbrev(commit->object.oid.hash, abbrev_commit), stdout);
+		fputs(find_unique_abbrev(commit->object.oid.hash, abbrev_commit), opt->diffopt.file);
 		if (opt->print_parents)
-			show_parents(commit, abbrev_commit);
+			show_parents(commit, abbrev_commit, opt->diffopt.file);
 		if (opt->children.name)
 			show_children(opt, commit, abbrev_commit);
 		show_decorations(opt, commit);
 		if (opt->graph && !graph_is_commit_finished(opt->graph)) {
-			putchar('\n');
+			putc('\n', opt->diffopt.file);
 			graph_show_remainder(opt->graph);
 		}
-		putchar(opt->diffopt.line_termination);
+		putc(opt->diffopt.line_termination, opt->diffopt.file);
 		return;
 	}
 
@@ -589,7 +587,7 @@ void show_log(struct rev_info *opt)
 		if (opt->diffopt.line_termination == '\n' &&
 		    !opt->missing_newline)
 			graph_show_padding(opt->graph);
-		putchar(opt->diffopt.line_termination);
+		putc(opt->diffopt.line_termination, opt->diffopt.file);
 	}
 	opt->shown_one = 1;
 
@@ -603,32 +601,32 @@ void show_log(struct rev_info *opt)
 	 * Print header line of header..
 	 */
 
-	if (opt->commit_format == CMIT_FMT_EMAIL) {
+	if (cmit_fmt_is_mail(opt->commit_format)) {
 		log_write_email_headers(opt, commit, &ctx.subject, &extra_headers,
 					&ctx.need_8bit_cte);
 	} else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
-		fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
+		fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), opt->diffopt.file);
 		if (opt->commit_format != CMIT_FMT_ONELINE)
-			fputs("commit ", stdout);
+			fputs("commit ", opt->diffopt.file);
 
 		if (!opt->graph)
 			put_revision_mark(opt, commit);
 		fputs(find_unique_abbrev(commit->object.oid.hash, abbrev_commit),
-		      stdout);
+		      opt->diffopt.file);
 		if (opt->print_parents)
-			show_parents(commit, abbrev_commit);
+			show_parents(commit, abbrev_commit, opt->diffopt.file);
 		if (opt->children.name)
 			show_children(opt, commit, abbrev_commit);
 		if (parent)
-			printf(" (from %s)",
+			fprintf(opt->diffopt.file, " (from %s)",
 			       find_unique_abbrev(parent->object.oid.hash,
 						  abbrev_commit));
-		fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), stdout);
+		fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), opt->diffopt.file);
 		show_decorations(opt, commit);
 		if (opt->commit_format == CMIT_FMT_ONELINE) {
-			putchar(' ');
+			putc(' ', opt->diffopt.file);
 		} else {
-			putchar('\n');
+			putc('\n', opt->diffopt.file);
 			graph_show_oneline(opt->graph);
 		}
 		if (opt->reflog_info) {
@@ -683,9 +681,12 @@ void show_log(struct rev_info *opt)
 	ctx.fmt = opt->commit_format;
 	ctx.mailmap = opt->mailmap;
 	ctx.color = opt->diffopt.use_color;
+	ctx.expand_tabs_in_log = opt->expand_tabs_in_log;
 	ctx.output_encoding = get_log_output_encoding();
 	if (opt->from_ident.mail_begin && opt->from_ident.name_begin)
 		ctx.from_ident = &opt->from_ident;
+	if (opt->graph)
+		ctx.graph_width = graph_width(opt->graph);
 	pretty_print_commit(&ctx, commit, &msgbuf);
 
 	if (opt->add_signoff)
@@ -693,7 +694,7 @@ void show_log(struct rev_info *opt)
 
 	if ((ctx.fmt != CMIT_FMT_USERFORMAT) &&
 	    ctx.notes_message && *ctx.notes_message) {
-		if (ctx.fmt == CMIT_FMT_EMAIL) {
+		if (cmit_fmt_is_mail(ctx.fmt)) {
 			strbuf_addstr(&msgbuf, "---\n");
 			opt->shown_dashes = 1;
 		}
@@ -701,7 +702,7 @@ void show_log(struct rev_info *opt)
 	}
 
 	if (opt->show_log_size) {
-		printf("log size %i\n", (int)msgbuf.len);
+		fprintf(opt->diffopt.file, "log size %i\n", (int)msgbuf.len);
 		graph_show_oneline(opt->graph);
 	}
 
@@ -717,11 +718,11 @@ void show_log(struct rev_info *opt)
 	if (opt->graph)
 		graph_show_commit_msg(opt->graph, &msgbuf);
 	else
-		fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
+		fwrite(msgbuf.buf, sizeof(char), msgbuf.len, opt->diffopt.file);
 	if (opt->use_terminator && !commit_format_is_empty(opt->commit_format)) {
 		if (!opt->missing_newline)
 			graph_show_padding(opt->graph);
-		putchar(opt->diffopt.line_termination);
+		putc(opt->diffopt.line_termination, opt->diffopt.file);
 	}
 
 	strbuf_release(&msgbuf);
@@ -758,7 +759,7 @@ int log_tree_diff_flush(struct rev_info *opt)
 				struct strbuf *msg = NULL;
 				msg = opt->diffopt.output_prefix(&opt->diffopt,
 					opt->diffopt.output_prefix_data);
-				fwrite(msg->buf, msg->len, 1, stdout);
+				fwrite(msg->buf, msg->len, 1, opt->diffopt.file);
 			}
 
 			/*
@@ -773,8 +774,8 @@ int log_tree_diff_flush(struct rev_info *opt)
 			 */
 			if (!opt->shown_dashes &&
 			    (pch & opt->diffopt.output_format) == pch)
-				printf("---");
-			putchar('\n');
+				fprintf(opt->diffopt.file, "---");
+			putc('\n', opt->diffopt.file);
 		}
 	}
 	diff_flush(&opt->diffopt);
@@ -861,17 +862,18 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
 int log_tree_commit(struct rev_info *opt, struct commit *commit)
 {
 	struct log_info log;
-	int shown;
+	int shown, close_file = opt->diffopt.close_file;
 
 	log.commit = commit;
 	log.parent = NULL;
 	opt->loginfo = &log;
+	opt->diffopt.close_file = 0;
 
 	if (opt->line_level_traverse)
 		return line_log_print(opt, commit);
 
 	if (opt->track_linear && !opt->linear && !opt->reverse_output_stage)
-		printf("\n%s\n", opt->break_bar);
+		fprintf(opt->diffopt.file, "\n%s\n", opt->break_bar);
 	shown = log_tree_diff(opt, commit, &log);
 	if (!shown && opt->loginfo && opt->always_show_header) {
 		log.parent = NULL;
@@ -879,8 +881,10 @@ int log_tree_commit(struct rev_info *opt, struct commit *commit)
 		shown = 1;
 	}
 	if (opt->track_linear && !opt->linear && opt->reverse_output_stage)
-		printf("\n%s\n", opt->break_bar);
+		fprintf(opt->diffopt.file, "\n%s\n", opt->break_bar);
 	opt->loginfo = NULL;
-	maybe_flush_or_die(stdout, "stdout");
+	maybe_flush_or_die(opt->diffopt.file, "stdout");
+	if (close_file)
+		fclose(opt->diffopt.file);
 	return shown;
 }
diff --git a/mailmap.c b/mailmap.c
index 972623709f..b5c521fdea 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -189,8 +189,7 @@ static int read_mailmap_file(struct string_list *map, const char *filename,
 	if (!f) {
 		if (errno == ENOENT)
 			return 0;
-		return error("unable to open mailmap at %s: %s",
-			     filename, strerror(errno));
+		return error_errno("unable to open mailmap at %s", filename);
 	}
 
 	while (fgets(buffer, sizeof(buffer), f) != NULL)
diff --git a/match-trees.c b/match-trees.c
index 1ce0954a3e..396b7338df 100644
--- a/match-trees.c
+++ b/match-trees.c
@@ -48,17 +48,17 @@ static int score_matches(unsigned mode1, unsigned mode2, const char *path)
 }
 
 static void *fill_tree_desc_strict(struct tree_desc *desc,
-				   const unsigned char *hash)
+				   const struct object_id *hash)
 {
 	void *buffer;
 	enum object_type type;
 	unsigned long size;
 
-	buffer = read_sha1_file(hash, &type, &size);
+	buffer = read_sha1_file(hash->hash, &type, &size);
 	if (!buffer)
-		die("unable to read tree (%s)", sha1_to_hex(hash));
+		die("unable to read tree (%s)", oid_to_hex(hash));
 	if (type != OBJ_TREE)
-		die("%s is not a tree", sha1_to_hex(hash));
+		die("%s is not a tree", oid_to_hex(hash));
 	init_tree_desc(desc, buffer, size);
 	return buffer;
 }
@@ -73,7 +73,7 @@ static int base_name_entries_compare(const struct name_entry *a,
 /*
  * Inspect two trees, and give a score that tells how similar they are.
  */
-static int score_trees(const unsigned char *hash1, const unsigned char *hash2)
+static int score_trees(const struct object_id *hash1, const struct object_id *hash2)
 {
 	struct tree_desc one;
 	struct tree_desc two;
@@ -104,7 +104,7 @@ static int score_trees(const unsigned char *hash1, const unsigned char *hash2)
 		else if (cmp > 0)
 			/* path2 does not appear in one */
 			score += score_missing(e2.mode, e2.path);
-		else if (hashcmp(e1.sha1, e2.sha1))
+		else if (oidcmp(e1.oid, e2.oid))
 			/* they are different */
 			score += score_differs(e1.mode, e2.mode, e1.path);
 		else
@@ -119,8 +119,8 @@ static int score_trees(const unsigned char *hash1, const unsigned char *hash2)
 /*
  * Match one itself and its subtrees with two and pick the best match.
  */
-static void match_trees(const unsigned char *hash1,
-			const unsigned char *hash2,
+static void match_trees(const struct object_id *hash1,
+			const struct object_id *hash2,
 			int *best_score,
 			char **best_match,
 			const char *base,
@@ -131,7 +131,7 @@ static void match_trees(const unsigned char *hash1,
 
 	while (one.size) {
 		const char *path;
-		const unsigned char *elem;
+		const struct object_id *elem;
 		unsigned mode;
 		int score;
 
@@ -191,15 +191,15 @@ static int splice_tree(const unsigned char *hash1,
 	while (desc.size) {
 		const char *name;
 		unsigned mode;
-		const unsigned char *sha1;
+		const struct object_id *oid;
 
-		sha1 = tree_entry_extract(&desc, &name, &mode);
+		oid = tree_entry_extract(&desc, &name, &mode);
 		if (strlen(name) == toplen &&
 		    !memcmp(name, prefix, toplen)) {
 			if (!S_ISDIR(mode))
 				die("entry %s in tree %s is not a tree",
 				    name, sha1_to_hex(hash1));
-			rewrite_here = (unsigned char *) sha1;
+			rewrite_here = (unsigned char *) oid->hash;
 			break;
 		}
 		update_tree_entry(&desc);
@@ -229,9 +229,9 @@ static int splice_tree(const unsigned char *hash1,
  * other hand, it could cover tree one and we might need to pick a
  * subtree of it.
  */
-void shift_tree(const unsigned char *hash1,
-		const unsigned char *hash2,
-		unsigned char *shifted,
+void shift_tree(const struct object_id *hash1,
+		const struct object_id *hash2,
+		struct object_id *shifted,
 		int depth_limit)
 {
 	char *add_prefix;
@@ -262,7 +262,7 @@ void shift_tree(const unsigned char *hash1,
 	match_trees(hash2, hash1, &del_score, &del_prefix, "", depth_limit);
 
 	/* Assume we do not have to do any shifting */
-	hashcpy(shifted, hash2);
+	oidcpy(shifted, hash2);
 
 	if (add_score < del_score) {
 		/* We need to pick a subtree of two */
@@ -271,16 +271,16 @@ void shift_tree(const unsigned char *hash1,
 		if (!*del_prefix)
 			return;
 
-		if (get_tree_entry(hash2, del_prefix, shifted, &mode))
+		if (get_tree_entry(hash2->hash, del_prefix, shifted->hash, &mode))
 			die("cannot find path %s in tree %s",
-			    del_prefix, sha1_to_hex(hash2));
+			    del_prefix, oid_to_hex(hash2));
 		return;
 	}
 
 	if (!*add_prefix)
 		return;
 
-	splice_tree(hash1, add_prefix, hash2, shifted);
+	splice_tree(hash1->hash, add_prefix, hash2->hash, shifted->hash);
 }
 
 /*
@@ -288,22 +288,22 @@ void shift_tree(const unsigned char *hash1,
  * Unfortunately we cannot fundamentally tell which one to
  * be prefixed, as recursive merge can work in either direction.
  */
-void shift_tree_by(const unsigned char *hash1,
-		   const unsigned char *hash2,
-		   unsigned char *shifted,
+void shift_tree_by(const struct object_id *hash1,
+		   const struct object_id *hash2,
+		   struct object_id *shifted,
 		   const char *shift_prefix)
 {
-	unsigned char sub1[20], sub2[20];
+	struct object_id sub1, sub2;
 	unsigned mode1, mode2;
 	unsigned candidate = 0;
 
 	/* Can hash2 be a tree at shift_prefix in tree hash1? */
-	if (!get_tree_entry(hash1, shift_prefix, sub1, &mode1) &&
+	if (!get_tree_entry(hash1->hash, shift_prefix, sub1.hash, &mode1) &&
 	    S_ISDIR(mode1))
 		candidate |= 1;
 
 	/* Can hash1 be a tree at shift_prefix in tree hash2? */
-	if (!get_tree_entry(hash2, shift_prefix, sub2, &mode2) &&
+	if (!get_tree_entry(hash2->hash, shift_prefix, sub2.hash, &mode2) &&
 	    S_ISDIR(mode2))
 		candidate |= 2;
 
@@ -313,19 +313,19 @@ void shift_tree_by(const unsigned char *hash1,
 		int score;
 
 		candidate = 0;
-		score = score_trees(sub1, hash2);
+		score = score_trees(&sub1, hash2);
 		if (score > best_score) {
 			candidate = 1;
 			best_score = score;
 		}
-		score = score_trees(sub2, hash1);
+		score = score_trees(&sub2, hash1);
 		if (score > best_score)
 			candidate = 2;
 	}
 
 	if (!candidate) {
 		/* Neither is plausible -- do not shift */
-		hashcpy(shifted, hash2);
+		oidcpy(shifted, hash2);
 		return;
 	}
 
@@ -334,11 +334,11 @@ void shift_tree_by(const unsigned char *hash1,
 		 * shift tree2 down by adding shift_prefix above it
 		 * to match tree1.
 		 */
-		splice_tree(hash1, shift_prefix, hash2, shifted);
+		splice_tree(hash1->hash, shift_prefix, hash2->hash, shifted->hash);
 	else
 		/*
 		 * shift tree2 up by removing shift_prefix from it
 		 * to match tree1.
 		 */
-		hashcpy(shifted, sub2);
+		oidcpy(shifted, &sub2);
 }
diff --git a/merge-recursive.c b/merge-recursive.c
index b880ae50e7..e5243c2b76 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -23,15 +23,46 @@
 #include "dir.h"
 #include "submodule.h"
 
+static void flush_output(struct merge_options *o)
+{
+	if (o->buffer_output < 2 && o->obuf.len) {
+		fputs(o->obuf.buf, stdout);
+		strbuf_reset(&o->obuf);
+	}
+}
+
+static int err(struct merge_options *o, const char *err, ...)
+{
+	va_list params;
+
+	if (o->buffer_output < 2)
+		flush_output(o);
+	else {
+		strbuf_complete(&o->obuf, '\n');
+		strbuf_addstr(&o->obuf, "error: ");
+	}
+	va_start(params, err);
+	strbuf_vaddf(&o->obuf, err, params);
+	va_end(params);
+	if (o->buffer_output > 1)
+		strbuf_addch(&o->obuf, '\n');
+	else {
+		error("%s", o->obuf.buf);
+		strbuf_reset(&o->obuf);
+	}
+
+	return -1;
+}
+
 static struct tree *shift_tree_object(struct tree *one, struct tree *two,
 				      const char *subtree_shift)
 {
 	struct object_id shifted;
 
 	if (!*subtree_shift) {
-		shift_tree(one->object.oid.hash, two->object.oid.hash, shifted.hash, 0);
+		shift_tree(&one->object.oid, &two->object.oid, &shifted, 0);
 	} else {
-		shift_tree_by(one->object.oid.hash, two->object.oid.hash, shifted.hash,
+		shift_tree_by(&one->object.oid, &two->object.oid, &shifted,
 			      subtree_shift);
 	}
 	if (!oidcmp(&two->object.oid, &shifted))
@@ -56,11 +87,11 @@ static struct commit *make_virtual_commit(struct tree *tree, const char *comment
  * Since we use get_tree_entry(), which does not put the read object into
  * the object pool, we cannot rely on a == b.
  */
-static int sha_eq(const unsigned char *a, const unsigned char *b)
+static int oid_eq(const struct object_id *a, const struct object_id *b)
 {
 	if (!a && !b)
 		return 2;
-	return a && b && hashcmp(a, b) == 0;
+	return a && b && oidcmp(a, b) == 0;
 }
 
 enum rename_type {
@@ -90,7 +121,7 @@ struct rename_conflict_info {
 struct stage_data {
 	struct {
 		unsigned mode;
-		unsigned char sha[20];
+		struct object_id oid;
 	} stages[4];
 	struct rename_conflict_info *rename_conflict_info;
 	unsigned processed:1;
@@ -134,11 +165,11 @@ static inline void setup_rename_conflict_info(enum rename_type rename_type,
 		int ostage2 = ostage1 ^ 1;
 
 		ci->ren1_other.path = pair1->one->path;
-		hashcpy(ci->ren1_other.sha1, src_entry1->stages[ostage1].sha);
+		oidcpy(&ci->ren1_other.oid, &src_entry1->stages[ostage1].oid);
 		ci->ren1_other.mode = src_entry1->stages[ostage1].mode;
 
 		ci->ren2_other.path = pair2->one->path;
-		hashcpy(ci->ren2_other.sha1, src_entry2->stages[ostage2].sha);
+		oidcpy(&ci->ren2_other.oid, &src_entry2->stages[ostage2].oid);
 		ci->ren2_other.mode = src_entry2->stages[ostage2].mode;
 	}
 }
@@ -148,14 +179,6 @@ static int show(struct merge_options *o, int v)
 	return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
 }
 
-static void flush_output(struct merge_options *o)
-{
-	if (o->obuf.len) {
-		fputs(o->obuf.buf, stdout);
-		strbuf_reset(&o->obuf);
-	}
-}
-
 __attribute__((format (printf, 3, 4)))
 static void output(struct merge_options *o, int v, const char *fmt, ...)
 {
@@ -177,37 +200,48 @@ static void output(struct merge_options *o, int v, const char *fmt, ...)
 
 static void output_commit_title(struct merge_options *o, struct commit *commit)
 {
-	int i;
-	flush_output(o);
-	for (i = o->call_depth; i--;)
-		fputs("  ", stdout);
+	strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
 	if (commit->util)
-		printf("virtual %s\n", merge_remote_util(commit)->name);
+		strbuf_addf(&o->obuf, "virtual %s\n",
+			merge_remote_util(commit)->name);
 	else {
-		printf("%s ", find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV));
+		strbuf_addf(&o->obuf, "%s ",
+			find_unique_abbrev(commit->object.oid.hash,
+				DEFAULT_ABBREV));
 		if (parse_commit(commit) != 0)
-			printf(_("(bad commit)\n"));
+			strbuf_addf(&o->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)
-				printf("%.*s\n", len, title);
+				strbuf_addf(&o->obuf, "%.*s\n", len, title);
 			unuse_commit_buffer(commit, msg);
 		}
 	}
+	flush_output(o);
 }
 
-static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
+static int add_cacheinfo(struct merge_options *o,
+		unsigned int mode, const struct object_id *oid,
 		const char *path, int stage, int refresh, int options)
 {
 	struct cache_entry *ce;
-	ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage,
-			      (refresh ? (CE_MATCH_REFRESH |
-					  CE_MATCH_IGNORE_MISSING) : 0 ));
+	int ret;
+
+	ce = make_cache_entry(mode, oid ? oid->hash : null_sha1, path, stage, 0);
 	if (!ce)
-		return error(_("addinfo_cache failed for path '%s'"), path);
-	return add_cache_entry(ce, options);
+		return err(o, _("addinfo_cache failed for path '%s'"), path);
+
+	ret = add_cache_entry(ce, options);
+	if (refresh) {
+		struct cache_entry *nce;
+
+		nce = refresh_cache_entry(ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING);
+		if (nce != ce)
+			ret = add_cache_entry(nce, options);
+	}
+	return ret;
 }
 
 static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
@@ -259,15 +293,17 @@ struct tree *write_tree_from_memory(struct merge_options *o)
 				fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
 					(int)ce_namelen(ce), ce->name);
 		}
-		die("Bug in merge-recursive.c");
+		die("BUG: unmerged index entries in merge-recursive.c");
 	}
 
 	if (!active_cache_tree)
 		active_cache_tree = cache_tree();
 
 	if (!cache_tree_fully_valid(active_cache_tree) &&
-	    cache_tree_update(&the_index, 0) < 0)
-		die(_("error building trees"));
+	    cache_tree_update(&the_index, 0) < 0) {
+		err(o, _("error building trees"));
+		return NULL;
+	}
 
 	result = lookup_tree(active_cache_tree->sha1);
 
@@ -314,11 +350,11 @@ static struct stage_data *insert_stage_data(const char *path,
 	struct string_list_item *item;
 	struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
 	get_tree_entry(o->object.oid.hash, path,
-			e->stages[1].sha, &e->stages[1].mode);
+			e->stages[1].oid.hash, &e->stages[1].mode);
 	get_tree_entry(a->object.oid.hash, path,
-			e->stages[2].sha, &e->stages[2].mode);
+			e->stages[2].oid.hash, &e->stages[2].mode);
 	get_tree_entry(b->object.oid.hash, path,
-			e->stages[3].sha, &e->stages[3].mode);
+			e->stages[3].oid.hash, &e->stages[3].mode);
 	item = string_list_insert(entries, path);
 	item->util = e;
 	return e;
@@ -349,7 +385,7 @@ static struct string_list *get_unmerged(void)
 		}
 		e = item->util;
 		e->stages[ce_stage(ce)].mode = ce->ce_mode;
-		hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
+		hashcpy(e->stages[ce_stage(ce)].oid.hash, ce->sha1);
 	}
 
 	return unmerged;
@@ -400,7 +436,7 @@ static void record_df_conflict_files(struct merge_options *o,
 	 * and the file need to be present, then the D/F file will be
 	 * reinstated with a new unique name at the time it is processed.
 	 */
-	struct string_list df_sorted_entries;
+	struct string_list df_sorted_entries = STRING_LIST_INIT_NODUP;
 	const char *last_file = NULL;
 	int last_len = 0;
 	int i;
@@ -413,7 +449,6 @@ static void record_df_conflict_files(struct merge_options *o,
 		return;
 
 	/* Ensure D/F conflicts are adjacent in the entries list. */
-	memset(&df_sorted_entries, 0, sizeof(struct string_list));
 	for (i = 0; i < entries->nr; i++) {
 		struct string_list_item *next = &entries->items[i];
 		string_list_append(&df_sorted_entries, next->string)->util =
@@ -533,7 +568,8 @@ static struct string_list *get_renames(struct merge_options *o,
 	return renames;
 }
 
-static int update_stages(const char *path, const struct diff_filespec *o,
+static int update_stages(struct merge_options *opt, const char *path,
+			 const struct diff_filespec *o,
 			 const struct diff_filespec *a,
 			 const struct diff_filespec *b)
 {
@@ -552,13 +588,13 @@ static int update_stages(const char *path, const struct diff_filespec *o,
 		if (remove_file_from_cache(path))
 			return -1;
 	if (o)
-		if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options))
+		if (add_cacheinfo(opt, o->mode, &o->oid, path, 1, 0, options))
 			return -1;
 	if (a)
-		if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options))
+		if (add_cacheinfo(opt, a->mode, &a->oid, path, 2, 0, options))
 			return -1;
 	if (b)
-		if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options))
+		if (add_cacheinfo(opt, b->mode, &b->oid, path, 3, 0, options))
 			return -1;
 	return 0;
 }
@@ -572,9 +608,9 @@ static void update_entry(struct stage_data *entry,
 	entry->stages[1].mode = o->mode;
 	entry->stages[2].mode = a->mode;
 	entry->stages[3].mode = b->mode;
-	hashcpy(entry->stages[1].sha, o->sha1);
-	hashcpy(entry->stages[2].sha, a->sha1);
-	hashcpy(entry->stages[3].sha, b->sha1);
+	oidcpy(&entry->stages[1].oid, &o->oid);
+	oidcpy(&entry->stages[2].oid, &a->oid);
+	oidcpy(&entry->stages[3].oid, &b->oid);
 }
 
 static int remove_file(struct merge_options *o, int clean,
@@ -622,7 +658,7 @@ static char *unique_path(struct merge_options *o, const char *path, const char *
 	base_len = newpath.len;
 	while (string_list_has_string(&o->current_file_set, newpath.buf) ||
 	       string_list_has_string(&o->current_directory_set, newpath.buf) ||
-	       file_exists(newpath.buf)) {
+	       (!o->call_depth && file_exists(newpath.buf))) {
 		strbuf_setlen(&newpath, base_len);
 		strbuf_addf(&newpath, "_%d", suffix++);
 	}
@@ -658,23 +694,21 @@ static int was_tracked(const char *path)
 {
 	int pos = cache_name_pos(path, strlen(path));
 
-	if (pos < 0)
-		pos = -1 - pos;
-	while (pos < active_nr &&
-	       !strcmp(path, active_cache[pos]->name)) {
-		/*
-		 * If stage #0, it is definitely tracked.
-		 * If it has stage #2 then it was tracked
-		 * before this merge started.  All other
-		 * cases the path was not tracked.
-		 */
-		switch (ce_stage(active_cache[pos])) {
-		case 0:
-		case 2:
+	if (0 <= pos)
+		/* we have been tracking this path */
+		return 1;
+
+	/*
+	 * Look for an unmerged entry for the path,
+	 * specifically stage #2, which would indicate
+	 * that "our" side before the merge started
+	 * had the path tracked (and resulted in a conflict).
+	 */
+	for (pos = -1 - pos;
+	     pos < active_nr && !strcmp(path, active_cache[pos]->name);
+	     pos++)
+		if (ce_stage(active_cache[pos]) == 2)
 			return 1;
-		}
-		pos++;
-	}
 	return 0;
 }
 
@@ -709,12 +743,10 @@ static int make_room_for_path(struct merge_options *o, const char *path)
 	/* Make sure leading directories are created */
 	status = safe_create_leading_directories_const(path);
 	if (status) {
-		if (status == SCLD_EXISTS) {
+		if (status == SCLD_EXISTS)
 			/* something else exists */
-			error(msg, path, _(": perhaps a D/F conflict?"));
-			return -1;
-		}
-		die(msg, path, "");
+			return err(o, msg, path, _(": perhaps a D/F conflict?"));
+		return err(o, msg, path, "");
 	}
 
 	/*
@@ -722,7 +754,7 @@ static int make_room_for_path(struct merge_options *o, const char *path)
 	 * tracking it.
 	 */
 	if (would_lose_untracked(path))
-		return error(_("refusing to lose untracked file at '%s'"),
+		return err(o, _("refusing to lose untracked file at '%s'"),
 			     path);
 
 	/* Successful unlink is good.. */
@@ -732,16 +764,18 @@ static int make_room_for_path(struct merge_options *o, const char *path)
 	if (errno == ENOENT)
 		return 0;
 	/* .. but not some other error (who really cares what?) */
-	return error(msg, path, _(": perhaps a D/F conflict?"));
+	return err(o, msg, path, _(": perhaps a D/F conflict?"));
 }
 
-static void update_file_flags(struct merge_options *o,
-			      const unsigned char *sha,
-			      unsigned mode,
-			      const char *path,
-			      int update_cache,
-			      int update_wd)
+static int update_file_flags(struct merge_options *o,
+			     const struct object_id *oid,
+			     unsigned mode,
+			     const char *path,
+			     int update_cache,
+			     int update_wd)
 {
+	int ret = 0;
+
 	if (o->call_depth)
 		update_wd = 0;
 
@@ -760,11 +794,13 @@ static void update_file_flags(struct merge_options *o,
 			goto update_index;
 		}
 
-		buf = read_sha1_file(sha, &type, &size);
+		buf = read_sha1_file(oid->hash, &type, &size);
 		if (!buf)
-			die(_("cannot read object %s '%s'"), sha1_to_hex(sha), path);
-		if (type != OBJ_BLOB)
-			die(_("blob expected for %s '%s'"), sha1_to_hex(sha), path);
+			return err(o, _("cannot read object %s '%s'"), oid_to_hex(oid), path);
+		if (type != OBJ_BLOB) {
+			ret = err(o, _("blob expected for %s '%s'"), oid_to_hex(oid), path);
+			goto free_buf;
+		}
 		if (S_ISREG(mode)) {
 			struct strbuf strbuf = STRBUF_INIT;
 			if (convert_to_working_tree(path, buf, size, &strbuf)) {
@@ -776,8 +812,7 @@ static void update_file_flags(struct merge_options *o,
 
 		if (make_room_for_path(o, path) < 0) {
 			update_wd = 0;
-			free(buf);
-			goto update_index;
+			goto free_buf;
 		}
 		if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
 			int fd;
@@ -786,8 +821,11 @@ static void update_file_flags(struct merge_options *o,
 			else
 				mode = 0666;
 			fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
-			if (fd < 0)
-				die_errno(_("failed to open '%s'"), path);
+			if (fd < 0) {
+				ret = err(o, _("failed to open '%s': %s"),
+					  path, strerror(errno));
+				goto free_buf;
+			}
 			write_in_full(fd, buf, size);
 			close(fd);
 		} else if (S_ISLNK(mode)) {
@@ -795,31 +833,35 @@ static void update_file_flags(struct merge_options *o,
 			safe_create_leading_directories_const(path);
 			unlink(path);
 			if (symlink(lnk, path))
-				die_errno(_("failed to symlink '%s'"), path);
+				ret = err(o, _("failed to symlink '%s': %s"),
+					path, strerror(errno));
 			free(lnk);
 		} else
-			die(_("do not know what to do with %06o %s '%s'"),
-			    mode, sha1_to_hex(sha), path);
+			ret = err(o,
+				  _("do not know what to do with %06o %s '%s'"),
+				  mode, oid_to_hex(oid), path);
+ free_buf:
 		free(buf);
 	}
  update_index:
-	if (update_cache)
-		add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
+	if (!ret && update_cache)
+		add_cacheinfo(o, mode, oid, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
+	return ret;
 }
 
-static void update_file(struct merge_options *o,
-			int clean,
-			const unsigned char *sha,
-			unsigned mode,
-			const char *path)
+static int update_file(struct merge_options *o,
+		       int clean,
+		       const struct object_id *oid,
+		       unsigned mode,
+		       const char *path)
 {
-	update_file_flags(o, sha, mode, path, o->call_depth || clean, !o->call_depth);
+	return update_file_flags(o, oid, mode, path, o->call_depth || clean, !o->call_depth);
 }
 
 /* Low level file merging, update and removal */
 
 struct merge_file_info {
-	unsigned char sha[20];
+	struct object_id oid;
 	unsigned mode;
 	unsigned clean:1,
 		 merge:1;
@@ -871,9 +913,9 @@ static int merge_3way(struct merge_options *o,
 		name2 = mkpathdup("%s", branch2);
 	}
 
-	read_mmblob(&orig, one->sha1);
-	read_mmblob(&src1, a->sha1);
-	read_mmblob(&src2, b->sha1);
+	read_mmblob(&orig, one->oid.hash);
+	read_mmblob(&src1, a->oid.hash);
+	read_mmblob(&src2, b->oid.hash);
 
 	merge_status = ll_merge(result_buf, a->path, &orig, base_name,
 				&src1, name1, &src2, name2, &ll_opts);
@@ -887,138 +929,144 @@ static int merge_3way(struct merge_options *o,
 	return merge_status;
 }
 
-static struct merge_file_info merge_file_1(struct merge_options *o,
+static int merge_file_1(struct merge_options *o,
 					   const struct diff_filespec *one,
 					   const struct diff_filespec *a,
 					   const struct diff_filespec *b,
 					   const char *branch1,
-					   const char *branch2)
+					   const char *branch2,
+					   struct merge_file_info *result)
 {
-	struct merge_file_info result;
-	result.merge = 0;
-	result.clean = 1;
+	result->merge = 0;
+	result->clean = 1;
 
 	if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
-		result.clean = 0;
+		result->clean = 0;
 		if (S_ISREG(a->mode)) {
-			result.mode = a->mode;
-			hashcpy(result.sha, a->sha1);
+			result->mode = a->mode;
+			oidcpy(&result->oid, &a->oid);
 		} else {
-			result.mode = b->mode;
-			hashcpy(result.sha, b->sha1);
+			result->mode = b->mode;
+			oidcpy(&result->oid, &b->oid);
 		}
 	} else {
-		if (!sha_eq(a->sha1, one->sha1) && !sha_eq(b->sha1, one->sha1))
-			result.merge = 1;
+		if (!oid_eq(&a->oid, &one->oid) && !oid_eq(&b->oid, &one->oid))
+			result->merge = 1;
 
 		/*
 		 * Merge modes
 		 */
 		if (a->mode == b->mode || a->mode == one->mode)
-			result.mode = b->mode;
+			result->mode = b->mode;
 		else {
-			result.mode = a->mode;
+			result->mode = a->mode;
 			if (b->mode != one->mode) {
-				result.clean = 0;
-				result.merge = 1;
+				result->clean = 0;
+				result->merge = 1;
 			}
 		}
 
-		if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1))
-			hashcpy(result.sha, b->sha1);
-		else if (sha_eq(b->sha1, one->sha1))
-			hashcpy(result.sha, a->sha1);
+		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);
 		else if (S_ISREG(a->mode)) {
 			mmbuffer_t result_buf;
-			int merge_status;
+			int ret = 0, merge_status;
 
 			merge_status = merge_3way(o, &result_buf, one, a, b,
 						  branch1, branch2);
 
 			if ((merge_status < 0) || !result_buf.ptr)
-				die(_("Failed to execute internal merge"));
+				ret = err(o, _("Failed to execute internal merge"));
 
-			if (write_sha1_file(result_buf.ptr, result_buf.size,
-					    blob_type, result.sha))
-				die(_("Unable to add %s to database"),
-				    a->path);
+			if (!ret && write_sha1_file(result_buf.ptr, result_buf.size,
+						    blob_type, result->oid.hash))
+				ret = err(o, _("Unable to add %s to database"),
+					  a->path);
 
 			free(result_buf.ptr);
-			result.clean = (merge_status == 0);
+			if (ret)
+				return ret;
+			result->clean = (merge_status == 0);
 		} else if (S_ISGITLINK(a->mode)) {
-			result.clean = merge_submodule(result.sha,
-						       one->path, one->sha1,
-						       a->sha1, b->sha1,
+			result->clean = merge_submodule(result->oid.hash,
+						       one->path,
+						       one->oid.hash,
+						       a->oid.hash,
+						       b->oid.hash,
 						       !o->call_depth);
 		} else if (S_ISLNK(a->mode)) {
-			hashcpy(result.sha, a->sha1);
+			oidcpy(&result->oid, &a->oid);
 
-			if (!sha_eq(a->sha1, b->sha1))
-				result.clean = 0;
-		} else {
-			die(_("unsupported object type in the tree"));
-		}
+			if (!oid_eq(&a->oid, &b->oid))
+				result->clean = 0;
+		} else
+			die("BUG: unsupported object type in the tree");
 	}
 
-	return result;
+	return 0;
 }
 
-static struct merge_file_info
-merge_file_special_markers(struct merge_options *o,
+static int merge_file_special_markers(struct merge_options *o,
 			   const struct diff_filespec *one,
 			   const struct diff_filespec *a,
 			   const struct diff_filespec *b,
 			   const char *branch1,
 			   const char *filename1,
 			   const char *branch2,
-			   const char *filename2)
+			   const char *filename2,
+			   struct merge_file_info *mfi)
 {
 	char *side1 = NULL;
 	char *side2 = NULL;
-	struct merge_file_info mfi;
+	int ret;
 
 	if (filename1)
 		side1 = xstrfmt("%s:%s", branch1, filename1);
 	if (filename2)
 		side2 = xstrfmt("%s:%s", branch2, filename2);
 
-	mfi = merge_file_1(o, one, a, b,
-			   side1 ? side1 : branch1, side2 ? side2 : branch2);
+	ret = merge_file_1(o, one, a, b,
+			   side1 ? side1 : branch1,
+			   side2 ? side2 : branch2, mfi);
 	free(side1);
 	free(side2);
-	return mfi;
+	return ret;
 }
 
-static struct merge_file_info merge_file_one(struct merge_options *o,
+static int merge_file_one(struct merge_options *o,
 					 const char *path,
-					 const unsigned char *o_sha, int o_mode,
-					 const unsigned char *a_sha, int a_mode,
-					 const unsigned char *b_sha, int b_mode,
+					 const struct object_id *o_oid, int o_mode,
+					 const struct object_id *a_oid, int a_mode,
+					 const struct object_id *b_oid, int b_mode,
 					 const char *branch1,
-					 const char *branch2)
+					 const char *branch2,
+					 struct merge_file_info *mfi)
 {
 	struct diff_filespec one, a, b;
 
 	one.path = a.path = b.path = (char *)path;
-	hashcpy(one.sha1, o_sha);
+	oidcpy(&one.oid, o_oid);
 	one.mode = o_mode;
-	hashcpy(a.sha1, a_sha);
+	oidcpy(&a.oid, a_oid);
 	a.mode = a_mode;
-	hashcpy(b.sha1, b_sha);
+	oidcpy(&b.oid, b_oid);
 	b.mode = b_mode;
-	return merge_file_1(o, &one, &a, &b, branch1, branch2);
+	return merge_file_1(o, &one, &a, &b, branch1, branch2, mfi);
 }
 
-static void handle_change_delete(struct merge_options *o,
+static int handle_change_delete(struct merge_options *o,
 				 const char *path,
-				 const unsigned char *o_sha, int o_mode,
-				 const unsigned char *a_sha, int a_mode,
-				 const unsigned char *b_sha, int b_mode,
+				 const struct object_id *o_oid, int o_mode,
+				 const struct object_id *a_oid, int a_mode,
+				 const struct object_id *b_oid, int b_mode,
 				 const char *change, const char *change_past)
 {
 	char *renamed = NULL;
+	int ret = 0;
 	if (dir_in_way(path, !o->call_depth)) {
-		renamed = unique_path(o, path, a_sha ? o->branch1 : o->branch2);
+		renamed = unique_path(o, path, a_oid ? o->branch1 : o->branch2);
 	}
 
 	if (o->call_depth) {
@@ -1027,21 +1075,23 @@ static void handle_change_delete(struct merge_options *o,
 		 * correct; since there is no true "middle point" between
 		 * them, simply reuse the base version for virtual merge base.
 		 */
-		remove_file_from_cache(path);
-		update_file(o, 0, o_sha, o_mode, renamed ? renamed : path);
-	} else if (!a_sha) {
+		ret = remove_file_from_cache(path);
+		if (!ret)
+			ret = update_file(o, 0, o_oid, o_mode,
+					  renamed ? renamed : path);
+	} else if (!a_oid) {
 		if (!renamed) {
 			output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
 			       "and %s in %s. Version %s of %s left in tree."),
 			       change, path, o->branch1, change_past,
 			       o->branch2, o->branch2, path);
-			update_file(o, 0, b_sha, b_mode, path);
+			ret = update_file(o, 0, b_oid, b_mode, path);
 		} else {
 			output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
 			       "and %s in %s. Version %s of %s left in tree at %s."),
 			       change, path, o->branch1, change_past,
 			       o->branch2, o->branch2, path, renamed);
-			update_file(o, 0, b_sha, b_mode, renamed);
+			ret = update_file(o, 0, b_oid, b_mode, renamed);
 		}
 	} else {
 		if (!renamed) {
@@ -1054,7 +1104,7 @@ static void handle_change_delete(struct merge_options *o,
 			       "and %s in %s. Version %s of %s left in tree at %s."),
 			       change, path, o->branch2, change_past,
 			       o->branch1, o->branch1, path, renamed);
-			update_file(o, 0, a_sha, a_mode, renamed);
+			ret = update_file(o, 0, a_oid, a_mode, renamed);
 		}
 		/*
 		 * No need to call update_file() on path when !renamed, since
@@ -1064,59 +1114,60 @@ static void handle_change_delete(struct merge_options *o,
 		 */
 	}
 	free(renamed);
+
+	return ret;
 }
 
-static void conflict_rename_delete(struct merge_options *o,
+static int conflict_rename_delete(struct merge_options *o,
 				   struct diff_filepair *pair,
 				   const char *rename_branch,
 				   const char *other_branch)
 {
 	const struct diff_filespec *orig = pair->one;
 	const struct diff_filespec *dest = pair->two;
-	const unsigned char *a_sha = NULL;
-	const unsigned char *b_sha = NULL;
+	const struct object_id *a_oid = NULL;
+	const struct object_id *b_oid = NULL;
 	int a_mode = 0;
 	int b_mode = 0;
 
 	if (rename_branch == o->branch1) {
-		a_sha = dest->sha1;
+		a_oid = &dest->oid;
 		a_mode = dest->mode;
 	} else {
-		b_sha = dest->sha1;
+		b_oid = &dest->oid;
 		b_mode = dest->mode;
 	}
 
-	handle_change_delete(o,
-			     o->call_depth ? orig->path : dest->path,
-			     orig->sha1, orig->mode,
-			     a_sha, a_mode,
-			     b_sha, b_mode,
-			     _("rename"), _("renamed"));
-
-	if (o->call_depth) {
-		remove_file_from_cache(dest->path);
-	} else {
-		update_stages(dest->path, NULL,
-			      rename_branch == o->branch1 ? dest : NULL,
-			      rename_branch == o->branch1 ? NULL : dest);
-	}
+	if (handle_change_delete(o,
+				 o->call_depth ? orig->path : dest->path,
+				 &orig->oid, orig->mode,
+				 a_oid, a_mode,
+				 b_oid, b_mode,
+				 _("rename"), _("renamed")))
+		return -1;
 
+	if (o->call_depth)
+		return remove_file_from_cache(dest->path);
+	else
+		return update_stages(o, dest->path, NULL,
+				     rename_branch == o->branch1 ? dest : NULL,
+				     rename_branch == o->branch1 ? NULL : dest);
 }
 
 static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
 						 struct stage_data *entry,
 						 int stage)
 {
-	unsigned char *sha = entry->stages[stage].sha;
+	struct object_id *oid = &entry->stages[stage].oid;
 	unsigned mode = entry->stages[stage].mode;
-	if (mode == 0 || is_null_sha1(sha))
+	if (mode == 0 || is_null_oid(oid))
 		return NULL;
-	hashcpy(target->sha1, sha);
+	oidcpy(&target->oid, oid);
 	target->mode = mode;
 	return target;
 }
 
-static void handle_file(struct merge_options *o,
+static int handle_file(struct merge_options *o,
 			struct diff_filespec *rename,
 			int stage,
 			struct rename_conflict_info *ci)
@@ -1126,6 +1177,7 @@ static void handle_file(struct merge_options *o,
 	const char *cur_branch, *other_branch;
 	struct diff_filespec other;
 	struct diff_filespec *add;
+	int ret;
 
 	if (stage == 2) {
 		dst_entry = ci->dst_entry1;
@@ -1140,7 +1192,8 @@ static void handle_file(struct merge_options *o,
 	add = filespec_from_entry(&other, dst_entry, stage ^ 1);
 	if (add) {
 		char *add_name = unique_path(o, rename->path, other_branch);
-		update_file(o, 0, add->sha1, add->mode, add_name);
+		if (update_file(o, 0, &add->oid, add->mode, add_name))
+			return -1;
 
 		remove_file(o, 0, rename->path, 0);
 		dst_name = unique_path(o, rename->path, cur_branch);
@@ -1151,17 +1204,20 @@ static void handle_file(struct merge_options *o,
 			       rename->path, other_branch, dst_name);
 		}
 	}
-	update_file(o, 0, rename->sha1, rename->mode, dst_name);
-	if (stage == 2)
-		update_stages(rename->path, NULL, rename, add);
+	if ((ret = update_file(o, 0, &rename->oid, rename->mode, dst_name)))
+		; /* fall through, do allow dst_name to be released */
+	else if (stage == 2)
+		ret = update_stages(o, rename->path, NULL, rename, add);
 	else
-		update_stages(rename->path, NULL, add, rename);
+		ret = update_stages(o, rename->path, NULL, add, rename);
 
 	if (dst_name != rename->path)
 		free(dst_name);
+
+	return ret;
 }
 
-static void conflict_rename_rename_1to2(struct merge_options *o,
+static int conflict_rename_rename_1to2(struct merge_options *o,
 					struct rename_conflict_info *ci)
 {
 	/* One file was renamed in both branches, but to different names. */
@@ -1179,18 +1235,21 @@ static void conflict_rename_rename_1to2(struct merge_options *o,
 		struct merge_file_info mfi;
 		struct diff_filespec other;
 		struct diff_filespec *add;
-		mfi = merge_file_one(o, one->path,
-				 one->sha1, one->mode,
-				 a->sha1, a->mode,
-				 b->sha1, b->mode,
-				 ci->branch1, ci->branch2);
+		if (merge_file_one(o, one->path,
+				 &one->oid, one->mode,
+				 &a->oid, a->mode,
+				 &b->oid, b->mode,
+				 ci->branch1, ci->branch2, &mfi))
+			return -1;
+
 		/*
 		 * 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.
 		 */
-		update_file(o, 0, mfi.sha, mfi.mode, one->path);
+		if (update_file(o, 0, &mfi.oid, mfi.mode, one->path))
+			return -1;
 
 		/*
 		 * Above, we put the merged content at the merge-base's
@@ -1201,22 +1260,26 @@ static void conflict_rename_rename_1to2(struct merge_options *o,
 		 * resolving the conflict at that path in its favor.
 		 */
 		add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
-		if (add)
-			update_file(o, 0, add->sha1, add->mode, a->path);
+		if (add) {
+			if (update_file(o, 0, &add->oid, add->mode, a->path))
+				return -1;
+		}
 		else
 			remove_file_from_cache(a->path);
 		add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
-		if (add)
-			update_file(o, 0, add->sha1, add->mode, b->path);
+		if (add) {
+			if (update_file(o, 0, &add->oid, add->mode, b->path))
+				return -1;
+		}
 		else
 			remove_file_from_cache(b->path);
-	} else {
-		handle_file(o, a, 2, ci);
-		handle_file(o, b, 3, ci);
-	}
+	} else if (handle_file(o, a, 2, ci) || handle_file(o, b, 3, ci))
+		return -1;
+
+	return 0;
 }
 
-static void conflict_rename_rename_2to1(struct merge_options *o,
+static int conflict_rename_rename_2to1(struct merge_options *o,
 					struct rename_conflict_info *ci)
 {
 	/* Two files, a & b, were renamed to the same thing, c. */
@@ -1227,6 +1290,7 @@ static void conflict_rename_rename_2to1(struct merge_options *o,
 	char *path = c1->path; /* == c2->path */
 	struct merge_file_info mfi_c1;
 	struct merge_file_info mfi_c2;
+	int ret;
 
 	output(o, 1, _("CONFLICT (rename/rename): "
 	       "Rename %s->%s in %s. "
@@ -1234,15 +1298,16 @@ static void conflict_rename_rename_2to1(struct merge_options *o,
 	       a->path, c1->path, ci->branch1,
 	       b->path, c2->path, ci->branch2);
 
-	remove_file(o, 1, a->path, would_lose_untracked(a->path));
-	remove_file(o, 1, b->path, would_lose_untracked(b->path));
+	remove_file(o, 1, a->path, o->call_depth || would_lose_untracked(a->path));
+	remove_file(o, 1, b->path, o->call_depth || would_lose_untracked(b->path));
 
-	mfi_c1 = merge_file_special_markers(o, a, c1, &ci->ren1_other,
-					    o->branch1, c1->path,
-					    o->branch2, ci->ren1_other.path);
-	mfi_c2 = merge_file_special_markers(o, b, &ci->ren2_other, c2,
-					    o->branch1, ci->ren2_other.path,
-					    o->branch2, c2->path);
+	if (merge_file_special_markers(o, a, c1, &ci->ren1_other,
+				       o->branch1, c1->path,
+				       o->branch2, ci->ren1_other.path, &mfi_c1) ||
+	    merge_file_special_markers(o, b, &ci->ren2_other, c2,
+				       o->branch1, ci->ren2_other.path,
+				       o->branch2, c2->path, &mfi_c2))
+		return -1;
 
 	if (o->call_depth) {
 		/*
@@ -1253,19 +1318,25 @@ static void conflict_rename_rename_2to1(struct merge_options *o,
 		 * again later for the non-recursive merge.
 		 */
 		remove_file(o, 0, path, 0);
-		update_file(o, 0, mfi_c1.sha, mfi_c1.mode, a->path);
-		update_file(o, 0, mfi_c2.sha, mfi_c2.mode, b->path);
+		ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, a->path);
+		if (!ret)
+			ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode,
+					  b->path);
 	} else {
 		char *new_path1 = unique_path(o, path, ci->branch1);
 		char *new_path2 = unique_path(o, path, ci->branch2);
 		output(o, 1, _("Renaming %s to %s and %s to %s instead"),
 		       a->path, new_path1, b->path, new_path2);
 		remove_file(o, 0, path, 0);
-		update_file(o, 0, mfi_c1.sha, mfi_c1.mode, new_path1);
-		update_file(o, 0, mfi_c2.sha, mfi_c2.mode, new_path2);
+		ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, new_path1);
+		if (!ret)
+			ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode,
+					  new_path2);
 		free(new_path2);
 		free(new_path1);
 	}
+
+	return ret;
 }
 
 static int process_renames(struct merge_options *o,
@@ -1343,7 +1414,7 @@ static int process_renames(struct merge_options *o,
 			const char *ren2_dst = ren2->pair->two->path;
 			enum rename_type rename_type;
 			if (strcmp(ren1_src, ren2_src) != 0)
-				die("ren1_src != ren2_src");
+				die("BUG: ren1_src != ren2_src");
 			ren2->dst_entry->processed = 1;
 			ren2->processed = 1;
 			if (strcmp(ren1_dst, ren2_dst) != 0) {
@@ -1377,7 +1448,7 @@ static int process_renames(struct merge_options *o,
 			ren2 = lookup->util;
 			ren2_dst = ren2->pair->two->path;
 			if (strcmp(ren1_dst, ren2_dst) != 0)
-				die("ren1_dst != ren2_dst");
+				die("BUG: ren1_dst != ren2_dst");
 
 			clean_merge = 0;
 			ren2->processed = 1;
@@ -1421,13 +1492,15 @@ static int process_renames(struct merge_options *o,
 			remove_file(o, 1, ren1_src,
 				    renamed_stage == 2 || !was_tracked(ren1_src));
 
-			hashcpy(src_other.sha1, ren1->src_entry->stages[other_stage].sha);
+			oidcpy(&src_other.oid,
+			       &ren1->src_entry->stages[other_stage].oid);
 			src_other.mode = ren1->src_entry->stages[other_stage].mode;
-			hashcpy(dst_other.sha1, ren1->dst_entry->stages[other_stage].sha);
+			oidcpy(&dst_other.oid,
+			       &ren1->dst_entry->stages[other_stage].oid);
 			dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
 			try_merge = 0;
 
-			if (sha_eq(src_other.sha1, null_sha1)) {
+			if (oid_eq(&src_other.oid, &null_oid)) {
 				setup_rename_conflict_info(RENAME_DELETE,
 							   ren1->pair,
 							   NULL,
@@ -1439,7 +1512,7 @@ static int process_renames(struct merge_options *o,
 							   NULL,
 							   NULL);
 			} else if ((dst_other.mode == ren1->pair->two->mode) &&
-				   sha_eq(dst_other.sha1, ren1->pair->two->sha1)) {
+				   oid_eq(&dst_other.oid, &ren1->pair->two->oid)) {
 				/*
 				 * Added file on the other side identical to
 				 * the file being renamed: clean merge.
@@ -1448,13 +1521,14 @@ static int process_renames(struct merge_options *o,
 				 * update_file_flags() instead of
 				 * update_file().
 				 */
-				update_file_flags(o,
-						  ren1->pair->two->sha1,
-						  ren1->pair->two->mode,
-						  ren1_dst,
-						  1, /* update_cache */
-						  0  /* update_wd    */);
-			} else if (!sha_eq(dst_other.sha1, null_sha1)) {
+				if (update_file_flags(o,
+						      &ren1->pair->two->oid,
+						      ren1->pair->two->mode,
+						      ren1_dst,
+						      1, /* update_cache */
+						      0  /* update_wd    */))
+					clean_merge = -1;
+			} else if (!oid_eq(&dst_other.oid, &null_oid)) {
 				clean_merge = 0;
 				try_merge = 1;
 				output(o, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
@@ -1463,22 +1537,33 @@ static int process_renames(struct merge_options *o,
 				       ren1_dst, branch2);
 				if (o->call_depth) {
 					struct merge_file_info mfi;
-					mfi = merge_file_one(o, ren1_dst, null_sha1, 0,
-							 ren1->pair->two->sha1, ren1->pair->two->mode,
-							 dst_other.sha1, dst_other.mode,
-							 branch1, branch2);
+					if (merge_file_one(o, ren1_dst, &null_oid, 0,
+							   &ren1->pair->two->oid,
+							   ren1->pair->two->mode,
+							   &dst_other.oid,
+							   dst_other.mode,
+							   branch1, branch2, &mfi)) {
+						clean_merge = -1;
+						goto cleanup_and_return;
+					}
 					output(o, 1, _("Adding merged %s"), ren1_dst);
-					update_file(o, 0, mfi.sha, mfi.mode, ren1_dst);
+					if (update_file(o, 0, &mfi.oid,
+							mfi.mode, ren1_dst))
+						clean_merge = -1;
 					try_merge = 0;
 				} else {
 					char *new_path = unique_path(o, ren1_dst, branch2);
 					output(o, 1, _("Adding as %s instead"), new_path);
-					update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
+					if (update_file(o, 0, &dst_other.oid,
+							dst_other.mode, new_path))
+						clean_merge = -1;
 					free(new_path);
 				}
 			} else
 				try_merge = 1;
 
+			if (clean_merge < 0)
+				goto cleanup_and_return;
 			if (try_merge) {
 				struct diff_filespec *one, *a, *b;
 				src_other.path = (char *)ren1_src;
@@ -1505,36 +1590,39 @@ static int process_renames(struct merge_options *o,
 			}
 		}
 	}
+cleanup_and_return:
 	string_list_clear(&a_by_dst, 0);
 	string_list_clear(&b_by_dst, 0);
 
 	return clean_merge;
 }
 
-static unsigned char *stage_sha(const unsigned char *sha, unsigned mode)
+static struct object_id *stage_oid(const struct object_id *oid, unsigned mode)
 {
-	return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha;
+	return (is_null_oid(oid) || mode == 0) ? NULL: (struct object_id *)oid;
 }
 
-static int read_sha1_strbuf(const unsigned char *sha1, struct strbuf *dst)
+static int read_oid_strbuf(struct merge_options *o,
+	const struct object_id *oid, struct strbuf *dst)
 {
 	void *buf;
 	enum object_type type;
 	unsigned long size;
-	buf = read_sha1_file(sha1, &type, &size);
+	buf = read_sha1_file(oid->hash, &type, &size);
 	if (!buf)
-		return error(_("cannot read object %s"), sha1_to_hex(sha1));
+		return err(o, _("cannot read object %s"), oid_to_hex(oid));
 	if (type != OBJ_BLOB) {
 		free(buf);
-		return error(_("object %s is not a blob"), sha1_to_hex(sha1));
+		return err(o, _("object %s is not a blob"), oid_to_hex(oid));
 	}
 	strbuf_attach(dst, buf, size, size + 1);
 	return 0;
 }
 
-static int blob_unchanged(const unsigned char *o_sha,
+static int blob_unchanged(struct merge_options *opt,
+			  const struct object_id *o_oid,
 			  unsigned o_mode,
-			  const unsigned char *a_sha,
+			  const struct object_id *a_oid,
 			  unsigned a_mode,
 			  int renormalize, const char *path)
 {
@@ -1544,13 +1632,13 @@ static int blob_unchanged(const unsigned char *o_sha,
 
 	if (a_mode != o_mode)
 		return 0;
-	if (sha_eq(o_sha, a_sha))
+	if (oid_eq(o_oid, a_oid))
 		return 1;
 	if (!renormalize)
 		return 0;
 
-	assert(o_sha && a_sha);
-	if (read_sha1_strbuf(o_sha, &o) || read_sha1_strbuf(a_sha, &a))
+	assert(o_oid && a_oid);
+	if (read_oid_strbuf(opt, o_oid, &o) || read_oid_strbuf(opt, a_oid, &a))
 		goto error_return;
 	/*
 	 * Note: binary | is used so that both renormalizations are
@@ -1567,25 +1655,25 @@ error_return:
 	return ret;
 }
 
-static void handle_modify_delete(struct merge_options *o,
+static int handle_modify_delete(struct merge_options *o,
 				 const char *path,
-				 unsigned char *o_sha, int o_mode,
-				 unsigned char *a_sha, int a_mode,
-				 unsigned char *b_sha, int b_mode)
+				 struct object_id *o_oid, int o_mode,
+				 struct object_id *a_oid, int a_mode,
+				 struct object_id *b_oid, int b_mode)
 {
-	handle_change_delete(o,
-			     path,
-			     o_sha, o_mode,
-			     a_sha, a_mode,
-			     b_sha, b_mode,
-			     _("modify"), _("modified"));
+	return handle_change_delete(o,
+				    path,
+				    o_oid, o_mode,
+				    a_oid, a_mode,
+				    b_oid, b_mode,
+				    _("modify"), _("modified"));
 }
 
 static int merge_content(struct merge_options *o,
 			 const char *path,
-			 unsigned char *o_sha, int o_mode,
-			 unsigned char *a_sha, int a_mode,
-			 unsigned char *b_sha, int b_mode,
+			 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 char *reason = _("content");
@@ -1594,16 +1682,16 @@ static int merge_content(struct merge_options *o,
 	struct diff_filespec one, a, b;
 	unsigned df_conflict_remains = 0;
 
-	if (!o_sha) {
+	if (!o_oid) {
 		reason = _("add/add");
-		o_sha = (unsigned char *)null_sha1;
+		o_oid = (struct object_id *)&null_oid;
 	}
 	one.path = a.path = b.path = (char *)path;
-	hashcpy(one.sha1, o_sha);
+	oidcpy(&one.oid, o_oid);
 	one.mode = o_mode;
-	hashcpy(a.sha1, a_sha);
+	oidcpy(&a.oid, a_oid);
 	a.mode = a_mode;
-	hashcpy(b.sha1, b_sha);
+	oidcpy(&b.oid, b_oid);
 	b.mode = b_mode;
 
 	if (rename_conflict_info) {
@@ -1622,12 +1710,13 @@ static int merge_content(struct merge_options *o,
 		if (dir_in_way(path, !o->call_depth))
 			df_conflict_remains = 1;
 	}
-	mfi = merge_file_special_markers(o, &one, &a, &b,
-					 o->branch1, path1,
-					 o->branch2, path2);
+	if (merge_file_special_markers(o, &one, &a, &b,
+				       o->branch1, path1,
+				       o->branch2, path2, &mfi))
+		return -1;
 
 	if (mfi.clean && !df_conflict_remains &&
-	    sha_eq(mfi.sha, a_sha) && mfi.mode == a_mode) {
+	    oid_eq(&mfi.oid, a_oid) && mfi.mode == a_mode) {
 		int path_renamed_outside_HEAD;
 		output(o, 3, _("Skipped %s (merged same as existing)"), path);
 		/*
@@ -1638,7 +1727,7 @@ static int merge_content(struct merge_options *o,
 		 */
 		path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
 		if (!path_renamed_outside_HEAD) {
-			add_cacheinfo(mfi.mode, mfi.sha, path,
+			add_cacheinfo(o, mfi.mode, &mfi.oid, path,
 				      0, (!o->call_depth), 0);
 			return mfi.clean;
 		}
@@ -1651,7 +1740,8 @@ static int merge_content(struct merge_options *o,
 		output(o, 1, _("CONFLICT (%s): Merge conflict in %s"),
 				reason, path);
 		if (rename_conflict_info && !df_conflict_remains)
-			update_stages(path, &one, &a, &b);
+			if (update_stages(o, path, &one, &a, &b))
+				return -1;
 	}
 
 	if (df_conflict_remains) {
@@ -1659,30 +1749,33 @@ static int merge_content(struct merge_options *o,
 		if (o->call_depth) {
 			remove_file_from_cache(path);
 		} else {
-			if (!mfi.clean)
-				update_stages(path, &one, &a, &b);
-			else {
+			if (!mfi.clean) {
+				if (update_stages(o, path, &one, &a, &b))
+					return -1;
+			} else {
 				int file_from_stage2 = was_tracked(path);
 				struct diff_filespec merged;
-				hashcpy(merged.sha1, mfi.sha);
+				oidcpy(&merged.oid, &mfi.oid);
 				merged.mode = mfi.mode;
 
-				update_stages(path, NULL,
-					      file_from_stage2 ? &merged : NULL,
-					      file_from_stage2 ? NULL : &merged);
+				if (update_stages(o, path, NULL,
+						  file_from_stage2 ? &merged : NULL,
+						  file_from_stage2 ? NULL : &merged))
+					return -1;
 			}
 
 		}
 		new_path = unique_path(o, path, rename_conflict_info->branch1);
 		output(o, 1, _("Adding as %s instead"), new_path);
-		update_file(o, 0, mfi.sha, mfi.mode, new_path);
+		if (update_file(o, 0, &mfi.oid, mfi.mode, new_path)) {
+			free(new_path);
+			return -1;
+		}
 		free(new_path);
 		mfi.clean = 0;
-	} else {
-		update_file(o, mfi.clean, mfi.sha, mfi.mode, path);
-	}
+	} else if (update_file(o, mfi.clean, &mfi.oid, mfi.mode, path))
+		return -1;
 	return mfi.clean;
-
 }
 
 /* Per entry merge function */
@@ -1694,9 +1787,9 @@ static int process_entry(struct merge_options *o,
 	unsigned o_mode = entry->stages[1].mode;
 	unsigned a_mode = entry->stages[2].mode;
 	unsigned b_mode = entry->stages[3].mode;
-	unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
-	unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
-	unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_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);
 
 	entry->processed = 1;
 	if (entry->rename_conflict_info) {
@@ -1705,66 +1798,71 @@ static int process_entry(struct merge_options *o,
 		case RENAME_NORMAL:
 		case RENAME_ONE_FILE_TO_ONE:
 			clean_merge = merge_content(o, path,
-						    o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
+						    o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
 						    conflict_info);
 			break;
 		case RENAME_DELETE:
 			clean_merge = 0;
-			conflict_rename_delete(o, conflict_info->pair1,
-					       conflict_info->branch1,
-					       conflict_info->branch2);
+			if (conflict_rename_delete(o,
+						   conflict_info->pair1,
+						   conflict_info->branch1,
+						   conflict_info->branch2))
+				clean_merge = -1;
 			break;
 		case RENAME_ONE_FILE_TO_TWO:
 			clean_merge = 0;
-			conflict_rename_rename_1to2(o, conflict_info);
+			if (conflict_rename_rename_1to2(o, conflict_info))
+				clean_merge = -1;
 			break;
 		case RENAME_TWO_FILES_TO_ONE:
 			clean_merge = 0;
-			conflict_rename_rename_2to1(o, conflict_info);
+			if (conflict_rename_rename_2to1(o, conflict_info))
+				clean_merge = -1;
 			break;
 		default:
 			entry->processed = 0;
 			break;
 		}
-	} else if (o_sha && (!a_sha || !b_sha)) {
+	} else if (o_oid && (!a_oid || !b_oid)) {
 		/* Case A: Deleted in one */
-		if ((!a_sha && !b_sha) ||
-		    (!b_sha && blob_unchanged(o_sha, o_mode, a_sha, a_mode, normalize, path)) ||
-		    (!a_sha && blob_unchanged(o_sha, o_mode, b_sha, b_mode, normalize, path))) {
+		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))) {
 			/* Deleted in both or deleted in one and
 			 * unchanged in the other */
-			if (a_sha)
+			if (a_oid)
 				output(o, 2, _("Removing %s"), path);
 			/* do not touch working file if it did not exist */
-			remove_file(o, 1, path, !a_sha);
+			remove_file(o, 1, path, !a_oid);
 		} else {
 			/* Modify/delete; deleted side may have put a directory in the way */
 			clean_merge = 0;
-			handle_modify_delete(o, path, o_sha, o_mode,
-					     a_sha, a_mode, b_sha, b_mode);
+			if (handle_modify_delete(o, path, o_oid, o_mode,
+						 a_oid, a_mode, b_oid, b_mode))
+				clean_merge = -1;
 		}
-	} else if ((!o_sha && a_sha && !b_sha) ||
-		   (!o_sha && !a_sha && b_sha)) {
+	} else if ((!o_oid && a_oid && !b_oid) ||
+		   (!o_oid && !a_oid && b_oid)) {
 		/* Case B: Added in one. */
 		/* [nothing|directory] -> ([nothing|directory], file) */
 
 		const char *add_branch;
 		const char *other_branch;
 		unsigned mode;
-		const unsigned char *sha;
+		const struct object_id *oid;
 		const char *conf;
 
-		if (a_sha) {
+		if (a_oid) {
 			add_branch = o->branch1;
 			other_branch = o->branch2;
 			mode = a_mode;
-			sha = a_sha;
+			oid = a_oid;
 			conf = _("file/directory");
 		} else {
 			add_branch = o->branch2;
 			other_branch = o->branch1;
 			mode = b_mode;
-			sha = b_sha;
+			oid = b_oid;
 			conf = _("directory/file");
 		}
 		if (dir_in_way(path, !o->call_depth)) {
@@ -1773,31 +1871,31 @@ static int process_entry(struct merge_options *o,
 			output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
 			       "Adding %s as %s"),
 			       conf, path, other_branch, path, new_path);
-			if (o->call_depth)
-				remove_file_from_cache(path);
-			update_file(o, 0, sha, mode, new_path);
-			if (o->call_depth)
+			if (update_file(o, 0, oid, mode, new_path))
+				clean_merge = -1;
+			else if (o->call_depth)
 				remove_file_from_cache(path);
 			free(new_path);
 		} else {
 			output(o, 2, _("Adding %s"), path);
 			/* do not overwrite file if already present */
-			update_file_flags(o, sha, mode, path, 1, !a_sha);
+			if (update_file_flags(o, oid, mode, path, 1, !a_oid))
+				clean_merge = -1;
 		}
-	} else if (a_sha && b_sha) {
+	} else if (a_oid && b_oid) {
 		/* Case C: Added in both (check for same permissions) and */
 		/* case D: Modified in both, but differently. */
 		clean_merge = merge_content(o, path,
-					    o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
+					    o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
 					    NULL);
-	} else if (!o_sha && !a_sha && !b_sha) {
+	} else if (!o_oid && !a_oid && !b_oid) {
 		/*
 		 * 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);
 	} else
-		die(_("Fatal merge failure, shouldn't happen."));
+		die("BUG: fatal merge failure, shouldn't happen.");
 
 	return clean_merge;
 }
@@ -1815,7 +1913,7 @@ int merge_trees(struct merge_options *o,
 		common = shift_tree_object(head, common, o->subtree_shift);
 	}
 
-	if (sha_eq(common->object.oid.hash, merge->object.oid.hash)) {
+	if (oid_eq(&common->object.oid, &merge->object.oid)) {
 		output(o, 0, _("Already up-to-date!"));
 		*result = head;
 		return 1;
@@ -1825,11 +1923,10 @@ int merge_trees(struct merge_options *o,
 
 	if (code != 0) {
 		if (show(o, 4) || o->call_depth)
-			die(_("merging of trees %s and %s failed"),
+			err(o, _("merging of trees %s and %s failed"),
 			    oid_to_hex(&head->object.oid),
 			    oid_to_hex(&merge->object.oid));
-		else
-			exit(128);
+		return -1;
 	}
 
 	if (unmerged_cache()) {
@@ -1845,17 +1942,23 @@ int merge_trees(struct merge_options *o,
 		re_head  = get_renames(o, head, common, head, merge, entries);
 		re_merge = get_renames(o, merge, common, head, merge, entries);
 		clean = process_renames(o, re_head, re_merge);
+		if (clean < 0)
+			return clean;
 		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
-				&& !process_entry(o, path, e))
-				clean = 0;
+			if (!e->processed) {
+				int ret = process_entry(o, path, e);
+				if (!ret)
+					clean = 0;
+				else if (ret < 0)
+					return ret;
+			}
 		}
 		for (i = 0; i < entries->nr; i++) {
 			struct stage_data *e = entries->items[i].util;
 			if (!e->processed)
-				die(_("Unprocessed path??? %s"),
+				die("BUG: unprocessed path??? %s",
 				    entries->items[i].string);
 		}
 
@@ -1870,8 +1973,8 @@ int merge_trees(struct merge_options *o,
 	else
 		clean = 1;
 
-	if (o->call_depth)
-		*result = write_tree_from_memory(o);
+	if (o->call_depth && !(*result = write_tree_from_memory(o)))
+		return -1;
 
 	return clean;
 }
@@ -1937,23 +2040,25 @@ int merge_recursive(struct merge_options *o,
 		/*
 		 * When the merge fails, the result contains files
 		 * with conflict markers. The cleanness flag is
-		 * ignored, it was never actually used, as result of
-		 * merge_trees has always overwritten it: the committed
-		 * "conflicts" were already resolved.
+		 * ignored (unless indicating an error), it was never
+		 * actually used, as result of merge_trees has always
+		 * overwritten it: the committed "conflicts" were
+		 * already resolved.
 		 */
 		discard_cache();
 		saved_b1 = o->branch1;
 		saved_b2 = o->branch2;
 		o->branch1 = "Temporary merge branch 1";
 		o->branch2 = "Temporary merge branch 2";
-		merge_recursive(o, merged_common_ancestors, iter->item,
-				NULL, &merged_common_ancestors);
+		if (merge_recursive(o, merged_common_ancestors, iter->item,
+				    NULL, &merged_common_ancestors) < 0)
+			return -1;
 		o->branch1 = saved_b1;
 		o->branch2 = saved_b2;
 		o->call_depth--;
 
 		if (!merged_common_ancestors)
-			die(_("merge returned no commit"));
+			return err(o, _("merge returned no commit"));
 	}
 
 	discard_cache();
@@ -1963,6 +2068,10 @@ int merge_recursive(struct merge_options *o,
 	o->ancestor = "merged common ancestors";
 	clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
 			    &mrtree);
+	if (clean < 0) {
+		flush_output(o);
+		return clean;
+	}
 
 	if (o->call_depth) {
 		*result = make_virtual_commit(mrtree, "merged tree");
@@ -1970,17 +2079,19 @@ int merge_recursive(struct merge_options *o,
 		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))
 		diff_warn_rename_limit("merge.renamelimit",
 				       o->needed_rename_limit, 0);
 	return clean;
 }
 
-static struct commit *get_ref(const unsigned char *sha1, const char *name)
+static struct commit *get_ref(const struct object_id *oid, const char *name)
 {
 	struct object *object;
 
-	object = deref_tag(parse_object(sha1), name, strlen(name));
+	object = deref_tag(parse_object(oid->hash), name, strlen(name));
 	if (!object)
 		return NULL;
 	if (object->type == OBJ_TREE)
@@ -1993,10 +2104,10 @@ static struct commit *get_ref(const unsigned char *sha1, const char *name)
 }
 
 int merge_recursive_generic(struct merge_options *o,
-			    const unsigned char *head,
-			    const unsigned char *merge,
+			    const struct object_id *head,
+			    const struct object_id *merge,
 			    int num_base_list,
-			    const unsigned char **base_list,
+			    const struct object_id **base_list,
 			    struct commit **result)
 {
 	int clean;
@@ -2009,9 +2120,9 @@ int merge_recursive_generic(struct merge_options *o,
 		int i;
 		for (i = 0; i < num_base_list; ++i) {
 			struct commit *base;
-			if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
-				return error(_("Could not parse object '%s'"),
-					sha1_to_hex(base_list[i]));
+			if (!(base = get_ref(base_list[i], oid_to_hex(base_list[i]))))
+				return err(o, _("Could not parse object '%s'"),
+					oid_to_hex(base_list[i]));
 			commit_list_insert(base, &ca);
 		}
 	}
@@ -2019,9 +2130,12 @@ int merge_recursive_generic(struct merge_options *o,
 	hold_locked_index(lock, 1);
 	clean = merge_recursive(o, head_commit, next_commit, ca,
 			result);
+	if (clean < 0)
+		return clean;
+
 	if (active_cache_changed &&
 	    write_locked_index(&the_index, lock, COMMIT_LOCK))
-		return error(_("Unable to write index."));
+		return err(o, _("Unable to write index."));
 
 	return clean ? 0 : 1;
 }
diff --git a/merge-recursive.h b/merge-recursive.h
index 52f0201f68..735343b413 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -13,7 +13,7 @@ struct merge_options {
 		MERGE_RECURSIVE_THEIRS
 	} recursive_variant;
 	const char *subtree_shift;
-	unsigned buffer_output : 1;
+	unsigned buffer_output; /* 1: output at end, 2: keep buffered */
 	unsigned renormalize : 1;
 	long xdl_opts;
 	int verbosity;
@@ -49,10 +49,10 @@ int merge_trees(struct merge_options *o,
  * virtual commits and call merge_recursive() proper.
  */
 int merge_recursive_generic(struct merge_options *o,
-			    const unsigned char *head,
-			    const unsigned char *merge,
+			    const struct object_id *head,
+			    const struct object_id *merge,
 			    int num_ca,
-			    const unsigned char **ca,
+			    const struct object_id **ca,
 			    struct commit **result);
 
 void init_merge_options(struct merge_options *o);
diff --git a/mergetools/examdiff b/mergetools/examdiff
new file mode 100644
index 0000000000..7b524d4088
--- /dev/null
+++ b/mergetools/examdiff
@@ -0,0 +1,18 @@
+diff_cmd () {
+	"$merge_tool_path" "$LOCAL" "$REMOTE" -nh
+}
+
+merge_cmd () {
+	touch "$BACKUP"
+	if $base_present
+	then
+		"$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh
+	else
+		"$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh
+	fi
+	check_unchanged
+}
+
+translate_merge_tool_path() {
+	mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
+}
diff --git a/mergetools/winmerge b/mergetools/winmerge
index 74a66d4e8d..f3819d316a 100644
--- a/mergetools/winmerge
+++ b/mergetools/winmerge
@@ -13,24 +13,5 @@ merge_cmd () {
 }
 
 translate_merge_tool_path() {
-	# Use WinMergeU.exe if it exists in $PATH
-	if type -p WinMergeU.exe >/dev/null 2>&1
-	then
-		printf WinMergeU.exe
-		return
-	fi
-
-	# Look for WinMergeU.exe in the typical locations
-	winmerge_exe="WinMerge/WinMergeU.exe"
-	for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)=' |
-		cut -d '=' -f 2- | sort -u)
-	do
-		if test -n "$directory" && test -x "$directory/$winmerge_exe"
-		then
-			printf '%s' "$directory/$winmerge_exe"
-			return
-		fi
-	done
-
-	printf WinMergeU.exe
+	mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
 }
diff --git a/mru.c b/mru.c
new file mode 100644
index 0000000000..9dedae0287
--- /dev/null
+++ b/mru.c
@@ -0,0 +1,50 @@
+#include "cache.h"
+#include "mru.h"
+
+void mru_append(struct mru *mru, void *item)
+{
+	struct mru_entry *cur = xmalloc(sizeof(*cur));
+	cur->item = item;
+	cur->prev = mru->tail;
+	cur->next = NULL;
+
+	if (mru->tail)
+		mru->tail->next = cur;
+	else
+		mru->head = cur;
+	mru->tail = cur;
+}
+
+void mru_mark(struct mru *mru, struct mru_entry *entry)
+{
+	/* If we're already at the front of the list, nothing to do */
+	if (mru->head == entry)
+		return;
+
+	/* Otherwise, remove us from our current slot... */
+	if (entry->prev)
+		entry->prev->next = entry->next;
+	if (entry->next)
+		entry->next->prev = entry->prev;
+	else
+		mru->tail = entry->prev;
+
+	/* And insert us at the beginning. */
+	entry->prev = NULL;
+	entry->next = mru->head;
+	if (mru->head)
+		mru->head->prev = entry;
+	mru->head = entry;
+}
+
+void mru_clear(struct mru *mru)
+{
+	struct mru_entry *p = mru->head;
+
+	while (p) {
+		struct mru_entry *to_free = p;
+		p = p->next;
+		free(to_free);
+	}
+	mru->head = mru->tail = NULL;
+}
diff --git a/mru.h b/mru.h
new file mode 100644
index 0000000000..42e4aeaa10
--- /dev/null
+++ b/mru.h
@@ -0,0 +1,45 @@
+#ifndef MRU_H
+#define MRU_H
+
+/**
+ * A simple most-recently-used cache, backed by a doubly-linked list.
+ *
+ * Usage is roughly:
+ *
+ *   // Create a list.  Zero-initialization is required.
+ *   static struct mru cache;
+ *   mru_append(&cache, item);
+ *   ...
+ *
+ *   // Iterate in MRU order.
+ *   struct mru_entry *p;
+ *   for (p = cache.head; p; p = p->next) {
+ *	if (matches(p->item))
+ *		break;
+ *   }
+ *
+ *   // Mark an item as used, moving it to the front of the list.
+ *   mru_mark(&cache, p);
+ *
+ *   // Reset the list to empty, cleaning up all resources.
+ *   mru_clear(&cache);
+ *
+ * Note that you SHOULD NOT call mru_mark() and then continue traversing the
+ * list; it reorders the marked item to the front of the list, and therefore
+ * you will begin traversing the whole list again.
+ */
+
+struct mru_entry {
+	void *item;
+	struct mru_entry *prev, *next;
+};
+
+struct mru {
+	struct mru_entry *head, *tail;
+};
+
+void mru_append(struct mru *mru, void *item);
+void mru_mark(struct mru *mru, struct mru_entry *entry);
+void mru_clear(struct mru *mru);
+
+#endif /* MRU_H */
diff --git a/notes-merge.c b/notes-merge.c
index 34bfac0c68..97fc42f64b 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -41,14 +41,14 @@ static int verify_notes_filepair(struct diff_filepair *p, unsigned char *sha1)
 	switch (p->status) {
 	case DIFF_STATUS_MODIFIED:
 		assert(p->one->mode == p->two->mode);
-		assert(!is_null_sha1(p->one->sha1));
-		assert(!is_null_sha1(p->two->sha1));
+		assert(!is_null_oid(&p->one->oid));
+		assert(!is_null_oid(&p->two->oid));
 		break;
 	case DIFF_STATUS_ADDED:
-		assert(is_null_sha1(p->one->sha1));
+		assert(is_null_oid(&p->one->oid));
 		break;
 	case DIFF_STATUS_DELETED:
-		assert(is_null_sha1(p->two->sha1));
+		assert(is_null_oid(&p->two->oid));
 		break;
 	default:
 		return -1;
@@ -142,27 +142,27 @@ static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o,
 		if (verify_notes_filepair(p, obj)) {
 			trace_printf("\t\tCannot merge entry '%s' (%c): "
 			       "%.7s -> %.7s. Skipping!\n", p->one->path,
-			       p->status, sha1_to_hex(p->one->sha1),
-			       sha1_to_hex(p->two->sha1));
+			       p->status, oid_to_hex(&p->one->oid),
+			       oid_to_hex(&p->two->oid));
 			continue;
 		}
 		mp = find_notes_merge_pair_pos(changes, len, obj, 1, &occupied);
 		if (occupied) {
 			/* We've found an addition/deletion pair */
 			assert(!hashcmp(mp->obj, obj));
-			if (is_null_sha1(p->one->sha1)) { /* addition */
+			if (is_null_oid(&p->one->oid)) { /* addition */
 				assert(is_null_sha1(mp->remote));
-				hashcpy(mp->remote, p->two->sha1);
-			} else if (is_null_sha1(p->two->sha1)) { /* deletion */
+				hashcpy(mp->remote, p->two->oid.hash);
+			} else if (is_null_oid(&p->two->oid)) { /* deletion */
 				assert(is_null_sha1(mp->base));
-				hashcpy(mp->base, p->one->sha1);
+				hashcpy(mp->base, p->one->oid.hash);
 			} else
 				assert(!"Invalid existing change recorded");
 		} else {
 			hashcpy(mp->obj, obj);
-			hashcpy(mp->base, p->one->sha1);
+			hashcpy(mp->base, p->one->oid.hash);
 			hashcpy(mp->local, uninitialized);
-			hashcpy(mp->remote, p->two->sha1);
+			hashcpy(mp->remote, p->two->oid.hash);
 			len++;
 		}
 		trace_printf("\t\tStored remote change for %s: %.7s -> %.7s\n",
@@ -170,7 +170,7 @@ static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o,
 		       sha1_to_hex(mp->remote));
 	}
 	diff_flush(&opt);
-	free_pathspec(&opt.pathspec);
+	clear_pathspec(&opt.pathspec);
 
 	*num_changes = len;
 	return changes;
@@ -203,21 +203,21 @@ static void diff_tree_local(struct notes_merge_options *o,
 		if (verify_notes_filepair(p, obj)) {
 			trace_printf("\t\tCannot merge entry '%s' (%c): "
 			       "%.7s -> %.7s. Skipping!\n", p->one->path,
-			       p->status, sha1_to_hex(p->one->sha1),
-			       sha1_to_hex(p->two->sha1));
+			       p->status, oid_to_hex(&p->one->oid),
+			       oid_to_hex(&p->two->oid));
 			continue;
 		}
 		mp = find_notes_merge_pair_pos(changes, len, obj, 0, &match);
 		if (!match) {
 			trace_printf("\t\tIgnoring local-only change for %s: "
 			       "%.7s -> %.7s\n", sha1_to_hex(obj),
-			       sha1_to_hex(p->one->sha1),
-			       sha1_to_hex(p->two->sha1));
+			       oid_to_hex(&p->one->oid),
+			       oid_to_hex(&p->two->oid));
 			continue;
 		}
 
 		assert(!hashcmp(mp->obj, obj));
-		if (is_null_sha1(p->two->sha1)) { /* deletion */
+		if (is_null_oid(&p->two->oid)) { /* deletion */
 			/*
 			 * Either this is a true deletion (1), or it is part
 			 * of an A/D pair (2), or D/A pair (3):
@@ -229,7 +229,7 @@ static void diff_tree_local(struct notes_merge_options *o,
 			 */
 			if (!hashcmp(mp->local, uninitialized))
 				hashclr(mp->local);
-		} else if (is_null_sha1(p->one->sha1)) { /* addition */
+		} else if (is_null_oid(&p->one->oid)) { /* addition */
 			/*
 			 * Either this is a true addition (1), or it is part
 			 * of an A/D pair (2), or D/A pair (3):
@@ -240,23 +240,23 @@ static void diff_tree_local(struct notes_merge_options *o,
 			 */
 			assert(is_null_sha1(mp->local) ||
 			       !hashcmp(mp->local, uninitialized));
-			hashcpy(mp->local, p->two->sha1);
+			hashcpy(mp->local, p->two->oid.hash);
 		} else { /* modification */
 			/*
 			 * This is a true modification. p->one->sha1 shall
 			 * match mp->base, and mp->local shall be uninitialized.
 			 * Set mp->local to p->two->sha1.
 			 */
-			assert(!hashcmp(p->one->sha1, mp->base));
+			assert(!hashcmp(p->one->oid.hash, mp->base));
 			assert(!hashcmp(mp->local, uninitialized));
-			hashcpy(mp->local, p->two->sha1);
+			hashcpy(mp->local, p->two->oid.hash);
 		}
 		trace_printf("\t\tStored local change for %s: %.7s -> %.7s\n",
 		       sha1_to_hex(mp->obj), sha1_to_hex(mp->base),
 		       sha1_to_hex(mp->local));
 	}
 	diff_flush(&opt);
-	free_pathspec(&opt.pathspec);
+	clear_pathspec(&opt.pathspec);
 }
 
 static void check_notes_merge_worktree(struct notes_merge_options *o)
@@ -298,12 +298,8 @@ static void write_buf_to_worktree(const unsigned char *obj,
 	char *path = git_pathdup(NOTES_MERGE_WORKTREE "/%s", sha1_to_hex(obj));
 	if (safe_create_leading_directories_const(path))
 		die_errno("unable to create directory for '%s'", path);
-	if (file_exists(path))
-		die("found existing file at '%s'", path);
 
-	fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, 0666);
-	if (fd < 0)
-		die_errno("failed to open '%s'", path);
+	fd = xopen(path, O_WRONLY | O_EXCL | O_CREAT, 0666);
 
 	while (size > 0) {
 		long ret = write_in_full(fd, buf, size);
diff --git a/notes.c b/notes.c
index 88cf4747c1..df4660fe62 100644
--- a/notes.c
+++ b/notes.c
@@ -70,7 +70,7 @@ struct non_note {
 
 struct notes_tree default_notes_tree;
 
-static struct string_list display_notes_refs;
+static struct string_list display_notes_refs = STRING_LIST_INIT_NODUP;
 static struct notes_tree **display_notes_trees;
 
 static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
@@ -446,7 +446,7 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
 			l = (struct leaf_node *)
 				xcalloc(1, sizeof(struct leaf_node));
 			hashcpy(l->key_sha1, object_sha1);
-			hashcpy(l->val_sha1, entry.sha1);
+			hashcpy(l->val_sha1, entry.oid->hash);
 			if (len < 20) {
 				if (!S_ISDIR(entry.mode) || path_len != 2)
 					goto handle_non_note; /* not subtree */
@@ -493,7 +493,7 @@ handle_non_note:
 			}
 			strbuf_addstr(&non_note_path, entry.path);
 			add_non_note(t, strbuf_detach(&non_note_path, NULL),
-				     entry.mode, entry.sha1);
+				     entry.mode, entry.oid->hash);
 		}
 	}
 	free(buf);
diff --git a/pack-check.c b/pack-check.c
index 1da89a41ce..d123846ea2 100644
--- a/pack-check.c
+++ b/pack-check.c
@@ -105,6 +105,8 @@ static int verify_packfile(struct packed_git *p,
 		void *data;
 		enum object_type type;
 		unsigned long size;
+		off_t curpos;
+		int data_valid;
 
 		if (p->index_version > 1) {
 			off_t offset = entries[i].offset;
@@ -116,8 +118,25 @@ static int verify_packfile(struct packed_git *p,
 					    sha1_to_hex(entries[i].sha1),
 					    p->pack_name, (uintmax_t)offset);
 		}
-		data = unpack_entry(p, entries[i].offset, &type, &size);
-		if (!data)
+
+		curpos = entries[i].offset;
+		type = unpack_object_header(p, w_curs, &curpos, &size);
+		unuse_pack(w_curs);
+
+		if (type == OBJ_BLOB && big_file_threshold <= size) {
+			/*
+			 * Let check_sha1_signature() check it with
+			 * the streaming interface; no point slurping
+			 * the data in-core only to discard.
+			 */
+			data = NULL;
+			data_valid = 0;
+		} else {
+			data = unpack_entry(p, entries[i].offset, &type, &size);
+			data_valid = 1;
+		}
+
+		if (data_valid && !data)
 			err = error("cannot unpack %s from %s at offset %"PRIuMAX"",
 				    sha1_to_hex(entries[i].sha1), p->pack_name,
 				    (uintmax_t)entries[i].offset);
diff --git a/pack-write.c b/pack-write.c
index 33293ce2a6..ea0b788130 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -354,7 +354,6 @@ void finish_tmp_packfile(struct strbuf *name_buffer,
 		die_errno("unable to make temporary index file readable");
 
 	strbuf_addf(name_buffer, "%s.pack", sha1_to_hex(sha1));
-	free_pack_by_name(name_buffer->buf);
 
 	if (rename(pack_tmp_name, name_buffer->buf))
 		die_errno("unable to rename temporary pack file");
diff --git a/pack.h b/pack.h
index 3223f5a038..0e77429df5 100644
--- a/pack.h
+++ b/pack.h
@@ -74,6 +74,7 @@ struct pack_idx_entry {
 
 
 struct progress;
+/* Note, the data argument could be NULL if object type is blob */
 typedef int (*verify_fn)(const unsigned char*, 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);
diff --git a/pager.c b/pager.c
index 4bc048148e..6470b8180d 100644
--- a/pager.c
+++ b/pager.c
@@ -63,14 +63,38 @@ const char *git_pager(int stdout_is_tty)
 	return pager;
 }
 
+static void setup_pager_env(struct argv_array *env)
+{
+	const char **argv;
+	int i;
+	char *pager_env = xstrdup(PAGER_ENV);
+	int n = split_cmdline(pager_env, &argv);
+
+	if (n < 0)
+		die("malformed build-time PAGER_ENV: %s",
+			split_cmdline_strerror(n));
+
+	for (i = 0; i < n; i++) {
+		char *cp = strchr(argv[i], '=');
+
+		if (!cp)
+			die("malformed build-time PAGER_ENV");
+
+		*cp = '\0';
+		if (!getenv(argv[i])) {
+			*cp = '=';
+			argv_array_push(env, argv[i]);
+		}
+	}
+	free(pager_env);
+	free(argv);
+}
+
 void prepare_pager_args(struct child_process *pager_process, const char *pager)
 {
 	argv_array_push(&pager_process->args, pager);
 	pager_process->use_shell = 1;
-	if (!getenv("LESS"))
-		argv_array_push(&pager_process->env_array, "LESS=FRX");
-	if (!getenv("LV"))
-		argv_array_push(&pager_process->env_array, "LV=-c");
+	setup_pager_env(&pager_process->env_array);
 }
 
 void setup_pager(void)
diff --git a/parse-options-cb.c b/parse-options-cb.c
index 239898d946..9667bc75a0 100644
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -117,19 +117,24 @@ int parse_opt_tertiary(const struct option *opt, const char *arg, int unset)
 	return 0;
 }
 
-int parse_options_concat(struct option *dst, size_t dst_size, struct option *src)
+struct option *parse_options_concat(struct option *a, struct option *b)
 {
-	int i, j;
-
-	for (i = 0; i < dst_size; i++)
-		if (dst[i].type == OPTION_END)
-			break;
-	for (j = 0; i < dst_size; i++, j++) {
-		dst[i] = src[j];
-		if (src[j].type == OPTION_END)
-			return 0;
-	}
-	return -1;
+	struct option *ret;
+	size_t i, a_len = 0, b_len = 0;
+
+	for (i = 0; a[i].type != OPTION_END; i++)
+		a_len++;
+	for (i = 0; b[i].type != OPTION_END; i++)
+		b_len++;
+
+	ALLOC_ARRAY(ret, st_add3(a_len, b_len, 1));
+	for (i = 0; i < a_len; i++)
+		ret[i] = a[i];
+	for (i = 0; i < b_len; i++)
+		ret[a_len + i] = b[i];
+	ret[a_len + b_len] = b[b_len]; /* final OPTION_END */
+
+	return ret;
 }
 
 int parse_opt_string_list(const struct option *opt, const char *arg, int unset)
@@ -144,7 +149,7 @@ int parse_opt_string_list(const struct option *opt, const char *arg, int unset)
 	if (!arg)
 		return -1;
 
-	string_list_append(v, xstrdup(arg));
+	string_list_append(v, arg);
 	return 0;
 }
 
diff --git a/parse-options.c b/parse-options.c
index 47a9192060..312a85dbde 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -110,6 +110,8 @@ static int get_value(struct parse_opt_ctx_t *p,
 		return 0;
 
 	case OPTION_COUNTUP:
+		if (*(int *)opt->value < 0)
+			*(int *)opt->value = 0;
 		*(int *)opt->value = unset ? 0 : *(int *)opt->value + 1;
 		return 0;
 
diff --git a/parse-options.h b/parse-options.h
index ea4af92a51..78f8384c56 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -215,7 +215,7 @@ extern int parse_options_step(struct parse_opt_ctx_t *ctx,
 
 extern int parse_options_end(struct parse_opt_ctx_t *ctx);
 
-extern int parse_options_concat(struct option *dst, size_t, struct option *src);
+extern 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);
diff --git a/patch-ids.c b/patch-ids.c
index b7b3e5a1a7..082412aca6 100644
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -4,8 +4,8 @@
 #include "sha1-lookup.h"
 #include "patch-ids.h"
 
-static int commit_patch_id(struct commit *commit, struct diff_options *options,
-		    unsigned char *sha1)
+int commit_patch_id(struct commit *commit, struct diff_options *options,
+		    unsigned char *sha1, int diff_header_only)
 {
 	if (commit->parents)
 		diff_tree_sha1(commit->parents->item->object.oid.hash,
@@ -13,93 +13,86 @@ static int commit_patch_id(struct commit *commit, struct diff_options *options,
 	else
 		diff_root_tree_sha1(commit->object.oid.hash, "", options);
 	diffcore_std(options);
-	return diff_flush_patch_id(options, sha1);
+	return diff_flush_patch_id(options, sha1, diff_header_only);
 }
 
-static const unsigned char *patch_id_access(size_t index, void *table)
+/*
+ * When we cannot load the full patch-id for both commits for whatever
+ * reason, the function returns -1 (i.e. return error(...)). Despite
+ * the "cmp" in the name of this function, the caller only cares about
+ * the return value being zero (a and b are equivalent) or non-zero (a
+ * and b are different), and returning non-zero would keep both in the
+ * result, even if they actually were equivalent, in order to err on
+ * the side of safety.  The actual value being negative does not have
+ * any significance; only that it is non-zero matters.
+ */
+static int patch_id_cmp(struct patch_id *a,
+			struct patch_id *b,
+			struct diff_options *opt)
 {
-	struct patch_id **id_table = table;
-	return id_table[index]->patch_id;
+	if (is_null_sha1(a->patch_id) &&
+	    commit_patch_id(a->commit, opt, a->patch_id, 0))
+		return error("Could not get patch ID for %s",
+			oid_to_hex(&a->commit->object.oid));
+	if (is_null_sha1(b->patch_id) &&
+	    commit_patch_id(b->commit, opt, b->patch_id, 0))
+		return error("Could not get patch ID for %s",
+			oid_to_hex(&b->commit->object.oid));
+	return hashcmp(a->patch_id, b->patch_id);
 }
 
-static int patch_pos(struct patch_id **table, int nr, const unsigned char *id)
-{
-	return sha1_pos(id, table, nr, patch_id_access);
-}
-
-#define BUCKET_SIZE 190 /* 190 * 21 = 3990, with slop close enough to 4K */
-struct patch_id_bucket {
-	struct patch_id_bucket *next;
-	int nr;
-	struct patch_id bucket[BUCKET_SIZE];
-};
-
 int init_patch_ids(struct patch_ids *ids)
 {
 	memset(ids, 0, sizeof(*ids));
 	diff_setup(&ids->diffopts);
 	DIFF_OPT_SET(&ids->diffopts, RECURSIVE);
 	diff_setup_done(&ids->diffopts);
+	hashmap_init(&ids->patches, (hashmap_cmp_fn)patch_id_cmp, 256);
 	return 0;
 }
 
 int free_patch_ids(struct patch_ids *ids)
 {
-	struct patch_id_bucket *next, *patches;
-
-	free(ids->table);
-	for (patches = ids->patches; patches; patches = next) {
-		next = patches->next;
-		free(patches);
-	}
+	hashmap_free(&ids->patches, 1);
 	return 0;
 }
 
-static struct patch_id *add_commit(struct commit *commit,
-				   struct patch_ids *ids,
-				   int no_add)
+static int init_patch_id_entry(struct patch_id *patch,
+			       struct commit *commit,
+			       struct patch_ids *ids)
 {
-	struct patch_id_bucket *bucket;
-	struct patch_id *ent;
-	unsigned char sha1[20];
-	int pos;
+	unsigned char header_only_patch_id[GIT_SHA1_RAWSZ];
 
-	if (commit_patch_id(commit, &ids->diffopts, sha1))
-		return NULL;
-	pos = patch_pos(ids->table, ids->nr, sha1);
-	if (0 <= pos)
-		return ids->table[pos];
-	if (no_add)
-		return NULL;
+	patch->commit = commit;
+	if (commit_patch_id(commit, &ids->diffopts, header_only_patch_id, 1))
+		return -1;
 
-	pos = -1 - pos;
-
-	bucket = ids->patches;
-	if (!bucket || (BUCKET_SIZE <= bucket->nr)) {
-		bucket = xcalloc(1, sizeof(*bucket));
-		bucket->next = ids->patches;
-		ids->patches = bucket;
-	}
-	ent = &bucket->bucket[bucket->nr++];
-	hashcpy(ent->patch_id, sha1);
-
-	ALLOC_GROW(ids->table, ids->nr + 1, ids->alloc);
-	if (pos < ids->nr)
-		memmove(ids->table + pos + 1, ids->table + pos,
-			sizeof(ent) * (ids->nr - pos));
-	ids->nr++;
-	ids->table[pos] = ent;
-	return ids->table[pos];
+	hashmap_entry_init(patch, sha1hash(header_only_patch_id));
+	return 0;
 }
 
 struct patch_id *has_commit_patch_id(struct commit *commit,
 				     struct patch_ids *ids)
 {
-	return add_commit(commit, ids, 1);
+	struct patch_id patch;
+
+	memset(&patch, 0, sizeof(patch));
+	if (init_patch_id_entry(&patch, commit, ids))
+		return NULL;
+
+	return hashmap_get(&ids->patches, &patch, &ids->diffopts);
 }
 
 struct patch_id *add_commit_patch_id(struct commit *commit,
 				     struct patch_ids *ids)
 {
-	return add_commit(commit, ids, 0);
+	struct patch_id *key = xcalloc(1, sizeof(*key));
+
+	if (init_patch_id_entry(key, commit, ids)) {
+		free(key);
+		return NULL;
+	}
+
+	hashmap_add(&ids->patches, key);
+	return key;
 }
diff --git a/patch-ids.h b/patch-ids.h
index c8c7ca110a..0f34ea11ea 100644
--- a/patch-ids.h
+++ b/patch-ids.h
@@ -2,17 +2,18 @@
 #define PATCH_IDS_H
 
 struct patch_id {
-	unsigned char patch_id[20];
-	char seen;
+	struct hashmap_entry ent;
+	unsigned char patch_id[GIT_SHA1_RAWSZ];
+	struct commit *commit;
 };
 
 struct patch_ids {
+	struct hashmap patches;
 	struct diff_options diffopts;
-	int nr, alloc;
-	struct patch_id **table;
-	struct patch_id_bucket *patches;
 };
 
+int commit_patch_id(struct commit *commit, struct diff_options *options,
+		    unsigned char *sha1, int);
 int init_patch_ids(struct patch_ids *);
 int free_patch_ids(struct patch_ids *);
 struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *);
diff --git a/path.c b/path.c
index 503766784c..17551c4834 100644
--- a/path.c
+++ b/path.c
@@ -5,6 +5,7 @@
 #include "strbuf.h"
 #include "string-list.h"
 #include "dir.h"
+#include "worktree.h"
 
 static int get_st_mode_bits(const char *path, int *mode)
 {
@@ -383,10 +384,11 @@ static void adjust_git_path(struct strbuf *buf, int git_dir_len)
 		update_common_dir(buf, git_dir_len, NULL);
 }
 
-static void do_git_path(struct strbuf *buf, const char *fmt, va_list args)
+static void do_git_path(const struct worktree *wt, struct strbuf *buf,
+			const char *fmt, va_list args)
 {
 	int gitdir_len;
-	strbuf_addstr(buf, get_git_dir());
+	strbuf_addstr(buf, get_worktree_git_dir(wt));
 	if (buf->len && !is_dir_sep(buf->buf[buf->len - 1]))
 		strbuf_addch(buf, '/');
 	gitdir_len = buf->len;
@@ -400,7 +402,7 @@ char *git_path_buf(struct strbuf *buf, const char *fmt, ...)
 	va_list args;
 	strbuf_reset(buf);
 	va_start(args, fmt);
-	do_git_path(buf, fmt, args);
+	do_git_path(NULL, buf, fmt, args);
 	va_end(args);
 	return buf->buf;
 }
@@ -409,7 +411,7 @@ void strbuf_git_path(struct strbuf *sb, const char *fmt, ...)
 {
 	va_list args;
 	va_start(args, fmt);
-	do_git_path(sb, fmt, args);
+	do_git_path(NULL, sb, fmt, args);
 	va_end(args);
 }
 
@@ -418,7 +420,7 @@ const char *git_path(const char *fmt, ...)
 	struct strbuf *pathname = get_pathname();
 	va_list args;
 	va_start(args, fmt);
-	do_git_path(pathname, fmt, args);
+	do_git_path(NULL, pathname, fmt, args);
 	va_end(args);
 	return pathname->buf;
 }
@@ -428,7 +430,7 @@ char *git_pathdup(const char *fmt, ...)
 	struct strbuf path = STRBUF_INIT;
 	va_list args;
 	va_start(args, fmt);
-	do_git_path(&path, fmt, args);
+	do_git_path(NULL, &path, fmt, args);
 	va_end(args);
 	return strbuf_detach(&path, NULL);
 }
@@ -454,6 +456,16 @@ const char *mkpath(const char *fmt, ...)
 	return cleanup_path(pathname->buf);
 }
 
+const char *worktree_git_path(const struct worktree *wt, const char *fmt, ...)
+{
+	struct strbuf *pathname = get_pathname();
+	va_list args;
+	va_start(args, fmt);
+	do_git_path(wt, pathname, fmt, args);
+	va_end(args);
+	return pathname->buf;
+}
+
 static void do_submodule_path(struct strbuf *buf, const char *path,
 			      const char *fmt, va_list args)
 {
@@ -471,7 +483,7 @@ static void do_submodule_path(struct strbuf *buf, const char *path,
 		strbuf_addstr(buf, git_dir);
 	}
 	strbuf_addch(buf, '/');
-	strbuf_addstr(&git_submodule_dir, buf->buf);
+	strbuf_addbuf(&git_submodule_dir, buf);
 
 	strbuf_vaddf(buf, fmt, args);
 
@@ -503,6 +515,35 @@ void strbuf_git_path_submodule(struct strbuf *buf, const char *path,
 	va_end(args);
 }
 
+static void do_git_common_path(struct strbuf *buf,
+			       const char *fmt,
+			       va_list args)
+{
+	strbuf_addstr(buf, get_git_common_dir());
+	if (buf->len && !is_dir_sep(buf->buf[buf->len - 1]))
+		strbuf_addch(buf, '/');
+	strbuf_vaddf(buf, fmt, args);
+	strbuf_cleanup_path(buf);
+}
+
+const char *git_common_path(const char *fmt, ...)
+{
+	struct strbuf *pathname = get_pathname();
+	va_list args;
+	va_start(args, fmt);
+	do_git_common_path(pathname, fmt, args);
+	va_end(args);
+	return pathname->buf;
+}
+
+void strbuf_git_common_path(struct strbuf *sb, const char *fmt, ...)
+{
+	va_list args;
+	va_start(args, fmt);
+	do_git_common_path(sb, fmt, args);
+	va_end(args);
+}
+
 int validate_headref(const char *path)
 {
 	struct stat st;
diff --git a/pathspec.c b/pathspec.c
index c9e9b6c077..24e0dd5232 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -489,7 +489,7 @@ void copy_pathspec(struct pathspec *dst, const struct pathspec *src)
 	       sizeof(struct pathspec_item) * dst->nr);
 }
 
-void free_pathspec(struct pathspec *pathspec)
+void clear_pathspec(struct pathspec *pathspec)
 {
 	free(pathspec->items);
 	pathspec->items = NULL;
diff --git a/pathspec.h b/pathspec.h
index 0c1126264a..4a80f6fc96 100644
--- a/pathspec.h
+++ b/pathspec.h
@@ -19,7 +19,7 @@
 #define PATHSPEC_ONESTAR 1	/* the pathspec pattern satisfies GFNM_ONESTAR */
 
 struct pathspec {
-	const char **_raw; /* get_pathspec() result, not freed by free_pathspec() */
+	const char **_raw; /* get_pathspec() result, not freed by clear_pathspec() */
 	int nr;
 	unsigned int has_wildcard:1;
 	unsigned int recursive:1;
@@ -74,7 +74,7 @@ extern void parse_pathspec(struct pathspec *pathspec,
 			   const char *prefix,
 			   const char **args);
 extern void copy_pathspec(struct pathspec *dst, const struct pathspec *src);
-extern void free_pathspec(struct pathspec *);
+extern void clear_pathspec(struct pathspec *);
 
 static inline int ps_strncmp(const struct pathspec_item *item,
 			     const char *s1, const char *s2, size_t n)
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index b2c14e2ff5..018beb85a0 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -98,6 +98,11 @@ sub resolve_local_globs {
 				    " globbed: $refname\n";
 			}
 			my $u = (::cmt_metadata("$refname"))[0];
+			if (!defined($u)) {
+				warn
+"W: $refname: no associated commit metadata from SVN, skipping\n";
+				next;
+			}
 			$u =~ s!^\Q$url\E(/|$)!! or die
 			  "$refname: '$url' not found in '$u'\n";
 			if ($pathname ne $u) {
@@ -1904,15 +1909,22 @@ sub make_log_entry {
 
 	my @parents = @$parents;
 	my $props = $ed->{dir_prop}{$self->path};
-	if ( $props->{"svk:merge"} ) {
-		$self->find_extra_svk_parents($props->{"svk:merge"}, \@parents);
-	}
-	if ( $props->{"svn:mergeinfo"} ) {
-		my $mi_changes = $self->mergeinfo_changes
-			($parent_path, $parent_rev,
-			 $self->path, $rev,
-			 $props->{"svn:mergeinfo"});
-		$self->find_extra_svn_parents($mi_changes, \@parents);
+	if ($self->follow_parent) {
+		my $tickets = $props->{"svk:merge"};
+		if ($tickets) {
+			$self->find_extra_svk_parents($tickets, \@parents);
+		}
+
+		my $mergeinfo_prop = $props->{"svn:mergeinfo"};
+		if ($mergeinfo_prop) {
+			my $mi_changes = $self->mergeinfo_changes(
+						$parent_path,
+						$parent_rev,
+						$self->path,
+						$rev,
+						$mergeinfo_prop);
+			$self->find_extra_svn_parents($mi_changes, \@parents);
+		}
 	}
 
 	open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
diff --git a/po/bg.po b/po/bg.po
index ac6f103e4d..ce75f39936 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -65,6 +65,9 @@
 # term управл�ваща дума (за git-bisect)
 # mergetag етикет при �ливане
 # delta - разлика, делта, обект-разлика
+# peeled tag - про�леден етикет - когато етикет �очи към друг етикет, а не подаване и про�лед�ваме подобно на �имволна връзка
+# strip - премахвам (за компонент при филтриране)
+# unrelated histories - незави�ими и�тории
 # ----
 # „$var“ - може да не �работва за shell  има gettext и eval_gettext - проверка - намират �е ле�но по „$
 # ========================
@@ -109,8 +112,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git master\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-12-22 22:50+0800\n"
-"PO-Revision-Date: 2015-12-28 11:32+0200\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"PO-Revision-Date: 2016-05-29 15:23+0300\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
@@ -133,7 +136,7 @@ msgstr ""
 "Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm Ф�ЙЛ“\n"
 "за да отбележите коригирането им. След това извършете подаването."
 
-#: advice.c:101 builtin/merge.c:1225
+#: advice.c:101 builtin/merge.c:1238
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "�е �те завършили �ливане. (Указател�т „MERGE_HEAD“ �ъще�твува)."
 
@@ -177,25 +180,25 @@ msgstr "ФОРМ�Т"
 msgid "archive format"
 msgstr "ФОРМ�Т на архива"
 
-#: archive.c:430 builtin/log.c:1229
+#: archive.c:430 builtin/log.c:1395
 msgid "prefix"
-msgstr "префик�"
+msgstr "ПРЕФИКС"
 
 #: archive.c:431
 msgid "prepend prefix to each pathname in the archive"
-msgstr "добав�не на този префик� към в�еки път в архива"
+msgstr "добав�не на този ПРЕФИКС към в�еки път в архива"
 
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535 builtin/blame.c:2536
-#: builtin/config.c:58 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:707 builtin/hash-object.c:99 builtin/ls-files.c:446
-#: builtin/ls-files.c:449 builtin/notes.c:395 builtin/notes.c:558
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549
+#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989
+#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459
+#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561
 #: builtin/read-tree.c:109 parse-options.h:153
 msgid "file"
-msgstr "файл"
+msgstr "Ф�ЙЛ"
 
 #: archive.c:433 builtin/archive.c:89
 msgid "write the archive to this file"
-msgstr "запазване на архива в този файл"
+msgstr "запазване на архива в този Ф�ЙЛ"
 
 #: archive.c:435
 msgid "read .gitattributes in working directory"
@@ -221,7 +224,8 @@ msgstr "добро компре�иране"
 msgid "list supported archive formats"
 msgstr "извеждане на �пи�ъка � поддържаните формати"
 
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
 msgid "repo"
 msgstr "хранилище"
 
@@ -229,7 +233,7 @@ msgstr "хранилище"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "изтегл�не на архива от отдалеченото ХР��ИЛИЩЕ"
 
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482
 msgid "command"
 msgstr "команда"
 
@@ -237,7 +241,7 @@ msgstr "команда"
 msgid "path to the remote git-upload-archive command"
 msgstr "път към отдалечената команда „git-upload-archive“"
 
-#: attr.c:265
+#: attr.c:263
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -245,85 +249,102 @@ msgstr ""
 "Отрицателните шаблони �е игнорират в атрибутите на git.\n"
 "�ко ви тр�бва начална удивителна, ползвайте „\\!“."
 
-#: branch.c:61
+#: branch.c:53
+#, c-format
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
+msgstr ""
+"\n"
+"След корекци� на грешката, можете да обновите\n"
+"информаци�та за �ледени� клон чрез:\n"
+"git branch --set-upstream-to=%s%s%s"
+
+#: branch.c:67
 #, c-format
 msgid "Not setting branch %s as its own upstream."
 msgstr ""
 "Клонът „%s“ не може да �лужи като източник за �об�твената �и �инхронизаци�."
 
-#: branch.c:84
+#: branch.c:93
 #, c-format
 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
 msgstr ""
 "Клонът „%s“ ще �леди клона „%s“ от отдалеченото хранилище „%s“ чрез "
 "пребазиране."
 
-#: branch.c:85
+#: branch.c:94
 #, c-format
 msgid "Branch %s set up to track remote branch %s from %s."
 msgstr "Клонът „%s“ ще �леди клона „%s“ от отдалеченото хранилище „%s“."
 
-#: branch.c:89
+#: branch.c:98
 #, c-format
 msgid "Branch %s set up to track local branch %s by rebasing."
 msgstr ""
 "Клонът „%s“ ще �леди клона „%s“ от локалното хранилище чрез пребазиране."
 
-#: branch.c:90
+#: branch.c:99
 #, c-format
 msgid "Branch %s set up to track local branch %s."
 msgstr "Клонът „%s“ ще �леди клона „%s“ от локалното хранилище."
 
-#: branch.c:95
+#: branch.c:104
 #, c-format
 msgid "Branch %s set up to track remote ref %s by rebasing."
 msgstr "Клонът „%s“ ще �леди отдалечени� указател „%s“ чрез пребазиране."
 
-#: branch.c:96
+#: branch.c:105
 #, c-format
 msgid "Branch %s set up to track remote ref %s."
 msgstr "Клонът „%s“ ще �леди отдалечени� указател „%s“."
 
-#: branch.c:100
+#: branch.c:109
 #, c-format
 msgid "Branch %s set up to track local ref %s by rebasing."
 msgstr "Клонът „%s“ ще �леди локални� указател „%s“ чрез пребазиране."
 
-#: branch.c:101
+#: branch.c:110
 #, c-format
 msgid "Branch %s set up to track local ref %s."
 msgstr "Клонът „%s“ ще �леди локални� указател „%s“."
 
-#: branch.c:134
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "�а�тройките за �ледени� клон не могат да бъдат запи�ани"
+
+#: branch.c:156
 #, c-format
 msgid "Not tracking: ambiguous information for ref %s"
 msgstr "��ма �ледене: дву�ми�лена информаци� за указател� „%s“"
 
-#: branch.c:163
+#: branch.c:185
 #, c-format
 msgid "'%s' is not a valid branch name."
 msgstr "„%s“ не е позволено име за клон."
 
-#: branch.c:168
+#: branch.c:190
 #, c-format
 msgid "A branch named '%s' already exists."
 msgstr "Вече �ъще�твува клон � име „%s“."
 
-#: branch.c:176
+#: branch.c:198
 msgid "Cannot force update the current branch."
 msgstr "Текущи�т клон не може да бъде принудително обновен."
 
-#: branch.c:196
+#: branch.c:218
 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr "Зададените на�тройки за �леденето �а грешни — началото „%s“ не е клон."
 
-#: branch.c:198
+#: branch.c:220
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "за�вени�т отдалечен клон „%s“ не �ъще�твува"
 
-#: branch.c:200
+#: branch.c:222
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -342,26 +363,31 @@ msgstr ""
 "може да използвате „git push -u“, за да на�троите към кой клон да �е "
 "изтла�ква."
 
-#: branch.c:244
+#: branch.c:266
 #, c-format
 msgid "Not a valid object name: '%s'."
 msgstr "�еправилно име на обект: „%s“"
 
-#: branch.c:264
+#: branch.c:286
 #, c-format
 msgid "Ambiguous object name: '%s'."
 msgstr "Дву�ми�лено име на обект: „%s“"
 
-#: branch.c:269
+#: branch.c:291
 #, c-format
 msgid "Not a valid branch point: '%s'."
 msgstr "�еправилно м��то за начало на клон: „%s“"
 
-#: branch.c:322
+#: branch.c:345
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "„%s“ вече е изтеглен в „%s“"
 
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "Указател�т „HEAD“ на работното дърво „%s“ не е обновен"
+
 #: bundle.c:34
 #, c-format
 msgid "'%s' does not look like a v2 bundle file"
@@ -372,7 +398,7 @@ msgstr "Файлът „%s“ не изглежда да е пратка на gi
 msgid "unrecognized header: %s%s (%d)"
 msgstr "непозната заглавна ча�т: %s%s (%d)"
 
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
 #, c-format
 msgid "could not open '%s'"
 msgstr "„%s“ не може да �е отвори"
@@ -381,10 +407,10 @@ msgstr "„%s“ не може да �е отвори"
 msgid "Repository lacks these prerequisite commits:"
 msgstr "В хранилището лип�ват �ледните необходими подавани�:"
 
-#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
-#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358
-#: builtin/shortlog.c:158
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
 msgid "revision walk setup failed"
 msgstr "неу�пешно на�тройване на обхождането на вер�иите"
 
@@ -424,21 +450,21 @@ msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
 "указател�т „%s“ не е бил включен поради опциите зададени на „git rev-list“"
 
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "непознат аргумент: %s"
 
-#: bundle.c:449
+#: bundle.c:451
 msgid "Refusing to create empty bundle."
 msgstr "Създаването на празна пратка е невъзможно."
 
-#: bundle.c:459
+#: bundle.c:463
 #, c-format
 msgid "cannot create '%s'"
 msgstr "Файлът „%s“ не може да бъде �ъздаден"
 
-#: bundle.c:480
+#: bundle.c:491
 msgid "index-pack died"
 msgstr "Командата „git index-pack“ не завърши у�пешно"
 
@@ -447,8 +473,8 @@ msgstr "Командата „git index-pack“ не завърши у�пешн
 msgid "invalid color value: %.*s"
 msgstr "неправилна �тойно�т за цв�т: %.*s"
 
-#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
-#: builtin/am.c:2149
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
 #, c-format
 msgid "could not parse %s"
 msgstr "„%s“ не може да �е анализира"
@@ -462,28 +488,27 @@ msgstr "%s %s не е подаване!"
 msgid "memory exhausted"
 msgstr "паметта �върши"
 
-#: config.c:474 config.c:476
+#: config.c:475 config.c:477
 #, c-format
-msgid "bad config file line %d in %s"
-msgstr "неправилен ред %d в „%s“"
+msgid "bad config line %d in %s %s"
+msgstr "неправилен ред %d в на�тройката %s „%s“"
 
-#: config.c:592
+#: config.c:593
 #, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
-msgstr ""
-"неправилна чи�лова �тойно�т „%s“ за на�тройката „%s“ в раздела „%s“: %s"
+msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
+msgstr "неправилна чи�лова �тойно�т „%s“ за на�тройката „%s“ в %s „%s“: %s"
 
-#: config.c:594
+#: config.c:595
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за на�тройката „%s“: %s"
 
-#: config.c:679
+#: config.c:680
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "домашната папка на потребител� не може да бъде открита: „%s“"
 
-#: config.c:757 config.c:768
+#: config.c:761 config.c:772
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "неправилно ниво на компре�иране: %d"
@@ -493,42 +518,50 @@ msgstr "неправилно ниво на компре�иране: %d"
 msgid "invalid mode for object creation: %s"
 msgstr "неправилен режим за �ъздаването на обекти: %s"
 
-#: config.c:1216
+#: config.c:1228
 msgid "unable to parse command-line config"
 msgstr "неправилни на�тройки от командни� ред"
 
-#: config.c:1277
+#: config.c:1284
 msgid "unknown error occured while reading the configuration files"
 msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
 
-#: config.c:1601
+#: config.c:1629
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "неразпозната �тойно�т „%s“ от командни� ред"
 
-#: config.c:1603
+#: config.c:1631
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "неправилна на�тройка „%s“ във файла „%s“ на ред №%d"
 
-#: config.c:1662
+#: config.c:1690
 #, c-format
 msgid "%s has multiple values"
 msgstr "зададени �а н�колко �тойно�ти за „%s“"
 
+#: config.c:2224
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "„%s“ не може да �е зададе да е „%s“"
+
+#: config.c:2226
+#, c-format
+msgid "could not unset '%s'"
+msgstr "„%s“ не може да �е премахне"
+
 #: connected.c:69
 msgid "Could not run 'git rev-list'"
 msgstr "Командата „git rev-list“ не може да бъде изпълнена."
 
 #: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "неу�пешен запи� на �пи�ъка � вер�иите: %s"
+msgid "failed write to rev-list"
+msgstr "неу�пешен запи� на �пи�ъка � вер�иите"
 
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "�тандартни�т вход на �пи�ъка � вер�иите не може да бъде затворен: %s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
+msgstr "�тандартни�т вход на �пи�ъка � вер�иите не може да бъде затворен"
 
 #: date.c:95
 msgid "in the future"
@@ -603,28 +636,28 @@ msgstr[1] "преди %lu години"
 msgid "failed to read orderfile '%s'"
 msgstr "файлът � подредбата на �ъответ�тви�та „%s“ не може да бъде прочетен"
 
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
 msgid "Performing inexact rename detection"
 msgstr "Тър�ене на преименувани� на обекти �ъчетани � промени"
 
-#: diff.c:115
+#: diff.c:116
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 "  �еу�пешно разпознаване на „%s“ като процент-праг за �тати�тиката по "
 "директории\n"
 
-#: diff.c:120
+#: diff.c:121
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  �епознат параметър „%s“ за �тати�тиката по директории'\n"
 
-#: diff.c:215
+#: diff.c:225
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "�епозната �тойно�т „%s“ за на�тройката „diff.submodule“"
 
-#: diff.c:267
+#: diff.c:277
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -633,17 +666,17 @@ msgstr ""
 "Грешки в на�тройката „diff.dirstat“:\n"
 "%s"
 
-#: diff.c:3000
+#: diff.c:3007
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr ""
 "външната програма за разлики завърши неу�пешно. Спиране на работата при „%s“"
 
-#: diff.c:3396
+#: diff.c:3405
 msgid "--follow requires exactly one pathspec"
 msgstr "Опци�та „--follow“ изи�ква точно един път"
 
-#: diff.c:3559
+#: diff.c:3568
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -652,20 +685,21 @@ msgstr ""
 "�еразпознат параметър към опци�та „--dirstat/-X“:\n"
 "%s"
 
-#: diff.c:3573
+#: diff.c:3582
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "�еразпознат параметър към опци�та „--submodule“: „%s“"
 
-#: dir.c:1915
+#: dir.c:1823
 msgid "failed to get kernel name and information"
 msgstr "името и вер�и�та на �дрото не б�ха получени"
 
-#: dir.c:1998
-msgid "Untracked cache is disabled on this system."
-msgstr "Кеша за не�ледените файлове е изключен на тази �и�тема"
+#: dir.c:1942
+msgid "Untracked cache is disabled on this system or location."
+msgstr ""
+"Кеша за не�ледените файлове е изключен на тази �и�тема или ме�тоположение."
 
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
 msgid "could not run gpg."
 msgstr "Програмата „gpg“ не може да бъде �тартирана."
 
@@ -679,43 +713,43 @@ msgstr "Програмата „gpg“ не подпи�а данните."
 
 #: gpg-interface.c:222
 #, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "Програмата „gpg“ не у�п� да �ъздаде временни� файл „%s“: %s"
+msgid "could not create temporary file '%s'"
+msgstr "Програмата не у�п� да �ъздаде временни� файл „%s“"
 
-#: gpg-interface.c:225
+#: gpg-interface.c:224
 #, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "Програмата „gpg“ не у�п� да запише �амо�то�телни� подпи� към „%s“: %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "Програмата не у�п� да запише �амо�то�телни� подпи� в „%s“"
 
 #: grep.c:1718
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "„%s“: файлът �очен от „%s“ не може да бъде прочетен"
 
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
 #, c-format
-msgid "'%s': %s"
-msgstr "„%s“: „%s“"
+msgid "failed to stat '%s'"
+msgstr "не може да бъде получена информаци� чрез „stat“ за „%s“"
 
 #: grep.c:1746
 #, c-format
-msgid "'%s': short read %s"
-msgstr "„%s“: изчитането на „%s“ върна по-малко байтове от за�вените"
+msgid "'%s': short read"
+msgstr "„%s“: изчитането върна по-малко байтове от за�вените"
 
-#: help.c:207
+#: help.c:205
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "налични команди на git от „%s“"
 
-#: help.c:214
+#: help.c:212
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "команди на git от други директории от „$PATH“"
 
-#: help.c:246
+#: help.c:244
 msgid "These are common Git commands used in various situations:"
 msgstr "Това �а най-че�то използваните команди на Git:"
 
-#: help.c:311
+#: help.c:309
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -724,11 +758,11 @@ msgstr ""
 "Изглежда, че „%s“ е команда на git, но т� не може да\n"
 "бъде изпълнена. Веро�тно пакетът „git-%s“ е повреден."
 
-#: help.c:368
+#: help.c:366
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Странно, изглежда, че на �и�темата ви н�ма нито една команда на git."
 
-#: help.c:390
+#: help.c:388
 #, c-format
 msgid ""
 "WARNING: You called a Git command named '%s', which does not exist.\n"
@@ -739,17 +773,17 @@ msgstr ""
 "�ъще�твува. Изпълнението автоматично продължава, като �е �чита, че имате "
 "предвид „%s“"
 
-#: help.c:395
+#: help.c:393
 #, c-format
 msgid "in %0.1f seconds automatically..."
 msgstr "�лед %0.1f �екунди…"
 
-#: help.c:402
+#: help.c:400
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git: „%s“ не е команда на git. Погледнете изхода от „git --help“."
 
-#: help.c:406 help.c:466
+#: help.c:404 help.c:464
 msgid ""
 "\n"
 "Did you mean this?"
@@ -763,17 +797,41 @@ msgstr[1] ""
 "\n"
 "Команди � подобно име �а:"
 
-#: help.c:462
+#: help.c:460
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s — %s"
 
+#: lockfile.c:152
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"Файлът-ключалка „%s.lock“ не може да бъде �ъздаден: %s\n"
+"\n"
+"Изглежда, че и друг проце� на git е пу�нат в това хранилище, напр.\n"
+"редактор, �тартиран � „git commit“. Уверете �е, че в�ички подобни\n"
+"проце�и �а �прени и опитайте отново. �ко това не помогне, веро�тната\n"
+"причина е, че н�кой проце� на git в това хранилище е забил. За да\n"
+"продължите работа, ще тр�бва ръчно да изтриете файла:"
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Файлът-ключалка „%s.lock“ не може да бъде �ъздаден: %s"
+
 #: merge.c:41
 msgid "failed to read the cache"
 msgstr "кешът не може да бъде прочетен"
 
-#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:722
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
 msgid "unable to write new index file"
 msgstr "неу�пешно запи�ване на нови� индек�"
 
@@ -791,66 +849,66 @@ msgstr "неу�пешно изпълнение на „addinfo_cache“ за п
 msgid "error building trees"
 msgstr "грешка при изграждане на дърветата"
 
-#: merge-recursive.c:686
+#: merge-recursive.c:689
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "грешка при �ъздаването на път� „%s“%s"
 
-#: merge-recursive.c:697
+#: merge-recursive.c:700
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Изтриване на „%s“, за да �е о�вободи м��то за поддиректори�\n"
 
-#: merge-recursive.c:711 merge-recursive.c:732
+#: merge-recursive.c:714 merge-recursive.c:735
 msgid ": perhaps a D/F conflict?"
 msgstr ": възможно е да има конфликт директори�/файл."
 
-#: merge-recursive.c:722
+#: merge-recursive.c:725
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr ""
 "преу�танов�ване на дей�твието, за да не �е изтрие не�ледени�т файл „%s“"
 
-#: merge-recursive.c:762
+#: merge-recursive.c:765
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "обектът „%s“ (%s) не може да бъде прочетен"
 
-#: merge-recursive.c:764
+#: merge-recursive.c:767
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "обектът „%s“ (%s) �е очакваше да е BLOB, а не е"
 
-#: merge-recursive.c:787 builtin/clone.c:369
+#: merge-recursive.c:790 builtin/clone.c:376
 #, c-format
 msgid "failed to open '%s'"
 msgstr "директори�та „%s“ не може да бъде отворена"
 
-#: merge-recursive.c:795
+#: merge-recursive.c:798
 #, c-format
 msgid "failed to symlink '%s'"
 msgstr "неу�пешно �ъздаване на �имволната връзка „%s“"
 
-#: merge-recursive.c:798
+#: merge-recursive.c:801
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr ""
 "не е ��но какво да �е прави � обекта „%2$s“ (%3$s) � права за до�тъп „%1$06o“"
 
-#: merge-recursive.c:936
+#: merge-recursive.c:939
 msgid "Failed to execute internal merge"
 msgstr "�еу�пешно вътрешно �ливане"
 
-#: merge-recursive.c:940
+#: merge-recursive.c:943
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "„%s“ не може да �е добави в базата � данни"
 
-#: merge-recursive.c:956
+#: merge-recursive.c:959
 msgid "unsupported object type in the tree"
 msgstr "в дървото има неподдържан вид обект"
 
-#: merge-recursive.c:1031 merge-recursive.c:1045
+#: merge-recursive.c:1034 merge-recursive.c:1048
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -859,7 +917,7 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Вер�и� %s на „%s“ "
 "е о�тавена в дървото."
 
-#: merge-recursive.c:1037 merge-recursive.c:1050
+#: merge-recursive.c:1040 merge-recursive.c:1053
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -868,20 +926,20 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Вер�и� %s на „%s“ "
 "е о�тавена в дървото: %s."
 
-#: merge-recursive.c:1091
+#: merge-recursive.c:1094
 msgid "rename"
 msgstr "преименуване"
 
-#: merge-recursive.c:1091
+#: merge-recursive.c:1094
 msgid "renamed"
 msgstr "преименуван"
 
-#: merge-recursive.c:1147
+#: merge-recursive.c:1150
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "„%s“ е директори� в „%s“, затова �е добав� като „%s“"
 
-#: merge-recursive.c:1169
+#: merge-recursive.c:1172
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -890,150 +948,150 @@ msgstr ""
 "КО�ФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
 "„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s."
 
-#: merge-recursive.c:1174
+#: merge-recursive.c:1177
 msgid " (left unresolved)"
 msgstr " (некоригиран конфликт)"
 
-#: merge-recursive.c:1228
+#: merge-recursive.c:1231
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "КО�ФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
 "„%s“, а „%s“ е преименуван на „%s“ в „%s“"
 
-#: merge-recursive.c:1258
+#: merge-recursive.c:1261
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "Преименуване на „%s“ на „%s“, а „%s“ на „%s“"
 
-#: merge-recursive.c:1457
+#: merge-recursive.c:1460
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr ""
 "КО�ФЛИКТ (преименуване/добав�не): „%s“ е преименуван на „%s“ в клон „%s“, а "
 "„%s“ е добавен в „%s“"
 
-#: merge-recursive.c:1467
+#: merge-recursive.c:1470
 #, c-format
 msgid "Adding merged %s"
 msgstr "Добав�не на �лети� „%s“"
 
-#: merge-recursive.c:1472 merge-recursive.c:1674
+#: merge-recursive.c:1475 merge-recursive.c:1677
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Добав�не като „%s“"
 
-#: merge-recursive.c:1523
+#: merge-recursive.c:1526
 #, c-format
 msgid "cannot read object %s"
 msgstr "обектът „%s“ не може да �е прочете"
 
-#: merge-recursive.c:1526
+#: merge-recursive.c:1529
 #, c-format
 msgid "object %s is not a blob"
 msgstr "обектът „%s“ не е BLOB"
 
-#: merge-recursive.c:1578
+#: merge-recursive.c:1581
 msgid "modify"
 msgstr "пром�на"
 
-#: merge-recursive.c:1578
+#: merge-recursive.c:1581
 msgid "modified"
 msgstr "променен"
 
-#: merge-recursive.c:1588
+#: merge-recursive.c:1591
 msgid "content"
 msgstr "�ъдържание"
 
-#: merge-recursive.c:1595
+#: merge-recursive.c:1598
 msgid "add/add"
 msgstr "добав�не/добав�не"
 
-#: merge-recursive.c:1629
+#: merge-recursive.c:1632
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Пре�качане на „%s“ (�лети�т резултат е идентичен �ъ� �егашни�)"
 
-#: merge-recursive.c:1643
+#: merge-recursive.c:1646
 #, c-format
 msgid "Auto-merging %s"
 msgstr "�втоматично �ливане на „%s“"
 
-#: merge-recursive.c:1647 git-submodule.sh:1025
+#: merge-recursive.c:1650 git-submodule.sh:941
 msgid "submodule"
 msgstr "ПОДМОДУЛ"
 
-#: merge-recursive.c:1648
+#: merge-recursive.c:1651
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "КО�ФЛИКТ (%s): Конфликт при �ливане на „%s“"
 
-#: merge-recursive.c:1734
+#: merge-recursive.c:1737
 #, c-format
 msgid "Removing %s"
 msgstr "Изтриване на „%s“"
 
-#: merge-recursive.c:1759
+#: merge-recursive.c:1762
 msgid "file/directory"
 msgstr "файл/директори�"
 
-#: merge-recursive.c:1765
+#: merge-recursive.c:1768
 msgid "directory/file"
 msgstr "директори�/файл"
 
-#: merge-recursive.c:1770
+#: merge-recursive.c:1773
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "КО�ФЛИКТ (%s): Съще�твува директори� на име „%s“ в „%s“. Добав�не на „%s“ "
 "като „%s“"
 
-#: merge-recursive.c:1780
+#: merge-recursive.c:1781
 #, c-format
 msgid "Adding %s"
 msgstr "Добав�не на „%s“"
 
-#: merge-recursive.c:1797
+#: merge-recursive.c:1798
 msgid "Fatal merge failure, shouldn't happen."
 msgstr "Фатална грешка при �ливане, а такава не тр�бва да възниква!"
 
-#: merge-recursive.c:1816
+#: merge-recursive.c:1817
 msgid "Already up-to-date!"
 msgstr "Вече е обновено!"
 
-#: merge-recursive.c:1825
+#: merge-recursive.c:1826
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "неу�пешно �ливане на дърветата „%s“ и „%s“"
 
-#: merge-recursive.c:1855
+#: merge-recursive.c:1856
 #, c-format
 msgid "Unprocessed path??? %s"
 msgstr ""
 "Път�т „%s“ не е обработен, това е грешка в Git, докладвайте � на "
 "разработчиците, като пратите е-пи�мо на адре�: „git@vger.kernel.org“."
 
-#: merge-recursive.c:1903
+#: merge-recursive.c:1904
 msgid "Merging:"
 msgstr "Сливане:"
 
-#: merge-recursive.c:1916
+#: merge-recursive.c:1917
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "открит е %u общ предше�твеник:"
 msgstr[1] "открити �а %u общи предше�твеници:"
 
-#: merge-recursive.c:1953
+#: merge-recursive.c:1954
 msgid "merge returned no commit"
 msgstr "�ливането не върна подаване"
 
-#: merge-recursive.c:2010
+#: merge-recursive.c:2011
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "�еу�пешен анализ на обекта „%s“"
 
-#: merge-recursive.c:2021 builtin/merge.c:645
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
 msgid "Unable to write index."
 msgstr "Индек�ът не може да бъде прочетен"
 
@@ -1065,28 +1123,28 @@ msgstr "Зададена е лоша Ñ�тойноÑ�Ñ‚ на променливаÑ
 msgid "unable to parse object: %s"
 msgstr "обектът „%s“ не може да бъде анализиран"
 
-#: parse-options.c:570
+#: parse-options.c:572
 msgid "..."
 msgstr "…"
 
-#: parse-options.c:588
+#: parse-options.c:590
 #, c-format
 msgid "usage: %s"
 msgstr "употреба: %s"
 
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
 #, c-format
 msgid "   or: %s"
 msgstr "     или: %s"
 
-#: parse-options.c:595
+#: parse-options.c:597
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:629
+#: parse-options.c:631
 msgid "-NUM"
 msgstr "-ЧИСЛО"
 
@@ -1095,7 +1153,7 @@ msgstr "-ЧИСЛО"
 msgid "malformed object name '%s'"
 msgstr "неправилно име на обект „%s“"
 
-#: path.c:752
+#: path.c:796
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "�е могат да �е дадат права за запи� в директори�та „%s“ на групата"
@@ -1151,12 +1209,12 @@ msgstr "Път�т „%s“ е в подмодула „%.*s“"
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: магиче�ките пътища не �е поддържат от командата „%s“"
 
-#: pathspec.c:432
+#: pathspec.c:433
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "път�т „%s“ е �лед �имволна връзка"
 
-#: pathspec.c:441
+#: pathspec.c:442
 msgid ""
 "There is nothing to exclude from by :(exclude) patterns.\n"
 "Perhaps you forgot to add either ':/' or '.' ?"
@@ -1164,7 +1222,7 @@ msgstr ""
 "�ищо не �е изключва от шаблоните за изключване.\n"
 "Това че�то �е �лучва, ако �те забравили да добавите „:/“ или „.“."
 
-#: pretty.c:969
+#: pretty.c:971
 msgid "unable to parse --pretty format"
 msgstr "аргументът към опци�та „--pretty“ не може да �е анализира"
 
@@ -1191,165 +1249,250 @@ msgstr ""
 "„GIT_INDEX_VERSION“.\n"
 "Ще �е ползва вер�и� %i"
 
-#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
-#: builtin/merge.c:983
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "„%s“ не може да бъде отворен за запи�"
 
-#: refs/files-backend.c:2359
+#: refs/files-backend.c:2243
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "Указател�т „%s“ не може да бъде изтрит: %s"
 
-#: refs/files-backend.c:2362
+#: refs/files-backend.c:2246
 #, c-format
 msgid "could not delete references: %s"
 msgstr "Указателите не може да бъдат изтрити: %s"
 
-#: refs/files-backend.c:2371
+#: refs/files-backend.c:2255
 #, c-format
 msgid "could not remove reference %s"
 msgstr "Указател�т „%s“ не може да бъде изтрит"
 
-#: ref-filter.c:245
+#: ref-filter.c:55
 #, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "грешка във форма̀та: лек�емата %%(end) е използвана без �ъответната �"
+msgid "expected format: %%(color:<color>)"
+msgstr "очакван формат: %%(color:ЦВЯТ)"
+
+#: ref-filter.c:57
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "непознат цв�т: %%(color:%s)"
 
-#: ref-filter.c:704
+#: ref-filter.c:71
+#, c-format
+msgid "unrecognized format: %%(%s)"
+msgstr "непознат формат: %%(%s)"
+
+#: ref-filter.c:77
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) не приема аргументи"
+
+#: ref-filter.c:84
+#, c-format
+msgid "%%(subject) does not take arguments"
+msgstr "%%(subject) не приема аргументи"
+
+#: ref-filter.c:101
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "очаква �е положителна �тойно�т за „contents:lines=%s“"
 
-#: ref-filter.c:833
+#: ref-filter.c:103
 #, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "очакван формат: %%(color:ЦВЯТ)"
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "непознат аргумент за %%(contents): %s"
 
-#: ref-filter.c:835
-msgid "unable to parse format"
-msgstr "форматът не може да бъде анализиран"
+#: ref-filter.c:113
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "непознат аргумент за %%(objectname): %s"
 
-#: ref-filter.c:870
+#: ref-filter.c:135
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "очакван формат: %%(align:ШИРОЧИ��,ПОЗИЦИЯ)"
 
-#: ref-filter.c:893
+#: ref-filter.c:147
 #, c-format
-msgid "improper format entered align:%s"
-msgstr "въведен е неправилен формат align:%s"
+msgid "unrecognized position:%s"
+msgstr "непозната позици�: %s"
 
-#: ref-filter.c:898
+#: ref-filter.c:151
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "непозната широчина: %s"
+
+#: ref-filter.c:157
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr "непознат аргумент за %%(align): %s"
+
+#: ref-filter.c:161
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "очаква �е положителна широчина � лек�емата „%%(align)“"
 
-#: ref-filter.c:1219
+#: ref-filter.c:244
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "неправилно име на обект: „%.*s“"
+
+#: ref-filter.c:270
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "непознато име на обект: „%.*s“"
+
+#: ref-filter.c:372
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "грешка във форма̀та: лек�емата %%(end) е използвана без �ъответната �"
+
+#: ref-filter.c:424
+#, c-format
+msgid "malformed format string %s"
+msgstr "неправилен низ за форматиране „%s“"
+
+#: ref-filter.c:878
+msgid ":strip= requires a positive integer argument"
+msgstr "„:strip=“ изи�ква аргумент ц�ло, положително чи�ло"
+
+#: ref-filter.c:883
+#, c-format
+msgid "ref '%s' does not have %ld components to :strip"
+msgstr "указател�т „%s“ не разполага � %ld компоненти за премахване (:strip)"
+
+#: ref-filter.c:1046
+#, c-format
+msgid "unknown %.*s format %s"
+msgstr "непознато „%.*s“, формат „%s“"
+
+#: ref-filter.c:1066 ref-filter.c:1097
+#, c-format
+msgid "missing object %s for %s"
+msgstr "обектът „%s“ лип�ва за „%s“"
+
+#: ref-filter.c:1069 ref-filter.c:1100
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "неу�пешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“"
+
+#: ref-filter.c:1311
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "обект �ъ� �грешен формат при „%s“"
 
-#: ref-filter.c:1561
+#: ref-filter.c:1373
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "игнориране на указател� � грешно име „%s“"
+
+#: ref-filter.c:1378
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "игнориране на повредени� указател „%s“"
+
+#: ref-filter.c:1651
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "грешка във форма̀та: лип�ва лек�емата %%(end)"
 
-#: ref-filter.c:1615
+#: ref-filter.c:1705
 #, c-format
 msgid "malformed object name %s"
 msgstr "неправилно име на обект „%s“"
 
-#: remote.c:756
+#: remote.c:746
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "�евъзможно е да �е до�тав�т едновременно и „%s“, и „%s“ към „%s“"
 
-#: remote.c:760
+#: remote.c:750
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "„%s“ обикновено �леди „%s“, а не „%s“"
 
-#: remote.c:764
+#: remote.c:754
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "„%s“ �леди както „%s“, така и „%s“"
 
-#: remote.c:772
+#: remote.c:762
 msgid "Internal error"
 msgstr "Вътрешна грешка"
 
-#: remote.c:1687 remote.c:1730
+#: remote.c:1678 remote.c:1721
 msgid "HEAD does not point to a branch"
 msgstr "Указател�т „HEAD“ не �очи към клон"
 
-#: remote.c:1696
+#: remote.c:1687
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "н�ма клон на име „%s“"
 
-#: remote.c:1699
+#: remote.c:1690
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "не е зададен клон-източник за клона „%s“"
 
-#: remote.c:1705
+#: remote.c:1696
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "клонът-източник „%s“ не е �ъхранен като �лед�щ клон"
 
-#: remote.c:1720
+#: remote.c:1711
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "лип�ва локален �лед�щ клон за ме�тоположението за изтла�кване „%s“ в "
 "хранилището „%s“"
 
-#: remote.c:1735
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "н�ма информаци� клонът „%s“ да �леди н�кой друг"
 
-#: remote.c:1746
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "указател�т за изтла�кване на „%s“ не включва „%s“"
 
-#: remote.c:1759
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "указател�т за изтла�кване не включва цел („push.default“ е „nothing“)"
 
-#: remote.c:1781
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "про�тото (simple) изтла�кване не �ъответ�тва на една цел"
 
-#: remote.c:2083
+#: remote.c:2074
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Този клон �леди „%s“, но �ледени�т клон е изтрит.\n"
 
-#: remote.c:2087
+#: remote.c:2078
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (за да коригирате това, използвайте „git branch --unset-upstream“)\n"
 
-#: remote.c:2090
+#: remote.c:2081
 #, c-format
 msgid "Your branch is up-to-date with '%s'.\n"
 msgstr "Клонът е актуализиран към „%s“.\n"
 
-#: remote.c:2094
+#: remote.c:2085
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Клонът ви е � %2$d подаване пред „%1$s“.\n"
 msgstr[1] "Клонът ви е � %2$d подавани� пред „%1$s“.\n"
 
-#: remote.c:2100
+#: remote.c:2091
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (публикувайте локалните �и промени чрез „git push“)\n"
 
-#: remote.c:2103
+#: remote.c:2094
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -1359,11 +1502,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Клонът ви е � %2$d подавани� зад „%1$s“ и може да бъде тривиално �л�т.\n"
 
-#: remote.c:2111
+#: remote.c:2102
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (обновете локални� �и клон чрез „git pull“)\n"
 
-#: remote.c:2114
+#: remote.c:2105
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -1378,28 +1521,28 @@ msgstr[1] ""
 "Текущи�т клон �е е отделил от „%s“,\n"
 "двата имат �ъответно по %d и %d не�ъвпадащи подавани�.\n"
 
-#: remote.c:2124
+#: remote.c:2115
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (�лейте отдалечени� клон в локални� чрез „git pull“)\n"
 
-#: revision.c:2193
+#: revision.c:2142
 msgid "your current branch appears to be broken"
 msgstr "Текущи�т клон е повреден"
 
-#: revision.c:2196
+#: revision.c:2145
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "Текущи�т клон „%s“ е без подавани� "
 
-#: revision.c:2390
+#: revision.c:2339
 msgid "--first-parent is incompatible with --bisect"
 msgstr "опциите „--first-parent“ и „--bisect“ �а не�ъвме�тими"
 
-#: run-command.c:90
+#: run-command.c:92
 msgid "open /dev/null failed"
 msgstr "неу�пешно отвар�не на „/dev/null“"
 
-#: run-command.c:92
+#: run-command.c:94
 #, c-format
 msgid "dup2(%d,%d) failed"
 msgstr "неу�пешно изпълнение на dup2(%d,%d)"
@@ -1425,7 +1568,7 @@ msgid "the receiving end does not support --atomic push"
 msgstr "получаващата �трана не поддържа изтла�кване � опци�та „--atomic“"
 
 # FIXME git add <path…> for consistence
-#: sequencer.c:183
+#: sequencer.c:174
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -1433,7 +1576,7 @@ msgstr ""
 "�лед коригирането на конфликтите, отбележете �ъответните\n"
 "пътища � „git add ПЪТ…“ или „git rm ПЪТ…“."
 
-#: sequencer.c:186
+#: sequencer.c:177
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -1444,227 +1587,227 @@ msgstr ""
 "подайте резултата � командата „git commit'“."
 
 # FIXME - must be the same as Could not write to '%s' above
-#: sequencer.c:199 sequencer.c:842 sequencer.c:922
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
 #, c-format
 msgid "Could not write to %s"
 msgstr "„%s“ не може да бъде запи�ан"
 
-#: sequencer.c:202
+#: sequencer.c:193
 #, c-format
 msgid "Error wrapping up %s"
 msgstr "Обработката на „%s“ не завърши у�пешно."
 
-#: sequencer.c:217
+#: sequencer.c:208
 msgid "Your local changes would be overwritten by cherry-pick."
 msgstr "Локалните ви промени ще бъдат презапи�ани при отбирането на подавани�."
 
-#: sequencer.c:219
+#: sequencer.c:210
 msgid "Your local changes would be overwritten by revert."
 msgstr "Локалните ви промени ще бъдат презапи�ани при отм�ната на подавани�."
 
-#: sequencer.c:222
+#: sequencer.c:213
 msgid "Commit your changes or stash them to proceed."
 msgstr "Подайте или �катайте промените, за да продължите"
 
 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:309
+#: sequencer.c:300
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: нови�т индек� не може да бъде запазен"
 
-#: sequencer.c:327
+#: sequencer.c:318
 msgid "Could not resolve HEAD commit\n"
 msgstr "Подаването �очено от указател� „HEAD“ не може да бъде открито\n"
 
-#: sequencer.c:347
+#: sequencer.c:338
 msgid "Unable to update cache tree\n"
 msgstr "Дървото на кеша не може да бъде обновено\n"
 
-#: sequencer.c:399
+#: sequencer.c:390
 #, c-format
 msgid "Could not parse commit %s\n"
 msgstr "Подаването „%s“ не може да бъде анализирано\n"
 
-#: sequencer.c:404
+#: sequencer.c:395
 #, c-format
 msgid "Could not parse parent commit %s\n"
 msgstr "Родител�кото подаване „%s“ не може да бъде анализирано\n"
 
-#: sequencer.c:469
+#: sequencer.c:460
 msgid "Your index file is unmerged."
 msgstr "Индек�ът не е �л�т."
 
-#: sequencer.c:488
+#: sequencer.c:479
 #, c-format
 msgid "Commit %s is a merge but no -m option was given."
 msgstr "Подаването „%s“ е �ливане, но не е дадена опци�та „-m“"
 
-#: sequencer.c:496
+#: sequencer.c:487
 #, c-format
 msgid "Commit %s does not have parent %d"
 msgstr "Подаването „%s“ н�ма родител %d"
 
-#: sequencer.c:500
+#: sequencer.c:491
 #, c-format
 msgid "Mainline was specified but commit %s is not a merge."
 msgstr "Указано е базово подаване, но подаването „%s“ не е �ливане."
 
 #. TRANSLATORS: The first %s will be "revert" or
 #. "cherry-pick", the second %s a SHA1
-#: sequencer.c:513
+#: sequencer.c:504
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: неразпозната �тойно�т за родител�кото подаване „%s“"
 
-#: sequencer.c:517
+#: sequencer.c:508
 #, c-format
 msgid "Cannot get commit message for %s"
 msgstr "�еу�пешно извличане на �ъобщението за подаване на „%s“"
 
-#: sequencer.c:603
+#: sequencer.c:594
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "подаването „%s“… не може да бъде отменено: „%s“"
 
-#: sequencer.c:604
+#: sequencer.c:595
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "подаването „%s“… не може да бъде приложено: „%s“"
 
-#: sequencer.c:639
+#: sequencer.c:630
 msgid "empty commit set passed"
 msgstr "зададено е празно множе�тво от подавани�"
 
-#: sequencer.c:647
+#: sequencer.c:638
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: неу�пешно изчитане на индек�а"
 
-#: sequencer.c:651
+#: sequencer.c:642
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: неу�пешно обнов�ване на индек�а"
 
-#: sequencer.c:711
+#: sequencer.c:702
 #, c-format
 msgid "Cannot %s during a %s"
 msgstr "По време на „%1$s“ не може да �е извърши „%2$s“"
 
-#: sequencer.c:733
+#: sequencer.c:724
 #, c-format
 msgid "Could not parse line %d."
 msgstr "%d-�т ред не може да �е анализира."
 
-#: sequencer.c:738
+#: sequencer.c:729
 msgid "No commits parsed."
 msgstr "�икое от подавани�та не може да �е разпознае."
 
 # FIXME Could not open %s. - full stop for consistence with next message
-#: sequencer.c:750
+#: sequencer.c:741
 #, c-format
 msgid "Could not open %s"
 msgstr "„%s“ не може да �е прочете."
 
-#: sequencer.c:754
+#: sequencer.c:745
 #, c-format
 msgid "Could not read %s."
 msgstr "„%s“ не може да �е отвори."
 
-#: sequencer.c:761
+#: sequencer.c:752
 #, c-format
 msgid "Unusable instruction sheet: %s"
 msgstr "Файлът � опи�ание на пред�то�щите дей�тви� — „%s“ не може да �е ползва"
 
-#: sequencer.c:791
+#: sequencer.c:782
 #, c-format
 msgid "Invalid key: %s"
 msgstr "�еправилен ключ: „%s“"
 
-#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49
+#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "�еправилна �тойно�т за „%s“: „%s“"
 
-#: sequencer.c:804
+#: sequencer.c:795
 #, c-format
 msgid "Malformed options sheet: %s"
 msgstr "�еправилно �ъдържание на файла � опции: „%s“"
 
-#: sequencer.c:823
+#: sequencer.c:814
 msgid "a cherry-pick or revert is already in progress"
 msgstr ""
 "в момента вече �е извършва отбиране на подавани� или пребазиране на клона"
 
-#: sequencer.c:824
+#: sequencer.c:815
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "използвайте „git cherry-pick (--continue | --quit | --abort)“"
 
-#: sequencer.c:828
+#: sequencer.c:819
 #, c-format
 msgid "Could not create sequencer directory %s"
 msgstr "Директори�та за �еквен�ора „%s“ не може да бъде �ъздадена"
 
-#: sequencer.c:844 sequencer.c:926
+#: sequencer.c:835 sequencer.c:916
 #, c-format
 msgid "Error wrapping up %s."
 msgstr "Обработката на „%s“ не завърши у�пешно."
 
-#: sequencer.c:863 sequencer.c:996
+#: sequencer.c:854 sequencer.c:986
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 "в момента не �е извършва отбиране на подавани� или пребазиране на клона"
 
-#: sequencer.c:865
+#: sequencer.c:856
 msgid "cannot resolve HEAD"
 msgstr "Подаването �очено от указател� „HEAD“ не може да бъде открито"
 
-#: sequencer.c:867
+#: sequencer.c:858
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 "дей�твието не може да бъде преу�тановено, когато �те на клон, който тепърва "
 "пред�тои да бъде �ъздаден"
 
-#: sequencer.c:887 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
 #, c-format
-msgid "cannot open %s: %s"
-msgstr "файлът „%s“ не може да бъде отворен: %s"
+msgid "cannot open %s"
+msgstr "„%s“ не може да бъде отворен"
 
-#: sequencer.c:890
+#: sequencer.c:880
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "файлът „%s“ не може да бъде прочетен: %s"
 
-#: sequencer.c:891
+#: sequencer.c:881
 msgid "unexpected end of file"
 msgstr "неочакван край на файл"
 
-#: sequencer.c:897
+#: sequencer.c:887
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 "запазени�т преди започването на отбирането файл за указател� „HEAD“ — „%s“ е "
 "повреден"
 
-#: sequencer.c:919
+#: sequencer.c:909
 #, c-format
 msgid "Could not format %s."
 msgstr "Файлът „%s“ не може да �е форматира по подход�щи� начин."
 
-#: sequencer.c:1064
+#: sequencer.c:1054
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: не може да �е отбере „%s“"
 
-#: sequencer.c:1067
+#: sequencer.c:1057
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: неправилна вер�и�"
 
-#: sequencer.c:1101
+#: sequencer.c:1091
 msgid "Can't revert as initial commit"
 msgstr "Първоначалното подаване не може да бъде отменено"
 
-#: sequencer.c:1102
+#: sequencer.c:1092
 msgid "Can't cherry-pick into empty head"
 msgstr "При празен връх не могат да �е отбират подавани�"
 
@@ -1673,7 +1816,35 @@ msgstr "При празен връх не могат да �е отбират п
 msgid "failed to read %s"
 msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: sha1_name.c:463
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Очаква �е вер�и� на хранилището на git <= %d, а не %d"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "открити �а непознати разширени� в хранилището:"
+
+#: sha1_file.c:1080
+msgid "offset before end of packfile (broken .idx?)"
+msgstr ""
+"отме�тване преди кра� на пакетни� файл (възможно е индек�ът да е повреден)"
+
+#: sha1_file.c:2458
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr ""
+"отме�тване преди началото на индек�а на пакетни� файл „%s“ (възможно е "
+"индек�ът да е повреден)"
+
+#: sha1_file.c:2462
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr ""
+"отме�тване преди кра� на индек�а на пакетни� файл „%s“ (възможно е индек�ът "
+"да е отр�зан)"
+
+#: sha1_name.c:462
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -1697,67 +1868,315 @@ msgstr ""
 "�прете това �ъобщение като изпълните командата:\n"
 "„git config advice.objectNameWarning false“"
 
-#: submodule.c:61 submodule.c:95
+#: submodule.c:64 submodule.c:98
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "�е�летите файлове „.gitmodules“ не могат да бъдат промен�ни. Първо "
 "коригирайте конфликтите"
 
-#: submodule.c:65 submodule.c:99
+#: submodule.c:68 submodule.c:102
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "Във файла „.gitmodules“ лип�ва раздел за директори� „path=%s“"
 
-#: submodule.c:73
+#: submodule.c:76
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Запи�ът „%s“ във файла „.gitmodules“ не може да бъде променен"
 
-#: submodule.c:106
+#: submodule.c:109
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "Запи�ът „%s“ във файла „.gitmodules“ не може да бъде изтрит"
 
-#: submodule.c:117
+#: submodule.c:120
 msgid "staging updated .gitmodules failed"
 msgstr "неу�пешно добав�не на променени� файл „.gitmodules“ в индек�а"
 
-#: submodule.c:1040
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "�а�тройката „submodule.fetchJobs“ не приема отрицателни �тойно�ти"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "�еправилна �тойно�т за „%s“"
+
+#: trailer.c:237
 #, c-format
-msgid "Could not set core.worktree in %s"
-msgstr "�а�тройката „core.worktree“ не може да �е зададе в „%s“"
+msgid "running trailer command '%s' failed"
+msgstr "неу�пешно изпълнение на завършващата команда „%s“"
 
-#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
-#: trailer.c:561
+#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
+#: trailer.c:562
 #, c-format
 msgid "unknown value '%s' for key '%s'"
 msgstr "неправилна �тойно�т „%s“ за на�тройката „%s“"
 
-#: trailer.c:543 trailer.c:548 builtin/remote.c:296
+#: trailer.c:544 trailer.c:549 builtin/remote.c:289
 #, c-format
 msgid "more than one %s"
 msgstr "�тойно�тта „%s“ �е повтар� в на�тройките"
 
-#: trailer.c:581
+#: trailer.c:582
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "празна завършваща лек�ема в епилога „%.*s“"
 
-#: trailer.c:701
+#: trailer.c:702
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "входни�т файл „%s“ не може да бъде прочетен"
 
-#: trailer.c:704
+#: trailer.c:705
 msgid "could not read from stdin"
 msgstr "от �тандартни� вход не може да �е чете"
 
-#: transport-helper.c:1025
+#: trailer.c:857 builtin/am.c:42
+#, c-format
+msgid "could not stat %s"
+msgstr "�е може да �е получи информаци� чрез „stat“ за „%s“"
+
+#: trailer.c:859
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "„%s“ не е обикновен файл"
+
+#: trailer.c:861
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "„%s“: н�ма права за запи�ване на файла"
+
+#: trailer.c:873
+msgid "could not open temporary file"
+msgstr "временни�т файл не може да �е отвори"
+
+#: trailer.c:912
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "временни�т файл не може да �е преименува на „%s“"
+
+#: transport-helper.c:1041
 #, c-format
 msgid "Could not read ref %s"
 msgstr "Указател�т „%s“ не може да �е прочете."
 
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you can switch branches."
+msgstr ""
+"Изтегл�нето ще презапише локалните промени на тези файлове:\n"
+"%%sПодайте или �катайте промените, за да преминете към нов клон."
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Изтегл�нето ще презапише локалните промени на тези файлове:\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you can merge."
+msgstr ""
+"Сливането ще презапише локалните промени на тези файлове:\n"
+"%%sПодайте или �катайте промените, за да �леете."
+
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Сливането ще презапише локалните промени на тези файлове:\n"
+"%%s"
+
+#: unpack-trees.c:74
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you can %s."
+msgstr ""
+"„%s“ ще презапише локалните промени на тези файлове:\n"
+"%%sПодайте или �катайте промените, за да извършите „%s“."
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"„%s“ ще презапише локалните промени на тези файлове:\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"Обнов�ването на тези директории ще изтрие не�ледените файлове в т�х:\n"
+"%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Изтегл�нето ще изтрие тези не�ледени файлове в работното дърво:\n"
+"%%sПреме�тете ги или ги изтрийте, за да преминете на друг клон."
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Изтегл�нето ще изтрие тези не�ледени файлове в работното дърво:\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Сливането ще изтрие тези не�ледени файлове в работното дърво:\n"
+"%%sПреме�тете ги или ги изтрийте, за да �леете."
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Сливането ще изтрие тези не�ледени файлове в работното дърво:\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"„%s“ ще изтрие тези не�ледени файлове в работното дърво:\n"
+"%%sПреме�тете ги или ги изтрийте, за да извършите „%s“."
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"„%s“ ще изтрие тези не�ледени файлове в работното дърво:\n"
+"%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Изтегл�нето ще презапише тези не�ледени файлове в работното дърво:\n"
+"%%sПреме�тете ги или ги изтрийте, за да �мените клон."
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Изтегл�нето ще презапише тези не�ледени файлове в работното дърво:\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Сливането ще презапише тези не�ледени файлове в работното дърво:\n"
+"%%sПреме�тете ги или ги изтрийте, за да �леете."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Сливането ще презапише тези не�ледени файлове в работното дърво:\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"„%s“ ще презапише тези не�ледени файлове в работното дърво:\n"
+"%%sПреме�тете ги или ги изтрийте, за да извършите „%s“."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"„%s“ ще презапише тези не�ледени файлове в работното дърво:\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "Запи�ът за „%s“ �ъвпада � този за „%s“. �е може да �е при�вои."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"Ча�тичното изтегл�не не може да бъде обновено: �ледните запи�и не �а "
+"актуални:\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Обнов�ването на ча�тичното изтегл�не ще презапише тези файлове в работното "
+"дърво:\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Обнов�ването на ча�тичното изтегл�не ще изтрие тези файлове в работното "
+"дърво:\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "Преу�танов�ване на дей�твието\n"
+
+#: unpack-trees.c:237
 msgid "Checking out files"
 msgstr "Изтегл�не на файлове"
 
@@ -1790,210 +2209,206 @@ msgstr "неправилен номер на порт"
 msgid "invalid '..' path segment"
 msgstr "неправилна ча�т от път� „..“"
 
-#: wrapper.c:219 wrapper.c:362
+#: wrapper.c:222 wrapper.c:381
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "„%s“ не може да бъде отворен и за четене, и за запи�"
 
-#: wrapper.c:221 wrapper.c:364
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "„%s“ не може да бъде отворен за запи�"
 
-#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
-#: builtin/merge.c:1074 builtin/pull.c:380
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "файлът не може да бъде прочетен: „%s“"
 
-#: wrapper.c:579
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "н�ма до�тъп до „%s“: %s"
-
-#: wrapper.c:600
+#: wrapper.c:594 wrapper.c:615
 #, c-format
 msgid "unable to access '%s'"
 msgstr "н�ма до�тъп до „%s“"
 
-#: wrapper.c:608
+#: wrapper.c:623
 msgid "unable to get current working directory"
 msgstr "текущата работна директори� е недо�тъпна"
 
-#: wrapper.c:635
+#: wrapper.c:650
 #, c-format
 msgid "could not open %s for writing"
 msgstr "„%s“ не може да бъде отворен за запи�"
 
 # FIXME - must be the same as Could not write to '%s' above
-#: wrapper.c:646 builtin/am.c:425
+#: wrapper.c:661 builtin/am.c:410
 #, c-format
 msgid "could not write to %s"
 msgstr "„%s“ не може да бъде запи�ан"
 
-#: wrapper.c:652
+#: wrapper.c:667
 #, c-format
 msgid "could not close %s"
 msgstr "„%s“ не може да �е затвори"
 
-#: wt-status.c:149
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "�е�лети пътища:"
 
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (използвайте „git reset %s Ф�ЙЛ…“, за да извадите Ф�ЙЛа от индек�а)"
 
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 "  (използвайте „git rm --cached %s Ф�ЙЛ…“, за да извадите Ф�ЙЛа от индек�а)"
 
-#: wt-status.c:182
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr ""
 "  (използвайте „git add Ф�ЙЛ…“, за да укажете разрешаването на конфликта)"
 
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (използвайте „git add/rm Ф�ЙЛ…“, �поред решението, което избирате за "
 "конфликта)"
 
-#: wt-status.c:186
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 "  (използвайте „git rm Ф�ЙЛ…“, за да укажете разрешаването на конфликта)"
 
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
 msgid "Changes to be committed:"
 msgstr "Промени, които ще бъдат подадени:"
 
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
 msgid "Changes not staged for commit:"
 msgstr "Промени, които не �а в индек�а за подаване:"
 
-#: wt-status.c:219
+#: wt-status.c:220
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 "  (използвайте „git add Ф�ЙЛ…“, за да обновите �ъдържанието за подаване)"
 
-#: wt-status.c:221
+#: wt-status.c:222
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (използвайте „git add/rm Ф�ЙЛ…“, за да обновите �ъдържанието за подаване)"
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (използвайте „git checkout -- Ф�ЙЛ…“, за да отхвърлите промените в "
 "работното дърво)"
 
-#: wt-status.c:224
+#: wt-status.c:225
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (подайте или отхвърлете не�леденото или промененото �ъдържание в "
 "подмодулите)"
 
-#: wt-status.c:236
+#: wt-status.c:237
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (използвайте „git %s Ф�ЙЛ…“, за да определите какво включвате в подаването)"
 
-#: wt-status.c:251
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "изтрити в двата �луча�:"
 
-#: wt-status.c:253
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "добавени от ва�:"
 
-#: wt-status.c:255
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "изтрити от т�х:"
 
-#: wt-status.c:257
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "добавени от т�х:"
 
-#: wt-status.c:259
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "изтрити от ва�:"
 
-#: wt-status.c:261
+#: wt-status.c:262
 msgid "both added:"
 msgstr "добавени и в двата �луча�:"
 
-#: wt-status.c:263
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "променени и в двата �луча�:"
 
-#: wt-status.c:265
+#: wt-status.c:266
 #, c-format
 msgid "bug: unhandled unmerged status %x"
 msgstr "грешка: �ъ�то�нието на пром�ната „%x“ не може да бъде обработено"
 
-#: wt-status.c:273
+#: wt-status.c:274
 msgid "new file:"
 msgstr "нов файл:"
 
-#: wt-status.c:275
+#: wt-status.c:276
 msgid "copied:"
 msgstr "копиран:"
 
-#: wt-status.c:277
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "изтрит:"
 
-#: wt-status.c:279
+#: wt-status.c:280
 msgid "modified:"
 msgstr "променен:"
 
-#: wt-status.c:281
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "преименуван:"
 
-#: wt-status.c:283
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "�м�на на вида:"
 
-#: wt-status.c:285
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "непозната пром�на:"
 
-#: wt-status.c:287
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "не�л�т:"
 
-#: wt-status.c:369
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "нови подавани�, "
 
-#: wt-status.c:371
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "променено �ъдържание, "
 
-#: wt-status.c:373
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "не�ледено �ъдържание, "
 
-#: wt-status.c:390
+#: wt-status.c:391
 #, c-format
 msgid "bug: unhandled diff status %c"
 msgstr "грешка: �ъ�то�нието на пром�ната „%c“ не може да бъде обработено"
 
-#: wt-status.c:754
+#: wt-status.c:755
 msgid "Submodules changed but not updated:"
 msgstr "Подмодулите �а променени, но не �а обновени:"
 
-#: wt-status.c:756
+#: wt-status.c:757
 msgid "Submodule changes to be committed:"
 msgstr "Промени в подмодулите за подаване:"
 
-#: wt-status.c:837
+#: wt-status.c:838
 msgid ""
 "Do not touch the line above.\n"
 "Everything below will be removed."
@@ -2001,39 +2416,39 @@ msgstr ""
 "�е промен�йте горни� ред.\n"
 "В�ичко отдолу ще бъде изтрито."
 
-#: wt-status.c:948
+#: wt-status.c:949
 msgid "You have unmerged paths."
 msgstr "��кои пътища не �а �лети."
 
-#: wt-status.c:951
+#: wt-status.c:952
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git commit“)"
 
-#: wt-status.c:954
+#: wt-status.c:956
 msgid "All conflicts fixed but you are still merging."
 msgstr "В�ички конфликти �а решени, но продължавате �ливането."
 
-#: wt-status.c:957
+#: wt-status.c:959
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (използвайте „git commit“, за да завършите �ливането)"
 
-#: wt-status.c:967
+#: wt-status.c:969
 msgid "You are in the middle of an am session."
 msgstr "В момента прилагате поредица от кръпки чрез „git am“."
 
-#: wt-status.c:970
+#: wt-status.c:972
 msgid "The current patch is empty."
 msgstr "Текущата кръпка е празна."
 
-#: wt-status.c:974
+#: wt-status.c:976
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git am --continue“)"
 
-#: wt-status.c:976
+#: wt-status.c:978
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (използвайте „git am --skip“, за да пропу�нете тази кръпка)"
 
-#: wt-status.c:978
+#: wt-status.c:980
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 "  (използвайте „git am --abort“, за да въз�тановите първоначални� клон)"
@@ -2187,43 +2602,43 @@ msgstr ""
 "  (използвайте „git bisect reset“, за да �е върнете към първоначалното "
 "�ъ�то�ние и клон)"
 
-#: wt-status.c:1438
+#: wt-status.c:1460
 msgid "On branch "
 msgstr "�а клон "
 
-#: wt-status.c:1444
+#: wt-status.c:1466
 msgid "interactive rebase in progress; onto "
 msgstr "извършвате интерактивно пребазиране върху "
 
-#: wt-status.c:1446
+#: wt-status.c:1468
 msgid "rebase in progress; onto "
 msgstr "извършвате пребазиране върху "
 
-#: wt-status.c:1451
+#: wt-status.c:1473
 msgid "HEAD detached at "
 msgstr "Указател�т „HEAD“ не е �вързан и е при "
 
-#: wt-status.c:1453
+#: wt-status.c:1475
 msgid "HEAD detached from "
 msgstr "Указател�т „HEAD“ не е �вързан и е отделѐн от "
 
-#: wt-status.c:1456
+#: wt-status.c:1478
 msgid "Not currently on any branch."
 msgstr "Извън в�ички клони."
 
-#: wt-status.c:1474
+#: wt-status.c:1496
 msgid "Initial commit"
 msgstr "Първоначално подаване"
 
-#: wt-status.c:1488
+#: wt-status.c:1510
 msgid "Untracked files"
 msgstr "�е�ледени файлове"
 
-#: wt-status.c:1490
+#: wt-status.c:1512
 msgid "Ignored files"
 msgstr "Игнорирани файлове"
 
-#: wt-status.c:1494
+#: wt-status.c:1516
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2235,32 +2650,32 @@ msgstr ""
 "изпълнението, но не тр�бва да забрав�те ръчно да добав�те новите файлове.\n"
 "За повече подробно�ти погледнете „git status help“."
 
-#: wt-status.c:1500
+#: wt-status.c:1522
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "�е�ледените файлове не �а изведени%s"
 
-#: wt-status.c:1502
+#: wt-status.c:1524
 msgid " (use -u option to show untracked files)"
 msgstr " (използвайте опци�та „-u“, за да изведете не�ледените файлове)"
 
-#: wt-status.c:1508
+#: wt-status.c:1530
 msgid "No changes"
 msgstr "��ма промени"
 
-#: wt-status.c:1513
+#: wt-status.c:1535
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "към индек�а за подаване не �а добавени промени (използвайте „git add“ и/или "
 "„git commit -a“)\n"
 
-#: wt-status.c:1516
+#: wt-status.c:1538
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "към индек�а за подаване не �а добавени промени\n"
 
-#: wt-status.c:1519
+#: wt-status.c:1541
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -2269,52 +2684,56 @@ msgstr ""
 "към индек�а за подаване не �а добавени промени, но има нови файлове "
 "(използвайте „git add“, за да започне т�хното �ледене)\n"
 
-#: wt-status.c:1522
+#: wt-status.c:1544
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "към индек�а за подаване не �а добавени промени, но има нови файлове\n"
 
-#: wt-status.c:1525
+#: wt-status.c:1547
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "лип�ват каквито и да е промени (�ъздайте или копирайте файлове и използвайте "
 "„git add“, за да започне т�хното �ледене)\n"
 
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
 #, c-format
 msgid "nothing to commit\n"
 msgstr "лип�ват каквито и да е промени\n"
 
-#: wt-status.c:1531
+#: wt-status.c:1553
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "лип�ват каквито и да е промени (използвайте опци�та „-u“, за да �е изведат и "
 "не�ледените файлове)\n"
 
-#: wt-status.c:1535
+#: wt-status.c:1557
 #, c-format
 msgid "nothing to commit, working directory clean\n"
 msgstr "лип�ват каквито и да е промени, работното дърво е чи�то\n"
 
-#: wt-status.c:1642
+#: wt-status.c:1664
 msgid "Initial commit on "
 msgstr "Първоначално подаване на клон"
 
-#: wt-status.c:1646
+#: wt-status.c:1668
 msgid "HEAD (no branch)"
 msgstr "HEAD (извън клон)"
 
-#: wt-status.c:1675
+#: wt-status.c:1697
 msgid "gone"
 msgstr "изтрит"
 
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
 msgid "behind "
 msgstr "назад � "
 
-#: compat/precompose_utf8.c:56 builtin/clone.c:408
+#: wt-status.c:1702 wt-status.c:1705
+msgid "ahead "
+msgstr "напред � "
+
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "неу�пешно изтриване на „%s“"
@@ -2328,7 +2747,7 @@ msgstr "git add [ОПЦИЯ…] [--] ПЪТ…"
 msgid "unexpected diff status %c"
 msgstr "неочакван изходен код при генериране на разлика: %c"
 
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
 msgid "updating files failed"
 msgstr "неу�пешно обнов�ване на файловете"
 
@@ -2341,7 +2760,7 @@ msgstr "изтриване на „%s“\n"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Промени, които и �лед обнов�ването на индек�а не �а добавени към него:"
 
-#: builtin/add.c:194 builtin/rev-parse.c:796
+#: builtin/add.c:194 builtin/rev-parse.c:811
 msgid "Could not read the index"
 msgstr "Индек�ът не може да бъде прочетен"
 
@@ -2377,15 +2796,15 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Следните пътища ще бъдат игнорирани �поред н�кой от файловете „.gitignore“:\n"
 
-#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543
-#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
 msgid "dry run"
 msgstr "пробно изпълнeние"
 
-#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
 msgid "be verbose"
 msgstr "повече подробно�ти"
 
@@ -2393,7 +2812,7 @@ msgstr "повече подробно�ти"
 msgid "interactive picking"
 msgstr "интерактивно отбиране на промени"
 
-#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
 msgid "select hunks interactively"
 msgstr "интерактивен избор на парчета код"
 
@@ -2465,138 +2884,123 @@ msgstr "�ищо не е зададено и нищо не е добавено.\
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Веро�тно и�кахте да използвате „git add .“?\n"
 
-#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
-#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:40
+#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
 msgid "index file corrupt"
 msgstr "файлът � индек�а е повреден"
 
-#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "�ови�т индек� не може да бъде запи�ан"
 
-#: builtin/am.c:42
-#, c-format
-msgid "could not stat %s"
-msgstr "�е може да �е получи информаци� чрез „stat“ за „%s“"
-
-#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
 #, c-format
 msgid "could not read '%s'"
 msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: builtin/am.c:445
+#: builtin/am.c:430
 msgid "could not parse author script"
 msgstr "�криптът за автор не може да �е анализира"
 
-#: builtin/am.c:522
+#: builtin/am.c:507
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "„%s“ бе изтрит от куката „applypatch-msg“"
 
-#: builtin/am.c:563 builtin/notes.c:300
+#: builtin/am.c:548 builtin/notes.c:300
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Дадени�т входен ред е � неправилен формат: „%s“."
 
-#: builtin/am.c:600 builtin/notes.c:315
+#: builtin/am.c:585 builtin/notes.c:315
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Бележката не може да �е копира от „%s“ към „%s“"
 
-#: builtin/am.c:626
+#: builtin/am.c:611
 msgid "fseek failed"
 msgstr "неу�пешно изпълнение на „fseek“"
 
-#: builtin/am.c:787 builtin/am.c:875
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "„%s“ не може да бъде отворен за четене: %s"
-
-#: builtin/am.c:794
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "„%s“ не може да бъде отворен за запи�: %s"
-
-#: builtin/am.c:803
+#: builtin/am.c:788
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "кръпката „%s“ не може да �е анализира"
 
-#: builtin/am.c:868
+#: builtin/am.c:853
 msgid "Only one StGIT patch series can be applied at once"
 msgstr ""
 "Само една �ери� кръпки от „StGIT“ може да бъде прилагана в даден момент"
 
-#: builtin/am.c:916
+#: builtin/am.c:900
 msgid "invalid timestamp"
 msgstr "неправилна �тойно�т за време"
 
-#: builtin/am.c:919 builtin/am.c:927
+#: builtin/am.c:903 builtin/am.c:911
 msgid "invalid Date line"
 msgstr "неправилен ред за дата „Date“"
 
-#: builtin/am.c:924
+#: builtin/am.c:908
 msgid "invalid timezone offset"
 msgstr "неправилно отме�тване на ча�ови� по��"
 
-#: builtin/am.c:1011
+#: builtin/am.c:995
 msgid "Patch format detection failed."
 msgstr "Форматът на кръпката не може да бъде определен."
 
-#: builtin/am.c:1016 builtin/clone.c:373
+#: builtin/am.c:1000 builtin/clone.c:380
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/am.c:1020
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Кръпките не могат да бъдат разделени."
 
-#: builtin/am.c:1152 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
 msgid "unable to write index file"
 msgstr "индек�ът не може да бъде запи�ан"
 
-#: builtin/am.c:1203
+#: builtin/am.c:1187
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "След коригирането на този проблем изпълнете „%s --continue“."
 
-#: builtin/am.c:1204
+#: builtin/am.c:1188
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "�ко предпочитате да пре�кочите тази кръпка, изпълнете „%s --skip“."
 
-#: builtin/am.c:1205
+#: builtin/am.c:1189
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "За да �е върнете към първоначалното �ъ�то�ние, изпълнете „%s --abort“."
 
-#: builtin/am.c:1343
+#: builtin/am.c:1327
 msgid "Patch is empty. Was it split wrong?"
 msgstr "Празна кръпка. Дали не е разделена погрешно?"
 
-#: builtin/am.c:1417 builtin/log.c:1347
+#: builtin/am.c:1401 builtin/log.c:1516
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "грешна идентично�т: %s"
 
-#: builtin/am.c:1444
+#: builtin/am.c:1428
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "подаването не може да бъде анализирано: %s"
 
-#: builtin/am.c:1646
+#: builtin/am.c:1630
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "В хранилището лип�ват необходимите обекти BLOB, за да �е премине към тройно "
 "�ливане."
 
-#: builtin/am.c:1648
+#: builtin/am.c:1632
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Базовото дърво �е рекон�труира от информаци�та в индек�а…"
 
-#: builtin/am.c:1667
+#: builtin/am.c:1651
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -2604,39 +3008,39 @@ msgstr ""
 "Кръпката не може да �е приложи към обектите BLOB в индек�а.\n"
 "Да не би да �те � редактирали на ръка?"
 
-#: builtin/am.c:1673
+#: builtin/am.c:1657
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Преминаване към прилагане на кръпка към базата и тройно �ливане…"
 
-#: builtin/am.c:1688
+#: builtin/am.c:1672
 msgid "Failed to merge in the changes."
 msgstr "�еу�пешно �ливане на промените."
 
-#: builtin/am.c:1712 builtin/merge.c:632
+#: builtin/am.c:1696 builtin/merge.c:636
 msgid "git write-tree failed to write a tree"
 msgstr "Командата „git write-tree“ не у�п� да запише обект-дърво"
 
-#: builtin/am.c:1719
+#: builtin/am.c:1703
 msgid "applying to an empty history"
 msgstr "прилагане върху празна и�тори�"
 
-#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
-#: builtin/merge.c:854
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
 msgid "failed to write commit object"
 msgstr "обектът за подаването не може да бъде запи�ан"
 
-#: builtin/am.c:1764 builtin/am.c:1768
+#: builtin/am.c:1748 builtin/am.c:1752
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "не може да �е продължи — „%s“ не �ъще�твува."
 
-#: builtin/am.c:1784
+#: builtin/am.c:1768
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "За интерактивно изпълнение е необходимо �тандартни�т\n"
 "изход да е �вързан � терминал, а в момента не е."
 
-#: builtin/am.c:1789
+#: builtin/am.c:1773
 msgid "Commit Body is:"
 msgstr "Т�лото на кръпката за прилагане е:"
 
@@ -2644,38 +3048,38 @@ msgstr "Т�лото на кръпката за прилагане е:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1799
+#: builtin/am.c:1783
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 "Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане "
 "на в�ичко:"
 
-#: builtin/am.c:1849
+#: builtin/am.c:1833
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 "Индек�ът не е чи�т: кръпките не могат да бъдат приложени (замър�ени �а: %s)"
 
-#: builtin/am.c:1884 builtin/am.c:1955
+#: builtin/am.c:1868 builtin/am.c:1940
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Прилагане: %.*s"
 
-#: builtin/am.c:1900
+#: builtin/am.c:1884
 msgid "No changes -- Patch already applied."
 msgstr "Без промени — кръпката вече е приложена."
 
-#: builtin/am.c:1908
+#: builtin/am.c:1892
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "�еу�пешно прилагане на кръпка при %s %.*s“"
 
-#: builtin/am.c:1914
+#: builtin/am.c:1898
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "Дубликат на проблемната кръпка �е намира в: %s"
 
-#: builtin/am.c:1958
+#: builtin/am.c:1943
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -2685,7 +3089,7 @@ msgstr ""
 "�ко н�ма друга пром�на за включване в индек�а, най-веро�тно н�ко� друга\n"
 "кръпка е довела до �ъщите промени и в такъв �лучай про�то пропу�нете тази."
 
-#: builtin/am.c:1965
+#: builtin/am.c:1950
 msgid ""
 "You still have unmerged paths in your index.\n"
 "Did you forget to use 'git add'?"
@@ -2693,17 +3097,17 @@ msgstr ""
 "Индек�ът в�е още �ъдържа не�лети промени.\n"
 "Възможно е да не �те изпълнили „git add“."
 
-#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
 #: builtin/reset.c:316
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "„%s“ не е разпознат като обект."
 
-#: builtin/am.c:2125
+#: builtin/am.c:2110
 msgid "failed to clean index"
 msgstr "индек�ът не може да бъде изчи�тен"
 
-#: builtin/am.c:2159
+#: builtin/am.c:2144
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -2714,157 +3118,159 @@ msgstr ""
 "към\n"
 "„ORIG_HEAD“"
 
-#: builtin/am.c:2220
+#: builtin/am.c:2205
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "�еправилна �тойно�т за „--patch-format“: „%s“"
 
-#: builtin/am.c:2253
+#: builtin/am.c:2238
 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
 msgstr "git am [ОПЦИЯ…] [Ф�ЙЛ_С_ПОЩ�|ДИРЕКТОРИЯ_С_ПОЩ�]…"
 
-#: builtin/am.c:2254
+#: builtin/am.c:2239
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)"
 
-#: builtin/am.c:2260
+#: builtin/am.c:2245
 msgid "run interactively"
 msgstr "интерактивна работа"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2247
 msgid "historical option -- no-op"
 msgstr "изо�тавена опци�, �ъще�твува по и�ториче�ки причини, нищо не прави"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2249
 msgid "allow fall back on 3way merging if needed"
 msgstr "да �е преминава към тройно �ливане при нужда."
 
-#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
 #: builtin/repack.c:171
 msgid "be quiet"
 msgstr "без извеждане на информаци�"
 
-#: builtin/am.c:2267
+#: builtin/am.c:2252
 msgid "add a Signed-off-by line to the commit message"
 msgstr "добав�не на ред за подпи� „Signed-off-by“ в �ъобщението за подаване"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2255
 msgid "recode into utf8 (default)"
 msgstr "прекодиране в UTF-8 (�тандартно)"
 
-#: builtin/am.c:2272
+#: builtin/am.c:2257
 msgid "pass -k flag to git-mailinfo"
 msgstr "подаване на опци�та „-k“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2274
+#: builtin/am.c:2259
 msgid "pass -b flag to git-mailinfo"
 msgstr "подаване на опци�та „-b“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2276
+#: builtin/am.c:2261
 msgid "pass -m flag to git-mailinfo"
 msgstr "подаване на опци�та „-m“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2263
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 "подаване на опци�та „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2266
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "без подаване на опци�та „--keep-cr“ на командата „git-mailsplit“ незави�имо "
 "от „am.keepcr“"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2269
 msgid "strip everything before a scissors line"
 msgstr "пропу�кане на в�ичко преди реда за отр�зване"
 
-#: builtin/am.c:2285 builtin/apply.c:4554
+#: builtin/am.c:2270 builtin/apply.c:4546
 msgid "action"
 msgstr "дей�твие"
 
-#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2313
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
 msgid "pass it through git-apply"
 msgstr "прекарване през „git-apply“"
 
-#: builtin/am.c:2294 builtin/apply.c:4578
+#: builtin/am.c:2279 builtin/apply.c:4570
 msgid "root"
 msgstr "��Ч�Л��_ДИРЕКТОРИЯ"
 
-#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
-#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
-#: builtin/pull.c:167 builtin/submodule--helper.c:78
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
 msgid "path"
 msgstr "път"
 
-#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193
 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
 #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
 #: parse-options.h:134 parse-options.h:244
 msgid "n"
 msgstr "БРОЙ"
 
-#: builtin/am.c:2306 builtin/apply.c:4522
+#: builtin/am.c:2291 builtin/apply.c:4514
 msgid "num"
 msgstr "БРОЙ"
 
-#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
 #: builtin/tag.c:372
 msgid "format"
 msgstr "ФОРМ�Т"
 
-#: builtin/am.c:2310
+#: builtin/am.c:2295
 msgid "format the patch(es) are in"
 msgstr "формат на кръпките"
 
-#: builtin/am.c:2316
+#: builtin/am.c:2301
 msgid "override error message when patch failure occurs"
 msgstr "избрано от ва� �ъобщение за грешка при прилагане на кръпки"
 
-#: builtin/am.c:2318
+#: builtin/am.c:2303
 msgid "continue applying patches after resolving a conflict"
 msgstr "продължаване на прилагането на кръпки �лед коригирането на конфликт"
 
-#: builtin/am.c:2321
+#: builtin/am.c:2306
 msgid "synonyms for --continue"
 msgstr "�иноними на „--continue“"
 
-#: builtin/am.c:2324
+#: builtin/am.c:2309
 msgid "skip the current patch"
 msgstr "пре�качане на текущата кръпка"
 
-#: builtin/am.c:2327
+#: builtin/am.c:2312
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 "въз�танов�ване на първоначалното �ъ�то�ние на клона и преу�танов�ване на "
 "прилагането на кръпката."
 
-#: builtin/am.c:2331
+#: builtin/am.c:2316
 msgid "lie about committer date"
-msgstr "дата за подаване различна от първоначалнота"
+msgstr "дата за подаване различна от първоначалната"
 
-#: builtin/am.c:2333
+#: builtin/am.c:2318
 msgid "use current timestamp for author date"
 msgstr "използване на текущото време като това за автор"
 
-#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
 msgid "key-id"
 msgstr "ИДЕ�ТИФИК�ТОР_��_КЛЮЧ"
 
-#: builtin/am.c:2336
+#: builtin/am.c:2321
 msgid "GPG-sign commits"
 msgstr "подпи�ване на подавани�та � GPG"
 
-#: builtin/am.c:2339
+#: builtin/am.c:2324
 msgid "(internal use for git-rebase)"
 msgstr "(ползва �е вътрешно за „git-rebase“)"
 
-#: builtin/am.c:2354
+#: builtin/am.c:2339
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -2872,18 +3278,18 @@ msgstr ""
 "Опциите „-b“/„--binary“ отдавна не прав�т нищо и\n"
 "ще бъдат премахнати в бъдеще. �е ги ползвайте."
 
-#: builtin/am.c:2361
+#: builtin/am.c:2346
 msgid "failed to read the index"
 msgstr "неу�пешно изчитане на индек�а"
 
-#: builtin/am.c:2376
+#: builtin/am.c:2361
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "предишната директори� за пребазиране „%s“ в�е още �ъще�твува, а е зададен "
 "файл „mbox“."
 
-#: builtin/am.c:2400
+#: builtin/am.c:2385
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -2892,7 +3298,7 @@ msgstr ""
 "Открита е излишна директори� „%s“.\n"
 "Можете да � изтриете � командата „git am --abort“."
 
-#: builtin/am.c:2406
+#: builtin/am.c:2391
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "В момента не тече операци� по коригиране и н�ма как да �е продължи."
 
@@ -2925,45 +3331,45 @@ msgstr "Регул�рни�т израз върна %d при подадена
 msgid "unable to find filename in patch at line %d"
 msgstr "Лип�ва име на файл на ред %d от кръпката"
 
-#: builtin/apply.c:940
+#: builtin/apply.c:937
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: лош изход от командата „git-diff“ — на ред %2$d �е очакваше „/dev/"
 "null“, а бе получен „%1$s“"
 
-#: builtin/apply.c:944
+#: builtin/apply.c:942
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
 "неправилно име на нов файл"
 
-#: builtin/apply.c:945
+#: builtin/apply.c:943
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
 "неправилно име на �тар файл"
 
-#: builtin/apply.c:952
+#: builtin/apply.c:949
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr ""
 "git apply: лош изход от командата „git-diff“ — на ред %d �е очакваше „/dev/"
 "null“"
 
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "при повторното пребро�ване бе получен неочакван ред: „%.*s“"
 
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "ча�т от кръпка без заглавна ча�т на ред %d: %.*s"
 
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -2978,65 +3384,65 @@ msgstr[1] ""
 "След �ъкращаването на първите %d ча�ти от компонентите на път�, в заглавната "
 "ча�т на „git diff“ лип�ва информаци� за име на файл (ред: %d)"
 
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
 msgid "new file depends on old contents"
 msgstr "нови�т файл зави�и от �тарото �ъдържание на файла"
 
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
 msgid "deleted file still has contents"
 msgstr "изтрити�т файл не е празен"
 
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "грешка в кръпката на ред %d"
 
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "нови�т файл „%s“ зави�и от �тарото �ъдържание на файла"
 
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "изтрити�т файл „%s“ не е празен"
 
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "� предупреждение: файлът „%s“ вече е празен, но не е изтрит"
 
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "грешка в двоичната кръпка на ред %d: %.*s"
 
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "неразпозната двоичната кръпка на ред %d"
 
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "кръпката е � изц�ло повредени данни на ред %d"
 
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "�имволната връзка „%s“ не може да бъде прочетена"
 
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
 #, c-format
 msgid "unable to open or read %s"
 msgstr "файлът „%s“ не може да бъде отворен или прочетен"
 
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "неправилно начало на ред: „%c“"
 
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -3045,13 +3451,13 @@ msgstr[0] ""
 msgstr[1] ""
 "%d-то парче код бе у�пешно приложено на ред %d (отме�тване от %d реда)."
 
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 "Контек�тът е намален на (%ld/%ld) за прилагането на парчето код на ред %d"
 
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -3060,328 +3466,338 @@ msgstr ""
 "при тър�ене за:\n"
 "%.*s"
 
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "лип�ват данните за двоичната кръпка за „%s“"
 
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "двоичната кръпка не може да бъде приложена върху „%s“"
 
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "двоичната кръпка за „%s“ води до неправилни резултати (очакваше �е SHA1: "
 "„%s“, а бе получено: „%s“)"
 
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "неу�пешно прилагане на кръпка: „%s:%ld“"
 
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
 #, c-format
 msgid "cannot checkout %s"
 msgstr "„%s“ не може да �е изтегли"
 
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
 #, c-format
 msgid "read of %s failed"
 msgstr "неу�пешно прочитане на „%s“"
 
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "изчитане на „%s“ �лед про�лед�ване на �имволна връзка"
 
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "обектът � път „%s“ е преименуван или изтрит"
 
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "„%s“ не �ъще�твува в индек�а"
 
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
 #, c-format
 msgid "%s: %s"
 msgstr "„%s“: %s"
 
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
 #, c-format
 msgid "%s: does not match index"
 msgstr "„%s“ не �ъответ�тва на индек�а"
 
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
 msgid "removal patch leaves file contents"
 msgstr "изтриващата кръпка о�тав� файла непразен"
 
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
 #, c-format
 msgid "%s: wrong type"
 msgstr "„%s“: неправилен вид"
 
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "„%s“ е от вид „%o“, а �е очакваше „%o“"
 
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
 #, c-format
 msgid "invalid path '%s'"
 msgstr "неправилен път: „%s“"
 
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
 #, c-format
 msgid "%s: already exists in index"
 msgstr "„%s“: вече �ъще�твува в индек�а"
 
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "„%s“: вече �ъще�твува в работното дърво"
 
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "новите права за до�тъп (%o) на „%s“ не �ъвпадат �ъ� �тарите (%o)"
 
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 "новите права за до�тъп (%o) на „%s“ не �ъвпадат �ъ� �тарите (%o) на „%s“"
 
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "за�егнати�т файл „%s“ е �лед �имволна връзка"
 
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "Кръпката „%s“ не може да бъде приложена"
 
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Провер�ване на кръпката „%s“…"
 
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "неу�пешно �ъздаване на запи� в кеша чрез „make_cache_entry“ за „%s“"
 
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "„%s“ не може да �е извади от индек�а"
 
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "повредена кръпка за модула „%s“"
 
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr ""
 "не може да �е получи информаци� чрез „stat“ за ново�ъздадени� файл „%s“"
 
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "не може да �е за �ъздаде м��тото за �ъхранение на ново�ъздадени� файл „%s“"
 
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "не може да �е добави запи� в кеша за „%s“"
 
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
 #, c-format
 msgid "closing file '%s'"
 msgstr "затвар�не на файла „%s“"
 
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "файлът „%s“ не може да �е запише � режим на до�тъп „%o“"
 
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Кръпката „%s“ бе приложена чи�то."
 
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
 msgid "internal error"
 msgstr "вътрешна грешка"
 
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Прилагане на кръпката „%%s“ � %d отхвърлено парче…"
 msgstr[1] "Прилагане на кръпката „%%s“ � %d отхвърлени парчета…"
 
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "�ъкращаване на името на файла � отхвърлените парчета на „ %.*s.rej“"
 
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "файлът „%s“ не може да бъде отворен: %s"
+
+#: builtin/apply.c:4298
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "%d-то парче бе у�пешно приложено."
 
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "%d-то парче бе отхвърлено."
 
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Пропу�ната кръпка: „%s“"
+
+#: builtin/apply.c:4395
 msgid "unrecognized input"
 msgstr "непознат вход"
 
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
 msgid "unable to read index file"
 msgstr "индек�ът не може да бъде запи�ан"
 
-#: builtin/apply.c:4517
+#: builtin/apply.c:4509
 msgid "don't apply changes matching the given path"
 msgstr "без прилагане на промените напа�ващи на дадени� път"
 
-#: builtin/apply.c:4520
+#: builtin/apply.c:4512
 msgid "apply changes matching the given path"
 msgstr "прилагане на промените напа�ващи на дадени� път"
 
-#: builtin/apply.c:4523
+#: builtin/apply.c:4515
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата"
 
-#: builtin/apply.c:4526
+#: builtin/apply.c:4518
 msgid "ignore additions made by the patch"
 msgstr "игнориране на редовете добавени от тази кръпка"
 
-#: builtin/apply.c:4528
+#: builtin/apply.c:4520
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "извеждане на �тати�тика на промените без прилагане на кръпката"
 
-#: builtin/apply.c:4532
+#: builtin/apply.c:4524
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "извеждане на бро� на добавените и изтритите редове"
 
-#: builtin/apply.c:4534
+#: builtin/apply.c:4526
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "извеждане на �тати�тика на входните данни без прилагане на кръпката"
 
-#: builtin/apply.c:4536
+#: builtin/apply.c:4528
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "проверка дали кръпката може да �е приложи, без дей�твително прилагане"
 
-#: builtin/apply.c:4538
+#: builtin/apply.c:4530
 msgid "make sure the patch is applicable to the current index"
 msgstr "проверка дали кръпката може да бъде приложена към текущи� индек�"
 
-#: builtin/apply.c:4540
+#: builtin/apply.c:4532
 msgid "apply a patch without touching the working tree"
 msgstr "прилагане на кръпката без пром�на на работното дърво"
 
-#: builtin/apply.c:4542
+#: builtin/apply.c:4534
 msgid "accept a patch that touches outside the working area"
 msgstr "прилагане на кръпка, ко�то промен� и файлове извън работното дърво"
 
-#: builtin/apply.c:4544
+#: builtin/apply.c:4536
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 "кръпката да бъде приложена. Опци�та �е комбинира � „--check“/„--stat“/„--"
 "summary“"
 
-#: builtin/apply.c:4546
+#: builtin/apply.c:4538
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "пробване � тройно �ливане, ако кръпката не може да �е приложи директно"
 
-#: builtin/apply.c:4548
+#: builtin/apply.c:4540
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "�ъздаване на временен индек� на база на включената информаци� за индек�а"
 
-#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
 msgid "paths are separated with NUL character"
 msgstr "раздел�не на пътищата � нулеви� знак „NUL“"
 
-#: builtin/apply.c:4553
+#: builtin/apply.c:4545
 msgid "ensure at least <n> lines of context match"
 msgstr "да �е о�игури контек�т от поне такъв БРОЙ �ъвпадащи редове"
 
-#: builtin/apply.c:4555
+#: builtin/apply.c:4547
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "за�ичане на нови или променени редове � грешки в знаците за интервали"
 
-#: builtin/apply.c:4558 builtin/apply.c:4561
+#: builtin/apply.c:4550 builtin/apply.c:4553
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 "игнориране на промените в знаците за интервали при откриване на контек�та"
 
-#: builtin/apply.c:4564
+#: builtin/apply.c:4556
 msgid "apply the patch in reverse"
 msgstr "прилагане на кръпката в обратна по�ока"
 
-#: builtin/apply.c:4566
+#: builtin/apply.c:4558
 msgid "don't expect at least one line of context"
 msgstr "без изи�кване на дори и един ред контек�т"
 
-#: builtin/apply.c:4568
+#: builtin/apply.c:4560
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "о�тав�не на отхвърлените парчета във файлове � разширение „.rej“"
 
-#: builtin/apply.c:4570
+#: builtin/apply.c:4562
 msgid "allow overlapping hunks"
 msgstr "позвол�ване на за�тъпващи �е парчета"
 
-#: builtin/apply.c:4573
+#: builtin/apply.c:4565
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "пренебрегване на неправилно лип�ващ знак за нов ред в кра� на файл"
 
-#: builtin/apply.c:4576
+#: builtin/apply.c:4568
 msgid "do not trust the line counts in the hunk headers"
 msgstr "без довер�ване на номерата на редовете в заглавните ча�ти на парчетата"
 
-#: builtin/apply.c:4579
+#: builtin/apply.c:4571
 msgid "prepend <root> to all filenames"
 msgstr "добав�не на тази ��Ч�Л��_ДИРЕКТОРИЯ към имената на в�ички файлове"
 
-#: builtin/apply.c:4601
+#: builtin/apply.c:4593
 msgid "--3way outside a repository"
 msgstr "като „--3way“, но извън хранилище"
 
-#: builtin/apply.c:4609
+#: builtin/apply.c:4601
 msgid "--index outside a repository"
 msgstr "като „--index“, но извън хранилище"
 
-#: builtin/apply.c:4612
+#: builtin/apply.c:4604
 msgid "--cached outside a repository"
 msgstr "като „--cached“, но извън хранилище"
 
-#: builtin/apply.c:4631
+#: builtin/apply.c:4623
 #, c-format
 msgid "can't open patch '%s'"
 msgstr "кръпката „%s“ не може да бъде отворена"
 
-#: builtin/apply.c:4645
+#: builtin/apply.c:4637
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "пренебрегната е %d грешка в знаците за интервали"
 msgstr[1] "пренебрегнати �а %d грешки в знаците за интервали"
 
-#: builtin/apply.c:4651 builtin/apply.c:4661
+#: builtin/apply.c:4643 builtin/apply.c:4653
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
@@ -3436,120 +3852,128 @@ msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr ""
 "обнов�ване на указател� „BISECT_HEAD“ вме�то да �е използва текущото подаване"
 
-#: builtin/blame.c:32
+#: builtin/blame.c:33
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_З�_ВЕРСИЯТ�…] [ВЕРСИЯ] [--] Ф�ЙЛ"
 
-#: builtin/blame.c:37
+#: builtin/blame.c:38
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "ОПЦИИте_З�_ВЕРСИЯТ� �а документирани в ръковод�твото git-rev-list(1)"
 
-#: builtin/blame.c:2519
+#: builtin/blame.c:1782
+msgid "Blaming lines"
+msgstr "�нотирани редове"
+
+#: builtin/blame.c:2531
 msgid "Show blame entries as we find them, incrementally"
 msgstr "Извеждане на анотациите � намирането им, по�ледователно"
 
 # FIXME SHA-1 -> SHA1
-#: builtin/blame.c:2520
+#: builtin/blame.c:2532
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr ""
 "Извеждане на празни �уми по SHA1 за граничните подавани� (�тандартно опци�та "
 "е изключена)"
 
-#: builtin/blame.c:2521
+#: builtin/blame.c:2533
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 "�ачалните подавани� да не �е �читат за гранични (�тандартно опци�та е "
 "изключена)"
 
-#: builtin/blame.c:2522
+#: builtin/blame.c:2534
 msgid "Show work cost statistics"
 msgstr "Извеждане на �тати�тика за извършените дей�тви�"
 
-#: builtin/blame.c:2523
+#: builtin/blame.c:2535
+msgid "Force progress reporting"
+msgstr "Принудително извеждане на напредъка"
+
+#: builtin/blame.c:2536
 msgid "Show output score for blame entries"
 msgstr "Извеждане на допълнителна информаци� за определ�нето на анотациите"
 
-#: builtin/blame.c:2524
+#: builtin/blame.c:2537
 msgid "Show original filename (Default: auto)"
 msgstr ""
 "Извеждане на първоначалното име на файл (�тандартно това е автоматично)"
 
-#: builtin/blame.c:2525
+#: builtin/blame.c:2538
 msgid "Show original linenumber (Default: off)"
 msgstr ""
 "Извеждане на първоначални�т номер на ред (�тандартно опци�та е изключена)"
 
-#: builtin/blame.c:2526
+#: builtin/blame.c:2539
 msgid "Show in a format designed for machine consumption"
 msgstr "Извеждане във формат за по-нататъшна обработка"
 
-#: builtin/blame.c:2527
+#: builtin/blame.c:2540
 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 "Извеждане във формат за команди от потребител�ко ниво � информаци� на в�еки "
 "ред"
 
-#: builtin/blame.c:2528
+#: builtin/blame.c:2541
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 "Използване на �ъщи� формат като „git-annotate“ (�тандартно опци�та е "
 "изключена)"
 
-#: builtin/blame.c:2529
+#: builtin/blame.c:2542
 msgid "Show raw timestamp (Default: off)"
 msgstr "Извеждане на неформатирани времена (�тандартно опци�та е изключена)"
 
-#: builtin/blame.c:2530
+#: builtin/blame.c:2543
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Извеждане на пълните �уми по SHA1 (�тандартно опци�та е изключена)"
 
-#: builtin/blame.c:2531
+#: builtin/blame.c:2544
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Без име на автор и време на пром�на (�тандартно опци�та е изключена)"
 
-#: builtin/blame.c:2532
+#: builtin/blame.c:2545
 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 "Извеждане на е-пощата на автора, а не името му (�тандартно опци�та е "
 "изключена)"
 
-#: builtin/blame.c:2533
+#: builtin/blame.c:2546
 msgid "Ignore whitespace differences"
 msgstr "Без разлики в знаците за интервали"
 
-#: builtin/blame.c:2534
+#: builtin/blame.c:2547
 msgid "Spend extra cycles to find better match"
 msgstr "Допълнителни изчи�лени� за по-добри резултати"
 
-#: builtin/blame.c:2535
+#: builtin/blame.c:2548
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Изчитане на вер�иите от Ф�ЙЛ, а не чрез изпълнение на „git-rev-list“"
 
-#: builtin/blame.c:2536
+#: builtin/blame.c:2549
 msgid "Use <file>'s contents as the final image"
 msgstr "Използване на �ъдържанието на Ф�ЙЛа като крайно положение"
 
-#: builtin/blame.c:2537 builtin/blame.c:2538
+#: builtin/blame.c:2550 builtin/blame.c:2551
 msgid "score"
 msgstr "напа�ване на редовете"
 
-#: builtin/blame.c:2537
+#: builtin/blame.c:2550
 msgid "Find line copies within and across files"
 msgstr ""
 "Тър�ене на копирани редове както в рамките на един файл, така и от един файл "
 "към друг"
 
-#: builtin/blame.c:2538
+#: builtin/blame.c:2551
 msgid "Find line movements within and across files"
 msgstr ""
 "Тър�ене на преме�тени редове както в рамките на един файл, така и от един "
 "файл към друг"
 
-#: builtin/blame.c:2539
+#: builtin/blame.c:2552
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:2539
+#: builtin/blame.c:2552
 msgid "Process only line range n,m, counting from 1"
 msgstr ""
 "Информаци� �амо за редовете в интервала от n до m включително. Броенето "
@@ -3561,31 +3985,31 @@ msgstr ""
 #. takes 22 places, is the longest among various forms of
 #. relative timestamps, but your language may need more or
 #. fewer display columns.
-#: builtin/blame.c:2620
+#: builtin/blame.c:2641
 msgid "4 years, 11 months ago"
 msgstr "преди 4 години и 11 ме�еца"
 
-#: builtin/branch.c:25
+#: builtin/branch.c:26
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr "git branch [ОПЦИЯ…] [-r | -a] [--merged | --no-merged]"
 
-#: builtin/branch.c:26
+#: builtin/branch.c:27
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr "git branch [ОПЦИЯ…] [-l] [-f] ИМЕ_��_КЛО� [��Ч�ЛО]"
 
-#: builtin/branch.c:27
+#: builtin/branch.c:28
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [ОПЦИЯ…] [-r] (-d | -D) ИМЕ_��_КЛО�…"
 
-#: builtin/branch.c:28
+#: builtin/branch.c:29
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [ОПЦИЯ…] (-m | -M) [СТ�Р_КЛО�] �ОВ_КЛО�"
 
-#: builtin/branch.c:29
+#: builtin/branch.c:30
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [ОПЦИЯ…] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:142
+#: builtin/branch.c:143
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -3594,7 +4018,7 @@ msgstr ""
 "изтриване на клона „%s“, който е �л�т към „%s“,\n"
 "         но още не е �л�т към върха „HEAD“."
 
-#: builtin/branch.c:146
+#: builtin/branch.c:147
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -3603,12 +4027,12 @@ msgstr ""
 "отказване на изтриване на клона „%s“, който не е �л�т към\n"
 "         „%s“, но е �л�т към върха „HEAD“."
 
-#: builtin/branch.c:160
+#: builtin/branch.c:161
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Обектът-подаване за „%s“ не може да бъде открит"
 
-#: builtin/branch.c:164
+#: builtin/branch.c:165
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -3617,301 +4041,322 @@ msgstr ""
 "Клонът „%s“ не е �л�т напълно. �ко �те �игурни, че и�кате\n"
 "да го изтриете, изпълнете „git branch -D %s“."
 
-#: builtin/branch.c:177
+#: builtin/branch.c:178
 msgid "Update of config-file failed"
 msgstr "�еу�пешно обнов�ване на конфигурационни� файл"
 
-#: builtin/branch.c:205
+#: builtin/branch.c:206
 msgid "cannot use -a with -d"
 msgstr "Опци�та „-a“ е не�ъвме�тима � опци�та „-d“"
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Обектът-подаване, �очен от указател� „HEAD“, не може да бъде открит"
 
-#: builtin/branch.c:219
+#: builtin/branch.c:226
 #, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "�е можете да изтриете текущи� клон „%s“"
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "�е можете да изтриете клона „%s“, който е изтеглен в път� „%s“"
 
-#: builtin/branch.c:235
+#: builtin/branch.c:241
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "�лед�щи�т клон „%s“ не може да бъде открит."
 
-#: builtin/branch.c:236
+#: builtin/branch.c:242
 #, c-format
 msgid "branch '%s' not found."
 msgstr "клонът „%s“ не може да бъде открит."
 
-#: builtin/branch.c:251
+#: builtin/branch.c:257
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Грешка при изтриването на �лед�щи� клон „%s“"
 
-#: builtin/branch.c:252
+#: builtin/branch.c:258
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Грешка при изтриването на клона „%s“"
 
-#: builtin/branch.c:259
+#: builtin/branch.c:265
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Изтрит �лед�щ клон „%s“ (той �очеше към „%s“).\n"
 
-#: builtin/branch.c:260
+#: builtin/branch.c:266
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Изтрит клон „%s“ (той �очеше към „%s“).\n"
 
-#: builtin/branch.c:303
+#: builtin/branch.c:309
 #, c-format
 msgid "[%s: gone]"
 msgstr "[%s: изтрит]"
 
-#: builtin/branch.c:308
+#: builtin/branch.c:314
 #, c-format
 msgid "[%s]"
 msgstr "[%s]"
 
-#: builtin/branch.c:313
+#: builtin/branch.c:319
 #, c-format
 msgid "[%s: behind %d]"
 msgstr "[%s: назад � %d]"
 
-#: builtin/branch.c:315
+#: builtin/branch.c:321
 #, c-format
 msgid "[behind %d]"
 msgstr "[назад � %d]"
 
-#: builtin/branch.c:319
+#: builtin/branch.c:325
 #, c-format
 msgid "[%s: ahead %d]"
 msgstr "[%s: напред � %d]"
 
-#: builtin/branch.c:321
+#: builtin/branch.c:327
 #, c-format
 msgid "[ahead %d]"
 msgstr "[напред � %d]"
 
-#: builtin/branch.c:324
+#: builtin/branch.c:330
 #, c-format
 msgid "[%s: ahead %d, behind %d]"
 msgstr "[%s: напред � %d, назад � %d]"
 
-#: builtin/branch.c:327
+#: builtin/branch.c:333
 #, c-format
 msgid "[ahead %d, behind %d]"
 msgstr "[напред � %d, назад � %d]"
 
-#: builtin/branch.c:340
+#: builtin/branch.c:346
 msgid " **** invalid ref ****"
 msgstr " ��� неправилен указател ���"
 
-#: builtin/branch.c:366
+#: builtin/branch.c:372
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(извън клон, пребазиране на „%s“)"
 
-#: builtin/branch.c:369
+#: builtin/branch.c:375
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(извън клон, двоично тър�ене от „%s“)"
 
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(Указател�т „HEAD“ не е �вързан и е при „%s“)"
 
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "Указател�т „HEAD“ не е �вързан и е отделѐн от „%s“"
 
-#: builtin/branch.c:382
+#: builtin/branch.c:390
 msgid "(no branch)"
 msgstr "(извън клон)"
 
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "Клонът „%s“ �е пребазира върху „%s“"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "Тър�и �е двоично в клона „%s“ при „%s“"
+
+#: builtin/branch.c:560
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 "не можете да преименувате текущи� клон, защото �те извън който и да е клон"
 
-#: builtin/branch.c:534
+#: builtin/branch.c:570
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "�еправилно име на клон: „%s“"
 
-#: builtin/branch.c:549
+#: builtin/branch.c:587
 msgid "Branch rename failed"
 msgstr "�еу�пешно преименуване на клон"
 
-#: builtin/branch.c:553
+#: builtin/branch.c:591
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "�а клона � неправилно име „%s“ е дадено �лужебно име"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:594
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Клонът е преименуван на „%s“, но указател�т „HEAD“ не е обновен"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:601
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Клонът е преименуван, но конфигурационни�т файл не е обновен"
 
-#: builtin/branch.c:587
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "шаблонът за опи�ание на клон не бе запи�ан: „%s“"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "шаблонът за опи�ание на клон не бе запи�ан"
 
-#: builtin/branch.c:616
+#: builtin/branch.c:651
 msgid "Generic options"
 msgstr "Общи на�тройки"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:653
 msgid "show hash and subject, give twice for upstream branch"
 msgstr ""
 "извеждане на хеша и темата. Повтар�нето на опци�та прибав� отдалечените клони"
 
-#: builtin/branch.c:619
+#: builtin/branch.c:654
 msgid "suppress informational messages"
 msgstr "без информационни �ъобщени�"
 
-#: builtin/branch.c:620
+#: builtin/branch.c:655
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "задаване на режима на �ледене (виж git-pull(1))"
 
-#: builtin/branch.c:622
+#: builtin/branch.c:657
 msgid "change upstream info"
 msgstr "�м�на на �ледени� клон"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "клон-източник"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "�м�на на клона-източник"
+
+#: builtin/branch.c:661
 msgid "use colored output"
 msgstr "цветен изход"
 
-#: builtin/branch.c:627
+#: builtin/branch.c:662
 msgid "act on remote-tracking branches"
 msgstr "дей�твие върху �лед�щите клони"
 
-#: builtin/branch.c:629 builtin/branch.c:630
+#: builtin/branch.c:664 builtin/branch.c:665
 msgid "print only branches that contain the commit"
-msgstr "извеждане �амо на клоните, които �ъдържат това подаване"
+msgstr "извеждане �амо на клоните, които �ъдържат това ПОД�В��Е"
 
-#: builtin/branch.c:633
+#: builtin/branch.c:668
 msgid "Specific git-branch actions:"
 msgstr "Специални дей�тви� на „git-branch“:"
 
-#: builtin/branch.c:634
+#: builtin/branch.c:669
 msgid "list both remote-tracking and local branches"
 msgstr "извеждане както на �лед�щите, така и на локалните клони"
 
-#: builtin/branch.c:636
+#: builtin/branch.c:671
 msgid "delete fully merged branch"
 msgstr "изтриване на клони, които �а напълно �лети"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:672
 msgid "delete branch (even if not merged)"
 msgstr "изтриване и на клони, които не �а напълно �лети"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:673
 msgid "move/rename a branch and its reflog"
 msgstr ""
 "преме�тване/преименуване на клон и принадлежащи�т му журнал на указателите"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:674
 msgid "move/rename a branch, even if target exists"
 msgstr "преме�тване/преименуване на клон, дори ако има вече клон � такова име"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:675
 msgid "list branch names"
 msgstr "извеждане на имената на клоните"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:676
 msgid "create the branch's reflog"
 msgstr "�ъздаване на журнала на указателите на клона"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:678
 msgid "edit the description for the branch"
 msgstr "редактиране на опи�анието на клона"
 
-#: builtin/branch.c:644
+#: builtin/branch.c:679
 msgid "force creation, move/rename, deletion"
 msgstr "принудително �ъздаване, преме�тване, преименуване, изтриване"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:680
 msgid "print only branches that are merged"
 msgstr "извеждане �амо на �летите клони"
 
-#: builtin/branch.c:646
+#: builtin/branch.c:681
 msgid "print only branches that are not merged"
 msgstr "извеждане �амо на не�летите клони"
 
-#: builtin/branch.c:647
+#: builtin/branch.c:682
 msgid "list branches in columns"
 msgstr "извеждане по колони"
 
-#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
 msgid "key"
-msgstr "ключ"
+msgstr "КЛЮЧ"
 
-#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
 msgid "field name to sort on"
 msgstr "име на полето, по което да е подредбата"
 
-#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
-#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
 #: builtin/tag.c:369
 msgid "object"
-msgstr "обект"
+msgstr "ОБЕКТ"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:687
 msgid "print only branches of the object"
-msgstr "извеждане �амо на клоните на обекта"
+msgstr "извеждане �амо на клоните на ОБЕКТ�"
 
-#: builtin/branch.c:670
+#: builtin/branch.c:705
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "�е може да �е открие към какво �очи указател�т „HEAD“"
 
-#: builtin/branch.c:674 builtin/clone.c:697
+#: builtin/branch.c:709 builtin/clone.c:707
 msgid "HEAD not found below refs/heads!"
 msgstr "В директори�та „refs/heads“ лип�ва файл „HEAD“"
 
-#: builtin/branch.c:694
+#: builtin/branch.c:729
 msgid "--column and --verbose are incompatible"
 msgstr "Опциите „--column“ и „--verbose“ �а не�ъвме�тими"
 
-#: builtin/branch.c:705 builtin/branch.c:747
+#: builtin/branch.c:740 builtin/branch.c:782
 msgid "branch name required"
 msgstr "�еобходимо е име на клон"
 
-#: builtin/branch.c:723
+#: builtin/branch.c:758
 msgid "Cannot give description to detached HEAD"
 msgstr "�е може да зададете опи�ание на „HEAD“ извън клон"
 
-#: builtin/branch.c:728
+#: builtin/branch.c:763
 msgid "cannot edit description of more than one branch"
 msgstr "�е може да редактирате опи�анието на повече от един клон едновременно"
 
-#: builtin/branch.c:735
+#: builtin/branch.c:770
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "В клона „%s“ в�е още н�ма подавани�."
 
-#: builtin/branch.c:738
+#: builtin/branch.c:773
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Лип�ва клон на име „%s“."
 
-#: builtin/branch.c:753
+#: builtin/branch.c:788
 msgid "too many branches for a rename operation"
 msgstr "Прекалено много клони за преименуване"
 
-#: builtin/branch.c:758
+#: builtin/branch.c:793
 msgid "too many branches to set new upstream"
 msgstr "Зададени �а прекалено много клони за �ледене"
 
-#: builtin/branch.c:762
+#: builtin/branch.c:797
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -3919,39 +4364,39 @@ msgstr ""
 "Следеното от „HEAD“ не може да �е зададе да е „%s“, защото то не �очи към "
 "никой клон."
 
-#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
 #, c-format
 msgid "no such branch '%s'"
 msgstr "��ма клон на име „%s“."
 
-#: builtin/branch.c:769
+#: builtin/branch.c:804
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "�е �ъще�твува клон на име „%s“."
 
-#: builtin/branch.c:781
+#: builtin/branch.c:816
 msgid "too many branches to unset upstream"
 msgstr "Прекалено много клони за махане на �ледене"
 
-#: builtin/branch.c:785
+#: builtin/branch.c:820
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "Следеното от „HEAD“ не може да махне, защото то не �очи към никой клон."
 
-#: builtin/branch.c:791
+#: builtin/branch.c:826
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "��ма информаци� клонът „%s“ да �леди н�кой друг"
 
-#: builtin/branch.c:805
+#: builtin/branch.c:840
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "��ма никакъв �ми�ъл ръчно да �ъздавате „HEAD“."
 
-#: builtin/branch.c:811
+#: builtin/branch.c:846
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr "Опциите „-a“ и „-r“ на „git branch“ �а не�ъвме�тими � име на клон"
 
-#: builtin/branch.c:814
+#: builtin/branch.c:849
 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3960,7 +4405,7 @@ msgstr ""
 "Опци�та „--set-upstream“ вече е о�тар�ла и пред�тои да бъде махната. "
 "Използвайте „--track“ или „--set-upstream-to“\n"
 
-#: builtin/branch.c:831
+#: builtin/branch.c:866
 #, c-format
 msgid ""
 "\n"
@@ -3971,16 +4416,6 @@ msgstr ""
 "За да накарате „%s“ да �леди „%s“, изпълнете �ледната команда:\n"
 "\n"
 
-#: builtin/branch.c:832
-#, c-format
-msgid "    git branch -d %s\n"
-msgstr "    git branch -d %s\n"
-
-#: builtin/branch.c:833
-#, c-format
-msgid "    git branch --set-upstream-to %s\n"
-msgstr "    git branch --set-upstream-to %s\n"
-
 #: builtin/bundle.c:51
 #, c-format
 msgid "%s is okay\n"
@@ -4077,7 +4512,7 @@ msgstr "извеждане на в�ички атрибути, зададени
 msgid "use .gitattributes only from the index"
 msgstr "използване на файла „.gitattributes“ �амо от индек�а"
 
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
 msgid "read file names from stdin"
 msgstr "изчитане на имената на файловете от �тандартни� вход"
 
@@ -4085,7 +4520,7 @@ msgstr "изчитане на имената на файловете от �та
 msgid "terminate input and output records by a NUL character"
 msgstr "раздел�не на входните и изходните запи�и � нулеви� знак „NUL“"
 
-#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
 msgid "suppress progress reporting"
 msgstr "без показване на напредъка"
 
@@ -4138,49 +4573,54 @@ msgstr "контактът не може да бъде анализиран: %s"
 msgid "no contacts specified"
 msgstr "не �а указани контакти"
 
-#: builtin/checkout-index.c:126
+#: builtin/checkout-index.c:127
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [ОПЦИЯ…] [--] [Ф�ЙЛ…]"
 
-#: builtin/checkout-index.c:188
+#: builtin/checkout-index.c:144
+msgid "stage should be between 1 and 3 or all"
+msgstr "етапът тр�бва да е „1“, „2“, „3“ или „all“ (в�ички)"
+
+#: builtin/checkout-index.c:160
 msgid "check out all files in the index"
 msgstr "изтегл�не на в�ички файлове в индек�а"
 
-#: builtin/checkout-index.c:189
+#: builtin/checkout-index.c:161
 msgid "force overwrite of existing files"
 msgstr "презапи�ване на файловете, дори и да �ъще�твуват"
 
-#: builtin/checkout-index.c:191
+#: builtin/checkout-index.c:163
 msgid "no warning for existing files and files not in index"
 msgstr "без предупреждени� при лип�ващи файлове и файлове не в индек�а"
 
-#: builtin/checkout-index.c:193
+#: builtin/checkout-index.c:165
 msgid "don't checkout new files"
 msgstr "без изтегл�не на нови файлове"
 
-#: builtin/checkout-index.c:195
+#: builtin/checkout-index.c:167
 msgid "update stat information in the index file"
 msgstr "обнов�ване на информаци�та получена чрез „stat“ за файловете в индек�а"
 
-#: builtin/checkout-index.c:201
+#: builtin/checkout-index.c:171
 msgid "read list of paths from the standard input"
 msgstr "изчитане на пътищата от �тандартни� вход"
 
-#: builtin/checkout-index.c:203
+#: builtin/checkout-index.c:173
 msgid "write the content to temporary files"
 msgstr "запи�ване на �ъдържанието във временни файлове"
 
-#: builtin/checkout-index.c:204 builtin/column.c:30
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
-#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
+#: builtin/checkout-index.c:174 builtin/column.c:30
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
 msgid "string"
 msgstr "�ИЗ"
 
-#: builtin/checkout-index.c:205
+#: builtin/checkout-index.c:175
 msgid "when creating files, prepend <string>"
 msgstr "при �ъздаването на нови файлове да �е добав� префик�а �ИЗ"
 
-#: builtin/checkout-index.c:208
+#: builtin/checkout-index.c:177
 msgid "copy out the files from named stage"
 msgstr "копиране на файловете от това �ъ�то�ние на �ливане"
 
@@ -4222,45 +4662,49 @@ msgstr "път�т „%s“ не може да бъде �л�н"
 msgid "Unable to add merge result for '%s'"
 msgstr "Резултатът за „%s“ не може да бъде �л�н"
 
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "Опци�та „%s“ е не�ъвме�тима � обнов�ването на пътища"
 
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "Опци�та „%s“ е не�ъвме�тима � „%s“"
 
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "�евъзможно е едновременно да обнов�вате пътища и да преминете към клона „%s“."
 
-#: builtin/checkout.c:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
 msgid "corrupt index file"
 msgstr "повреден файл на индек�а"
 
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "път�т „%s“ не е �л�т"
 
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
 msgid "you need to resolve your current index first"
 msgstr "първо тр�бва да коригирате индек�а �и"
 
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Журналът на указателите за „%s“ не може да �е про�леди: %s\n"
 
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
 msgid "HEAD is now at"
 msgstr "Указател�т „HEAD“ в момента �очи към"
 
+#: builtin/checkout.c:664 builtin/clone.c:661
+msgid "unable to update HEAD"
+msgstr "Указател�т „HEAD“ не може да бъде обновен"
+
 #: builtin/checkout.c:668
 #, c-format
 msgid "Reset branch '%s'\n"
@@ -4276,7 +4720,7 @@ msgstr "Вече �те на „%s“\n"
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Преминаване към клона „%s“ и занул�ване на промените\n"
 
-#: builtin/checkout.c:677 builtin/checkout.c:1066
+#: builtin/checkout.c:677 builtin/checkout.c:1067
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Преминахте към нови� клон „%s“\n"
@@ -4348,7 +4792,7 @@ msgstr "вътрешна грешка при обхождането на верÑ
 msgid "Previous HEAD position was"
 msgstr "Преди това „HEAD“ �очеше към"
 
-#: builtin/checkout.c:823 builtin/checkout.c:1061
+#: builtin/checkout.c:823 builtin/checkout.c:1062
 msgid "You are on a branch yet to be born"
 msgstr "В момента �те на клон, който пред�тои да бъде �ъздаден"
 
@@ -4357,137 +4801,137 @@ msgstr "В момента �те на клон, който пред�тои да
 msgid "only one reference expected, %d given."
 msgstr "очакваше �е един указател, а �те подали %d."
 
-#: builtin/checkout.c:1007 builtin/worktree.c:213
+#: builtin/checkout.c:1008 builtin/worktree.c:212
 #, c-format
 msgid "invalid reference: %s"
 msgstr "неправилен указател: %s"
 
-#: builtin/checkout.c:1036
+#: builtin/checkout.c:1037
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "указател�т не �очи към обект-дърво: %s"
 
-#: builtin/checkout.c:1075
+#: builtin/checkout.c:1076
 msgid "paths cannot be used with switching branches"
 msgstr "задаването на път е не�ъвме�тимо � преминаването от един клон към друг"
 
-#: builtin/checkout.c:1078 builtin/checkout.c:1082
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "опци�та „%s“ е не�ъвме�тима � преминаването от един клон към друг"
 
-#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
-#: builtin/checkout.c:1097
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "опци�та „%s“ е не�ъвме�тима � „%s“"
 
-#: builtin/checkout.c:1102
+#: builtin/checkout.c:1103
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr ""
 "За да преминете към клон, подайте указател, който �очи към подаване. „%s“ не "
 "е такъв"
 
-#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
-#: builtin/worktree.c:322
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
 msgid "branch"
 msgstr "клон"
 
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1137
 msgid "create and checkout a new branch"
 msgstr "�ъздаване и преминаване към нов клон"
 
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1139
 msgid "create/reset and checkout a branch"
 msgstr "�ъздаване/занул�ване на клон и преминаване към него"
 
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1140
 msgid "create reflog for new branch"
 msgstr "�ъздаване на журнал на указателите за нов клон"
 
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1141
 msgid "detach the HEAD at named commit"
 msgstr "отдел�не на указател� „HEAD“ към указаното подаване"
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1142
 msgid "set upstream info for new branch"
 msgstr "задаване на кой клон бива �леден при �ъздаването на нови� клон"
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1144
 msgid "new-branch"
 msgstr "�ОВ_КЛО�"
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1144
 msgid "new unparented branch"
 msgstr "нов клон без родител"
 
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1145
 msgid "checkout our version for unmerged files"
 msgstr "изтегл�не на вашата вер�и� на не�летите файлове"
 
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1147
 msgid "checkout their version for unmerged files"
 msgstr "изтегл�не на чуждата вер�и� на не�летите файлове"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1149
 msgid "force checkout (throw away local modifications)"
 msgstr "принудително изтегл�не (вашите промени ще бъдат занулени)"
 
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1150
 msgid "perform a 3-way merge with the new branch"
 msgstr "извършване на тройно �ливане � нови� клон"
 
-#: builtin/checkout.c:1150 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
 msgid "update ignored files (default)"
 msgstr "обнов�ване на игнорираните файлове (�тандартно)"
 
-#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
 msgid "style"
-msgstr "�тил"
+msgstr "СТИЛ"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1153
 msgid "conflict style (merge or diff3)"
 msgstr "дей�твие при конфликт (�ливане или тройна разлика)"
 
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1156
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "без ограничаване на изброените пътища �амо до ча�тично изтеглените"
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1158
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr ""
 "опит за отгатване на име на клон �лед неу�пешен опит � „git checkout "
 "�ЕСЪЩЕСТВУВ�Щ_КЛО�“"
 
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1160
 msgid "do not check if another worktree is holding the given ref"
 msgstr "без проверка дали друго работно дърво държи указател�"
 
-#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
-#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
 #: builtin/send-pack.c:168
 msgid "force progress reporting"
 msgstr "извеждане на напредъка"
 
-#: builtin/checkout.c:1191
+#: builtin/checkout.c:1192
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "Опциите „-b“, „-B“ и „--orphan“ �а не�ъвме�тими една � друга"
 
-#: builtin/checkout.c:1208
+#: builtin/checkout.c:1209
 msgid "--track needs a branch name"
 msgstr "опци�та „--track“ изи�ква име на клон"
 
-#: builtin/checkout.c:1213
+#: builtin/checkout.c:1214
 msgid "Missing branch name; try -b"
 msgstr "Лип�ва име на клон, използвайте опци�та „-b“"
 
-#: builtin/checkout.c:1249
+#: builtin/checkout.c:1250
 msgid "invalid path specification"
 msgstr "указан е неправилен път"
 
-#: builtin/checkout.c:1256
+#: builtin/checkout.c:1257
 #, c-format
 msgid ""
 "Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4496,12 +4940,12 @@ msgstr ""
 "�е можете едновременно да обнов�вате пътища и да преминете към клона „%s“.\n"
 "Дали не и�кате да изтеглите „%s“, който не �очи към подаване?"
 
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1262
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: опци�та „--detach“ не приема аргумент-път „%s“"
 
-#: builtin/checkout.c:1265
+#: builtin/checkout.c:1266
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -4539,7 +4983,7 @@ msgstr "Хранилището „%s“ ще бъде пре�кочено\n"
 msgid "failed to remove %s"
 msgstr "файлът „%s“ не може да бъде изтрит"
 
-#: builtin/clean.c:315
+#: builtin/clean.c:291
 msgid ""
 "Prompt help:\n"
 "1          - select a numbered item\n"
@@ -4551,7 +4995,7 @@ msgstr ""
 "ПРЕФИКС    — избор на един�твен обект по този уникален префик�\n"
 "           — (празно) нищо да не �е избира"
 
-#: builtin/clean.c:319
+#: builtin/clean.c:295
 msgid ""
 "Prompt help:\n"
 "1          - select a single item\n"
@@ -4571,38 +5015,38 @@ msgstr ""
 "*          — избиране на в�ички обекти\n"
 "           — (празно) завършване на избирането"
 
-#: builtin/clean.c:535
+#: builtin/clean.c:511
 #, c-format
 msgid "Huh (%s)?"
 msgstr "�еправилен избор (%s). Изберете отново."
 
 # FIXME - should we use >> or sth else
-#: builtin/clean.c:677
+#: builtin/clean.c:653
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Шаблони за игнорирани елементи≫ "
 
-#: builtin/clean.c:714
+#: builtin/clean.c:690
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: �икой обект не напа�ва на „%s“"
 
-#: builtin/clean.c:735
+#: builtin/clean.c:711
 msgid "Select items to delete"
 msgstr "Избиране на обекти за изтриване"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:776
+#: builtin/clean.c:752
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Да �е изтрие ли „%s“? „y“ —  да, „N“ — �Е"
 
 # FIXME improve message
-#: builtin/clean.c:801
+#: builtin/clean.c:777
 msgid "Bye."
 msgstr "Изход."
 
-#: builtin/clean.c:809
+#: builtin/clean.c:785
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -4620,63 +5064,63 @@ msgstr ""
 "help                — този край\n"
 "?                   — под�казка за шаблоните"
 
-#: builtin/clean.c:836
+#: builtin/clean.c:812
 msgid "*** Commands ***"
 msgstr "��� Команди ���"
 
 # FIXME improve message
-#: builtin/clean.c:837
+#: builtin/clean.c:813
 msgid "What now"
 msgstr "Избор на �ледващо дей�твие"
 
-#: builtin/clean.c:845
+#: builtin/clean.c:821
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Следни�т обект ще бъде изтрит:"
 msgstr[1] "Следните обекти ще бъдат изтрити:"
 
-#: builtin/clean.c:862
+#: builtin/clean.c:838
 msgid "No more files to clean, exiting."
 msgstr "Файловете за изчи�тване �вършиха. Изход от програмата."
 
-#: builtin/clean.c:893
+#: builtin/clean.c:869
 msgid "do not print names of files removed"
 msgstr "без извеждане на имената на файловете, които ще бъдат изтрити"
 
-#: builtin/clean.c:895
+#: builtin/clean.c:871
 msgid "force"
 msgstr "принудително изтриване"
 
-#: builtin/clean.c:896
+#: builtin/clean.c:872
 msgid "interactive cleaning"
 msgstr "интерактивно изтриване"
 
-#: builtin/clean.c:898
+#: builtin/clean.c:874
 msgid "remove whole directories"
 msgstr "изтриване на цели директории"
 
-#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
-#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
 msgid "pattern"
-msgstr "шаблон"
+msgstr "Ш�БЛО�"
 
-#: builtin/clean.c:900
+#: builtin/clean.c:876
 msgid "add <pattern> to ignore rules"
 msgstr "добав�не на Ш�БЛО� от файлове, които да не �е три�т"
 
-#: builtin/clean.c:901
+#: builtin/clean.c:877
 msgid "remove ignored files, too"
 msgstr "изтриване и на игнорираните файлове"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:879
 msgid "remove only ignored files"
 msgstr "изтриване �амо на игнорирани файлове"
 
-#: builtin/clean.c:921
+#: builtin/clean.c:897
 msgid "-x and -X cannot be used together"
 msgstr "опциите „-x“ и „-X“ �а не�ъвме�тими"
 
-#: builtin/clean.c:925
+#: builtin/clean.c:901
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -4684,7 +5128,7 @@ msgstr ""
 "�а�тройката „clean.requireForce“ е зададена като и�тина, което изи�ква н�ко� "
 "от опциите „-i“, „-n“ или „-f“. ��ма да �е извърши изчи�тване"
 
-#: builtin/clean.c:928
+#: builtin/clean.c:904
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -4697,148 +5141,168 @@ msgstr ""
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [ОПЦИЯ…] [--] ХР��ИЛИЩЕ [ДИРЕКТОРИЯ]"
 
-#: builtin/clone.c:59
+#: builtin/clone.c:62
 msgid "don't create a checkout"
 msgstr "без �ъздаване на работно дърво"
 
-#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
 msgid "create a bare repository"
 msgstr "�ъздаване на голо хранилище"
 
-#: builtin/clone.c:64
+#: builtin/clone.c:67
 msgid "create a mirror repository (implies bare)"
 msgstr ""
 "�ъздаване на хранилище-огледало (включва опци�та „--bare“ за голо хранилище)"
 
-#: builtin/clone.c:66
+#: builtin/clone.c:69
 msgid "to clone from a local repository"
 msgstr "клониране от локално хранилище"
 
-#: builtin/clone.c:68
+#: builtin/clone.c:71
 msgid "don't use local hardlinks, always copy"
 msgstr "без твърди връзки, файловете винаги да �е копират"
 
-#: builtin/clone.c:70
+#: builtin/clone.c:73
 msgid "setup as shared repository"
 msgstr "на�тройване за �поделено хранилище"
 
-#: builtin/clone.c:72 builtin/clone.c:74
+#: builtin/clone.c:75 builtin/clone.c:77
 msgid "initialize submodules in the clone"
 msgstr "инициализиране на подмодулите при това клониране"
 
-#: builtin/clone.c:75 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "брой подмодули, клонирани паралелно"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
 msgid "template-directory"
 msgstr "директори� � шаблони"
 
-#: builtin/clone.c:76 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
 msgid "directory from which templates will be used"
 msgstr "директори�, ко�то �ъдържа шаблоните, които да �е ползват"
 
-#: builtin/clone.c:78 builtin/submodule--helper.c:179
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
 msgid "reference repository"
 msgstr "еталонно хранилище"
 
-#: builtin/clone.c:80
+#: builtin/clone.c:85
 msgid "use --reference only while cloning"
 msgstr "опци�та „--reference“ може да �е използва �амо при клониране"
 
-#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
 msgid "name"
 msgstr "ИМЕ"
 
-#: builtin/clone.c:82
+#: builtin/clone.c:87
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "използване на това ИМЕ вме�то „origin“ при про�лед�ване на клони"
 
-#: builtin/clone.c:84
+#: builtin/clone.c:89
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "изтегл�не на този КЛО�, а не �очени�т от отдалечени� указател „HEAD“"
 
-#: builtin/clone.c:86
+#: builtin/clone.c:91
 msgid "path to git-upload-pack on the remote"
 msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
 
-#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654 builtin/pull.c:186
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201
 msgid "depth"
 msgstr "ДЪЛБОЧИ��"
 
-#: builtin/clone.c:88
+#: builtin/clone.c:93
 msgid "create a shallow clone of that depth"
 msgstr "плитко клониране до тази ДЪЛБОЧИ��"
 
-#: builtin/clone.c:90
+#: builtin/clone.c:95
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 "клониране �амо на един клон — или �очени� от отдалечени� „HEAD“, или изрично "
 "зададени� � „--branch“"
 
-#: builtin/clone.c:91 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "в�ички клонирани подмодули ще �а плитки"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
 msgid "gitdir"
 msgstr "СЛУЖЕБ��_ДИРЕКТОРИЯ"
 
-#: builtin/clone.c:92 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
 msgid "separate git dir from working tree"
 msgstr "отделна СЛУЖЕБ��_ДИРЕКТОРИЯ за git извън работното дърво"
 
-#: builtin/clone.c:93
+#: builtin/clone.c:100
 msgid "key=value"
 msgstr "КЛЮЧ=СТОЙ�ОСТ"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:101
 msgid "set config inside the new repository"
 msgstr "задаване на на�тройките на новото хранилище"
 
-#: builtin/clone.c:300
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
+msgid "use IPv4 addresses only"
+msgstr "�амо адре�и IPv4"
+
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
+msgid "use IPv6 addresses only"
+msgstr "�амо адре�и IPv6"
+
+#: builtin/clone.c:241
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Името на директори�та не може да бъде отгатнато.\n"
+"Задайте директори�та изрично на командни� ред"
+
+#: builtin/clone.c:307
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "в�е още не �е поддържа еталонно хранилище „%s“ като �вързано."
 
-#: builtin/clone.c:302
+#: builtin/clone.c:309
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "еталонното хранилище „%s“ не е локално"
 
-#: builtin/clone.c:307
+#: builtin/clone.c:314
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "еталонното хранилище „%s“ е плитко"
 
-#: builtin/clone.c:310
+#: builtin/clone.c:317
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "еталонното хранилище „%s“ е � при�аждане"
 
-#: builtin/clone.c:375 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "не може да бъде получена информаци� чрез „stat“ за „%s“"
-
-#: builtin/clone.c:377
+#: builtin/clone.c:384
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "„%s“ �ъще�твува и не е директори�"
 
-#: builtin/clone.c:391
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "не може да бъде получена информаци� чрез „stat“ за „%s“\n"
 
-#: builtin/clone.c:413
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "връзката „%s“ не може да бъде �ъздадена"
 
-#: builtin/clone.c:417
+#: builtin/clone.c:424
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "файлът не може да бъде копиран като „%s“"
 
-#: builtin/clone.c:442 builtin/clone.c:626
+#: builtin/clone.c:449 builtin/clone.c:633
 #, c-format
 msgid "done.\n"
 msgstr "дей�твието завърши.\n"
 
-#: builtin/clone.c:454
+#: builtin/clone.c:461
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -4849,7 +5313,7 @@ msgstr ""
 "клон в момента �а изтеглени � командата „git status“. Можете да\n"
 "завършите изтегл�нето на клона � командата „git checkout -f HEAD“.\n"
 
-#: builtin/clone.c:531
+#: builtin/clone.c:538
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
@@ -4857,116 +5321,126 @@ msgstr ""
 "и който �ледва да бъде изтеглен, не �ъще�твува."
 
 # FIXME translator note that the space at end is necesssary
-#: builtin/clone.c:621
+#: builtin/clone.c:628
 #, c-format
 msgid "Checking connectivity... "
 msgstr "Проверка на връзката… "
 
-#: builtin/clone.c:624
+#: builtin/clone.c:631
 msgid "remote did not send all necessary objects"
 msgstr "отдалеченото хранилище не изпрати в�ички необходими обекти."
 
-#: builtin/clone.c:688
+# FIXME merge with next?
+#: builtin/clone.c:649
+#, c-format
+msgid "unable to update %s"
+msgstr "обектът „%s“ не може да бъде обновен"
+
+#: builtin/clone.c:698
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "указател�т „HEAD“ от отдалеченото хранилище �очи към нещо,\n"
 "което не �ъще�твува. �е може да �е изтегли определен клон.\n"
 
-#: builtin/clone.c:719
+#: builtin/clone.c:729
 msgid "unable to checkout working tree"
 msgstr "работното дърво не може да бъде подготвено"
 
-#: builtin/clone.c:808
+#: builtin/clone.c:767
+msgid "unable to write parameters to config file"
+msgstr "на�тройките не могат да бъдат запи�ани в конфигурационни� файл"
+
+#: builtin/clone.c:830
 msgid "cannot repack to clean up"
 msgstr "не може да �е извърши пакетиране за изчи�тване на файловете"
 
-#: builtin/clone.c:810
+#: builtin/clone.c:832
 msgid "cannot unlink temporary alternates file"
 msgstr "временни�т файл за алтернативни обекти не може да бъде изтрит"
 
-#: builtin/clone.c:842
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
 msgid "Too many arguments."
 msgstr "Прекалено много аргументи."
 
-#: builtin/clone.c:846
+#: builtin/clone.c:868
 msgid "You must specify a repository to clone."
 msgstr "Тр�бва да укажете кое хранилище и�кате да клонирате."
 
-#: builtin/clone.c:857
+#: builtin/clone.c:879
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "опциите „--bare“ и „--origin %s“ �а не�ъвме�тими."
 
-#: builtin/clone.c:860
+#: builtin/clone.c:882
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "опциите „--bare“ и „--separate-git-dir“ �а не�ъвме�тими."
 
-#: builtin/clone.c:873
+#: builtin/clone.c:895
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "не �ъще�твува хранилище „%s“"
 
-#: builtin/clone.c:879 builtin/fetch.c:1166
+#: builtin/clone.c:901 builtin/fetch.c:1174
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "дълбочината тр�бва да е положително ц�ло чи�ло, а не „%s“"
 
-#: builtin/clone.c:889
+#: builtin/clone.c:911
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "целеви�т път „%s“ �ъще�твува и не е празна директори�."
 
-#: builtin/clone.c:899
+#: builtin/clone.c:921
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "в „%s“ вече �ъще�твува работно дърво."
 
-#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
-#: builtin/worktree.c:221 builtin/worktree.c:248
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "родител�ките директории на „%s“ не могат да бъдат �ъздадени"
 
-#: builtin/clone.c:917
+#: builtin/clone.c:939
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "работното дърво в „%s“ не може да бъде �ъздадено."
 
-#: builtin/clone.c:935
+#: builtin/clone.c:957
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Клониране и �ъздаване на голо хранилище в „%s“…\n"
 
-#: builtin/clone.c:937
+#: builtin/clone.c:959
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Клониране и �ъздаване на хранилище в „%s“…\n"
 
-#: builtin/clone.c:975
+#: builtin/clone.c:998
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опци�та „--depth“ �е игнорира. Ползвайте �хемата "
 "„file://“."
 
-#: builtin/clone.c:978
+#: builtin/clone.c:1001
 msgid "source repository is shallow, ignoring --local"
 msgstr "клонираното хранилище е плитко, затова опци�та „--local“ �е игнорира"
 
-#: builtin/clone.c:983
+#: builtin/clone.c:1006
 msgid "--local is ignored"
 msgstr "опци�та „--local“ �е игнорира"
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1010
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "�е �е поддържа клониране на връзки от вида „%s“ "
 
-#: builtin/clone.c:1036 builtin/clone.c:1044
+#: builtin/clone.c:1059 builtin/clone.c:1067
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Отдалечени�т клон „%s“ лип�ва в клонираното хранилище „%s“"
 
-#: builtin/clone.c:1047
+#: builtin/clone.c:1070
 msgid "You appear to have cloned an empty repository."
 msgstr "Изглежда клонирахте празно хранилище."
 
@@ -5110,66 +5584,66 @@ msgstr ""
 "Чрез командата „git cherry-pick --continue“ ще продължите отбирането на\n"
 "о�таналите подавани�.\n"
 
-#: builtin/commit.c:305
+#: builtin/commit.c:307
 msgid "failed to unpack HEAD tree object"
 msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет"
 
-#: builtin/commit.c:346
+#: builtin/commit.c:348
 msgid "unable to create temporary index"
 msgstr "временни�т индек� не може да бъде �ъздаден"
 
-#: builtin/commit.c:352
+#: builtin/commit.c:354
 msgid "interactive add failed"
 msgstr "неу�пешно интерактивно добав�не"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:367
 msgid "unable to update temporary index"
 msgstr "временни�т индек� не може да бъде обновен"
 
-#: builtin/commit.c:367
+#: builtin/commit.c:369
 msgid "Failed to update main cache tree"
 msgstr "Дървото на о�новни� кеш не може да бъде обновено"
 
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
 msgid "unable to write new_index file"
 msgstr "нови�т индек� не може да бъде запи�ан"
 
-#: builtin/commit.c:445
+#: builtin/commit.c:447
 msgid "cannot do a partial commit during a merge."
 msgstr "по време на �ливане не може да �е извърши ча�тично подаване."
 
-#: builtin/commit.c:447
+#: builtin/commit.c:449
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "по време на отбиране не може да �е извърши ча�тично подаване."
 
-#: builtin/commit.c:456
+#: builtin/commit.c:458
 msgid "cannot read the index"
 msgstr "индек�ът не може да бъде прочетен"
 
-#: builtin/commit.c:475
+#: builtin/commit.c:477
 msgid "unable to write temporary index file"
 msgstr "временни�т индек� не може да бъде запи�ан"
 
-#: builtin/commit.c:580
+#: builtin/commit.c:582
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "заглавната ча�т за автор в подаването „%s“ лип�ва"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:584
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "заглавната ча�т за автор в подаването „%s“ е неправилна"
 
-#: builtin/commit.c:601
+#: builtin/commit.c:603
 msgid "malformed --author parameter"
 msgstr "неправилен параметър към опци�та „--author“"
 
-#: builtin/commit.c:609
+#: builtin/commit.c:611
 #, c-format
 msgid "invalid date format: %s"
 msgstr "неправилен формат на дата: %s"
 
-#: builtin/commit.c:653
+#: builtin/commit.c:655
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -5177,39 +5651,39 @@ msgstr ""
 "не може да �е избере знак за коментар — в текущото �ъобщение за подаване �а "
 "използвани в�ички подобни знаци"
 
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "�ледното подаване не може да бъде открито: %s"
 
-#: builtin/commit.c:702 builtin/shortlog.c:273
+#: builtin/commit.c:704 builtin/shortlog.c:285
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(изчитане на �ъобщението за подаване от �тандартни� вход)\n"
 
-#: builtin/commit.c:704
+#: builtin/commit.c:706
 msgid "could not read log from standard input"
 msgstr "�ъобщението за подаване не бе прочетено �тандартни� вход"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:710
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "файлът �ъ� �ъобщението за подаване „%s“ не може да бъде прочетен"
 
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "�ъобщението за �ливане MERGE_MSG не може да бъде прочетено"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
 msgid "could not read SQUASH_MSG"
 msgstr "�ъобщението за �мачкване SQUASH_MSG не може да бъде прочетено"
 
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "�ъобщението за �ливане MERGE_MSG не може да бъде прочетено"
+
+#: builtin/commit.c:796
 msgid "could not write commit template"
 msgstr "шаблонът за подаване не може да бъде запазен"
 
 # FIXME
-#: builtin/commit.c:803
+#: builtin/commit.c:814
 #, c-format
 msgid ""
 "\n"
@@ -5225,7 +5699,7 @@ msgstr ""
 "и опитайте отново.\n"
 
 # FIXME
-#: builtin/commit.c:808
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -5241,7 +5715,7 @@ msgstr ""
 "  %s\n"
 "и опитайте отново.\n"
 
-#: builtin/commit.c:821
+#: builtin/commit.c:832
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5250,7 +5724,7 @@ msgstr ""
 "Въведете �ъобщението за подаване на промените. Редовете, които започват\n"
 "� „%c“, ще бъдат пропу�нати, а празно �ъобщение преу�танов�ва подаването.\n"
 
-#: builtin/commit.c:828
+#: builtin/commit.c:839
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5261,96 +5735,96 @@ msgstr ""
 "� „%c“, �ъщо ще бъдат включени — може да ги изтриете вие. Празно \n"
 "�ъобщение преу�танов�ва подаването.\n"
 
-#: builtin/commit.c:848
+#: builtin/commit.c:859
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s�втор:   %.*s <%.*s>"
 
-#: builtin/commit.c:856
+#: builtin/commit.c:867
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sДата:    %s"
 
-#: builtin/commit.c:863
+#: builtin/commit.c:874
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sПодаващ: %.*s <%.*s>"
 
-#: builtin/commit.c:881
+#: builtin/commit.c:892
 msgid "Cannot read index"
 msgstr "Индек�ът не може да бъде прочетен"
 
-#: builtin/commit.c:938
+#: builtin/commit.c:949
 msgid "Error building trees"
 msgstr "Грешка при изграждане на дърветата"
 
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Подайте �ъобщението � н�ко� от опциите „-m“ или „-F“.\n"
 
-#: builtin/commit.c:1055
+#: builtin/commit.c:1066
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "Опци�та „--author '%s'“ не отговар� на форма̀та „Име <е-поща>“ и не �ъвпада � "
 "никой автор"
 
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "�еправилна �тойно�т за не�ледените файлове: „%s“"
 
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
 msgid "--long and -z are incompatible"
 msgstr "Опциите „--long“ и „-z“ �а не�ъвме�тими."
 
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Опциите „--reset-author“ и „--author“ �а не�ъвме�тими."
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1157
 msgid "You have nothing to amend."
 msgstr "��ма какво да бъде поправено."
 
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "В момента �е извършва �ливане, не можете да поправ�те."
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1162
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "В момента �е извършва отбиране на подаване, не можете да поправ�те."
 
-#: builtin/commit.c:1154
+#: builtin/commit.c:1165
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Опциите „--squash“ и „--fixup“ �а не�ъвме�тими."
 
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ �а не�ъвме�тими."
 
-#: builtin/commit.c:1166
+#: builtin/commit.c:1177
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "Опци�та „-m“ е не�ъвме�тима � „-c“, „-C“, „-F“ и „--fixup“."
 
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 "Опци�та „--reset-author“ може да �е използва �амо заедно � „-C“, „-c“ или\n"
 "„--amend“."
 
-#: builtin/commit.c:1191
+#: builtin/commit.c:1202
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ �а\n"
 "не�ъвме�тими."
 
-#: builtin/commit.c:1193
+#: builtin/commit.c:1204
 msgid "No paths with --include/--only does not make sense."
 msgstr "Опциите „--include“ и „--only“ изи�кват аргументи."
 
 # FIXME bad message
-#: builtin/commit.c:1195
+#: builtin/commit.c:1206
 msgid "Clever... amending the last one with dirty index."
 msgstr ""
 "Чуде�но �те �е �етили как да поправите �ъобщението на по�ледното подаване "
@@ -5358,271 +5832,269 @@ msgstr ""
 "променен индек�. Споделете и � друг потребител трика � „git commit --amend -"
 "o“."
 
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
 msgstr ""
 "Зададени �а изрични пътища без опциите „-i“ или „-o“. Приема �е, че в�е едно "
 "�те\n"
 "ползвали опци�та „--only“ � ПЪТища…"
 
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "�е�ъще�твуващ режим на изчи�тване „%s“"
 
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
 msgid "Paths with -a does not make sense."
 msgstr "Опци�та „-a“ е не�ъвме�тима �ъ� задаването на пътища."
 
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
 msgid "show status concisely"
 msgstr "кратка информаци� за �ъ�то�нието"
 
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
 msgid "show branch information"
 msgstr "информаци� за клоните"
 
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544
-#: builtin/worktree.c:423
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
 msgid "machine-readable output"
 msgstr "формат на изхода за четене от програма"
 
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
 msgid "show status in long format (default)"
 msgstr "подробна информаци� за �ъ�то�нието (�тандартно)"
 
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
 msgid "terminate entries with NUL"
 msgstr "раздел�не на елементите � нулеви� знак „NUL“"
 
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
 #: builtin/fast-export.c:984 builtin/tag.c:353
 msgid "mode"
-msgstr "режим"
+msgstr "РЕЖИМ"
 
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
-"извеждане на не�ледените файлове. Възможните режими �а „all“ (подробна\n"
-"информаци�), „normal“ (кратка информаци�), „no“ (без не�ледените файлове).\n"
-"Стандартни�т режим е: „all“."
+"извеждане на не�ледените файлове. Възможните РЕЖИМи �а „all“ (подробна "
+"информаци�), „normal“ (кратка информаци�), „no“ (без не�ледените файлове). "
+"Стандартни�т РЕЖИМ е: „all“."
 
-#: builtin/commit.c:1340
+#: builtin/commit.c:1351
 msgid "show ignored files"
 msgstr "извеждане на игнорираните файлове"
 
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
 msgid "when"
-msgstr "кога"
+msgstr "КОГ�"
 
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 "игнориране на промените в подмодулите. Опци� � незадължителна �тойно�т — "
-"една от\n"
-"„all“ (в�ички), „dirty“ (тези � неподадени промени), „untracked“ (не�ледени)"
+"една от „all“ (в�ички), „dirty“ (тези � неподадени промени), "
+"„untracked“ (не�ледени)"
 
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
 msgid "list untracked files in columns"
 msgstr "извеждане на не�ледените файлове в колони"
 
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
 msgid "couldn't look up newly created commit"
 msgstr "току що �ъздаденото подаване не може да бъде открито"
 
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
 msgid "could not parse newly created commit"
 msgstr "току що �ъздаденото подаване не може да бъде анализирано"
 
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
 msgid "detached HEAD"
 msgstr "не�вързан връх „HEAD“"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
 msgid " (root-commit)"
 msgstr " (начално подаване)"
 
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
 msgid "suppress summary after successful commit"
 msgstr "без информаци� �лед у�пешно подаване"
 
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
 msgid "show diff in commit message template"
 msgstr "добав�не на разликата към шаблона за �ъобщението при подаване"
 
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
 msgid "Commit message options"
 msgstr "Опции за �ъобщението при подаване"
 
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
 msgid "read message from file"
-msgstr "взимане на �ъобщението от файл"
+msgstr "взимане на �ъобщението от Ф�ЙЛ"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "author"
-msgstr "автор"
+msgstr "�ВТОР"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "override author for commit"
-msgstr "задаване на автор за подаването"
+msgstr "задаване на �ВТОР за подаването"
 
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
 msgid "date"
-msgstr "дата"
+msgstr "Д�Т�"
 
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
 msgid "override date for commit"
-msgstr "задаване на дата за подаването"
+msgstr "задаване на Д�Т� за подаването"
 
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
-#: builtin/notes.c:555 builtin/tag.c:349
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
+#: builtin/notes.c:558 builtin/tag.c:349
 msgid "message"
-msgstr "�ъобщение"
+msgstr "СЪОБЩЕ�ИЕ"
 
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
 msgid "commit message"
-msgstr "�ъобщение при подаване"
+msgstr "СЪОБЩЕ�ИЕ при подаване"
 
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
 msgid "commit"
-msgstr "подаване"
+msgstr "ПОД�В��Е"
 
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
 msgid "reuse and edit message from specified commit"
-msgstr "преизползване и редактиране на �ъобщението от указаното подаване"
+msgstr "преизползване и редактиране на �ъобщението от указаното ПОД�В��Е"
 
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
 msgid "reuse message from specified commit"
-msgstr "преизползване на �ъобщението от указаното подаване"
+msgstr "преизползване на �ъобщението от указаното ПОД�В��Е"
 
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
-"използване на автоматичното �ъобщение при �мачкване за вкарване на "
-"указаното\n"
-"подаване в предното без �леда"
+"използване на автоматичното �ъобщение при �мачкване за вкарване на указаното "
+"ПОД�В��Е в предното без �леда"
 
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "използване на автоматичното �ъобщение при �мачкване за �мачкване на "
-"указаното\n"
-"подаване в предното"
+"указаното ПОД�В��Е в предното"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1603
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 "�м�на на автора да �ъвпада � подаващи� (използва �е � „-C“/„-c“/„--amend“)"
 
-#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
 msgid "add Signed-off-by:"
 msgstr "добав�не на поле за подпи� — „Signed-off-by:“"
 
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
 msgid "use specified template file"
-msgstr "използване на указани� шаблонен файл"
+msgstr "използване на указани� шаблонен Ф�ЙЛ"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
 msgid "force edit of commit"
 msgstr "редактиране на подаване"
 
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
 msgid "default"
 msgstr "�тандартно"
 
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
 msgid "how to strip spaces and #comments from message"
 msgstr "кои празни знаци и #коментари да �е махат от �ъобщени�та"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
 msgid "include status in commit message template"
 msgstr "вмъкване на �ъ�то�нието в шаблона за �ъобщението при подаване"
 
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
 #: builtin/revert.c:93
 msgid "GPG sign commit"
 msgstr "подпи�ване на подаването � GPG"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
 msgid "Commit contents options"
 msgstr "Опции за избор на файлове при подаване"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
 msgid "commit all changed files"
 msgstr "подаване на в�ички променени файлове"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
 msgid "add specified files to index for commit"
 msgstr "добав�не на указаните файлове към индек�а за подаване"
 
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
 msgid "interactively add files"
 msgstr "интерактивно добав�не на файлове"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
 msgid "interactively add changes"
 msgstr "интерактивно добав�не на промени"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
 msgid "commit only specified files"
 msgstr "подаване �амо на указаните файлове"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
 msgid "bypass pre-commit hook"
 msgstr "без изпълнение на куката преди подаване (pre-commit)"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
 msgid "show what would be committed"
 msgstr "отпечатване на това, което би било подадено"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
 msgid "amend previous commit"
 msgstr "поправ�не на предишното подаване"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
 msgid "bypass post-rewrite hook"
 msgstr "без изпълнение на куката �лед презапи�ване (post-rewrite)"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
 msgid "ok to record an empty change"
 msgstr "позвол�ване на празни подавани�"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
 msgid "ok to record a change with an empty message"
 msgstr "позвол�ване на подавани� � празни �ъобщени�"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
 msgid "could not parse HEAD commit"
 msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
 
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Повреден файл за върха за �ливането „MERGE_HEAD“ (%s)"
 
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
 msgid "could not read MERGE_MODE"
 msgstr "режимът на �ливане „MERGE_MODE“ не може да бъде прочетен"
 
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "�ъобщението за подаване не може да бъде прочетено: %s"
 
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "�еизвършване на подаване поради нередактирано �ъобщение.\n"
 
-#: builtin/commit.c:1740
+#: builtin/commit.c:1760
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "�еизвършване на подаване поради празно �ъобщение.\n"
 
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -5632,145 +6104,151 @@ msgstr ""
 "не е запи�ан. Проверете дали ди�кът не е препълнен или не �те\n"
 "превишили ди�ковата �и квота. След това изпълнете „git reset HEAD“."
 
-#: builtin/config.c:8
+#: builtin/config.c:9
 msgid "git config [<options>]"
 msgstr "git config [ОПЦИЯ…]"
 
-#: builtin/config.c:54
+#: builtin/config.c:56
 msgid "Config file location"
 msgstr "Ме�тоположение на конфигурационни� файл"
 
-#: builtin/config.c:55
+#: builtin/config.c:57
 msgid "use global config file"
 msgstr "използване на глобални� конфигурационен файл"
 
-#: builtin/config.c:56
+#: builtin/config.c:58
 msgid "use system config file"
 msgstr "използване на �и�темни� конфигурационен файл"
 
-#: builtin/config.c:57
+#: builtin/config.c:59
 msgid "use repository config file"
 msgstr "използване на конфигурационни� файл на хранилището"
 
-#: builtin/config.c:58
+#: builtin/config.c:60
 msgid "use given config file"
-msgstr "използване на зададени� конфигурационен файл"
+msgstr "използване на зададени� конфигурационен Ф�ЙЛ"
 
-#: builtin/config.c:59
+#: builtin/config.c:61
 msgid "blob-id"
-msgstr "идентификатор на BLOB"
+msgstr "ИДЕ�ТИФИК�ТОР"
 
-#: builtin/config.c:59
+#: builtin/config.c:61
 msgid "read config from given blob object"
 msgstr ""
-"изчитане на конфигураци�та от BLOB � този идентификатор на �ъдържанието"
+"изчитане на конфигураци�та от BLOB � този ИДЕ�ТИФИК�ТОР на �ъдържанието"
 
-#: builtin/config.c:60
+#: builtin/config.c:62
 msgid "Action"
 msgstr "Дей�твие"
 
-#: builtin/config.c:61
+#: builtin/config.c:63
 msgid "get value: name [value-regex]"
 msgstr "извеждане на �тойно�т: ИМЕ [РЕГУЛЯРЕ�_ИЗР�З_З�_СТОЙ�ОСТТ�]"
 
-#: builtin/config.c:62
+#: builtin/config.c:64
 msgid "get all values: key [value-regex]"
 msgstr "извеждане на в�ички �тойно�ти: ключ [РЕГУЛЯРЕ�_ИЗР�З_З�_СТОЙ�ОСТТ�]"
 
-#: builtin/config.c:63
+#: builtin/config.c:65
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr ""
 "извеждане на �тойно�тите за РЕГУЛЯР�и�_ИЗР�З: РЕГУЛЯРЕ�_ИЗР�З_З�_ИМЕТО "
 "[РЕГУЛЯРЕ�_ИЗР�З_З�_СТОЙ�ОСТТ�]"
 
-#: builtin/config.c:64
+#: builtin/config.c:66
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "извеждане на �тойно�тта за указани� адре�: Р�ЗДЕЛ[.ПРОМЕ�ЛИВ�] �ДРЕС"
 
-#: builtin/config.c:65
+#: builtin/config.c:67
 msgid "replace all matching variables: name value [value_regex]"
 msgstr ""
 "зам�на на в�ички �ъвпадащи променливи: ИМЕ СТОЙ�ОСТ "
 "[РЕГУЛЯРЕ�_ИЗР�З_З�_СТОЙ�ОСТТ�]"
 
-#: builtin/config.c:66
+#: builtin/config.c:68
 msgid "add a new variable: name value"
 msgstr "добав�не на нова променлива: ИМЕ СТОЙ�ОСТ"
 
-#: builtin/config.c:67
+#: builtin/config.c:69
 msgid "remove a variable: name [value-regex]"
 msgstr "изтриване на променлива: ИМЕ [РЕГУЛЯРЕ�_ИЗР�З_З�_СТОЙ�ОСТТ�]"
 
-#: builtin/config.c:68
+#: builtin/config.c:70
 msgid "remove all matches: name [value-regex]"
 msgstr "изтриване на в�ички �ъвпадащи: ИМЕ [РЕГУЛЯРЕ�_ИЗР�З_З�_СТОЙ�ОСТТ�]"
 
-#: builtin/config.c:69
+#: builtin/config.c:71
 msgid "rename section: old-name new-name"
 msgstr "преименуване на раздел: СТ�РО_ИМЕ �ОВО_ИМЕ"
 
-#: builtin/config.c:70
+#: builtin/config.c:72
 msgid "remove a section: name"
 msgstr "изтриване на раздел: ИМЕ"
 
-#: builtin/config.c:71
+#: builtin/config.c:73
 msgid "list all"
 msgstr "избро�ване на в�ички"
 
-#: builtin/config.c:72
+#: builtin/config.c:74
 msgid "open an editor"
 msgstr "отвар�не на редактор"
 
-#: builtin/config.c:73
+#: builtin/config.c:75
 msgid "find the color configured: slot [default]"
 msgstr "извеждане на зададени� цв�т: номер [�тандартно]"
 
-#: builtin/config.c:74
+#: builtin/config.c:76
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "извеждане на зададени� цв�т: номер [�тандартни�т изход е терминал]"
 
-#: builtin/config.c:75
+#: builtin/config.c:77
 msgid "Type"
 msgstr "Вид"
 
-#: builtin/config.c:76
+#: builtin/config.c:78
 msgid "value is \"true\" or \"false\""
 msgstr "СТОЙ�ОСТТ� е „true“ (и�тина) или „false“ (лъжа)"
 
-#: builtin/config.c:77
+#: builtin/config.c:79
 msgid "value is decimal number"
 msgstr "СТОЙ�ОСТТ� е ц�ло, де�етично чи�ло"
 
-#: builtin/config.c:78
+#: builtin/config.c:80
 msgid "value is --bool or --int"
 msgstr "СТОЙ�ОСТТ� е „--bool“ (булева) или „--int“ (де�етично ц�ло чи�ло)"
 
-#: builtin/config.c:79
+#: builtin/config.c:81
 msgid "value is a path (file or directory name)"
 msgstr "СТОЙ�ОСТТ� е път (до файл или директори�)"
 
-#: builtin/config.c:80
+#: builtin/config.c:82
 msgid "Other"
 msgstr "Други"
 
 # FIXME NUL byte to null char, terminate -> razdelitel - da stane ednakvo
-#: builtin/config.c:81
+#: builtin/config.c:83
 msgid "terminate values with NUL byte"
 msgstr "раздел�не на �тойно�тите � нулеви� знак „NUL“"
 
-#: builtin/config.c:82
+#: builtin/config.c:84
 msgid "show variable names only"
 msgstr "извеждане на имената на променливите"
 
-#: builtin/config.c:83
+#: builtin/config.c:85
 msgid "respect include directives on lookup"
 msgstr "при тър�ене да �е уважат и директивите за включване"
 
-#: builtin/config.c:303
+#: builtin/config.c:86
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr ""
+"извеждане на м��тото на задаване на на�тройката (файл, �тандартен вход, "
+"обект BLOB, команден ред)"
+
+#: builtin/config.c:328
 msgid "unable to parse default color value"
 msgstr "неразпозната �тойно�т на �тандартни� цв�т"
 
-#: builtin/config.c:441
+#: builtin/config.c:472
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -5785,7 +6263,7 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:575
+#: builtin/config.c:614
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "конфигурационни�т файл „%s“ не може да бъде �ъздаден"
@@ -5822,7 +6300,7 @@ msgstr "в анотираниÑ� етикет „%s“ липÑ�ва вградеÐ
 msgid "tag '%s' is really '%s' here"
 msgstr "етикетът „%s“ тук е в�ъщно�т „%s“"
 
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "�еправилно име на обект „%s“"
@@ -5918,7 +6396,7 @@ msgstr "да �е тър�и �амо в този БРОЙ по�ледни ет
 msgid "only consider tags matching <pattern>"
 msgstr "да �е тър�и �амо измежду етикетите напа�ващи този Ш�БЛО�"
 
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
 msgid "show abbreviated commit object as fallback"
 msgstr "извеждане на �ъкратено име на обект като резервен вариант"
 
@@ -5952,21 +6430,21 @@ msgstr "„%s“: не е нито обикновен файл, нито Ñ�имÐ
 msgid "invalid option: %s"
 msgstr "неправилна опци�: %s"
 
-#: builtin/diff.c:358
+#: builtin/diff.c:360
 msgid "Not a git repository"
 msgstr "�е е хранилище на Git"
 
-#: builtin/diff.c:401
+#: builtin/diff.c:403
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "зададен е неправилен обект „%s“."
 
-#: builtin/diff.c:410
+#: builtin/diff.c:412
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "зададени �а повече от 2 обекта BLOB: „%s“"
 
-#: builtin/diff.c:417
+#: builtin/diff.c:419
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "зададен е неподдържан обект „%s“."
@@ -5989,11 +6467,11 @@ msgstr "Как да �е обработват етикетите на филтр
 
 #: builtin/fast-export.c:988
 msgid "Dump marks to this file"
-msgstr "Запазване на маркерите в този файл"
+msgstr "Запазване на маркерите в този Ф�ЙЛ"
 
 #: builtin/fast-export.c:990
 msgid "Import marks from this file"
-msgstr "Вна��не на маркерите от този файл"
+msgstr "Вна��не на маркерите от този Ф�ЙЛ"
 
 #: builtin/fast-export.c:992
 msgid "Fake a tagger when tags lack one"
@@ -6013,11 +6491,11 @@ msgstr "Без извеждане на Ñ�ъдържанието на обектÐ
 
 #: builtin/fast-export.c:998
 msgid "refspec"
-msgstr "указател на вер�и�"
+msgstr "УК�З�ТЕЛ_��_ВЕРСИЯ"
 
 #: builtin/fast-export.c:999
 msgid "Apply refspec to exported refs"
-msgstr "Прилагане на указател� на вер�и� към изне�ените указатели"
+msgstr "Прилагане на УК�З�ТЕЛ�_��_ВЕРСИЯ към изне�ените указатели"
 
 #: builtin/fast-export.c:1000
 msgid "anonymize output"
@@ -6039,164 +6517,163 @@ msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРÐ�Ð�ИЛИЩЕ | ГРУПÐ�)â
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [ОПЦИЯ…]"
 
-#: builtin/fetch.c:90 builtin/pull.c:162
+#: builtin/fetch.c:92 builtin/pull.c:174
 msgid "fetch from all remotes"
 msgstr "до�тав�не от в�ички отдалечени хранилища"
 
-#: builtin/fetch.c:92 builtin/pull.c:165
+#: builtin/fetch.c:94 builtin/pull.c:177
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "добав�не към „.git/FETCH_HEAD“ вме�то зам�на"
 
-#: builtin/fetch.c:94 builtin/pull.c:168
+#: builtin/fetch.c:96 builtin/pull.c:180
 msgid "path to upload pack on remote end"
 msgstr "отдалечен път, където да �е качи пакетът"
 
-#: builtin/fetch.c:95 builtin/pull.c:170
+#: builtin/fetch.c:97 builtin/pull.c:182
 msgid "force overwrite of local branch"
 msgstr "принудително презапи�ване на локални� клон"
 
-#: builtin/fetch.c:97
+#: builtin/fetch.c:99
 msgid "fetch from multiple remotes"
 msgstr "до�тав�не от множе�тво отдалечени хранилища"
 
-#: builtin/fetch.c:99 builtin/pull.c:172
+#: builtin/fetch.c:101 builtin/pull.c:184
 msgid "fetch all tags and associated objects"
 msgstr "до�тав�не на в�ички етикети и принадлежащи обекти"
 
-#: builtin/fetch.c:101
+#: builtin/fetch.c:103
 msgid "do not fetch all tags (--no-tags)"
 msgstr "без до�тав�нето на в�ички етикети „--no-tags“"
 
-#: builtin/fetch.c:103 builtin/pull.c:175
+#: builtin/fetch.c:105
+msgid "number of submodules fetched in parallel"
+msgstr "брой подмодули до�тавени паралелно"
+
+#: builtin/fetch.c:107 builtin/pull.c:187
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "ока�тр�не на клоните �лед�щи вече не�ъще�твуващи отдалечени клони"
 
-#: builtin/fetch.c:104 builtin/pull.c:178
+#: builtin/fetch.c:108 builtin/pull.c:190
 msgid "on-demand"
-msgstr "при нужда"
+msgstr "ПРИ �УЖД�"
 
-#: builtin/fetch.c:105 builtin/pull.c:179
+#: builtin/fetch.c:109 builtin/pull.c:191
 msgid "control recursive fetching of submodules"
 msgstr "управление на рекур�ивното до�тав�не на подмодулите"
 
-#: builtin/fetch.c:109 builtin/pull.c:184
+#: builtin/fetch.c:113 builtin/pull.c:199
 msgid "keep downloaded pack"
 msgstr "запазване на изтеглените пакети � обекти"
 
-#: builtin/fetch.c:111
+#: builtin/fetch.c:115
 msgid "allow updating of HEAD ref"
 msgstr "позвол�ване на обнов�ването на указател� „HEAD“"
 
-#: builtin/fetch.c:114 builtin/pull.c:187
+#: builtin/fetch.c:118 builtin/pull.c:202
 msgid "deepen history of shallow clone"
 msgstr "задълбочаване на и�тори�та на плитко хранилище"
 
-#: builtin/fetch.c:116 builtin/pull.c:190
+#: builtin/fetch.c:120 builtin/pull.c:205
 msgid "convert to a complete repository"
 msgstr "превръщане в пълно хранилище"
 
-#: builtin/fetch.c:118 builtin/log.c:1233
+#: builtin/fetch.c:122 builtin/log.c:1399
 msgid "dir"
 msgstr "директори�"
 
-#: builtin/fetch.c:119
+#: builtin/fetch.c:123
 msgid "prepend this to submodule path output"
 msgstr "добав�не на това пред път� на подмодула"
 
-#: builtin/fetch.c:122
+#: builtin/fetch.c:126
 msgid "default mode for recursion"
 msgstr "�тандартен режим на рекур�и�"
 
-#: builtin/fetch.c:124 builtin/pull.c:193
+#: builtin/fetch.c:128 builtin/pull.c:208
 msgid "accept refs that update .git/shallow"
 msgstr "приемане на указатели, които обнов�ват „.git/shallow“"
 
-#: builtin/fetch.c:125 builtin/pull.c:195
+#: builtin/fetch.c:129 builtin/pull.c:210
 msgid "refmap"
-msgstr "карта � указатели"
+msgstr "К�РТ�_С_УК�З�ТЕЛИ"
 
-#: builtin/fetch.c:126 builtin/pull.c:196
+#: builtin/fetch.c:130 builtin/pull.c:211
 msgid "specify fetch refmap"
-msgstr "указване на картата � указатели за до�тав�не"
+msgstr "указване на К�РТ�та_С_УК�З�ТЕЛИ за до�тав�не"
 
-#: builtin/fetch.c:378
+#: builtin/fetch.c:386
 msgid "Couldn't find remote ref HEAD"
 msgstr "Указател�т „HEAD“ в отдалеченото хранилище не може да бъде открит"
 
-#: builtin/fetch.c:458
+#: builtin/fetch.c:466
 #, c-format
 msgid "object %s not found"
 msgstr "обектът „%s“ лип�ва"
 
-#: builtin/fetch.c:463
+#: builtin/fetch.c:471
 msgid "[up to date]"
 msgstr "[актуализиран]"
 
-#: builtin/fetch.c:477
+#: builtin/fetch.c:485
 #, c-format
 msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
 msgstr "! %-*s %-*s → %s  (в текущи� клон не може да �е до�тав�)"
 
-#: builtin/fetch.c:478 builtin/fetch.c:566
+#: builtin/fetch.c:486 builtin/fetch.c:574
 msgid "[rejected]"
 msgstr "[отхвърлен]"
 
-#: builtin/fetch.c:489
+#: builtin/fetch.c:497
 msgid "[tag update]"
 msgstr "[обнов�ване на етикетите]"
 
-#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544
+#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
 msgid "  (unable to update local ref)"
 msgstr "  (локалните указатели не могат да бъдат обновени)"
 
-#: builtin/fetch.c:509
+#: builtin/fetch.c:517
 msgid "[new tag]"
 msgstr "[нов етикет]"
 
-#: builtin/fetch.c:512
+#: builtin/fetch.c:520
 msgid "[new branch]"
 msgstr "[нов клон]"
 
-#: builtin/fetch.c:515
+#: builtin/fetch.c:523
 msgid "[new ref]"
 msgstr "[нов указател]"
 
-#: builtin/fetch.c:561
+#: builtin/fetch.c:569
 msgid "unable to update local ref"
 msgstr "локален указател не може да бъде обновен"
 
-#: builtin/fetch.c:561
+#: builtin/fetch.c:569
 msgid "forced update"
 msgstr "принудително обнов�ване"
 
-#: builtin/fetch.c:568
+#: builtin/fetch.c:576
 msgid "(non-fast-forward)"
 msgstr "(�ливането не е тривиално)"
 
-#: builtin/fetch.c:602 builtin/fetch.c:843
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "файлът „%s“ не може да бъде отворен: %s\n"
-
-#: builtin/fetch.c:611
+#: builtin/fetch.c:619
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "хранилището „%s“ не изпрати в�ички необходими обекти\n"
 
-#: builtin/fetch.c:629
+#: builtin/fetch.c:637
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
 "отхвърл�не на върха „%s“, защото плитките хранилища не могат да бъдат "
 "обнов�вани"
 
-#: builtin/fetch.c:716 builtin/fetch.c:808
+#: builtin/fetch.c:724 builtin/fetch.c:816
 #, c-format
 msgid "From %.*s\n"
 msgstr "От %.*s\n"
 
 # FIXME - is the space necessary
-#: builtin/fetch.c:727
+#: builtin/fetch.c:735
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -6206,55 +6683,55 @@ msgstr ""
 "„git remote prune %s“, за да премахнете о�тарелите клони, които\n"
 "предизвикват конфликта"
 
-#: builtin/fetch.c:779
+#: builtin/fetch.c:787
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (обектът „%s“ ще �е окаже извън клон)"
 
-#: builtin/fetch.c:780
+#: builtin/fetch.c:788
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (обектът „%s“ вече е извън клон)"
 
-#: builtin/fetch.c:812
+#: builtin/fetch.c:820
 msgid "[deleted]"
 msgstr "[изтрит]"
 
-#: builtin/fetch.c:813 builtin/remote.c:1040
+#: builtin/fetch.c:821 builtin/remote.c:1025
 msgid "(none)"
 msgstr "(нищо)"
 
-#: builtin/fetch.c:833
+#: builtin/fetch.c:841
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "�е може да до�тавите в текущи� клон „%s“ на хранилище, което не е голо"
 
-#: builtin/fetch.c:852
+#: builtin/fetch.c:860
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "Стойно�тта „%2$s“ за опци�та „%1$s“ не е �ъвме�тима � „%3$s“"
 
-#: builtin/fetch.c:855
+#: builtin/fetch.c:863
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Опци�та „%s“ �е игнорира при „%s“\n"
 
-#: builtin/fetch.c:911
+#: builtin/fetch.c:920
 #, c-format
 msgid "Don't know how to fetch from %s"
 msgstr "�е �е поддържа до�тав�не от „%s“"
 
-#: builtin/fetch.c:1072
+#: builtin/fetch.c:1080
 #, c-format
 msgid "Fetching %s\n"
 msgstr "До�тав�не на „%s“\n"
 
-#: builtin/fetch.c:1074 builtin/remote.c:96
+#: builtin/fetch.c:1082 builtin/remote.c:96
 #, c-format
 msgid "Could not fetch %s"
 msgstr "„%s“ не може да �е до�тави"
 
-#: builtin/fetch.c:1092
+#: builtin/fetch.c:1100
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -6262,33 +6739,33 @@ msgstr ""
 "�е �те указали отдалечено хранилище. Задайте или адре�, или име\n"
 "на отдалечено хранилище, откъдето да �е до�тав�т новите вер�ии."
 
-#: builtin/fetch.c:1115
+#: builtin/fetch.c:1123
 msgid "You need to specify a tag name."
 msgstr "Тр�бва да укажете име на етикет."
 
-#: builtin/fetch.c:1157
+#: builtin/fetch.c:1165
 msgid "--depth and --unshallow cannot be used together"
 msgstr "опциите „--depth“ и „--unshallow“ �а не�ъвме�тими"
 
-#: builtin/fetch.c:1159
+#: builtin/fetch.c:1167
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "не можете да използвате опци�та „--unshallow“ върху пълно хранилище"
 
-#: builtin/fetch.c:1179
+#: builtin/fetch.c:1187
 msgid "fetch --all does not take a repository argument"
 msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище"
 
-#: builtin/fetch.c:1181
+#: builtin/fetch.c:1189
 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 "към „git fetch --all“ не можете да добавите аргумент — указател на вер�и�"
 
-#: builtin/fetch.c:1192
+#: builtin/fetch.c:1200
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "��ма нито отдалечено хранилище, нито група от хранилища на име „%s“"
 
-#: builtin/fetch.c:1200
+#: builtin/fetch.c:1208
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Указването на група и указването на вер�и� �а не�ъвме�тими"
 
@@ -6362,7 +6839,7 @@ msgstr "ФОРМ�Т за изхода"
 
 #: builtin/for-each-ref.c:41
 msgid "print only refs which points at the given object"
-msgstr "извеждане �амо на указателите, �очещи към обекта"
+msgstr "извеждане �амо на указателите, �очещи към ОБЕКТ�"
 
 #: builtin/for-each-ref.c:43
 msgid "print only refs that are merged"
@@ -6374,7 +6851,7 @@ msgstr "извеждане �амо на не�летите указатели"
 
 #: builtin/for-each-ref.c:45
 msgid "print only refs which contain the commit"
-msgstr "извеждане �амо на указателите, които �ъдържат това подаване"
+msgstr "извеждане �амо на указателите, които �ъдържат това ПОД�В��Е"
 
 #: builtin/fsck.c:156 builtin/prune.c:140
 msgid "Checking connectivity"
@@ -6384,56 +6861,56 @@ msgstr "Проверка на връзката"
 msgid "Checking object directories"
 msgstr "Проверка на директориите � обекти"
 
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]"
 
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
 msgid "show unreachable objects"
 msgstr "показване на недо�тижимите обекти"
 
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
 msgid "show dangling objects"
 msgstr "показване на обектите извън клоните"
 
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
 msgid "report tags"
 msgstr "показване на етикетите"
 
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
 msgid "report root nodes"
 msgstr "показване на кореновите възли"
 
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
 msgid "make index objects head nodes"
 msgstr "задаване на обекти от индек�а да �а коренови"
 
 # FIXME bad message
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
 msgid "make reflogs head nodes (default)"
 msgstr "про�лед�ване на указателите от журнала като глави (�тандартно)"
 
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
 msgid "also consider packs and alternate objects"
 msgstr "допълнително да �е провер�ват пакетите и алтернативните обекти"
 
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
 msgid "check only connectivity"
 msgstr "проверка �амо на връзката"
 
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
 msgid "enable more strict checking"
 msgstr "по-�троги проверки"
 
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
 msgid "write dangling objects in .git/lost-found"
 msgstr "запазване на обектите извън клоните в директори�та „.git/lost-found“"
 
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
 msgid "show progress"
 msgstr "показване на напредъка"
 
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
 msgid "Checking objects"
 msgstr "Проверка на обектите"
 
@@ -6527,239 +7004,253 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [ОПЦИЯ…] [-e] Ш�БЛО� [ВЕРСИЯ…] [[--] ПЪТ…]"
 
-#: builtin/grep.c:218
+#: builtin/grep.c:219
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: неу�пешно �ъздаване на нишка: %s"
 
-#: builtin/grep.c:441 builtin/grep.c:476
+#: builtin/grep.c:277
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+msgstr "зададен е неправилен брой нишки (%d) за %s"
+
+#: builtin/grep.c:452 builtin/grep.c:487
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "дървото не може да бъде прочетено (%s)"
 
-#: builtin/grep.c:491
+#: builtin/grep.c:502
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "не може да �е изпълни „grep“ от обект от вида %s"
 
-#: builtin/grep.c:547
+#: builtin/grep.c:560
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "опци�та „%c“ очаква чи�ло за аргумент"
 
-#: builtin/grep.c:564
+#: builtin/grep.c:577
 #, c-format
 msgid "cannot open '%s'"
 msgstr "„%s“ не може да бъде отворен"
 
-#: builtin/grep.c:633
+#: builtin/grep.c:646
 msgid "search in index instead of in the work tree"
 msgstr "тър�ене в индек�а, а не в работното дърво"
 
-#: builtin/grep.c:635
+#: builtin/grep.c:648
 msgid "find in contents not managed by git"
 msgstr "тър�ене и във файловете, които не �а под управлението на git"
 
-#: builtin/grep.c:637
+#: builtin/grep.c:650
 msgid "search in both tracked and untracked files"
 msgstr "тър�ене и в �ледените, и в не�ледените файлове"
 
-#: builtin/grep.c:639
+#: builtin/grep.c:652
 msgid "ignore files specified via '.gitignore'"
 msgstr "игнориране на файловете указани в „.gitignore“"
 
-#: builtin/grep.c:642
+#: builtin/grep.c:655
 msgid "show non-matching lines"
 msgstr "извеждане на редовете, които не �ъвпадат"
 
-#: builtin/grep.c:644
+#: builtin/grep.c:657
 msgid "case insensitive matching"
 msgstr "без значение на реги�търа на буквите (главни/малки)"
 
-#: builtin/grep.c:646
+#: builtin/grep.c:659
 msgid "match patterns only at word boundaries"
 msgstr "напа�ване на шаблоните �амо по границите на думите"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:661
 msgid "process binary files as text"
 msgstr "обработване на двоичните файлове като тек�тови"
 
-#: builtin/grep.c:650
+#: builtin/grep.c:663
 msgid "don't match patterns in binary files"
 msgstr "пре�качане на двоичните файлове"
 
-#: builtin/grep.c:653
+#: builtin/grep.c:666
 msgid "process binary files with textconv filters"
 msgstr ""
 "обработване на двоичните файлове чрез филтри за преобразуване към тек�т"
 
-#: builtin/grep.c:655
+#: builtin/grep.c:668
 msgid "descend at most <depth> levels"
 msgstr "навлизане мак�имално на тази ДЪЛБОЧИ�� в дървото"
 
-#: builtin/grep.c:659
+#: builtin/grep.c:672
 msgid "use extended POSIX regular expressions"
 msgstr "разширени регул�рни изрази по POSIX"
 
-#: builtin/grep.c:662
+#: builtin/grep.c:675
 msgid "use basic POSIX regular expressions (default)"
 msgstr "о�новни регул�рни изрази по POSIX (�тандартно)"
 
-#: builtin/grep.c:665
+#: builtin/grep.c:678
 msgid "interpret patterns as fixed strings"
 msgstr "шаблоните �а до�ловни низове"
 
-#: builtin/grep.c:668
+#: builtin/grep.c:681
 msgid "use Perl-compatible regular expressions"
 msgstr "регул�рни изрази на Perl"
 
-#: builtin/grep.c:671
+#: builtin/grep.c:684
 msgid "show line numbers"
 msgstr "извеждане на номерата на редовете"
 
-#: builtin/grep.c:672
+#: builtin/grep.c:685
 msgid "don't show filenames"
 msgstr "без извеждане на имената на файловете"
 
-#: builtin/grep.c:673
+#: builtin/grep.c:686
 msgid "show filenames"
 msgstr "извеждане на имената на файловете"
 
-#: builtin/grep.c:675
+#: builtin/grep.c:688
 msgid "show filenames relative to top directory"
 msgstr ""
 "извеждане на отно�ителните имена на файловете �пр�мо о�новната директори� на "
 "хранилището"
 
-#: builtin/grep.c:677
+#: builtin/grep.c:690
 msgid "show only filenames instead of matching lines"
 msgstr "извеждане �амо на имената на файловете без напа�ващите редове"
 
-#: builtin/grep.c:679
+#: builtin/grep.c:692
 msgid "synonym for --files-with-matches"
 msgstr "�иноним на „--files-with-matches“"
 
-#: builtin/grep.c:682
+#: builtin/grep.c:695
 msgid "show only the names of files without match"
 msgstr ""
 "извеждане �амо на имената на файловете, които не �ъдържат ред, напа�ващ на "
 "шаблона"
 
-#: builtin/grep.c:684
+#: builtin/grep.c:697
 msgid "print NUL after filenames"
 msgstr "извеждане на нулеви� знак „NUL“ �лед в��ко име на файл"
 
-#: builtin/grep.c:686
+#: builtin/grep.c:699
 msgid "show the number of matches instead of matching lines"
 msgstr "извеждане на бро� на �ъвпадени�та вме�то напа�ващите редове"
 
-#: builtin/grep.c:687
+#: builtin/grep.c:700
 msgid "highlight matches"
 msgstr "оцвет�ване на напа�вани�та"
 
-#: builtin/grep.c:689
+#: builtin/grep.c:702
 msgid "print empty line between matches from different files"
 msgstr "извеждане на празен ред между напа�вани�та от различни файлове"
 
-#: builtin/grep.c:691
+#: builtin/grep.c:704
 msgid "show filename only once above matches from same file"
 msgstr ""
 "извеждане на името на файла �амо веднъж за в�ички напа�вани� от този файл"
 
-#: builtin/grep.c:694
+#: builtin/grep.c:707
 msgid "show <n> context lines before and after matches"
 msgstr "извеждане на такъв БРОЙ редове преди и �лед напа�вани�та"
 
-#: builtin/grep.c:697
+#: builtin/grep.c:710
 msgid "show <n> context lines before matches"
 msgstr "извеждане на такъв БРОЙ редове преди напа�вани�та"
 
-#: builtin/grep.c:699
+#: builtin/grep.c:712
 msgid "show <n> context lines after matches"
 msgstr "извеждане на такъв БРОЙ редове �лед напа�вани�та"
 
-#: builtin/grep.c:700
+#: builtin/grep.c:714
+msgid "use <n> worker threads"
+msgstr "използване на такъв БРОЙ работещи нишки"
+
+#: builtin/grep.c:715
 msgid "shortcut for -C NUM"
 msgstr "�иноним на „-C БРОЙ“"
 
-#: builtin/grep.c:703
+#: builtin/grep.c:718
 msgid "show a line with the function name before matches"
 msgstr "извеждане на ред � името на функци�та, в ко�то е напа�нат шаблона"
 
-#: builtin/grep.c:705
+#: builtin/grep.c:720
 msgid "show the surrounding function"
 msgstr "извеждане на обхващащата функци�"
 
-#: builtin/grep.c:708
+#: builtin/grep.c:723
 msgid "read patterns from file"
-msgstr "изчитане на шаблоните от файл"
+msgstr "изчитане на шаблоните от Ф�ЙЛ"
 
-#: builtin/grep.c:710
+#: builtin/grep.c:725
 msgid "match <pattern>"
 msgstr "напа�ване на Ш�БЛО�"
 
-#: builtin/grep.c:712
+#: builtin/grep.c:727
 msgid "combine patterns specified with -e"
 msgstr "комбиниране на шаблоните указани � опци�та „-e“"
 
-#: builtin/grep.c:724
+#: builtin/grep.c:739
 msgid "indicate hit with exit status without output"
 msgstr ""
 "без извеждане на �тандартни� изход. Изходни�т код указва наличието на "
 "напа�ване"
 
-#: builtin/grep.c:726
+#: builtin/grep.c:741
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "извеждане на редове �амо от файловете, които напа�ват на в�ички шаблони"
 
-#: builtin/grep.c:728
+#: builtin/grep.c:743
 msgid "show parse tree for grep expression"
 msgstr "извеждане на дървото за анализ на регул�рни� израз"
 
-#: builtin/grep.c:732
+#: builtin/grep.c:747
 msgid "pager"
 msgstr "програма за преглед по �траници"
 
-#: builtin/grep.c:732
+#: builtin/grep.c:747
 msgid "show matching files in the pager"
 msgstr "извеждане на �ъвпадащите файлове в програма за преглед по �траници"
 
-#: builtin/grep.c:735
+#: builtin/grep.c:750
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr ""
 "позвол�ване на �тартирането на grep(1) (текущи�т компилат пренебрегва тази "
 "опци�)"
 
-#: builtin/grep.c:793
+#: builtin/grep.c:813
 msgid "no pattern given."
 msgstr "лип�ва шаблон."
 
-#: builtin/grep.c:851
+#: builtin/grep.c:845 builtin/index-pack.c:1477
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "зададен е неправилен брой нишки: %d"
+
+#: builtin/grep.c:875
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 "опци�та „--open-files-in-pager“ е �ъвме�тима �амо � тър�ене в работното дърво"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:901
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "опциите „--cached“ и „--untracked“ �а не�ъвме�тими � „--no-index“."
 
-#: builtin/grep.c:882
+#: builtin/grep.c:906
 msgid "--no-index or --untracked cannot be used with revs."
 msgstr ""
 "опциите „--cached“ и „--untracked“ �а не�ъвме�тими � тър�ене във вер�ии."
 
-#: builtin/grep.c:885
+#: builtin/grep.c:909
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr ""
 "опциите „--(no-)exclude-standard“ �а не�ъвме�тими � тър�ене по �ледени "
 "файлове."
 
-#: builtin/grep.c:893
+#: builtin/grep.c:917
 msgid "both --cached and trees are given."
 msgstr "опци�та „--cached“ е не�ъвме�тима �ъ� задаване на дърво."
 
-#: builtin/hash-object.c:80
+#: builtin/hash-object.c:81
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -6767,40 +7258,40 @@ msgstr ""
 "git hash-object [-t ВИД] [-w] [--path=Ф�ЙЛ | --no-filters] [--stdin] [--] "
 "Ф�ЙЛ…"
 
-#: builtin/hash-object.c:81
+#: builtin/hash-object.c:82
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object --stdin-paths"
 
-#: builtin/hash-object.c:92
+#: builtin/hash-object.c:93
 msgid "type"
 msgstr "ВИД"
 
-#: builtin/hash-object.c:92
+#: builtin/hash-object.c:93
 msgid "object type"
-msgstr "вид на обекта"
+msgstr "ВИД на обекта"
 
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
 msgid "write the object into the object database"
 msgstr "запи�ване на обекта в базата от данни за обектите"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "read the object from stdin"
 msgstr "изчитане на обекта от �тандартни� вход"
 
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
 msgid "store file as is without filters"
 msgstr "запазване на файла както е — без филтри"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "�ъздаване и хеширане на произволни данни за повредени обекти за тра�иране на "
 "Git"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
 msgid "process file as it were from this path"
-msgstr "обработване на файла в�е едно е � този път"
+msgstr "обработване на Ф�ЙЛа в�е едно е � този път"
 
 #: builtin/help.c:41
 msgid "print all available commands"
@@ -6846,10 +7337,10 @@ msgstr "Прекалено �тара вер�и� на „emacsclient“ — %d
 
 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
 #, c-format
-msgid "failed to exec '%s': %s"
-msgstr "неу�пешно изпълнение на „%s“: %s"
+msgid "failed to exec '%s'"
+msgstr "неу�пешно изпълнение на „%s“"
 
-#: builtin/help.c:208
+#: builtin/help.c:205
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -6858,7 +7349,7 @@ msgstr ""
 "„%s“: път към неподдържана програма за преглед на\n"
 " ръковод�твото. Вме�то не� пробвайте „man.<tool>.cmd“."
 
-#: builtin/help.c:220
+#: builtin/help.c:217
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -6867,63 +7358,63 @@ msgstr ""
 "„%s“: команда за поддържана програма за преглед на\n"
 " ръковод�твото. Вме�то не� пробвайте „man.<tool>.path“."
 
-#: builtin/help.c:337
+#: builtin/help.c:334
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "„%s“: непозната програма за преглед на ръковод�твото."
 
-#: builtin/help.c:354
+#: builtin/help.c:351
 msgid "no man viewer handled the request"
 msgstr "нико� програма за преглед на ръковод�тво не у�п� да обработи за�вката"
 
-#: builtin/help.c:362
+#: builtin/help.c:359
 msgid "no info viewer handled the request"
 msgstr ""
 "нико� програма за преглед на информационните �траници не у�п� да обработи "
 "за�вката"
 
-#: builtin/help.c:411
+#: builtin/help.c:408
 msgid "Defining attributes per path"
 msgstr "Указване на атрибути към път"
 
-#: builtin/help.c:412
+#: builtin/help.c:409
 msgid "Everyday Git With 20 Commands Or So"
 msgstr "Ежедневието в Git в рамките на 20-ина команди"
 
-#: builtin/help.c:413
+#: builtin/help.c:410
 msgid "A Git glossary"
 msgstr "Речник � термините на Git"
 
-#: builtin/help.c:414
+#: builtin/help.c:411
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Указване на не�ледени файлове, които да бъдат нарочно пренебрегвани"
 
-#: builtin/help.c:415
+#: builtin/help.c:412
 msgid "Defining submodule properties"
 msgstr "Дефиниране на �вой�твата на подмодулите"
 
-#: builtin/help.c:416
+#: builtin/help.c:413
 msgid "Specifying revisions and ranges for Git"
 msgstr "Указване на вер�ии и интервали в Git"
 
-#: builtin/help.c:417
+#: builtin/help.c:414
 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
 msgstr "Въвеждащ урок за Git (вер�ии поне 1.5.1)"
 
-#: builtin/help.c:418
+#: builtin/help.c:415
 msgid "An overview of recommended workflows with Git"
 msgstr "Общ преглед на препоръчваните начини за работа � Git"
 
-#: builtin/help.c:430
+#: builtin/help.c:427
 msgid "The common Git guides are:\n"
 msgstr "Попул�рните пътеводители в Git �а:\n"
 
-#: builtin/help.c:451 builtin/help.c:468
+#: builtin/help.c:448 builtin/help.c:465
 #, c-format
 msgid "usage: %s%s"
 msgstr "употреба: %s%s"
 
-#: builtin/help.c:484
+#: builtin/help.c:481
 #, c-format
 msgid "`git %s' is aliased to `%s'"
 msgstr "„git %s“ е �иноним на „%s“"
@@ -7119,118 +7610,115 @@ msgstr ""
 
 #: builtin/index-pack.c:1253
 #, c-format
-msgid "completed with %d local objects"
-msgstr "дей�твието завърши � %d локални обекта"
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "дей�твието завърши � %d локален обект"
+msgstr[1] "дей�твието завърши � %d локални обекта"
 
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1265
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 "�еочаквана по�ледваща �ума за грешки за „%s“ (причината може да е грешка в "
 "ди�ка)"
 
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "в пакета има %d ненапа�ваща разлика"
 msgstr[1] "в пакета има %d ненапа�ващи разлики"
 
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1293
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "добавени�т обект не може да �е компре�ира � „deflate“: %d"
 
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "локални�т обект „%s“ е повреден"
 
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
 msgid "error while closing pack file"
 msgstr "грешка при затвар�нето на пакетни� файл"
 
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr ""
 "грешка при запи�ването на файла „%s“, о�игур�ващ запазване на директори�"
 
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr ""
 "грешка при затвар�нето на запи�ани� файл „%s“, о�игур�ващ запазване на "
 "директори�"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
 msgid "cannot store pack file"
 msgstr "пакетни�т файл не може да бъде запазен"
 
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
 msgid "cannot store index file"
 msgstr "файлът за индек�а не може да бъде �ъхранен"
 
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "зададена е неправилна вер�и� пакетиране: „pack.indexversion=%<PRIu32>“"
 
-#: builtin/index-pack.c:1475
-#, c-format
-msgid "invalid number of threads specified (%d)"
-msgstr "зададен е неправилен брой нишки: %d"
-
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1663
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "лип�ва поддръжка за нишки. „%s“ ще �е пренебрегне"
 
-#: builtin/index-pack.c:1537
+#: builtin/index-pack.c:1540
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Съще�твуващи�т пакетен файл „%s“ не може да бъде отворен"
 
-#: builtin/index-pack.c:1539
+#: builtin/index-pack.c:1542
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Съще�твуващи�т индек� за пакетни� файл „%s“ не може да бъде отворен"
 
-#: builtin/index-pack.c:1586
+#: builtin/index-pack.c:1589
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "%d обект не е разлика"
 msgstr[1] "%d обекта не �а разлика"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1596
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "дължината на веригата е %d: %lu обект"
 msgstr[1] "дължината на веригата е %d: %lu обекта"
 
+#: builtin/index-pack.c:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "името на пакетни� файл „%s“ не завършва на „.pack“"
+
 # FIXME it is not the cwd it is the previous cwd
-#: builtin/index-pack.c:1623
+#: builtin/index-pack.c:1638
 msgid "Cannot come back to cwd"
 msgstr "Проце�ът не може да �е върне към предишната работна директори�"
 
-#: builtin/index-pack.c:1675 builtin/index-pack.c:1678
-#: builtin/index-pack.c:1690 builtin/index-pack.c:1694
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
 #, c-format
 msgid "bad %s"
 msgstr "неправилна �тойно�т „%s“"
 
-#: builtin/index-pack.c:1708
+#: builtin/index-pack.c:1723
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "опци�та „--fix-thin“ изи�ква „--stdin“"
 
-#: builtin/index-pack.c:1712 builtin/index-pack.c:1721
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "името на пакетни� файл „%s“ не завършва на „.pack“"
-
-#: builtin/index-pack.c:1729
+#: builtin/index-pack.c:1731
 msgid "--verify with no packfile name given"
 msgstr "опци�та „--verify“ изи�ква име на пакетен файл"
 
@@ -7269,28 +7757,27 @@ msgstr "„%s“ не може да �е копира в „%s“"
 msgid "ignoring template %s"
 msgstr "игнориране на шаблона „%s“"
 
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
 #, c-format
 msgid "templates not found %s"
 msgstr "директори�та � шаблоните не е открита: „%s“"
 
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
 #, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr ""
-"шаблоните � неправилен номер на форма̀та %d н�ма да бъдат копирани от „%s“"
+msgid "not copying templates from '%s': %s"
+msgstr "шаблоните н�ма да бъдат копирани от „%s“: „%s“"
 
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
 #, c-format
 msgid "%s already exists"
 msgstr "Директори�та „%s“ вече �ъще�твува"
 
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "файлове от вид %d не �е поддържат"
 
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "„%s“ не може да �е преме�ти в „%s“"
@@ -7298,24 +7785,24 @@ msgstr "„%s“ не може да �е преме�ти в „%s“"
 #. TRANSLATORS: The first '%s' is either "Reinitialized
 #. existing" or "Initialized empty", the second " shared" or
 #. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
 #, c-format
 msgid "%s%s Git repository in %s%s\n"
 msgstr "%s%s хранилище на Git в „%s%s“\n"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Reinitialized existing"
 msgstr "�аново инициализирано, �ъще�твуващо"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Initialized empty"
 msgstr "Инициализирано празно"
 
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
 msgid " shared"
 msgstr ", �поделено"
 
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -7323,27 +7810,27 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_Ш�БЛО�И] [--"
 "shared[=ПР�В�]] [ДИРЕКТОРИЯ]"
 
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
 msgid "permissions"
 msgstr "права"
 
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 "указване, че хранилището на Git ще бъде �поделено от повече от един "
 "потребител"
 
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "не може да �е влезе в директори�та „%s“"
 
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7352,31 +7839,39 @@ msgstr ""
 "%s (или --work-tree=ДИРЕКТОРИЯ) изи�ква указването на %s (или --git-"
 "dir=ДИРЕКТОРИЯ)"
 
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Работното дърво в „%s“ е недо�тъпно"
 
 #: builtin/interpret-trailers.c:15
 msgid ""
-"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
-"[<file>...]"
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
 msgstr ""
-"git interpret-trailers [--trim-empty] [(--trailer ЛЕКСЕМ�[(=|:)СТОЙ�ОСТ])…] "
-"[Ф�ЙЛ…]"
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"ЛЕКСЕМ�[(=|:)СТОЙ�ОСТ])…] [Ф�ЙЛ…]"
 
-#: builtin/interpret-trailers.c:25
+#: builtin/interpret-trailers.c:26
+msgid "edit files in place"
+msgstr "директно редактиране на файловете"
+
+#: builtin/interpret-trailers.c:27
 msgid "trim empty trailers"
 msgstr "изчи�тване на празните епилози"
 
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:28
 msgid "trailer"
 msgstr "епилог"
 
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:29
 msgid "trailer(s) to add"
 msgstr "епилог(зи) за добав�не"
 
+#: builtin/interpret-trailers.c:42
+msgid "no input file given for in-place editing"
+msgstr "не е зададен входен файл за редактиране на м��то"
+
 #: builtin/log.c:43
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [ОПЦИЯ…] [ДИ�П�ЗО�_��_ВЕРСИИТЕ] [[--] ПЪТ…]"
@@ -7390,277 +7885,327 @@ msgstr "git show [ОПЦИЯ…] ОБЕКТ…"
 msgid "invalid --decorate option: %s"
 msgstr "неправилна опци� „--decorate“: %s"
 
-#: builtin/log.c:131
+#: builtin/log.c:137
 msgid "suppress diff output"
 msgstr "без извеждане на разликите"
 
-#: builtin/log.c:132
+#: builtin/log.c:138
 msgid "show source"
 msgstr "извеждане на изходни� код"
 
-#: builtin/log.c:133
+#: builtin/log.c:139
 msgid "Use mail map file"
 msgstr ""
 "Използване на файл за �ъответ�тви�та на имената и адре�ите на е-поща („."
 "mailmap“)"
 
-#: builtin/log.c:134
+#: builtin/log.c:140
 msgid "decorate options"
 msgstr "на�тройки на форма̀та на извежданата информаци�"
 
-#: builtin/log.c:137
+#: builtin/log.c:143
 msgid "Process line range n,m in file, counting from 1"
 msgstr ""
 "Обработване �амо на редовете във файла в интервала от n до m включително. "
 "Броенето започва от 1"
 
-#: builtin/log.c:233
+#: builtin/log.c:239
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Резултат: %d %s\n"
 
-#: builtin/log.c:465
+#: builtin/log.c:471
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: повреден файл"
 
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
 #, c-format
 msgid "Could not read object %s"
 msgstr "Обектът не може да бъде прочетен: %s"
 
-#: builtin/log.c:596
+#: builtin/log.c:602
 #, c-format
 msgid "Unknown type: %d"
 msgstr "�еизве�тен вид: %d"
 
-#: builtin/log.c:714
+#: builtin/log.c:722
 msgid "format.headers without value"
 msgstr "не е зададена �тойно�т на „format.headers“"
 
-#: builtin/log.c:798
+#: builtin/log.c:812
 msgid "name of output directory is too long"
 msgstr "прекалено дълго име на директори�та за изходната информаци�"
 
-#: builtin/log.c:813
+#: builtin/log.c:827
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Файлът-кръпка „%s“ не може да бъде отворен"
 
-#: builtin/log.c:827
+#: builtin/log.c:841
 msgid "Need exactly one range."
 msgstr "Тр�бва да зададете точно един диапазон."
 
-#: builtin/log.c:837
+#: builtin/log.c:851
 msgid "Not a range."
 msgstr "�е е диапазон."
 
-#: builtin/log.c:943
+#: builtin/log.c:957
 msgid "Cover letter needs email format"
 msgstr "Придружаващото пи�мо тр�бва да е форматирано като е-пи�мо"
 
 # FIXME bad wording insanely
-#: builtin/log.c:1022
+#: builtin/log.c:1036
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "неправилен формат на заглавната ча�т за отговор „in-reply-to“: %s"
 
-#: builtin/log.c:1050
+#: builtin/log.c:1064
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИ�П�ЗО�_��_ВЕРСИИТЕ]"
 
-# FIXME message WTF why ask it
-#: builtin/log.c:1095
+#: builtin/log.c:1109
 msgid "Two output directories?"
 msgstr "Можете да укажете мак�имум една директори� за изход."
 
-#: builtin/log.c:1211
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "�епознато подаване „%s“"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "�е може да �е открие към какво �очи „%s“."
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr "Точната база за �ливане не може да �е открие."
+
+#: builtin/log.c:1235
+msgid ""
+"Failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually."
+msgstr ""
+"Следени�т клон не може да бъде у�тановен. �ко и�кате ръчно да го\n"
+"зададете, използвайте „git branch --set-upstream-to“.\n"
+"Можете ръчно да зададете базово подаване чрез „--base=<base-commit-id>“."
+
+#: builtin/log.c:1255
+msgid "Failed to find exact merge base"
+msgstr "Точната база при �ливане не може да бъде открита"
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr "базовото подаване тр�бва да е предше�твеникът на �пи�ъка � вер�иите"
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr "базовото подаване не може да е в �пи�ъка � вер�иите"
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr "идентификаторът на кръпката не може да бъде получен"
+
+#: builtin/log.c:1377
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "номераци� „[PATCH n/m]“ дори и при един�твена кръпка"
 
-#: builtin/log.c:1214
+#: builtin/log.c:1380
 msgid "use [PATCH] even with multiple patches"
 msgstr "номераци� „[PATCH]“ дори и при множе�тво кръпки"
 
-#: builtin/log.c:1218
+#: builtin/log.c:1384
 msgid "print patches to standard out"
 msgstr "извеждане на кръпките на �тандартни� изход"
 
-#: builtin/log.c:1220
+#: builtin/log.c:1386
 msgid "generate a cover letter"
 msgstr "�ъздаване на придружаващо пи�мо"
 
-#: builtin/log.c:1222
+#: builtin/log.c:1388
 msgid "use simple number sequence for output file names"
 msgstr "про�та чи�лова по�ледователно�т за имената на файловете-кръпки"
 
-#: builtin/log.c:1223
+#: builtin/log.c:1389
 msgid "sfx"
 msgstr "З��ЦИ"
 
-#: builtin/log.c:1224
+#: builtin/log.c:1390
 msgid "use <sfx> instead of '.patch'"
 msgstr "използване на тези З��ЦИ за �уфик� вме�то „.patch“"
 
-#: builtin/log.c:1226
+#: builtin/log.c:1392
 msgid "start numbering patches at <n> instead of 1"
 msgstr "номерирането на кръпките да започва от този БРОЙ, а не � 1"
 
-#: builtin/log.c:1228
+#: builtin/log.c:1394
 msgid "mark the series as Nth re-roll"
 msgstr "отбел�зване, че това е N-тата поредна редакци� на поредицата от кръпки"
 
-#: builtin/log.c:1230
+#: builtin/log.c:1396
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Използване на този „[ПРЕФИКС]“ вме�то „[PATCH]“"
 
-#: builtin/log.c:1233
+#: builtin/log.c:1399
 msgid "store resulting files in <dir>"
 msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
 
-#: builtin/log.c:1236
+#: builtin/log.c:1402
 msgid "don't strip/add [PATCH]"
 msgstr "без добав�не/махане на префик�а „[PATCH]“"
 
-#: builtin/log.c:1239
+#: builtin/log.c:1405
 msgid "don't output binary diffs"
 msgstr "без извеждане на разлики между двоични файлове"
 
-#: builtin/log.c:1241
+#: builtin/log.c:1407
 msgid "output all-zero hash in From header"
 msgstr "в заглавната ча�т „From:“ (от) хешът да е �амо от нули"
 
-#: builtin/log.c:1243
+#: builtin/log.c:1409
 msgid "don't include a patch matching a commit upstream"
 msgstr "да не �е включват кръпки, които при�ъ�тват в �ледени� клон"
 
-#: builtin/log.c:1245
+#: builtin/log.c:1411
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 "извеждане във формат за кръпки, а на в �тандартни� (кръпка и �тати�тика)"
 
-#: builtin/log.c:1247
+#: builtin/log.c:1413
 msgid "Messaging"
 msgstr "Опции при изпращане"
 
-#: builtin/log.c:1248
+#: builtin/log.c:1414
 msgid "header"
 msgstr "З�ГЛ�В��_Ч�СТ"
 
-#: builtin/log.c:1249
+#: builtin/log.c:1415
 msgid "add email header"
 msgstr "добав�не на тази З�ГЛ�В��_Ч�СТ"
 
-#: builtin/log.c:1250 builtin/log.c:1252
+#: builtin/log.c:1416 builtin/log.c:1418
 msgid "email"
 msgstr "Е-ПОЩ�"
 
-#: builtin/log.c:1250
+#: builtin/log.c:1416
 msgid "add To: header"
 msgstr "добав�не на заглавна ча�т „To:“ (до)"
 
-#: builtin/log.c:1252
+#: builtin/log.c:1418
 msgid "add Cc: header"
 msgstr "добав�не на заглавна ча�т „Cc:“ (и до)"
 
-#: builtin/log.c:1254
+#: builtin/log.c:1420
 msgid "ident"
 msgstr "ИДЕ�ТИЧ�ОСТ"
 
-#: builtin/log.c:1255
+#: builtin/log.c:1421
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "задаване на адре�а в заглавната ча�т „From“ (от) да е тази ИДЕ�ТИЧ�ОСТ. �ко "
 "не е зададена такава, �е взима адре�а на подаващи�"
 
-#: builtin/log.c:1257
+#: builtin/log.c:1423
 msgid "message-id"
 msgstr "ИДЕ�ТИФИК�ТОР_��_СЪОБЩЕ�ИЕ"
 
-#: builtin/log.c:1258
+#: builtin/log.c:1424
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 "първото �ъобщение да е в отговор на е-пи�мото � този "
 "ИДЕ�ТИФИК�ТОР_��_СЪОБЩЕ�ИЕ"
 
-#: builtin/log.c:1259 builtin/log.c:1262
+#: builtin/log.c:1425 builtin/log.c:1428
 msgid "boundary"
 msgstr "граница"
 
-#: builtin/log.c:1260
+#: builtin/log.c:1426
 msgid "attach the patch"
 msgstr "прикреп�не на кръпката"
 
-#: builtin/log.c:1263
+#: builtin/log.c:1429
 msgid "inline the patch"
 msgstr "включване на кръпката в тек�та на пи�мата"
 
-#: builtin/log.c:1267
+#: builtin/log.c:1433
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
-"използване на нишки за �ъобщени�та. Стилът е „shallow“ (плитък) или "
+"използване на нишки за �ъобщени�та. СТИЛът е „shallow“ (плитък) или "
 "„deep“ (дълбок)"
 
-#: builtin/log.c:1269
+#: builtin/log.c:1435
 msgid "signature"
 msgstr "подпи�"
 
-#: builtin/log.c:1270
+#: builtin/log.c:1436
 msgid "add a signature"
 msgstr "добав�не на поле за подпи�"
 
-#: builtin/log.c:1272
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "Б�ЗОВО_ПОД�В��Е"
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr "добав�не на необходимото Б�Зово дърво към �ери�та кръпки"
+
+#: builtin/log.c:1440
 msgid "add a signature from a file"
 msgstr "добав�не на подпи� от файл"
 
-#: builtin/log.c:1273
+#: builtin/log.c:1441
 msgid "don't print the patch filenames"
 msgstr "без извеждане на имената на кръпките"
 
-#: builtin/log.c:1362
+#: builtin/log.c:1531
 msgid "-n and -k are mutually exclusive."
 msgstr "опциите „-n“ и „-k“ �а не�ъвме�тими."
 
-#: builtin/log.c:1364
+#: builtin/log.c:1533
 msgid "--subject-prefix and -k are mutually exclusive."
 msgstr "опциите „--subject-prefix“ и „-k“ �а не�ъвме�тими."
 
-#: builtin/log.c:1372
+#: builtin/log.c:1541
 msgid "--name-only does not make sense"
 msgstr "опци�та „--name-only“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1374
+#: builtin/log.c:1543
 msgid "--name-status does not make sense"
 msgstr "опци�та „--name-status“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1376
+#: builtin/log.c:1545
 msgid "--check does not make sense"
 msgstr "опци�та „--check“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1401
+#: builtin/log.c:1573
 msgid "standard output, or directory, which one?"
 msgstr ""
 "изходът може да или �тандартни�т, или да е в директори�, но не и двете."
 
-#: builtin/log.c:1403
+#: builtin/log.c:1575
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/log.c:1500
+#: builtin/log.c:1672
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "файлът „%s“ � подпи� не може да бъде прочетен"
 
-#: builtin/log.c:1563
+#: builtin/log.c:1743
 msgid "Failed to create output files"
 msgstr "Изходните файлове не могат да бъдат �ъздадени"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1792
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [ОТД�ЛЕЧЕ�_КЛО� [ВРЪХ [ПРЕДЕЛ]]]"
 
-#: builtin/log.c:1665
+#: builtin/log.c:1846
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7668,106 +8213,151 @@ msgstr ""
 "Следени�т отдалечен клон не бе открит, затова изрично задайте "
 "ОТД�ЛЕЧЕ�_КЛО�.\n"
 
-#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690
-#, c-format
-msgid "Unknown commit %s"
-msgstr "�епознато подаване „%s“"
-
-#: builtin/ls-files.c:358
+#: builtin/ls-files.c:378
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [ОПЦИЯ…] [Ф�ЙЛ…]"
 
-#: builtin/ls-files.c:415
+#: builtin/ls-files.c:427
 msgid "identify the file status with tags"
 msgstr "извеждане на �ъ�то�нието на файловете � еднобуквени флагове"
 
-#: builtin/ls-files.c:417
+#: builtin/ls-files.c:429
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "малки букви за файловете, които да �е �четат за непроменени"
 
-#: builtin/ls-files.c:419
+#: builtin/ls-files.c:431
 msgid "show cached files in the output (default)"
 msgstr "извеждане на кешираните файлове (�тандартно)"
 
-#: builtin/ls-files.c:421
+#: builtin/ls-files.c:433
 msgid "show deleted files in the output"
 msgstr "извеждане на изтритите файлове"
 
-#: builtin/ls-files.c:423
+#: builtin/ls-files.c:435
 msgid "show modified files in the output"
 msgstr "извеждане на променените файлове"
 
-#: builtin/ls-files.c:425
+#: builtin/ls-files.c:437
 msgid "show other files in the output"
 msgstr "извеждане на другите файлове"
 
-#: builtin/ls-files.c:427
+#: builtin/ls-files.c:439
 msgid "show ignored files in the output"
 msgstr "извеждане на игнорираните файлове"
 
-#: builtin/ls-files.c:430
+#: builtin/ls-files.c:442
 msgid "show staged contents' object name in the output"
 msgstr "извеждане на името на обекта за �ъдържанието на индек�а"
 
-#: builtin/ls-files.c:432
+#: builtin/ls-files.c:444
 msgid "show files on the filesystem that need to be removed"
 msgstr "извеждане на файловете, които тр�бва да бъдат изтрити"
 
-#: builtin/ls-files.c:434
+#: builtin/ls-files.c:446
 msgid "show 'other' directories' names only"
 msgstr "извеждане �амо на името на другите (не�ледените) директории"
 
-#: builtin/ls-files.c:437
+#: builtin/ls-files.c:448
+msgid "show line endings of files"
+msgstr "извеждане на знаците за край на ред във файловете"
+
+#: builtin/ls-files.c:450
 msgid "don't show empty directories"
 msgstr "без извеждане на празните директории"
 
-#: builtin/ls-files.c:440
+#: builtin/ls-files.c:453
 msgid "show unmerged files in the output"
 msgstr "извеждане на не�летите файлове"
 
 # FIXME not clear about what this option does
-#: builtin/ls-files.c:442
+#: builtin/ls-files.c:455
 msgid "show resolve-undo information"
 msgstr "извеждане на информаци�та за отм�на на разрешените подавани�"
 
-#: builtin/ls-files.c:444
+#: builtin/ls-files.c:457
 msgid "skip files matching pattern"
 msgstr "пре�качане на файловете напа�ващи Ш�БЛО�а"
 
-#: builtin/ls-files.c:447
+#: builtin/ls-files.c:460
 msgid "exclude patterns are read from <file>"
 msgstr "шаблоните за игнориране да �е прочетат от този Ф�ЙЛ"
 
-#: builtin/ls-files.c:450
+#: builtin/ls-files.c:463
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr ""
 "изчитане на допълнителните шаблони за игнориране по директори� от този Ф�ЙЛ"
 
-#: builtin/ls-files.c:452
+#: builtin/ls-files.c:465
 msgid "add the standard git exclusions"
 msgstr "добав�не на �тандартно игнорираните от Git файлове"
 
-#: builtin/ls-files.c:455
+#: builtin/ls-files.c:468
 msgid "make the output relative to the project top directory"
 msgstr "пътищата да �а отно�ителни �пр�мо о�новната директори� на проекта"
 
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:471
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "грешка, ако н�кой от тези Ф�ЙЛове не е в индек�а"
 
-#: builtin/ls-files.c:459
+#: builtin/ls-files.c:472
 msgid "tree-ish"
 msgstr "УК�З�ТЕЛ_КЪМ_ДЪРВО"
 
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:473
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 "�читане, че пътищата изтрити �лед УК�З�ТЕЛ�_КЪМ_ДЪРВО в�е още �ъще�твуват"
 
-#: builtin/ls-files.c:462
+#: builtin/ls-files.c:475
 msgid "show debugging data"
 msgstr "извеждане на информаци�та за изчи�тване на грешки"
 
+#: builtin/ls-remote.c:7
+msgid ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+"                     [-q | --quiet] [--exit-code] [--get-url]\n"
+"                     [--symref] [<repository> [<refs>...]]"
+msgstr ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=КОМ��Д�]\n"
+"                     [-q | --quiet] [--exit-code] [--get-url]\n"
+"                     [--symref] [ХР��ИЛИЩЕ [УК�З�ТЕЛ…]]"
+
+#: builtin/ls-remote.c:50
+msgid "do not print remote URL"
+msgstr "без извеждане на адре�ите на отдалечените хранилища"
+
+#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
+msgid "exec"
+msgstr "КОМ��Д�"
+
+#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
+msgid "path of git-upload-pack on the remote host"
+msgstr "път към командата „git-upload-pack“ на отдалечената машина"
+
+#: builtin/ls-remote.c:56
+msgid "limit to tags"
+msgstr "�амо етикетите"
+
+#: builtin/ls-remote.c:57
+msgid "limit to heads"
+msgstr "�амо върховете"
+
+#: builtin/ls-remote.c:58
+msgid "do not show peeled tags"
+msgstr "без извеждане на про�ледените етикети"
+
+#: builtin/ls-remote.c:60
+msgid "take url.<base>.insteadOf into account"
+msgstr "взимане предвид на „url.Б�З�.insteadOf“"
+
+#: builtin/ls-remote.c:62
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr "изход � код 2, ако не �е откри�т �ъвпадащи указатели"
+
+#: builtin/ls-remote.c:64
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr "извеждане на указател� заедно � обекта �очен от него"
+
 #: builtin/ls-tree.c:28
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [ОПЦИЯ…] УК�З�ТЕЛ_КЪМ_ДЪРВО [ПЪТ…]"
@@ -7819,175 +8409,179 @@ msgid "git merge --abort"
 msgstr "git merge --abort"
 
 # FIXME -m rather than just m
-#: builtin/merge.c:100
+#: builtin/merge.c:101
 msgid "switch `m' requires a value"
 msgstr "опци�та „-m“ изи�ква �тойно�т"
 
-#: builtin/merge.c:137
+#: builtin/merge.c:138
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "��ма такава �тратеги� за �ливане: „%s“.\n"
 
-#: builtin/merge.c:138
+#: builtin/merge.c:139
 #, c-format
 msgid "Available strategies are:"
 msgstr "�аличните �тратегии �а:"
 
-#: builtin/merge.c:143
+#: builtin/merge.c:144
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Допълнителните �тратегии �а:"
 
-#: builtin/merge.c:193 builtin/pull.c:119
+#: builtin/merge.c:194 builtin/pull.c:126
 msgid "do not show a diffstat at the end of the merge"
 msgstr "без извеждане на �тати�тиката �лед завършване на �ливане"
 
-#: builtin/merge.c:196 builtin/pull.c:122
+#: builtin/merge.c:197 builtin/pull.c:129
 msgid "show a diffstat at the end of the merge"
 msgstr "извеждане на �тати�тиката �лед завършване на �ливане"
 
-#: builtin/merge.c:197 builtin/pull.c:125
+#: builtin/merge.c:198 builtin/pull.c:132
 msgid "(synonym to --stat)"
 msgstr "(�иноним на „--stat“)"
 
-#: builtin/merge.c:199 builtin/pull.c:128
+#: builtin/merge.c:200 builtin/pull.c:135
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "добав�не (на мак�имум такъв БРОЙ) запи�и от �ъкратени� журнал в �ъобщението "
 "за подаване"
 
-#: builtin/merge.c:202 builtin/pull.c:131
+#: builtin/merge.c:203 builtin/pull.c:138
 msgid "create a single commit instead of doing a merge"
 msgstr "�ъздаване на едно подаване вме�то извършване на �ливане"
 
-#: builtin/merge.c:204 builtin/pull.c:134
+#: builtin/merge.c:205 builtin/pull.c:141
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "извършване на подаване при у�пешно �ливане (�тандартно дей�твие)"
 
-#: builtin/merge.c:206 builtin/pull.c:137
+#: builtin/merge.c:207 builtin/pull.c:144
 msgid "edit message before committing"
 msgstr "редактиране на �ъобщението преди подаване"
 
-#: builtin/merge.c:207
+#: builtin/merge.c:208
 msgid "allow fast-forward (default)"
 msgstr "позвол�ване на тривиално �ливане (�тандартно дей�твие)"
 
-#: builtin/merge.c:209 builtin/pull.c:143
+#: builtin/merge.c:210 builtin/pull.c:150
 msgid "abort if fast-forward is not possible"
 msgstr "преу�танов�ване, ако �ливането не е тривиално"
 
-#: builtin/merge.c:213
+#: builtin/merge.c:214
 msgid "Verify that the named commit has a valid GPG signature"
 msgstr "Проверка, че именуваното подаване е � правилен подпи� на GPG"
 
-#: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
 #: builtin/revert.c:89
 msgid "strategy"
-msgstr "�тратеги�"
+msgstr "СТР�ТЕГИЯ"
 
-#: builtin/merge.c:215 builtin/pull.c:149
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "merge strategy to use"
-msgstr "�тратеги� за �ливане, ко�то да �е ползва"
+msgstr "СТР�ТЕГИЯ за �ливане, ко�то да �е ползва"
 
-#: builtin/merge.c:216 builtin/pull.c:152
+#: builtin/merge.c:217 builtin/pull.c:161
 msgid "option=value"
-msgstr "опци�=�тойно�т"
+msgstr "ОПЦИЯ=СТОЙ�ОСТ"
 
-#: builtin/merge.c:217 builtin/pull.c:153
+#: builtin/merge.c:218 builtin/pull.c:162
 msgid "option for selected merge strategy"
-msgstr "опци� за избраната �тратеги� за �ливане"
+msgstr "ОПЦИЯ за избраната �тратеги� за �ливане"
 
-#: builtin/merge.c:219
+#: builtin/merge.c:220
 msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "�ъобщение при подаването �ъ� �ливане (при нетривиални �ливани�)"
+msgstr "СЪОБЩЕ�ИЕ при подаването �ъ� �ливане (при нетривиални �ливани�)"
 
-#: builtin/merge.c:223
+#: builtin/merge.c:224
 msgid "abort the current in-progress merge"
 msgstr "преу�танов�ване на текущото �ливане"
 
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "позвол�ване на �ливане на незави�ими и�тории"
+
+#: builtin/merge.c:254
 msgid "could not run stash."
 msgstr "не може да �е извърши �катаване"
 
-#: builtin/merge.c:256
+#: builtin/merge.c:259
 msgid "stash failed"
 msgstr "неу�пешно �катаване"
 
-#: builtin/merge.c:261
+#: builtin/merge.c:264
 #, c-format
 msgid "not a valid object: %s"
 msgstr "неправилен обект: „%s“"
 
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
 msgid "read-tree failed"
 msgstr "неу�пешно прочитане на обект-дърво"
 
-#: builtin/merge.c:327
+#: builtin/merge.c:330
 msgid " (nothing to squash)"
 msgstr " (н�ма какво да �е �мачка)"
 
-#: builtin/merge.c:340
+#: builtin/merge.c:343
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Подаване �ъ� �мачкване — указател�т „HEAD“ н�ма да бъде обновен\n"
 
-#: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
-#: builtin/merge.c:988
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
 #, c-format
 msgid "Could not write to '%s'"
 msgstr "„%s“ не може да бъде запи�ан"
 
-#: builtin/merge.c:372
+#: builtin/merge.c:375
 msgid "Writing SQUASH_MSG"
 msgstr "Запи�ване на �ъобщението за �мачкване SQUASH_MSG"
 
-#: builtin/merge.c:374
+#: builtin/merge.c:377
 msgid "Finishing SQUASH_MSG"
 msgstr "Завършване на �ъобщението за �мачкване SQUASH_MSG"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:400
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr ""
 "Лип�ва �ъобщение при подаване — указател�т „HEAD“ н�ма да бъде обновен\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:451
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "„%s“ не �очи към подаване"
 
-#: builtin/merge.c:537
+#: builtin/merge.c:541
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "�еправилен низ за на�тройката „branch.%s.mergeoptions“: „%s“"
 
-#: builtin/merge.c:656
+#: builtin/merge.c:660
 msgid "Not handling anything other than two heads merge."
 msgstr "Поддържа �е �амо �ливане на точно две и�тории."
 
-#: builtin/merge.c:670
+#: builtin/merge.c:674
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "�епозната опци� за рекур�ивното �ливане „merge-recursive“: „-X%s“"
 
-#: builtin/merge.c:683
+#: builtin/merge.c:687
 #, c-format
 msgid "unable to write %s"
 msgstr "„%s“ не може да бъде запи�ан"
 
-#: builtin/merge.c:772
+#: builtin/merge.c:776
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "От „%s“ не може да �е чете"
 
-#: builtin/merge.c:781
+#: builtin/merge.c:785
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Сливането н�ма да бъде подадено. За завършването му и подаването му "
 "използвайте командата „git commit“.\n"
 
-#: builtin/merge.c:787
+#: builtin/merge.c:791
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -8002,55 +8596,55 @@ msgstr ""
 "Редовете, които започват � „%c“ ще бъдат пропу�нати, а празно �ъобщение\n"
 "преу�танов�ва подаването.\n"
 
-#: builtin/merge.c:811
+#: builtin/merge.c:815
 msgid "Empty commit message."
 msgstr "Празно �ъобщение при подаване."
 
 # FIXME - WTF is wonderful.
-#: builtin/merge.c:823
+#: builtin/merge.c:835
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Първи�т етап на тривиалното �ливане завърши.\n"
 
-#: builtin/merge.c:878
+#: builtin/merge.c:890
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "�еу�пешно �ливане — коригирайте конфликтите и подайте резултата.\n"
 
-#: builtin/merge.c:894
+#: builtin/merge.c:906
 #, c-format
 msgid "'%s' is not a commit"
 msgstr "„%s“ не е подаване"
 
-#: builtin/merge.c:935
+#: builtin/merge.c:947
 msgid "No current branch."
 msgstr "��ма текущ клон."
 
-#: builtin/merge.c:937
+#: builtin/merge.c:949
 msgid "No remote for the current branch."
 msgstr "Текущи�т клон не �леди никой."
 
-#: builtin/merge.c:939
+#: builtin/merge.c:951
 msgid "No default upstream defined for the current branch."
 msgstr "Текущи�т клон не �леди никой клон."
 
-#: builtin/merge.c:944
+#: builtin/merge.c:956
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "�икой клон не �леди клона „%s“ от хранилището „%s“"
 
-#: builtin/merge.c:1079
+#: builtin/merge.c:1091
 #, c-format
 msgid "could not close '%s'"
 msgstr "„%s“ не може да �е затвори"
 
-#: builtin/merge.c:1206
+#: builtin/merge.c:1219
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 "�е може да преу�тановите �ливане, защото в момента не �е извършва такова "
 "(лип�ва указател „MERGE_HEAD“)."
 
-#: builtin/merge.c:1222
+#: builtin/merge.c:1235
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -8058,7 +8652,7 @@ msgstr ""
 "�е �те завършили �ливане. (Указател�т „MERGE_HEAD“ �ъще�твува).\n"
 "Подайте промените �и, преди да започнете ново �ливане."
 
-#: builtin/merge.c:1229
+#: builtin/merge.c:1242
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -8066,111 +8660,115 @@ msgstr ""
 "�е �те завършили отбиране на подаване (указател�т „CHERRY_PICK_HEAD“\n"
 "�ъще�твува). Подайте промените �и, преди да започнете ново �ливане."
 
-#: builtin/merge.c:1232
+#: builtin/merge.c:1245
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 "�е �те завършили отбиране на подаване (указател�т „CHERRY_PICK_HEAD“\n"
 "�ъще�твува)."
 
-#: builtin/merge.c:1241
+#: builtin/merge.c:1254
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Опци�та „--squash“ е не�ъвме�тима � „--no-ff“."
 
-#: builtin/merge.c:1249
+#: builtin/merge.c:1262
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "�е е указано подаване и на�тройката „merge.defaultToUpstream“ не е зададена."
 
-#: builtin/merge.c:1266
+#: builtin/merge.c:1279
 msgid "Squash commit into empty head not supported yet"
 msgstr "Подаване �ъ� �мачкване във връх без и�тори� в�е още не �е поддържа"
 
-#: builtin/merge.c:1268
+#: builtin/merge.c:1281
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 "Понеже върхът е без и�тори�, в�ички �ливани� �а тривиални, не може да �е "
 "извърши нетривиално �ливане изи�квано от опци�та „--no-ff“"
 
-#: builtin/merge.c:1274
+#: builtin/merge.c:1286
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "„%s“ — не е нещо, което може да �е �лее"
 
-#: builtin/merge.c:1276
+#: builtin/merge.c:1288
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Можете да �леете точно едно подаване във връх без и�тори�"
 
-#: builtin/merge.c:1331
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "Подаването „%s“ е � недоверен подпи� от GPG, който твърди, че е на „%s“."
 
-#: builtin/merge.c:1334
+#: builtin/merge.c:1347
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 "Подаването „%s“ е � неправилен подпи� от GPG, който твърди, че е на „%s“."
 
-#: builtin/merge.c:1337
+#: builtin/merge.c:1350
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Подаването „%s“ е без подпи� от GPG."
 
-#: builtin/merge.c:1340
+#: builtin/merge.c:1353
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Подаването „%s“ е � коректен подпи� от GPG на „%s“.\n"
 
-#: builtin/merge.c:1423
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr "незави�ими и�тории не може да �е �ле�т"
+
+#: builtin/merge.c:1439
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Обнов�ване „%s..%s“\n"
 
-#: builtin/merge.c:1460
+#: builtin/merge.c:1476
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Проба � най-тривиалното �ливане в рамките на индек�а…\n"
 
 # FIXME WTF message
-#: builtin/merge.c:1467
+#: builtin/merge.c:1483
 #, c-format
 msgid "Nope.\n"
 msgstr "�еу�пешно �ливане.\n"
 
-#: builtin/merge.c:1499
+#: builtin/merge.c:1515
 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 "�е може да �е извърши тривиално �ливане, преу�танов�ване на дей�твието."
 
-#: builtin/merge.c:1522 builtin/merge.c:1601
+#: builtin/merge.c:1538 builtin/merge.c:1617
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Привеждане на дървото към първоначалното…\n"
 
-#: builtin/merge.c:1526
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Пробване �ъ� �тратеги�та за �ливане „%s“…\n"
 
-#: builtin/merge.c:1592
+#: builtin/merge.c:1608
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "�ико� �тратеги� за �ливане не може да извърши �ливането.\n"
 
-#: builtin/merge.c:1594
+#: builtin/merge.c:1610
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "�еу�пешно �ливане �ъ� �тратеги� „%s“.\n"
 
-#: builtin/merge.c:1603
+#: builtin/merge.c:1619
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr ""
 "Ползва �е �тратеги�та „%s“, ко�то ще подготви дървото за коригиране на "
 "ръка.\n"
 
-#: builtin/merge.c:1615
+#: builtin/merge.c:1631
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -8258,19 +8856,19 @@ msgstr "без предупреждени� при конфликти"
 msgid "set labels for file1/orig-file/file2"
 msgstr "задаване на етикети за Ф�ЙЛ_1/ОРИГИ��Л/Ф�ЙЛ_2"
 
-#: builtin/mktree.c:64
+#: builtin/mktree.c:65
 msgid "git mktree [-z] [--missing] [--batch]"
 msgstr "git mktree [-z] [--missing] [--batch]"
 
-#: builtin/mktree.c:150
+#: builtin/mktree.c:152
 msgid "input is NUL terminated"
 msgstr "входните запи�и �а разделени � нулеви� знак „NUL“"
 
-#: builtin/mktree.c:151 builtin/write-tree.c:24
+#: builtin/mktree.c:153 builtin/write-tree.c:24
 msgid "allow missing objects"
 msgstr "разрешаване на лип�ващи обекти"
 
-#: builtin/mktree.c:152
+#: builtin/mktree.c:154
 msgid "allow creation of more than one tree"
 msgstr "разрешаване на �ъздаването на повече от едно дърво"
 
@@ -8278,138 +8876,136 @@ msgstr "разрешаване на Ñ�ъздаването на повече оÑ
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [ОПЦИЯ…] ОБЕКТ… ЦЕЛ"
 
-# FIXME message<
-#: builtin/mv.c:69
+#: builtin/mv.c:70
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "Директори�та „%s“ е в индек�а, но не е подмодул"
 
-#: builtin/mv.c:71
+#: builtin/mv.c:72 builtin/rm.c:317
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "За да продължите, или вкарайте промените по файла „.gitmodules“ в индек�а,\n"
 "или ги �катайте"
 
-# FIXME message
-#: builtin/mv.c:89
+#: builtin/mv.c:90
 #, c-format
 msgid "%.*s is in index"
 msgstr "„%.*s“ вече е в индек�а"
 
-#: builtin/mv.c:111
+#: builtin/mv.c:112
 msgid "force move/rename even if target exists"
 msgstr "принудително преме�тване/преименуване дори целта да �ъще�твува"
 
-#: builtin/mv.c:112
+#: builtin/mv.c:113
 msgid "skip move/rename errors"
 msgstr "пре�качане на грешките при преме�тване/преименуване"
 
-#: builtin/mv.c:151
+#: builtin/mv.c:152
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "целта „%s“ �ъще�твува и не е директори�"
 
-#: builtin/mv.c:162
+#: builtin/mv.c:163
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n"
 
-#: builtin/mv.c:166
+#: builtin/mv.c:167
 msgid "bad source"
 msgstr "неправилен обект"
 
-#: builtin/mv.c:169
+#: builtin/mv.c:170
 msgid "can not move directory into itself"
 msgstr "директори� не може да �е преме�ти в �ебе �и"
 
-#: builtin/mv.c:172
+#: builtin/mv.c:173
 msgid "cannot move directory over file"
 msgstr "директори� не може да �е преме�ти върху файл"
 
-#: builtin/mv.c:181
+#: builtin/mv.c:182
 msgid "source directory is empty"
 msgstr "първоначалната директори� е празна"
 
-#: builtin/mv.c:206
+#: builtin/mv.c:207
 msgid "not under version control"
 msgstr "не е под контрола на Git"
 
-#: builtin/mv.c:209
+#: builtin/mv.c:210
 msgid "destination exists"
 msgstr "целта �ъще�твува"
 
-#: builtin/mv.c:217
+#: builtin/mv.c:218
 #, c-format
 msgid "overwriting '%s'"
 msgstr "презапи�ване на „%s“"
 
-#: builtin/mv.c:220
+#: builtin/mv.c:221
 msgid "Cannot overwrite"
 msgstr "Презапи�ването е невъзможно"
 
-#: builtin/mv.c:223
+#: builtin/mv.c:224
 msgid "multiple sources for the same target"
 msgstr "множе�тво източници за една цел"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:226
 msgid "destination directory does not exist"
 msgstr "целевата директори� не �ъще�твува"
 
-#: builtin/mv.c:232
+#: builtin/mv.c:233
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, обект: „%s“, цел: „%s“"
 
-#: builtin/mv.c:253
+#: builtin/mv.c:254
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Преименуване на „%s“ на „%s“\n"
 
-#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "неу�пешно преименуване на „%s“"
 
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [ОПЦИЯ…] ПОД�В��Е…"
 
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [ОПЦИЯ…] --all"
 
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [ОПЦИЯ…] --stdin"
 
 # FIXME sha
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
 msgid "print only names (no SHA-1)"
 msgstr "извеждане �амо на имената (без �умите по SHA1)"
 
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
 msgid "only use tags to name the commits"
 msgstr "използване �амо на етикетите за именуване на подавани�та"
 
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
 msgid "only use refs matching <pattern>"
-msgstr "използване �амо на шаблоните напа�ващи на Ш�БЛО�а"
+msgstr "използване �амо на указателите напа�ващи на Ш�БЛО�а"
 
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
 msgid "list all commits reachable from all refs"
 msgstr ""
 "извеждане на в�ички подавани�, които могат да бъдат до�тигнати от в�ички "
 "указатели"
 
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
 msgid "read from stdin"
 msgstr "четене от �тандартни� вход"
 
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
 msgid "allow to print `undefined` names (default)"
 msgstr "да �е извеждат и недефинираните имена (�тандартна �тойно�т на опци�та)"
 
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
 msgid "dereference tags in the input (internal use)"
 msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)"
 
@@ -8557,24 +9153,16 @@ msgstr "обектът-бележка не може да бъде запи�ан
 msgid "The note contents have been left in %s"
 msgstr "Съдържанието на бележката е във файла „%s“"
 
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
 #, c-format
 msgid "cannot read '%s'"
 msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "файлът „%s“ не може да бъде отворен или прочетен"
 
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
-#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
-#: builtin/notes.c:877 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "�е може да �е открие към какво �очи „%s“."
-
 #: builtin/notes.c:256
 #, c-format
 msgid "Failed to read object '%s'."
@@ -8586,42 +9174,42 @@ msgid "Cannot read note data from non-blob object '%s'."
 msgstr ""
 "Съдържанието на бележка не може да �е вземе от обект, който не е BLOB: „%s“."
 
-#: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490
-#: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646
-#: builtin/notes.c:942
+#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
+#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
+#: builtin/notes.c:946
 msgid "too many parameters"
 msgstr "прекалено много параметри"
 
-#: builtin/notes.c:372 builtin/notes.c:659
+#: builtin/notes.c:375 builtin/notes.c:662
 #, c-format
 msgid "No note found for object %s."
 msgstr "��ма бележки за обекта „%s“."
 
-#: builtin/notes.c:393 builtin/notes.c:556
+#: builtin/notes.c:396 builtin/notes.c:559
 msgid "note contents as a string"
 msgstr "низ, който е �ъдържанието на бележката"
 
-#: builtin/notes.c:396 builtin/notes.c:559
+#: builtin/notes.c:399 builtin/notes.c:562
 msgid "note contents in a file"
-msgstr "файл �ъ� �ъдържанието на бележката"
+msgstr "Ф�ЙЛ �ъ� �ъдържанието на бележката"
 
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:402 builtin/notes.c:565
 msgid "reuse and edit specified note object"
-msgstr "преизползване и редактиране на указани� обект-бележка"
+msgstr "преизползване и редактиране на указани� ОБЕКТ-бележка"
 
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:405 builtin/notes.c:568
 msgid "reuse specified note object"
-msgstr "преизползване на указани� обект-бележка"
+msgstr "преизползване на указани� ОБЕКТ-бележка"
 
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:408 builtin/notes.c:571
 msgid "allow storing empty note"
 msgstr "приемане и на празни бележки"
 
-#: builtin/notes.c:406 builtin/notes.c:477
+#: builtin/notes.c:409 builtin/notes.c:480
 msgid "replace existing notes"
 msgstr "зам�на на �ъще�твуващите бележки"
 
-#: builtin/notes.c:431
+#: builtin/notes.c:434
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -8630,32 +9218,32 @@ msgstr ""
 "�е може да �е добави бележка, защото такава вече �ъще�твува за обекта „%s“. "
 "Използвайте опци�та „-f“, за да презапишете �ъще�твуващи бележки."
 
-#: builtin/notes.c:446 builtin/notes.c:525
+#: builtin/notes.c:449 builtin/notes.c:528
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Презапи�ване на �ъще�твуващите бележки за обекта „%s“\n"
 
-#: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Изтриване на бележката за обекта „%s“\n"
 
-#: builtin/notes.c:478
+#: builtin/notes.c:481
 msgid "read objects from stdin"
 msgstr "изчитане на обектите от �тандартни� вход"
 
 # FIXME imporve message
-#: builtin/notes.c:480
+#: builtin/notes.c:483
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 "зареждане на на�тройките за КОМ��Д�та, ко�то презапи�ва подавани� (включва "
 "опци�та „--stdin“)"
 
-#: builtin/notes.c:498
+#: builtin/notes.c:501
 msgid "too few parameters"
 msgstr "прекалено малко параметри"
 
-#: builtin/notes.c:519
+#: builtin/notes.c:522
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -8664,14 +9252,14 @@ msgstr ""
 "�е може да �е копира бележка, защото такава вече �ъще�твува за обекта „%s“. "
 "Използвайте опци�та „-f“, за да презапишете �ъще�твуващи бележки."
 
-#: builtin/notes.c:531
+#: builtin/notes.c:534
 #, c-format
 msgid "Missing notes on source object %s. Cannot copy."
 msgstr ""
 "�е може да �е копира бележка, ко�то не �ъще�твува — н�ма бележки за обекта-"
 "източник „%s“."
 
-#: builtin/notes.c:583
+#: builtin/notes.c:586
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -8682,67 +9270,67 @@ msgstr ""
 "Вме�то това ги използвайте � подкомандата „add“: „git notes add -f -m/-F/-c/-"
 "C“.\n"
 
-#: builtin/notes.c:764
+#: builtin/notes.c:768
 msgid "General options"
 msgstr "Общи опции"
 
-#: builtin/notes.c:766
+#: builtin/notes.c:770
 msgid "Merge options"
 msgstr "Опции при �ливане"
 
-#: builtin/notes.c:768
+#: builtin/notes.c:772
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgstr ""
-"коригиране на конфликтите при �ливане на бележките чрез тази �тратеги� — "
+"коригиране на конфликтите при �ливане на бележките чрез тази СТР�ТЕГИЯ — "
 "„manual“ (ръчно), „ours“ (вашата вер�и�), „theirs“ (чуждата вер�и�), "
 "„union“ (обедин�ване), „cat_sort_uniq“ (обедин�ване, подреждане, уникални "
 "резултати)"
 
-#: builtin/notes.c:770
+#: builtin/notes.c:774
 msgid "Committing unmerged notes"
 msgstr "Подаване на не�лети бележки"
 
-#: builtin/notes.c:772
+#: builtin/notes.c:776
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "завършване на �ливането чрез подаване на не�лети бележки"
 
-#: builtin/notes.c:774
+#: builtin/notes.c:778
 msgid "Aborting notes merge resolution"
 msgstr "Преу�танов�ване на корекци�та при �ливането на бележки"
 
-#: builtin/notes.c:776
+#: builtin/notes.c:780
 msgid "abort notes merge"
 msgstr "преу�танов�ване на �ливането на бележки"
 
-#: builtin/notes.c:853
+#: builtin/notes.c:857
 #, c-format
 msgid "A notes merge into %s is already in-progress at %s"
 msgstr "В момента �е извършва �ливане на бележките в „%s“ при „%s“"
 
-#: builtin/notes.c:880
+#: builtin/notes.c:884
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "��ма бележки за обекта „%s“\n"
 
-#: builtin/notes.c:892
+#: builtin/notes.c:896
 msgid "attempt to remove non-existent note is not an error"
 msgstr "опитът за изтриването на не�ъще�твуваща бележка не �е �чита за грешка"
 
-#: builtin/notes.c:895
+#: builtin/notes.c:899
 msgid "read object names from the standard input"
 msgstr "изчитане на имената на обектите от �тандартни� вход"
 
-#: builtin/notes.c:976
+#: builtin/notes.c:980
 msgid "notes-ref"
 msgstr "УК�З�ТЕЛ_З�_БЕЛЕЖК�"
 
-#: builtin/notes.c:977
+#: builtin/notes.c:981
 msgid "use notes from <notes-ref>"
 msgstr "да �е използва бележката �очена от този УК�З�ТЕЛ_З�_БЕЛЕЖК�"
 
-#: builtin/notes.c:1012 builtin/remote.c:1647
+#: builtin/notes.c:1016 builtin/remote.c:1628
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "�епозната подкоманда: %s"
@@ -8766,181 +9354,187 @@ msgstr ""
 msgid "deflate error (%d)"
 msgstr "грешка при декомпре�иране � „deflate“ (%d)"
 
-#: builtin/pack-objects.c:771
+#: builtin/pack-objects.c:763
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+"изключване на запи�ването на битовата ма�ка, пакетите �а разделени поради "
+"�тойно�тта на „pack.packSizeLimit“"
+
+#: builtin/pack-objects.c:776
 msgid "Writing objects"
 msgstr "Запи�ване на обектите"
 
-#: builtin/pack-objects.c:1011
+#: builtin/pack-objects.c:1017
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "изключване на запи�ването на битовата ма�ка, защото н�кои обекти н�ма да �е "
 "пакетират"
 
-#: builtin/pack-objects.c:2171
+#: builtin/pack-objects.c:2177
 msgid "Compressing objects"
 msgstr "Компре�иране на обектите"
 
-#: builtin/pack-objects.c:2568
+#: builtin/pack-objects.c:2563
 #, c-format
 msgid "unsupported index version %s"
 msgstr "неподдържана вер�и� на индек�а „%s“"
 
-#: builtin/pack-objects.c:2572
+#: builtin/pack-objects.c:2567
 #, c-format
 msgid "bad index version '%s'"
 msgstr "неправилна вер�и� на индек�а „%s“"
 
-#: builtin/pack-objects.c:2602
+#: builtin/pack-objects.c:2597
 msgid "do not show progress meter"
 msgstr "без извеждане на напредъка"
 
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2599
 msgid "show progress meter"
 msgstr "извеждане на напредъка"
 
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2601
 msgid "show progress meter during object writing phase"
 msgstr "извеждане на напредъка във фазата на запазване на обектите"
 
-#: builtin/pack-objects.c:2609
+#: builtin/pack-objects.c:2604
 msgid "similar to --all-progress when progress meter is shown"
 msgstr ""
 "�ъщото дей�твие като опци�та „--all-progress“ при извеждането на напредъка"
 
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2605
 msgid "version[,offset]"
 msgstr "ВЕРСИЯ[,ОТМЕСТВ��Е]"
 
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2606
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "запазване на индек�а на пакетните файлове във форма̀та � указаната вер�и�"
 
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2609
 msgid "maximum size of each output pack file"
 msgstr "мак�имален размер на в�еки пакетен файл"
 
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2611
 msgid "ignore borrowed objects from alternate object store"
 msgstr "игнориране на обектите заети от други хранилища на обекти"
 
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2613
 msgid "ignore packed objects"
 msgstr "игнориране на пакетираните обекти"
 
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2615
 msgid "limit pack window by objects"
 msgstr "ограничаване на прозореца за пакетиране по брой обекти"
 
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2617
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "ограничаване на прозореца за пакетиране и по памет о�вен по брой обекти"
 
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2619
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "мак�имална дължина на веригата от разлики, ко�то е позволена в пакетни� файл"
 
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2621
 msgid "reuse existing deltas"
 msgstr "преизползване на �ъще�твуващите разлики"
 
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2623
 msgid "reuse existing objects"
 msgstr "преизползване на �ъще�твуващите обекти"
 
-#: builtin/pack-objects.c:2630
+#: builtin/pack-objects.c:2625
 msgid "use OFS_DELTA objects"
 msgstr "използване на обекти „OFS_DELTA“"
 
-#: builtin/pack-objects.c:2632
+#: builtin/pack-objects.c:2627
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "�тартиране на нишки за претър�ване на най-добрите �ъвпадени� на разликите"
 
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2629
 msgid "do not create an empty pack output"
 msgstr "без �ъздаване на празен пакетен файл"
 
-#: builtin/pack-objects.c:2636
+#: builtin/pack-objects.c:2631
 msgid "read revision arguments from standard input"
 msgstr "изчитане на вер�иите от �тандартни� вход"
 
-#: builtin/pack-objects.c:2638
+#: builtin/pack-objects.c:2633
 msgid "limit the objects to those that are not yet packed"
 msgstr "ограничаване до в�е още непакетираните обекти"
 
-#: builtin/pack-objects.c:2641
+#: builtin/pack-objects.c:2636
 msgid "include objects reachable from any reference"
 msgstr ""
 "включване на в�ички обекти, които могат да �е до�тигнат от произволен "
 "указател"
 
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2639
 msgid "include objects referred by reflog entries"
 msgstr "включване и на обектите �очени от запи�ите в журнала на указателите"
 
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2642
 msgid "include objects referred to by the index"
 msgstr "включване и на обектите �очени от индек�а"
 
-#: builtin/pack-objects.c:2650
+#: builtin/pack-objects.c:2645
 msgid "output pack to stdout"
 msgstr "извеждане на пакета на �тандартни� изход"
 
-#: builtin/pack-objects.c:2652
+#: builtin/pack-objects.c:2647
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 "включване и на обектите-етикети, които �очат към обектите, които ще бъдат "
 "пакетирани"
 
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2649
 msgid "keep unreachable objects"
 msgstr "запазване на недо�тижимите обекти"
 
-#: builtin/pack-objects.c:2655 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
 msgid "time"
 msgstr "ВРЕМЕ"
 
-#: builtin/pack-objects.c:2656
+#: builtin/pack-objects.c:2651
 msgid "unpack unreachable objects newer than <time>"
 msgstr "разпакетиране на недо�тижимите обекти, които �а по-нови от това ВРЕМЕ"
 
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2654
 msgid "create thin packs"
 msgstr "�ъздаване на �ъкратени пакети"
 
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2656
 msgid "create packs suitable for shallow fetches"
 msgstr "пакетиране подход�що за плитко до�тав�не"
 
-#: builtin/pack-objects.c:2663
+#: builtin/pack-objects.c:2658
 msgid "ignore packs that have companion .keep file"
 msgstr "игнориране на пакетите, които �а придружени от файл „.keep“"
 
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2660
 msgid "pack compression level"
 msgstr "ниво на компре�иране при пакетиране"
 
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2662
 msgid "do not hide commits by grafts"
 msgstr ""
 "извеждане на в�ички родители — дори и тези, които нормално �а �крити при "
 "при�аждани�та"
 
-#: builtin/pack-objects.c:2669
+#: builtin/pack-objects.c:2664
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "използване на �ъще�твуващи индек�и на база битови ма�ки за у�кор�ване на "
 "пребро�ването на обектите"
 
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2666
 msgid "write a bitmap index together with the pack index"
 msgstr ""
 "запазване и на индек� на база побитова ма�ка, заедно � индек�а за пакета"
 
-#: builtin/pack-objects.c:2762
+#: builtin/pack-objects.c:2757
 msgid "Counting objects"
 msgstr "Пребро�ване на обектите"
 
@@ -8968,15 +9562,15 @@ msgstr "Изтриване на повтар�щите �е обекти"
 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--expire ВРЕМЕ] [--] [ВРЪХ…]"
 
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
 msgid "do not remove, show only"
 msgstr "�амо извеждане без дей�твително ока�тр�не"
 
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
 msgid "report pruned objects"
 msgstr "информаци� за ока�трените обекти"
 
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
 msgid "expire objects older than <time>"
 msgstr "ока�тр�не на обектите по-�тари от това ВРЕМЕ"
 
@@ -8984,52 +9578,60 @@ msgstr "окаÑ�Ñ‚Ñ€Ñ�не на обектите по-Ñ�тари от това Ð
 msgid "cannot prune in a precious-objects repo"
 msgstr "хранилище � важни обекти не може да �е ока�тр�"
 
-#: builtin/pull.c:69
+#: builtin/pull.c:72
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [ОПЦИЯ…] [ХР��ИЛИЩЕ [УК�З�ТЕЛ_��_ВЕРСИЯ…]]"
 
-#: builtin/pull.c:113
+#: builtin/pull.c:120
 msgid "Options related to merging"
 msgstr "Опции при �ливане"
 
-#: builtin/pull.c:116
+#: builtin/pull.c:123
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "вна��не на промените чрез пребазиране, а не чрез �ливане"
 
-#: builtin/pull.c:140 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
 msgid "allow fast-forward"
 msgstr "позвол�ване на тривиални �ливани�"
 
-#: builtin/pull.c:146
+#: builtin/pull.c:153
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "Проверка, че указаното подаване е � правилен подпи� на GPG"
 
-#: builtin/pull.c:160
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "автоматично �катаване/прилагане на �катаното преди и �лед пребазиране"
+
+#: builtin/pull.c:172
 msgid "Options related to fetching"
 msgstr "Опции при до�тав�не"
 
-#: builtin/pull.c:268
+#: builtin/pull.c:194
+msgid "number of submodules pulled in parallel"
+msgstr "брой подмодули издърпани паралелно"
+
+#: builtin/pull.c:283
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "�еправилна �тойно�т за „pull.ff“: „%s“"
 
-#: builtin/pull.c:352
+#: builtin/pull.c:379
 msgid "Cannot pull with rebase: You have unstaged changes."
 msgstr ""
 "�е можете да издърпвате при това пребазиране, защото има промени, които не "
 "�а в индек�а"
 
-#: builtin/pull.c:358
+#: builtin/pull.c:385
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "О�вен това в индек�а има неподадени промени."
 
-#: builtin/pull.c:360
+#: builtin/pull.c:387
 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
 msgstr ""
 "�е можете да издърпвате при това пребазиране, защото в индек�а има "
 "неподадени промени."
 
-#: builtin/pull.c:436
+#: builtin/pull.c:463
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -9037,14 +9639,14 @@ msgstr ""
 "Между указателите, които току що до�тавихте, н�ма подход�щ кандидат, върху "
 "който да пребазирате."
 
-#: builtin/pull.c:438
+#: builtin/pull.c:465
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Между указателите, които току що до�тавихте, н�ма подход�щ кандидат, който "
 "да �леете."
 
-#: builtin/pull.c:439
+#: builtin/pull.c:466
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -9052,7 +9654,7 @@ msgstr ""
 "�ай веро�тно �те подали шаблон за указатели, който не е напа�нал � нищо в "
 "отдалеченото хранилище."
 
-#: builtin/pull.c:442
+#: builtin/pull.c:469
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -9063,40 +9665,44 @@ msgstr ""
 "Понеже това не е хранилището по подразбиране на текущи� клон, тр�бва\n"
 "да укажете отдалечени� клон на командни� ред."
 
-#: builtin/pull.c:447
+#: builtin/pull.c:474 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Извън в�ички клони."
 
-#: builtin/pull.c:449 builtin/pull.c:464
+#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Укажете върху кой клон и�кате да пребазирате."
 
-#: builtin/pull.c:451 builtin/pull.c:466
+#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Укажете кой клон и�кате да �леете."
 
-#: builtin/pull.c:452 builtin/pull.c:467
+#: builtin/pull.c:479 builtin/pull.c:494
 msgid "See git-pull(1) for details."
 msgstr "За повече информаци� погледнете ръковод�твото „git-pull(1)“"
 
-#: builtin/pull.c:462
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "ОТД�ЛЕЧЕ�О_ХР��ИЛИЩЕ"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "КЛО�"
+
+#: builtin/pull.c:489 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "Текущи�т клон не �леди никой."
 
-#: builtin/pull.c:471
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
 msgid ""
-"If you wish to set tracking information for this branch you can do so with:\n"
-"\n"
-"    git branch --set-upstream-to=%s/<branch> %s\n"
+"If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
-"�ко в�е пак и�кате да зададете информаци� за �леден клон,\n"
-"можете да направите това � командата:\n"
-"\n"
-" git branch --set-upstream-to=%s/СЛЕДЕ�_КЛО� %s\n"
-"\n"
+"�ко и�кате да зададете информаци� за �леден клон, можете да направите това � "
+"командата:"
 
-#: builtin/pull.c:476
+#: builtin/pull.c:503
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -9105,11 +9711,15 @@ msgstr ""
 "За �ливане е указан отдалечени�т указател „%s“,\n"
 "но такъв не е до�тавен."
 
-#: builtin/pull.c:830
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "опци�та „--[no-]autostash“ изи�ква „--rebase“"
+
+#: builtin/pull.c:872
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Обнов�ване на в�е още не�ъздаден клон � промените от индек�а"
 
-#: builtin/pull.c:859
+#: builtin/pull.c:900
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -9119,7 +9729,7 @@ msgstr ""
 "до�тав�нето обнови върха на текущи� клон. Работното\n"
 "ви копие бе тривиално �л�то от подаване „%s“."
 
-#: builtin/pull.c:864
+#: builtin/pull.c:905
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -9136,11 +9746,11 @@ msgstr ""
 "  $ git reset --hard\n"
 "за връщане към нормално �ъ�то�ние."
 
-#: builtin/pull.c:879
+#: builtin/pull.c:920
 msgid "Cannot merge multiple branches into empty head."
 msgstr "�е може да �ливате множе�тво клони в празен върхов указател."
 
-#: builtin/pull.c:883
+#: builtin/pull.c:924
 msgid "Cannot rebase onto multiple branches."
 msgstr "�е може да пребазирате върху повече от един клон."
 
@@ -9148,15 +9758,15 @@ msgstr "Ð�е може да пребазирате върху повече от Ð
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [ОПЦИЯ…] [ХР��ИЛИЩЕ [УК�З�ТЕЛ_��_ВЕРСИЯ…]]"
 
-#: builtin/push.c:88
+#: builtin/push.c:89
 msgid "tag shorthand without <tag>"
 msgstr "�ъкращение за етикет без ЕТИКЕТ"
 
-#: builtin/push.c:98
+#: builtin/push.c:99
 msgid "--delete only accepts plain target ref names"
 msgstr "опци�та „--delete“ приема за цел �амо про�ти имена на указатели"
 
-#: builtin/push.c:142
+#: builtin/push.c:143
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -9165,7 +9775,7 @@ msgstr ""
 "За да включите тази опци� за по�то�нно, погледнете документаци�та за "
 "на�тройката „push.default“ в „git help config“."
 
-#: builtin/push.c:145
+#: builtin/push.c:146
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -9190,7 +9800,7 @@ msgstr ""
 "    git push %s %s\n"
 "%s"
 
-#: builtin/push.c:160
+#: builtin/push.c:161
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -9204,7 +9814,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:ИМЕ_��_ОТД�ЛЕЧЕ�ИЯ_КЛО�\n"
 
-#: builtin/push.c:174
+#: builtin/push.c:175
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -9218,14 +9828,14 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:182
+#: builtin/push.c:183
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 "Текущи�т клон „%s“ �леди н�колко отдалечени клона, не можете про�то да "
 "изтла�кате."
 
-#: builtin/push.c:185
+#: builtin/push.c:186
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -9237,67 +9847,14 @@ msgstr ""
 "Тр�бва да укажете ко� вер�и� да �е изтла�ка, за обнов�ване на отдалечени� "
 "клон."
 
-#: builtin/push.c:208
-msgid ""
-"push.default is unset; its implicit value has changed in\n"
-"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
-"and maintain the traditional behavior, use:\n"
-"\n"
-"  git config --global push.default matching\n"
-"\n"
-"To squelch this message and adopt the new behavior now, use:\n"
-"\n"
-"  git config --global push.default simple\n"
-"\n"
-"When push.default is set to 'matching', git will push local branches\n"
-"to the remote branches that already exist with the same name.\n"
-"\n"
-"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
-"behavior, which only pushes the current branch to the corresponding\n"
-"remote branch that 'git pull' uses to update the current branch.\n"
-"\n"
-"See 'git help config' and search for 'push.default' for further "
-"information.\n"
-"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
-"'current' instead of 'simple' if you sometimes use older versions of Git)"
-msgstr ""
-"�а�тройката „push.default“ не е зададена. Стойно�тта � по подразбиране е "
-"�менена\n"
-"в Git 2.0 от „matching“ (в�ички �ъвпадащи клони) на „simple“ (�амо текущи�\n"
-"клон). За да подти�нете това �ъобщение и да използвате традиционното "
-"поведение\n"
-"на Git 1.x, изпълнете командата:\n"
-"\n"
-"  git config --global push.default matching\n"
-"\n"
-"За да подти�нете това �ъобщение и да използвате новото поведение на Git 2."
-"x,\n"
-"изпълнете командата:\n"
-"\n"
-"  git config --global push.default simple\n"
-"\n"
-"Когато на�тройката „push.default“ е „matching“, git ще изтла�ка в�ички "
-"локални\n"
-"клони, които имат отдалечен аналог �ъ� �ъщото име.\n"
-"\n"
-"От вер�и� 2.0 Git �тандартно започва да ползва по-кон�ервативни� вариант\n"
-"„simple“, при който „push“ изтла�ква �амо текущи� клон към отдалечени�, "
-"�леден\n"
-"клон — �ъщи�, който „git pull“ използва, за да обнови текущи�.\n"
-"\n"
-"За повече информаци� погледнете „git help config“ и потър�ете „push."
-"default“.\n"
-"�овата �тойно�т „simple“ бе въведена � вер�и� 1.7.11 на Git. �ко пон�кога\n"
-"ползвате �тари вер�ии на Git, задайте �тойно�т „current“ вме�то „simple“."
-
-#: builtin/push.c:275
+#: builtin/push.c:242
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "�е �те указали вер�и� за подаване, а на�тройката „push.default“ е "
 "„nothing“ (нищо без изрично указана вер�и� да не �е изтла�ква)"
 
-#: builtin/push.c:282
+#: builtin/push.c:249
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -9311,7 +9868,7 @@ msgstr ""
 "преди отново да изтла�кате промените. За повече информаци� вижте раздела\n"
 "„Note about fast-forwards“ в �траницата от ръковод�твото „git push --help“."
 
-#: builtin/push.c:288
+#: builtin/push.c:255
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -9324,7 +9881,7 @@ msgstr ""
 "информаци� погледнете раздела „Note about fast-forwards“ в �траницата от\n"
 "ръковод�твото „git push --help“."
 
-#: builtin/push.c:294
+#: builtin/push.c:261
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -9343,14 +9900,14 @@ msgstr ""
 "�траницата\n"
 "от ръковод�твото „git push --help“."
 
-#: builtin/push.c:301
+#: builtin/push.c:268
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Изтла�кването е отхвърлено, защото в отдалеченото хранилище �ъще�твува "
 "етикет,\n"
 "който ще припокриете � етикет от вашето хранилище."
 
-#: builtin/push.c:304
+#: builtin/push.c:271
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -9360,22 +9917,22 @@ msgstr ""
 "указател, който вече �очи към обект, който не е подаване, както и тепърва\n"
 "да го промените да �очи към подобен обект.\n"
 
-#: builtin/push.c:363
+#: builtin/push.c:331
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Изтла�кване към „%s“\n"
 
-#: builtin/push.c:367
+#: builtin/push.c:335
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "ча�т от указателите не б�ха изтла�кани към „%s“"
 
-#: builtin/push.c:397
+#: builtin/push.c:365
 #, c-format
 msgid "bad repository '%s'"
 msgstr "неправилно указано хранилище „%s“"
 
-#: builtin/push.c:398
+#: builtin/push.c:366
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -9397,108 +9954,104 @@ msgstr ""
 "\n"
 "    git push ИМЕ\n"
 
-#: builtin/push.c:413
+#: builtin/push.c:381
 msgid "--all and --tags are incompatible"
 msgstr "опциите „--all“ и „--tags“ �а не�ъвме�тими"
 
-#: builtin/push.c:414
+#: builtin/push.c:382
 msgid "--all can't be combined with refspecs"
 msgstr "опци�та „--all“ е не�ъвме�тима � указването на вер�и�"
 
-#: builtin/push.c:419
+#: builtin/push.c:387
 msgid "--mirror and --tags are incompatible"
 msgstr "опциите „--mirror“ и „--tags“ �а не�ъвме�тими"
 
-#: builtin/push.c:420
+#: builtin/push.c:388
 msgid "--mirror can't be combined with refspecs"
 msgstr "опци�та „--mirror“ е не�ъвме�тима � указването на вер�и�"
 
-#: builtin/push.c:425
+#: builtin/push.c:393
 msgid "--all and --mirror are incompatible"
 msgstr "опциите „--all“ и „--mirror“ �а не�ъвме�тими"
 
-#: builtin/push.c:537
+#: builtin/push.c:505
 msgid "repository"
 msgstr "хранилище"
 
-#: builtin/push.c:538 builtin/send-pack.c:161
+#: builtin/push.c:506 builtin/send-pack.c:161
 msgid "push all refs"
 msgstr "изтла�кване на в�ички указатели"
 
-#: builtin/push.c:539 builtin/send-pack.c:163
+#: builtin/push.c:507 builtin/send-pack.c:163
 msgid "mirror all refs"
 msgstr "огледално копие на в�ички указатели"
 
-#: builtin/push.c:541
+#: builtin/push.c:509
 msgid "delete refs"
 msgstr "изтриване на указателите"
 
-#: builtin/push.c:542
+#: builtin/push.c:510
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "изтла�кване на етикетите (не�ъвме�тимо � опциите „--all“ и „--mirror“)"
 
-#: builtin/push.c:545 builtin/send-pack.c:164
+#: builtin/push.c:513 builtin/send-pack.c:164
 msgid "force updates"
 msgstr "принудително обнов�ване"
 
 # FIXME double check this
-#: builtin/push.c:547 builtin/send-pack.c:175
+#: builtin/push.c:515 builtin/send-pack.c:175
 msgid "refname>:<expect"
 msgstr "УК�З�ТЕЛ>:<ОЧ�КВ���_СТОЙ�ОСТ"
 
-#: builtin/push.c:548 builtin/send-pack.c:176
+#: builtin/push.c:516 builtin/send-pack.c:176
 msgid "require old value of ref to be at this value"
 msgstr "УК�З�ТЕЛ�т тр�бва първоначално да е � тази ОЧ�КВ���_СТОЙ�ОСТ"
 
-#: builtin/push.c:550
-msgid "check|on-demand|no"
-msgstr "„check“ (проверка), „on-demand“ (при нужда) или „no“ (без)"
-
-#: builtin/push.c:551
+#: builtin/push.c:519
 msgid "control recursive pushing of submodules"
 msgstr "управление на рекур�ивното изтла�кване на подмодулите"
 
-#: builtin/push.c:553 builtin/send-pack.c:169
+#: builtin/push.c:521 builtin/send-pack.c:169
 msgid "use thin pack"
 msgstr "използване на �ъкратени пакети"
 
-#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158
+#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
 #: builtin/send-pack.c:159
 msgid "receive pack program"
 msgstr "програма за получаването на пакети"
 
-#: builtin/push.c:556
+#: builtin/push.c:524
 msgid "set upstream for git pull/status"
 msgstr "задаване на отдалеченото хранилище за командите „git pull/status“"
 
-#: builtin/push.c:559
+#: builtin/push.c:527
 msgid "prune locally removed refs"
 msgstr "ока�тр�не на указателите, които �а премахнати от локалното хранилище"
 
-#: builtin/push.c:561
+#: builtin/push.c:529
 msgid "bypass pre-push hook"
 msgstr "без изпълнение на куката преди изтла�кване (pre-push)"
 
-#: builtin/push.c:562
+#: builtin/push.c:530
 msgid "push missing but relevant tags"
 msgstr ""
 "изтла�кване на лип�ващите в отдалеченото хранилище, но �вързани � текущото "
 "изтла�кване, етикети"
 
-#: builtin/push.c:565 builtin/send-pack.c:166
+#: builtin/push.c:533 builtin/send-pack.c:166
 msgid "GPG sign the push"
 msgstr "подпи�ване на изтла�кването � GPG"
 
-#: builtin/push.c:567 builtin/send-pack.c:170
+#: builtin/push.c:535 builtin/send-pack.c:170
 msgid "request atomic transaction on remote side"
 msgstr "изи�кване на атомарни операции от от�рещната �трана"
 
-#: builtin/push.c:577
+#: builtin/push.c:549
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr ""
 "опци�та „--delete“ е не�ъвме�тима � опциите  „--all“, „--mirror“ и „--tags“"
 
-#: builtin/push.c:579
+#: builtin/push.c:551
 msgid "--delete doesn't make sense without any refs"
 msgstr "опци�та „--delete“ изи�ква поне един указател на вер�и�"
 
@@ -9577,13 +10130,24 @@ msgstr "без прилагане на филтъра за ча�тично из
 msgid "debug unpack-trees"
 msgstr "изчи�тване на грешки в командата „unpack-trees“"
 
-# FIXME
-#: builtin/reflog.c:428
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack ДИРЕКТОРИЯ_��_GIT"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "без извеждане на информаци�"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "Тр�бва да укажете директори�."
+
+#: builtin/reflog.c:423
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "„%s“ не е правилна �тойно�т за време за „%s“"
 
-#: builtin/reflog.c:545 builtin/reflog.c:550
+#: builtin/reflog.c:540 builtin/reflog.c:545
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "„%s“ не е правилна �тойно�т за време"
@@ -9730,56 +10294,46 @@ msgstr ""
 "указването на �ледени клони е �ми�лено �амо за отдалечени хранилища, от "
 "които �е до�тав�"
 
-#: builtin/remote.c:193 builtin/remote.c:643
+#: builtin/remote.c:190 builtin/remote.c:633
 #, c-format
 msgid "remote %s already exists."
 msgstr "вече �ъще�твува отдалечено хранилище � име „%s“."
 
-#: builtin/remote.c:197 builtin/remote.c:647
+#: builtin/remote.c:194 builtin/remote.c:637
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "„%s“ е неправилно име за отдалечено хранилище"
 
-#: builtin/remote.c:241
+#: builtin/remote.c:234
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "О�новни�т клон „%s“ не може да бъде на�троен"
 
-#: builtin/remote.c:341
+#: builtin/remote.c:336
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Обектите за до�тав�не за указател� „%s“ не могат да бъдат получени"
 
-#: builtin/remote.c:442 builtin/remote.c:450
+#: builtin/remote.c:437 builtin/remote.c:445
 msgid "(matching)"
 msgstr "(�ъвпадащи)"
 
-#: builtin/remote.c:454
+#: builtin/remote.c:449
 msgid "(delete)"
 msgstr "(за изтриване)"
 
-#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
-#, c-format
-msgid "Could not append '%s' to '%s'"
-msgstr "„%s“ не може да �е добави към „%s“"
-
-#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
+#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
 #, c-format
 msgid "No such remote: %s"
 msgstr "Такова отдалечено хранилище н�ма: %s"
 
-#: builtin/remote.c:653
+#: builtin/remote.c:643
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Разделът „%s“ в на�тройките не може да бъде преименуван на „%s“"
 
-#: builtin/remote.c:659 builtin/remote.c:827
-#, c-format
-msgid "Could not remove config section '%s'"
-msgstr "Разделът „%s“ в на�тройките не може да бъде изтрит"
-
 # FIXME tabulator
-#: builtin/remote.c:674
+#: builtin/remote.c:663
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -9790,27 +10344,17 @@ msgstr ""
 "    %s\n"
 "  Променете на�тройките ръчно, ако е необходимо."
 
-#: builtin/remote.c:680
-#, c-format
-msgid "Could not append '%s'"
-msgstr "Разделът „%s“ не може да бъде добавен в на�тройките"
-
-#: builtin/remote.c:691
-#, c-format
-msgid "Could not set '%s'"
-msgstr "Разделът „%s“ не може да бъде зададен в на�тройките"
-
-#: builtin/remote.c:713
+#: builtin/remote.c:699
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "неу�пешно изтриване на „%s“"
 
-#: builtin/remote.c:747
+#: builtin/remote.c:733
 #, c-format
 msgid "creating '%s' failed"
 msgstr "неу�пешно �ъздаване на „%s“"
 
-#: builtin/remote.c:813
+#: builtin/remote.c:796
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -9824,125 +10368,132 @@ msgstr[1] ""
 "Бележка: ��колко клона извън йерархи�та „refs/remotes/“ не б�ха изтрити.\n"
 "Изтрийте ги чрез командата:"
 
-#: builtin/remote.c:928
+#: builtin/remote.c:810
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr "Разделът „%s“ в на�тройките не може да бъде изтрит"
+
+#: builtin/remote.c:911
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " нов (�ледващото до�тав�не ще го разположи в „remotes/%s“)"
 
-#: builtin/remote.c:931
+#: builtin/remote.c:914
 msgid " tracked"
 msgstr " �леден"
 
-#: builtin/remote.c:933
+#: builtin/remote.c:916
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " �тар (изтрийте чрез „git remote prune“)"
 
 # FIXME
-#: builtin/remote.c:935
+#: builtin/remote.c:918
 msgid " ???"
 msgstr " не��но �ъ�то�ние"
 
 # CHECK
-#: builtin/remote.c:976
+#: builtin/remote.c:959
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
 "неправилен клон за �ливане „%s“. �евъзможно е да пребазирате върху повече от "
 "1 клон"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:967
 #, c-format
-msgid "rebases onto remote %s"
-msgstr "пребазиране върху отдалечени� клон „%s“"
+msgid "rebases interactively onto remote %s"
+msgstr "интерактивно пребазиране върху отдалечени� клон „%s“"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:971
 #, c-format
 msgid " merges with remote %s"
 msgstr " �ливане � отдалечени� клон „%s“"
 
-#: builtin/remote.c:987
+#: builtin/remote.c:972
 msgid "    and with remote"
 msgstr "    и � отдалечени� клон"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:974
 #, c-format
 msgid "merges with remote %s"
 msgstr "�ливане � отдалечени� клон „%s“"
 
-#: builtin/remote.c:990
+#: builtin/remote.c:975
 msgid "   and with remote"
 msgstr "   и � отдалечени� клон"
 
-#: builtin/remote.c:1036
+#: builtin/remote.c:1021
 msgid "create"
 msgstr "�ъздаден"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1024
 msgid "delete"
 msgstr "изтрит"
 
-#: builtin/remote.c:1043
+#: builtin/remote.c:1028
 msgid "up to date"
 msgstr "актуален"
 
-#: builtin/remote.c:1046
+#: builtin/remote.c:1031
 msgid "fast-forwardable"
 msgstr "може да �е �лее тривиално"
 
-#: builtin/remote.c:1049
+#: builtin/remote.c:1034
 msgid "local out of date"
 msgstr "локални�т е изо�танал"
 
-#: builtin/remote.c:1056
+#: builtin/remote.c:1041
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s принудително изтла�ква към %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1044
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s изтла�ква към %-*s (%s)"
 
-#: builtin/remote.c:1063
+#: builtin/remote.c:1048
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s принудително изтла�ква към %s"
 
-#: builtin/remote.c:1066
+#: builtin/remote.c:1051
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s изтла�ква към %s"
 
-#: builtin/remote.c:1134
+#: builtin/remote.c:1119
 msgid "do not query remotes"
 msgstr "без за�вки към отдалечените хранилища"
 
-#: builtin/remote.c:1161
+#: builtin/remote.c:1146
 #, c-format
 msgid "* remote %s"
 msgstr "� отдалечено хранилище „%s“"
 
-#: builtin/remote.c:1162
+#: builtin/remote.c:1147
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  �дре� за до�тав�не: %s"
 
-#: builtin/remote.c:1163 builtin/remote.c:1314
+#: builtin/remote.c:1148 builtin/remote.c:1301
 msgid "(no URL)"
 msgstr "(без адре�)"
 
 # FIXME spaces betwen Push and URL
-#: builtin/remote.c:1172 builtin/remote.c:1174
+#. TRANSLATORS: the colon ':' should align with
+#. the one in "  Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  �дре� за изтла�кване: %s"
 
-#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  клон �очен от HEAD: %s"
 
-#: builtin/remote.c:1182
+#: builtin/remote.c:1169
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -9951,159 +10502,159 @@ msgstr ""
 "хранилище е\n"
 "  нееднозначен и е н�кой от �ледните):\n"
 
-#: builtin/remote.c:1194
+#: builtin/remote.c:1181
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Отдалечен клон:%s"
 msgstr[1] "  Отдалечени клони:%s"
 
-#: builtin/remote.c:1197 builtin/remote.c:1224
+#: builtin/remote.c:1184 builtin/remote.c:1211
 msgid " (status not queried)"
 msgstr " (�ъ�то�нието не бе проверено)"
 
-#: builtin/remote.c:1206
+#: builtin/remote.c:1193
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Локален клон на�троен за издърпване чрез „git pull“:"
 msgstr[1] "  Локални клони на�троени за издърпване чрез „git pull“:"
 
-#: builtin/remote.c:1214
+#: builtin/remote.c:1201
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Локалните указатели ще бъдат прене�ени чрез „ push“"
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1208
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Локални�т указател, на�троен за „git push“%s:"
 msgstr[1] "  Локалните указатели, на�троени за „git push“%s:"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1229
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "задаване на refs/remotes/ИМЕ/HEAD �поред отдалеченото хранилище"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1231
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "изтриване на refs/remotes/ИМЕ/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1246
 msgid "Cannot determine remote HEAD"
 msgstr "�е може да �е у�танови отдалечени�т връх"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1248
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "Множе�тво клони � върхове. Изберете изрично н�кой от т�х чрез командата:"
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1258
 #, c-format
 msgid "Could not delete %s"
 msgstr "„%s“ не може да бъде изтрит"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1266
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "�еправилен указател: %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1268
 #, c-format
 msgid "Could not setup %s"
 msgstr "„%s“ не може да �е на�трои"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1286
 #, c-format
 msgid " %s will become dangling!"
 msgstr "„%s“ ще �е превърне в обект извън клоните!"
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s has become dangling!"
 msgstr "„%s“ �е превърна в обект извън клоните!"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1297
 #, c-format
 msgid "Pruning %s"
 msgstr "Ока�тр�не на „%s“"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1298
 #, c-format
 msgid "URL: %s"
 msgstr "адре�: %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1314
 #, c-format
 msgid " * [would prune] %s"
 msgstr " � [ще бъде ока�трено] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1317
 #, c-format
 msgid " * [pruned] %s"
 msgstr " � [ока�трено] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1362
 msgid "prune remotes after fetching"
 msgstr "ока�тр�не на огледалата на отдалечените хранилища �лед до�тав�не"
 
-#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
 #, c-format
 msgid "No such remote '%s'"
 msgstr "��ма отдалечено хранилище на име „%s“"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1441
 msgid "add branch"
 msgstr "добав�не на клон"
 
-#: builtin/remote.c:1468
+#: builtin/remote.c:1448
 msgid "no remote specified"
 msgstr "не е указано отдалечено хранилище"
 
-#: builtin/remote.c:1485
+#: builtin/remote.c:1465
 msgid "query push URLs rather than fetch URLs"
 msgstr "запитване към адре�ите за изтла�кване, а не за до�тав�не"
 
-#: builtin/remote.c:1487
+#: builtin/remote.c:1467
 msgid "return all URLs"
 msgstr "извеждане на в�ички адре�и"
 
-#: builtin/remote.c:1515
+#: builtin/remote.c:1495
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "не е зададен адре� за отдалеченото хранилище „%s“"
 
-#: builtin/remote.c:1541
+#: builtin/remote.c:1521
 msgid "manipulate push URLs"
 msgstr "пром�на на адре�ите за изтла�кване"
 
-#: builtin/remote.c:1543
+#: builtin/remote.c:1523
 msgid "add URL"
 msgstr "добав�не на адре�и"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1525
 msgid "delete URLs"
 msgstr "изтриване на адре�и"
 
 # FIXME message - incompatible
-#: builtin/remote.c:1552
+#: builtin/remote.c:1532
 msgid "--add --delete doesn't make sense"
 msgstr "опциите „--add“ и „--delete“ �а не�ъвме�тими"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1573
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "�еправилен (�тар) формат за адре�: %s"
 
-#: builtin/remote.c:1600
+#: builtin/remote.c:1581
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Такъв адре� не е открит: %s"
 
 # FIXME CHECK MEANING
-#: builtin/remote.c:1602
+#: builtin/remote.c:1583
 msgid "Will not delete all non-push URLs"
 msgstr "�икой от адре�ите, които не �а за изтла�кване, н�ма да �е изтрие"
 
-#: builtin/remote.c:1616
+#: builtin/remote.c:1597
 msgid "be verbose; must be placed before a subcommand"
 msgstr "повече подробно�ти. По�тав� �е пред подкоманда"
 
@@ -10419,7 +10970,7 @@ msgstr "ИндекÑ�ÑŠÑ‚ не може да бъде занулен към веÑ
 msgid "Could not write new index file."
 msgstr "�ови�т индек� не може да бъде запи�ан."
 
-#: builtin/rev-list.c:354
+#: builtin/rev-list.c:350
 msgid "rev-list does not support display of notes"
 msgstr "командата „rev-list“ не поддържа извеждането на бележки"
 
@@ -10634,12 +11185,6 @@ msgstr ""
 "изходни�т код да е 0, дори ако никой файл нe e напа�нал � шаблона за "
 "изтриване"
 
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-"За да продължите, или вкарайте промените по файла „.gitmodules“ в индек�а,\n"
-"или ги �катайте"
-
 #: builtin/rm.c:335
 #, c-format
 msgid "not removing '%s' recursively without -r"
@@ -10681,29 +11226,24 @@ msgstr "извеждане на �ъ�то�нието от отдалечена
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr "git shortlog [ОПЦИЯ…] [ДИ�П�ЗО�_��_ВЕРСИИТЕ] [[--] [ПЪТ…]]"
 
-#: builtin/shortlog.c:131
-#, c-format
-msgid "Missing author: %s"
-msgstr "�вторът лип�ва: %s"
-
-#: builtin/shortlog.c:230
+#: builtin/shortlog.c:242
 msgid "sort output according to the number of commits per author"
 msgstr "подредба на подавани�та по бро� подавани� от автор"
 
-#: builtin/shortlog.c:232
+#: builtin/shortlog.c:244
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr "Без опи�ани� на подавани�та — да �е показва �амо бро� подавани�"
 
-#: builtin/shortlog.c:234
+#: builtin/shortlog.c:246
 msgid "Show the email address of each author"
 msgstr "Извеждане на адре�а на е-поща за в�еки автор"
 
 # FIXME why is this so short
-#: builtin/shortlog.c:235
+#: builtin/shortlog.c:247
 msgid "w[,i1[,i2]]"
 msgstr "ШИРОЧИ��[,ОТСТЪП_1[,ОТСТЪП_2]]"
 
-#: builtin/shortlog.c:236
+#: builtin/shortlog.c:248
 msgid "Linewrap output"
 msgstr ""
 "Прена��не на редовете до тази обща ШИРОЧИ�� (76), � ОТСТЪП_1 (6) за първи� "
@@ -10853,84 +11393,186 @@ msgid "skip and remove all lines starting with comment character"
 msgstr "пропу�кане на в�ички редове, които започват � „#“"
 
 #: builtin/stripspace.c:38
-msgid "prepend comment character and blank to each line"
-msgstr "добав�не на „# “ на в�еки ред"
+msgid "prepend comment character and space to each line"
+msgstr "добав�не на „# “ в началото на в�еки ред"
+
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "Такъв указател н�ма: %s"
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Очаква �е пълно име на указател, а не „%s“"
 
-#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "не може да �е махне компонент от адре�а „%s“"
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
 msgid "alternative anchor for relative paths"
 msgstr "директори� за определ�нето на отно�ителните пътища"
 
-#: builtin/submodule--helper.c:84
+#: builtin/submodule--helper.c:283
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]"
 
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "Във файла „.gitmodules“ не е открит адре� за път� към подмодул „%s“"
+
+#: builtin/submodule--helper.c:366
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "�еу�пешно реги�триране на адре� за път� към подмодул „%s“"
+
+#: builtin/submodule--helper.c:370
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "Реги�триран е подмодул „%s“ (%s) за път� към подмодул „%s“\n"
+
+#: builtin/submodule--helper.c:380
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "ПРЕДУПРЕЖДЕ�ИЕ: препоръчва �е режим на обнов�ване за подмодула „%s“\n"
+
+#: builtin/submodule--helper.c:387
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr ""
+"�еу�пешно реги�триране на режима на обнов�ване за път� към подмодул „%s“"
+
+#: builtin/submodule--helper.c:406
+msgid "Suppress output for initializing a submodule"
+msgstr "Без извеждане на информаци� при инициализирането на подмодул"
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper name [ПЪТ]"
+
+#: builtin/submodule--helper.c:432
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name ПЪТ"
 
-#: builtin/submodule--helper.c:120
+#: builtin/submodule--helper.c:438
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "Във файла „.gitmodules“ лип�ва информаци� за път� „%s“"
 
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:489
 msgid "where the new submodule will be cloned to"
 msgstr "къде да �е клонира нови�т подмодул"
 
-#: builtin/submodule--helper.c:173
+#: builtin/submodule--helper.c:492
 msgid "name of the new submodule"
 msgstr "име на нови� подмодул"
 
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:495
 msgid "url where to clone the submodule from"
 msgstr "адре�, от който да �е клонира нови�т подмодул"
 
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:501
 msgid "depth for shallow clones"
 msgstr "дълбочина на плитките хранилища"
 
-#: builtin/submodule--helper.c:188
+#: builtin/submodule--helper.c:507
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХР��ИЛИЩЕ] "
-"[--name ИМЕ] [--url �ДРЕС][--depth ДЪЛБОЧИ��] [--] ПЪТ…]"
+"[--name ИМЕ] [--depth ДЪЛБОЧИ��] --url �ДРЕС --path ПЪТ…"
 
-#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
-#: builtin/submodule--helper.c:216
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "Директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/submodule--helper.c:204
+#: builtin/submodule--helper.c:534
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "�еу�пешно клониране на адре�а „%s“ в път� „%s“ като подмодул"
 
-#: builtin/submodule--helper.c:227
+#: builtin/submodule--helper.c:550
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "файлът „%s“ не може да бъде отворен"
 
-#: builtin/submodule--helper.c:232
+#: builtin/submodule--helper.c:555
 #, c-format
 msgid "could not close file %s"
 msgstr "файлът „%s“ не може да �е затвори"
 
-#: builtin/submodule--helper.c:247
+#: builtin/submodule--helper.c:562
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "директори�та на подмодула „%s“ не може да бъде получена"
 
-#: builtin/submodule--helper.c:273
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
-msgstr "Ф�Т�Л�� ГРЕШК�: „submodule--helper“ тр�бва да �е �тартира � подкоманда"
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Път�т на подмодула „%s“ не е инициализиран"
+
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Веро�тно и�кахте да използвате „update --init“?"
+
+#: builtin/submodule--helper.c:639
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "Пре�качане на не�лети� подмодул „%s“"
 
-#: builtin/submodule--helper.c:280
+#: builtin/submodule--helper.c:660
 #, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr "Ф�Т�Л�� ГРЕШК�: „%s“ не е подкоманда на „submodule--helper“"
+msgid "Skipping submodule '%s'"
+msgstr "Пре�качане на подмодула „%s“"
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "път към работното дърво"
+
+#: builtin/submodule--helper.c:771
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "път към работното дърво, през границите на вложените подмодули"
+
+#: builtin/submodule--helper.c:775
+msgid "rebase, merge, checkout or none"
+msgstr ""
+"„rebase“ (пребазиране), „merge“ (�ливане), „checkout“ (изтегл�не) или "
+"„none“ (нищо да не �е прави)"
+
+#: builtin/submodule--helper.c:779
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "Плитко клониране, ограничено до указани� брой вер�ии"
+
+#: builtin/submodule--helper.c:782
+msgid "parallel jobs"
+msgstr "брой паралелни проце�и"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "без извеждане на напредъка на клонирането"
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=ПЪТ] [ПЪТ…]"
+
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr "неправилен параметър към опци�та „--update“"
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "„submodule--helper“ тр�бва да �е �тартира � подкоманда"
+
+#: builtin/submodule--helper.c:862
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "„%s“ не е подкоманда на „submodule--helper“"
 
 #: builtin/symbolic-ref.c:7
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10985,27 +11627,22 @@ msgstr ""
 msgid "git tag -v <tagname>..."
 msgstr "git tag -v ЕТИКЕТ…"
 
-#: builtin/tag.c:80
+#: builtin/tag.c:81
 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr "името на етикета е твърде дълго: „%.*s“…"
 
-#: builtin/tag.c:85
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr "етикетът „%s“ не е открит."
 
-#: builtin/tag.c:100
+#: builtin/tag.c:101
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Изтрит е етикетът „%s“ (бе „%s“)\n"
 
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "етикетът „%s“ не може да бъде проверен"
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
 #, c-format
 msgid ""
 "\n"
@@ -11018,7 +11655,7 @@ msgstr ""
 "  %s\n"
 "Редовете, които започват � „%c“, ще бъдат пропу�нати.\n"
 
-#: builtin/tag.c:126
+#: builtin/tag.c:121
 #, c-format
 msgid ""
 "\n"
@@ -11085,7 +11722,7 @@ msgstr "анотирането на етикети изи�ква �ъобщен
 
 #: builtin/tag.c:350
 msgid "tag message"
-msgstr "�ъобщение за етикет"
+msgstr "СЪОБЩЕ�ИЕ за етикет"
 
 #: builtin/tag.c:352
 msgid "annotated and GPG-signed tag"
@@ -11125,7 +11762,7 @@ msgstr "извеждане �амо на не�летите етикети"
 
 #: builtin/tag.c:370
 msgid "print only tags of the object"
-msgstr "извеждане �амо на етикетите на обекта"
+msgstr "извеждане �амо на етикетите на ОБЕКТ�"
 
 #: builtin/tag.c:399
 msgid "--column and -n are incompatible"
@@ -11145,28 +11782,28 @@ msgstr "Опци�та „-points-at“ изи�ква опци�та „-l“."
 
 #: builtin/tag.c:425
 msgid "--merged and --no-merged option are only allowed with -l"
-msgstr "Опцииите „--merged“ и „--no-merged“ изи�кват опци�та „-l“."
+msgstr "Опциите „--merged“ и „--no-merged“ изи�кват опци�та „-l“."
 
 # FIXME message pattern
 #: builtin/tag.c:433
 msgid "only one -F or -m option is allowed."
 msgstr "Опциите „-F“ и „-m“ �а не�ъвме�тими."
 
-#: builtin/tag.c:453
+#: builtin/tag.c:452
 msgid "too many params"
 msgstr "Прекалено много аргументи"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:458
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "„%s“ е неправилно име за етикет."
 
-#: builtin/tag.c:464
+#: builtin/tag.c:463
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "етикетът „%s“ вече �ъще�твува"
 
-#: builtin/tag.c:489
+#: builtin/tag.c:491
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Обновен етикет „%s“ (бе „%s“)\n"
@@ -11175,210 +11812,223 @@ msgstr "Обновен етикет „%s“ (бе „%s“)\n"
 msgid "Unpacking objects"
 msgstr "Разпакетиране на обектите"
 
-#: builtin/update-index.c:70
+#: builtin/update-index.c:79
 #, c-format
 msgid "failed to create directory %s"
 msgstr "директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/update-index.c:76
+#: builtin/update-index.c:85
 #, c-format
 msgid "failed to stat %s"
 msgstr "не може да бъде получена информаци� чрез „stat“ за „%s“"
 
-#: builtin/update-index.c:86
+#: builtin/update-index.c:95
 #, c-format
 msgid "failed to create file %s"
 msgstr "файлът „%s“ не може да бъде �ъздаден"
 
-#: builtin/update-index.c:94
+#: builtin/update-index.c:103
 #, c-format
 msgid "failed to delete file %s"
 msgstr "файлът „%s“ не може да бъде изтрит"
 
-#: builtin/update-index.c:101 builtin/update-index.c:203
+#: builtin/update-index.c:110 builtin/update-index.c:212
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "директори�та „%s“ не може да бъде изтрита"
 
-#: builtin/update-index.c:124
+#: builtin/update-index.c:133
 #, c-format
-msgid "Testing "
-msgstr "Проба"
+msgid "Testing mtime in '%s' "
+msgstr "Проверка на времето на пром�на (mtime) на файла „%s“"
 
-#: builtin/update-index.c:136
+#: builtin/update-index.c:145
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та не �е промен� �лед "
 "добав�нето на нов файл"
 
-#: builtin/update-index.c:149
+#: builtin/update-index.c:158
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та не �е промен� �лед "
 "добав�нето на нова директори�"
 
-#: builtin/update-index.c:162
+#: builtin/update-index.c:171
 msgid "directory stat info changes after updating a file"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та �е промен� �лед "
 "обнов�ването на нов файл"
 
-#: builtin/update-index.c:173
+#: builtin/update-index.c:182
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та �е промен� �лед добав�нето "
 "на файл в поддиректори�"
 
-#: builtin/update-index.c:184
+#: builtin/update-index.c:193
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та не �е промен� �лед "
 "изтриването на файл"
 
-#: builtin/update-index.c:197
+#: builtin/update-index.c:206
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та не �е промен� �лед "
 "изтриването на директори�"
 
-#: builtin/update-index.c:204
+#: builtin/update-index.c:213
 msgid " OK"
 msgstr " Добре"
 
-#: builtin/update-index.c:564
+#: builtin/update-index.c:575
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [ОПЦИЯ…] [--] [Ф�ЙЛ…]"
 
-#: builtin/update-index.c:918
+#: builtin/update-index.c:930
 msgid "continue refresh even when index needs update"
 msgstr ""
 "продължаване � обнов�ването, дори когато индек�ът тр�бва да бъде обновен"
 
-#: builtin/update-index.c:921
+#: builtin/update-index.c:933
 msgid "refresh: ignore submodules"
 msgstr "подмодулите да �е игнорират при обнов�ването"
 
-#: builtin/update-index.c:924
+#: builtin/update-index.c:936
 msgid "do not ignore new files"
 msgstr "новите файлове да не �е игнорират"
 
-#: builtin/update-index.c:926
+#: builtin/update-index.c:938
 msgid "let files replace directories and vice-versa"
 msgstr "файлове да могат да замен�т директории и обратно"
 
-#: builtin/update-index.c:928
+#: builtin/update-index.c:940
 msgid "notice files missing from worktree"
 msgstr "предупреждаване при лип�ващи в работното дърво файлове"
 
-#: builtin/update-index.c:930
+#: builtin/update-index.c:942
 msgid "refresh even if index contains unmerged entries"
 msgstr "обнов�ване дори и индек�ът да �ъдържа не�лети обекти"
 
-#: builtin/update-index.c:933
+#: builtin/update-index.c:945
 msgid "refresh stat information"
 msgstr "обнов�ване на информаци�та от функци�та „stat“"
 
-#: builtin/update-index.c:937
+#: builtin/update-index.c:949
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 "като опци�та „--refresh“, но да �е провер�т и обектите, които �а били приети "
 "за непроменени"
 
-#: builtin/update-index.c:941
+#: builtin/update-index.c:953
 msgid "<mode>,<object>,<path>"
 msgstr "РЕЖИМ,ОБЕКТ,ПЪТ"
 
-#: builtin/update-index.c:942
+#: builtin/update-index.c:954
 msgid "add the specified entry to the index"
 msgstr "добав�не на изброените обекти към индек�а"
 
-#: builtin/update-index.c:946
+#: builtin/update-index.c:958
 msgid "(+/-)x"
 msgstr "(+/-)x"
 
-#: builtin/update-index.c:947
+#: builtin/update-index.c:959
 msgid "override the executable bit of the listed files"
 msgstr "изрично задаване на �тойно�тта на флага дали файлът е изпълним"
 
-#: builtin/update-index.c:951
+#: builtin/update-index.c:963
 msgid "mark files as \"not changing\""
 msgstr "задаване на флаг, че файлът не �е промен�"
 
-#: builtin/update-index.c:954
+#: builtin/update-index.c:966
 msgid "clear assumed-unchanged bit"
 msgstr "изчи�тване на флага, че файлът не �е промен�"
 
-#: builtin/update-index.c:957
+#: builtin/update-index.c:969
 msgid "mark files as \"index-only\""
 msgstr "задаване на флаг, че файловете �а �амо за индек�а"
 
-#: builtin/update-index.c:960
+#: builtin/update-index.c:972
 msgid "clear skip-worktree bit"
 msgstr "изчи�тване на флага,  че файловете �а �амо за индек�а"
 
-#: builtin/update-index.c:963
+#: builtin/update-index.c:975
 msgid "add to index only; do not add content to object database"
 msgstr "добав�не �амо към индек�а без добав�не към базата от данни за обектите"
 
-#: builtin/update-index.c:965
+#: builtin/update-index.c:977
 msgid "remove named paths even if present in worktree"
 msgstr "изтриване на указаните пътища, дори и да �ъще�твуват в работното дърво"
 
-#: builtin/update-index.c:967
+#: builtin/update-index.c:979
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr ""
 "при комбиниране � опци�та „--stdin“ — входните редове �а разделени � нулеви� "
 "байт"
 
-#: builtin/update-index.c:969
+#: builtin/update-index.c:981
 msgid "read list of paths to be updated from standard input"
 msgstr "изчитане на �пи�ъка � пътища за обнов�ване от �тандартни� вход"
 
-#: builtin/update-index.c:973
+#: builtin/update-index.c:985
 msgid "add entries from standard input to the index"
 msgstr "добав�не на елементите от �тандартни� вход към индек�а"
 
-#: builtin/update-index.c:977
+#: builtin/update-index.c:989
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 "въз�танов�ване на �ъ�то�нието преди �ливане или нужда от обнов�ване за "
 "изброените пътища"
 
-#: builtin/update-index.c:981
+#: builtin/update-index.c:993
 msgid "only update entries that differ from HEAD"
 msgstr "добав�не �амо на �ъдържанието, което �е различава от това в „HEAD“"
 
-#: builtin/update-index.c:985
+#: builtin/update-index.c:997
 msgid "ignore files missing from worktree"
 msgstr "игнориране на файловете, които лип�ват в работното дърво"
 
-#: builtin/update-index.c:988
+#: builtin/update-index.c:1000
 msgid "report actions to standard output"
 msgstr "извеждане на дей�тви�та на �тандартни� изход"
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:1002
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 "забрав�не на запи�аната информаци� за неразрешени конфликти — за командите "
 "от потребител�ко ниво"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1006
 msgid "write index in this format"
 msgstr "запи�ване на индек�а в този формат"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1008
 msgid "enable or disable split index"
 msgstr "включване или изключване на раздел�нето на индек�а"
 
-#: builtin/update-index.c:998
+#: builtin/update-index.c:1010
 msgid "enable/disable untracked cache"
 msgstr "включване/изключване на кеша за не�ледените файлове"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1012
+msgid "test if the filesystem supports untracked cache"
+msgstr "проверка дали файловата �и�тема поддържа кеш за не�ледени файлове"
+
+#: builtin/update-index.c:1014
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 "включване на кеша за не�ледените файлове без проверка на файловата �и�тема"
 
+#: builtin/update-index.c:1134
+msgid "Untracked cache disabled"
+msgstr "Кешът за не�ледените файлове е изключен"
+
+#: builtin/update-index.c:1146
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr "Кешът за не�ледените файлове е изключен за „%s“"
+
 #: builtin/update-ref.c:9
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [ОПЦИЯ…] -d ИМЕ_��_УК�З�ТЕЛ [СТ�Р�_СТОЙ�ОСТ]"
@@ -11426,7 +12076,7 @@ msgstr "git verify-tag [-v | --verbose] ПОД�В��Е…"
 msgid "print commit contents"
 msgstr "извеждане на �ъдържанието на подаването"
 
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
 msgid "print raw gpg status output"
 msgstr "извеждане на необработени� изход от �ъ�то�нието на „gpg“"
 
@@ -11446,7 +12096,7 @@ msgstr "извеждане �амо на �тати�тиката"
 msgid "git verify-tag [-v | --verbose] <tag>..."
 msgstr "git verify-tag [-v | --verbose] ЕТИКЕТ…"
 
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
 msgid "print tag contents"
 msgstr "извеждане на �ъдържанието на ЕТИКЕТи"
 
@@ -11462,71 +12112,75 @@ msgstr "git worktree prune [ОПЦИЯ…]"
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [ОПЦИЯ…]"
 
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректори�"
 
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не �ъще�твува"
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr ""
 "Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен"
 
-#: builtin/worktree.c:61
+#: builtin/worktree.c:62
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“"
 
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 "Изтриване на „worktrees/%s“: файлът „gitdir“ �очи не�ъще�твуващо "
 "ме�тоположение"
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:113
 #, c-format
-msgid "failed to remove: %s"
-msgstr "„%s“ не може да �е изтрие"
+msgid "failed to remove '%s'"
+msgstr "директори�та „%s“ не може да бъде изтрита"
 
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
 #, c-format
 msgid "'%s' already exists"
 msgstr "„%s“ вече �ъще�твува"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/worktree.c:271
+#: builtin/worktree.c:270
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Подготв�не на %s (идентификатор %s)"
 
-#: builtin/worktree.c:319
+#: builtin/worktree.c:322
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "Изтегл�не КЛО�а, дори и да е изтеглен в друго работно дърво"
 
-#: builtin/worktree.c:321
+#: builtin/worktree.c:324
 msgid "create a new branch"
 msgstr "�ъздаване на нов клон"
 
-#: builtin/worktree.c:323
+#: builtin/worktree.c:326
 msgid "create or reset a branch"
 msgstr "�ъздаване или занул�ване на клони"
 
-#: builtin/worktree.c:324
+#: builtin/worktree.c:327
 msgid "detach HEAD at named commit"
 msgstr "отдел�не на указател� „HEAD“ към указаното подаване"
 
-#: builtin/worktree.c:331
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "подготв�не на новото работно дърво"
+
+#: builtin/worktree.c:336
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "Опциите „-b“, „-B“ и „--detach“ �а не�ъвме�тими една � друга"
 
@@ -11546,7 +12200,7 @@ msgstr "запиÑ� на обект-дърво за поддиректориÑ�Ñ‚Ð
 msgid "only useful for debugging"
 msgstr "�амо за изчи�тване на грешки"
 
-#: credential-cache--daemon.c:255
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "извеждане на �ъобщени�та за тра�иране на �тандартната грешка"
 
@@ -11562,6 +12216,10 @@ msgstr ""
 "за\n"
 "н�кое определено ПО�ЯТИЕ използвайте „git help ПО�ЯТИЕ“."
 
+#: http.c:322
+msgid "Public key pinning not supported with cURL < 7.44.0"
+msgstr "Задаването на по�то�нен публичен ключ не �е поддържа от cURL < 7.44.0"
+
 #: common-cmds.h:9
 msgid "start a working area (see also: git help tutorial)"
 msgstr "�ъздаване на работно дърво (погледнете: „git help tutorial“)"
@@ -11645,8 +12303,8 @@ msgid "Update remote refs along with associated objects"
 msgstr "Обнов�ване на отдалечените указатели и �вързаните � т�х обекти"
 
 #: common-cmds.h:32
-msgid "Forward-port local commits to the updated upstream head"
-msgstr "Пребазиране на промени към нова о�нова"
+msgid "Reapply commits on top of another base tip"
+msgstr "Прилагане на подавани�та върху друг връх"
 
 #: common-cmds.h:33
 msgid "Reset current HEAD to the specified state"
@@ -11690,7 +12348,7 @@ msgstr "по-малко подробно�ти"
 msgid "use <n> digits to display SHA-1s"
 msgstr "да �е показват такъв БРОЙ цифри от �умите по SHA1"
 
-#: rerere.h:38
+#: rerere.h:40
 msgid "update the index with reused conflict resolution if possible"
 msgstr ""
 "при възможно�т преизползване на решението на конфликта за обнов�ване на "
@@ -11853,7 +12511,6 @@ msgstr ""
 msgid "bisect run cannot continue any more"
 msgstr "двоичното тър�ене не може да продължи"
 
-# FIXME initial space
 #: git-bisect.sh:531
 #, sh-format
 msgid ""
@@ -11919,16 +12576,16 @@ msgstr ""
 "За да откажете пребазирането и да �е върнете към първоначалното �ъ�то�ние,\n"
 "изпълнете „git rebase --abort“."
 
-#: git-rebase.sh:165
+#: git-rebase.sh:168
 msgid "Applied autostash."
 msgstr "�втоматично �катаното е приложено."
 
-#: git-rebase.sh:168
+#: git-rebase.sh:171
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "„${stash_sha1}“ не може да бъде запазен"
 
-#: git-rebase.sh:169
+#: git-rebase.sh:172
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 "Your changes are safe in the stash.\n"
@@ -11938,34 +12595,30 @@ msgstr ""
 "надеждно �катани. Можете да пробвате да ги приложите чрез „git stash pop“\n"
 "или да ги изхвърлите чрез „git stash drop“, когато пои�кате.\n"
 
-#: git-rebase.sh:208
+#: git-rebase.sh:211
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането."
 
-#: git-rebase.sh:213
+#: git-rebase.sh:216
 msgid "It looks like git-am is in progress. Cannot rebase."
 msgstr ""
 "Изглежда, че �ега �е прилагат кръпки чрез командата „git-am“. �е може да "
 "пребазирате в момента."
 
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "Опци�та „--exec“ задължително изи�ква опци�та „--interactive“"
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
 msgid "No rebase in progress?"
 msgstr "Изглежда в момента не тече пребазиране"
 
-#: git-rebase.sh:370
+#: git-rebase.sh:368
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "Опци�та „--edit-todo“ е до�тъпна �амо по време на интерактивно пребазиране."
 
-#: git-rebase.sh:377
+#: git-rebase.sh:375
 msgid "Cannot read HEAD"
 msgstr "Указател�т „HEAD“ не може да бъде прочетен"
 
-#: git-rebase.sh:380
+#: git-rebase.sh:378
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -11973,12 +12626,12 @@ msgstr ""
 "Тр�бва да редактирате в�ички конфликти при �ливането. След това\n"
 "отбележете коригирането им чрез командата „git add“"
 
-#: git-rebase.sh:398
+#: git-rebase.sh:396
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "Връщането към „${head_name}“ е невъзможно"
 
-#: git-rebase.sh:417
+#: git-rebase.sh:415
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -11998,69 +12651,69 @@ msgstr ""
 "и отново започнете пребазирането. Текущото пребазиране �е преу�танов�ва, за\n"
 "да не загубите �лучайно промени."
 
-#: git-rebase.sh:468
+#: git-rebase.sh:466
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "неправилна о�нова за �равнение „${upstream_name}“"
 
-#: git-rebase.sh:492
+#: git-rebase.sh:490
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr ""
 "указател�т „${onto_name}“ може да �очи към повече от една о�нова за "
 "пребазирането"
 
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "указател�т „${onto_name}“ не �очи към никаква о�нова за пребазирането"
 
-#: git-rebase.sh:504
+#: git-rebase.sh:502
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "Указател�т „${onto_name}“ не �очи към подаване"
 
-#: git-rebase.sh:527
+#: git-rebase.sh:525
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "Ф�Т�Л�� ГРЕШК�: не �ъще�твува клон „${branch_name}“"
 
-#: git-rebase.sh:560
+#: git-rebase.sh:558
 msgid "Cannot autostash"
 msgstr "�е може да �е �катае автоматично"
 
-#: git-rebase.sh:565
+#: git-rebase.sh:563
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "�втоматично �катано: „${stash_abbrev}“"
 
-#: git-rebase.sh:569
+#: git-rebase.sh:567
 msgid "Please commit or stash them."
 msgstr "Промените тр�бва или да �е подадат, или да �е �ката�т."
 
-#: git-rebase.sh:589
+#: git-rebase.sh:587
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "Текущи�т клон „${branch_name}“ е напълно актуален."
 
-#: git-rebase.sh:593
+#: git-rebase.sh:591
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr ""
 "Текущи�т клон „${branch_name}“ е напълно актуален. Пребазирането е "
 "принудително."
 
-#: git-rebase.sh:604
+#: git-rebase.sh:602
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Промените от „${mb}“ към „${onto}“:"
 
-#: git-rebase.sh:613
+#: git-rebase.sh:611
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 "Първо, указател�т „HEAD“ започва да �очи към базата, върху ко�то пребазирате…"
 
-#: git-rebase.sh:623
+#: git-rebase.sh:621
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "Тривиално �ливане на „${branch_name}“ върху „${onto_name}“."
@@ -12207,31 +12860,26 @@ msgstr "�е е указано име на клон"
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(За да ги въз�тановите, изпълнете командата „git stash apply“)"
 
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "не може да �е махне компонент от адре�а „${remoteurl}“"
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "Отно�ителен път може да �е ползва �амо от о�новната директори� на работното "
 "дърво"
 
 # FIXME - what is this regex?
-#: git-submodule.sh:291
+#: git-submodule.sh:229
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr ""
 "адре� на хранилище: „${repo}“ тр�бва или да е аб�олютен, или да започва � "
 "„./“ или „../“"
 
-#: git-submodule.sh:308
+#: git-submodule.sh:246
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "„${sm_path}“ вече �ъще�твува в индек�а"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:250
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
@@ -12242,24 +12890,24 @@ msgstr ""
 "${sm_path}\n"
 "Използвайте опци�та „-f“, ако за да го добавите наи�тина."
 
-#: git-submodule.sh:330
+#: git-submodule.sh:268
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Добав�не на �ъще�твуващото хранилище в „${sm_path}“ към индек�а"
 
-#: git-submodule.sh:332
+#: git-submodule.sh:270
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "„${sm_path}“ �ъще�твува, а не е хранилище на Git"
 
-#: git-submodule.sh:340
+#: git-submodule.sh:278
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 "Открита е локална директори� на Git — „${sm_name}“, ко�то �очи към "
 "отдалечените хранилища:"
 
-#: git-submodule.sh:342
+#: git-submodule.sh:280
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from"
@@ -12267,7 +12915,7 @@ msgstr ""
 "�ко и�кате да преизползвате тази локална директори� на Git вме�то да отново "
 "да клонирате:"
 
-#: git-submodule.sh:344
+#: git-submodule.sh:282
 #, sh-format
 msgid ""
 "use the '--force' option. If the local git directory is not the correct repo"
@@ -12275,7 +12923,7 @@ msgstr ""
 "използвайте опци�та „--force“. �ко локалната директори� не �очи към "
 "правилното отдалечено хранилище"
 
-#: git-submodule.sh:345
+#: git-submodule.sh:283
 #, sh-format
 msgid ""
 "or you are unsure what this means choose another name with the '--name' "
@@ -12285,77 +12933,55 @@ msgstr ""
 "аргумент на опци�та „--name“."
 
 # FIXME активиране - какво в�ъщно�т �тава
-#: git-submodule.sh:347
+#: git-submodule.sh:285
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "�ктивиране на локалното хранилище за подмодула „${sm_name}“ наново."
 
-#: git-submodule.sh:359
+#: git-submodule.sh:297
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "Подмодулът „${sm_path}“ не може да бъде изтеглен"
 
-#: git-submodule.sh:364
+#: git-submodule.sh:302
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "�еу�пешно добав�не на подмодула „${sm_path}“"
 
-#: git-submodule.sh:373
+#: git-submodule.sh:311
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "�еу�пешно реги�триране на подмодула „${sm_path}“"
 
-#: git-submodule.sh:417
+#: git-submodule.sh:355
 #, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "Влизане в „${prefix}${displaypath}“"
+msgid "Entering '$displaypath'"
+msgstr "Влизане в „${displaypath}“"
 
-#: git-submodule.sh:437
+#: git-submodule.sh:375
 #, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
+msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr ""
-"Спиране при „${prefix}${displaypath}“ — изходни�т код от �крипта бе различен "
-"от 0."
+"Спиране при „${displaypath}“ — изходни�т код от �крипта бе различен от 0."
 
-#: git-submodule.sh:483
+#: git-submodule.sh:448
 #, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr ""
-"Във файла „.gitmodules“ не е открит адре� за път� към подмодул "
-"„${displaypath}“"
-
-#: git-submodule.sh:492
-#, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr "�еу�пешно реги�триране на адре� за път� към подмодул „${displaypath}“"
+msgid "pathspec and --all are incompatible"
+msgstr "указването на път е не�ъвме�тимо � опци�та „--all“"
 
-#: git-submodule.sh:494
+#: git-submodule.sh:453
 #, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr ""
-"Реги�триран е подмодул „${name}“, �очещ към адре� „${url}“, за път� към "
-"подмодул „${displaypath}“"
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "Използвайте „--all“, за да премахнете в�ички подмодули"
 
-#: git-submodule.sh:511
-#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr ""
-"�еу�пешно реги�триране на режима на обнов�ване за път� към подмодул "
-"„${displaypath}“"
-
-#: git-submodule.sh:549
-#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr "Използвайте „.“, за да премахнете в�ички подмодули"
-
-#: git-submodule.sh:566
+#: git-submodule.sh:470
 #, sh-format
 msgid "Submodule work tree '$displaypath' contains a .git directory"
 msgstr ""
 "Път�т към подмодул „${displaypath}“ в работното дърво �ъдържа директори� „."
 "git“"
 
-#: git-submodule.sh:567
+#: git-submodule.sh:471
 #, sh-format
 msgid ""
 "(use 'rm -rf' if you really want to remove it including all of its history)"
@@ -12363,7 +12989,7 @@ msgstr ""
 "(използвайте командата „rm -rf“, за да го изтриете заедно � ц�лата му "
 "и�тори�)"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:477
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12372,147 +12998,142 @@ msgstr ""
 "Път�т към подмодул „${displaypath}“ в работното дърво �ъдържа локални "
 "промени. Можете да ги пренебрегнете и отмените � опци�та „-f“"
 
-#: git-submodule.sh:576
+#: git-submodule.sh:480
 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr "Директори�та „${displaypath}“ е изчи�тена"
 
-#: git-submodule.sh:577
+#: git-submodule.sh:481
 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr ""
 "Директори�та към работното дърво на подмодула „${displaypath}“ не може да "
 "бъде изтрита"
 
-#: git-submodule.sh:580
+#: git-submodule.sh:484
 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr ""
 "Празната директори� за подмодула „${displaypath}“ не може да бъде �ъздадена"
 
-#: git-submodule.sh:589
+#: git-submodule.sh:493
 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr ""
 "Премахната е реги�траци�та на подмодул „${name}“, �очещ към адре� „${url}“, "
 "за път� „${displaypath}“"
 
-#: git-submodule.sh:705
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"Път�т към подмодул „${displaypath}“ не е инициализиран.\n"
-"Пробвайте � командата „update --init“."
-
-#: git-submodule.sh:718
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "Текущата вер�и� за подмодула в „${displaypath}“ лип�ва"
 
-#: git-submodule.sh:727
+#: git-submodule.sh:644
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "�еу�пешно до�тав�не в път� към подмодул „${sm_path}“"
 
-#: git-submodule.sh:751
+#: git-submodule.sh:667
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "�еу�пешно до�тав�не в път� към подмодул „${displaypath}“"
 
-#: git-submodule.sh:765
+#: git-submodule.sh:680
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "�еу�пешно изтегл�не на вер�и� „${sha1}“ в път� към подмодул „${displaypath}“'"
 
-#: git-submodule.sh:766
+#: git-submodule.sh:681
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Път към подмодул „${displaypath}“: изтеглена е вер�и� „${sha1}“"
 
-#: git-submodule.sh:770
+#: git-submodule.sh:685
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "�еу�пешно пребазиране на вер�и� „${sha1}“ в път� към подмодул "
 "„${displaypath}“"
 
-#: git-submodule.sh:771
+#: git-submodule.sh:686
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Път към подмодул „${displaypath}“: пребазиране върху вер�и� „${sha1}“"
 
-#: git-submodule.sh:776
+#: git-submodule.sh:691
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "�еу�пешно �ливане на вер�и� „${sha1}“ в път� към подмодул „${displaypath}“"
 
-#: git-submodule.sh:777
+#: git-submodule.sh:692
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Път към подмодул „${displaypath}“: �ливане � вер�и� „${sha1}“"
 
-#: git-submodule.sh:782
+#: git-submodule.sh:697
 #, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "�еу�пешно изпълнение на командата „${command} ${sha1}“ в път� към подмодул "
-"„${prefix}${sm_path}“"
+"„${displaypath}“"
 
-#: git-submodule.sh:783
+#: git-submodule.sh:698
 #, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "Път към подмодул „${prefix}${sm_path}“: „${command} ${sha1}“"
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“"
 
-#: git-submodule.sh:813
+#: git-submodule.sh:729
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 "�еу�пешна обработка на поддиректориите в път� към подмодул „${displaypath}“"
 
-#: git-submodule.sh:921
+#: git-submodule.sh:837
 msgid "The --cached option cannot be used with the --files option"
 msgstr "Опциите „--cached“ и „--files“ �а не�ъвме�тими"
 
-#: git-submodule.sh:973
+#: git-submodule.sh:889
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "неочакван режим „${mod_dst}“"
 
-#: git-submodule.sh:993
+#: git-submodule.sh:909
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr ""
 "  ПРЕДУПРЕЖДЕ�ИЕ: „${display_name}“ не �ъдържа подаването „${sha1_src}“"
 
-#: git-submodule.sh:996
+#: git-submodule.sh:912
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr ""
 "  ПРЕДУПРЕЖДЕ�ИЕ: „${display_name}“ не �ъдържа подаването „${sha1_dst}“"
 
-#: git-submodule.sh:999
+#: git-submodule.sh:915
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 "  ПРЕДУПРЕЖДЕ�ИЕ: „${display_name}“ не �ъдържа никое от подавани�та "
 "„${sha1_src}“ и „${sha1_dst}“"
 
-#: git-submodule.sh:1024
+#: git-submodule.sh:940
 msgid "blob"
 msgstr "обект BLOB"
 
-#: git-submodule.sh:1142
+#: git-submodule.sh:1059
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr ""
 "�еу�пешна обработка на поддиректориите в път� към подмодул „${sm_path}“"
 
-#: git-submodule.sh:1206
+#: git-submodule.sh:1123
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "Синхронизиране на адре�а за път� към подмодул „${displaypath}“"
+
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "За повече информаци� погледнете ръковод�твото на „git-${cmd}(1)“"
diff --git a/po/de.po b/po/de.po
index 0eadf34539..d50cb1b608 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
 "PO-Revision-Date: 2015-01-21 15:01+0800\n"
 "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n"
 "Language-Team: German <>\n"
@@ -31,7 +31,7 @@ msgstr ""
 "dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n"
 "und zu committen."
 
-#: advice.c:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
 
@@ -75,7 +75,7 @@ msgstr "Format"
 msgid "archive format"
 msgstr "Archivformat"
 
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
 msgid "prefix"
 msgstr "Präfix"
 
@@ -83,11 +83,11 @@ msgstr "Präfix"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
 
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547
-#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100
-#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549
+#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989
+#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459
+#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561
+#: builtin/read-tree.c:109 parse-options.h:153
 msgid "file"
 msgstr "Datei"
 
@@ -119,7 +119,8 @@ msgstr "besser komprimieren"
 msgid "list supported archive formats"
 msgstr "unterstützte Archivformate auflisten"
 
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
 msgid "repo"
 msgstr "Repository"
 
@@ -277,11 +278,16 @@ msgstr "mehrdeutiger Objekt-Name: '%s'"
 msgid "Not a valid branch point: '%s'."
 msgstr "Ungültiger Branchpunkt: '%s'"
 
-#: branch.c:344
+#: branch.c:345
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' ist bereits in '%s' ausgecheckt"
 
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert."
+
 #: bundle.c:34
 #, c-format
 msgid "'%s' does not look like a v2 bundle file"
@@ -292,7 +298,7 @@ msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
 
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
 #, c-format
 msgid "could not open '%s'"
 msgstr "Konnte '%s' nicht öffnen"
@@ -301,10 +307,10 @@ msgstr "Konnte '%s' nicht öffnen"
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
 
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
 msgid "revision walk setup failed"
 msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
 
@@ -343,21 +349,21 @@ msgstr "\"rev-list\" abgebrochen"
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
 
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "nicht erkanntes Argument: %s"
 
-#: bundle.c:449
+#: bundle.c:451
 msgid "Refusing to create empty bundle."
 msgstr "Erstellung eines leeren Pakets zurückgewiesen."
 
-#: bundle.c:459
+#: bundle.c:463
 #, c-format
 msgid "cannot create '%s'"
 msgstr "kann '%s' nicht erstellen"
 
-#: bundle.c:480
+#: bundle.c:491
 msgid "index-pack died"
 msgstr "Erstellung der Paketindexdatei abgebrochen"
 
@@ -366,8 +372,8 @@ msgstr "Erstellung der Paketindexdatei abgebrochen"
 msgid "invalid color value: %.*s"
 msgstr "Ungültiger Farbwert: %.*s"
 
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
 #, c-format
 msgid "could not parse %s"
 msgstr "konnte %s nicht parsen"
@@ -401,22 +407,22 @@ msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s"
 msgid "failed to expand user dir in: '%s'"
 msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
 
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "ungültiger zlib Komprimierungsgrad %d"
 
-#: config.c:891
+#: config.c:890
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "Ungültiger Modus für Objekterstellung: %s"
 
-#: config.c:1220
+#: config.c:1228
 msgid "unable to parse command-line config"
 msgstr ""
 "Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
 
-#: config.c:1281
+#: config.c:1284
 msgid "unknown error occured while reading the configuration files"
 msgstr ""
 "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
@@ -438,24 +444,27 @@ msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d"
 msgid "%s has multiple values"
 msgstr "%s hat mehrere Werte"
 
-#: config.c:2226
+#: config.c:2224
 #, c-format
-msgid "Could not set '%s' to '%s'"
+msgid "could not set '%s' to '%s'"
 msgstr "Konnte '%s' nicht zu '%s' setzen."
 
+#: config.c:2226
+#, c-format
+msgid "could not unset '%s'"
+msgstr "Konnte '%s' nicht aufheben."
+
 #: connected.c:69
 msgid "Could not run 'git rev-list'"
 msgstr "Konnte 'git rev-list' nicht ausführen"
 
 #: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "Fehler beim Schreiben nach rev-list: %s"
+msgid "failed write to rev-list"
+msgstr "Fehler beim Schreiben nach rev-list"
 
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe: %s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
+msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe"
 
 #: date.c:95
 msgid "in the future"
@@ -530,27 +539,27 @@ msgstr[1] "vor %lu Jahren"
 msgid "failed to read orderfile '%s'"
 msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'."
 
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
 msgid "Performing inexact rename detection"
 msgstr "Führe Erkennung für ungenaue Umbenennung aus"
 
-#: diff.c:115
+#: diff.c:116
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 "  Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n"
 
-#: diff.c:120
+#: diff.c:121
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Unbekannter \"dirstat\" Parameter '%s'\n"
 
-#: diff.c:215
+#: diff.c:225
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'"
 
-#: diff.c:267
+#: diff.c:277
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -559,16 +568,16 @@ msgstr ""
 "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
 "%s"
 
-#: diff.c:2997
+#: diff.c:3007
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
 
-#: diff.c:3393
+#: diff.c:3405
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow erfordert genau eine Pfadspezifikation"
 
-#: diff.c:3556
+#: diff.c:3568
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -577,22 +586,22 @@ msgstr ""
 "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
 "%s"
 
-#: diff.c:3570
+#: diff.c:3582
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
 
-#: dir.c:2004
+#: dir.c:1823
 msgid "failed to get kernel name and information"
 msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
 
-#: dir.c:2123
+#: dir.c:1942
 msgid "Untracked cache is disabled on this system or location."
 msgstr ""
 "Cache für unversionierte Dateien ist auf diesem System oder\n"
 "für dieses Verzeichnis deaktiviert."
 
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
 msgid "could not run gpg."
 msgstr "konnte gpg nicht ausführen"
 
@@ -606,28 +615,28 @@ msgstr "gpg beim Signieren der Daten fehlgeschlagen"
 
 #: gpg-interface.c:222
 #, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "konnte temporäre Datei '%s' nicht erstellen: %s"
+msgid "could not create temporary file '%s'"
+msgstr "konnte temporäre Datei '%s' nicht erstellen"
 
-#: gpg-interface.c:225
+#: gpg-interface.c:224
 #, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "Fehler beim Schreiben der Signatur nach '%s': %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
 
 #: grep.c:1718
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': konnte %s nicht lesen"
 
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
 #, c-format
-msgid "'%s': %s"
-msgstr "'%s': %s"
+msgid "failed to stat '%s'"
+msgstr "Konnte '%s' nicht lesen"
 
 #: grep.c:1746
 #, c-format
-msgid "'%s': short read %s"
-msgstr "'%s': read() zu kurz %s"
+msgid "'%s': short read"
+msgstr "'%s': read() zu kurz"
 
 #: help.c:205
 #, c-format
@@ -693,12 +702,37 @@ msgstr[1] ""
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
+#: lockfile.c:152
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"Konnte '%s.lock' nicht erstellen: %s.\n"
+"\n"
+"Ein anderer Git-Prozess scheint in diesem Repository ausgeführt\n"
+"zu werden, zum Beispiel ein noch offener Editor von 'git commit'.\n"
+"Bitte stellen Sie sicher, dass alle Prozesse beendet wurden und\n"
+"versuchen Sie es erneut. Falls es immer noch fehlschlägt, könnte\n"
+"ein früherer Git-Prozess in diesem Repository abgestürzt sein:\n"
+"Löschen Sie die Datei manuell um fortzufahren."
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Konnte '%s.lock' nicht erstellen: %s"
+
 #: merge.c:41
 msgid "failed to read the cache"
 msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
 
-#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
 msgid "unable to write new index file"
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
@@ -745,7 +779,7 @@ msgstr "kann Objekt %s '%s' nicht lesen"
 msgid "blob expected for %s '%s'"
 msgstr "Blob erwartet für %s '%s'"
 
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
 #, c-format
 msgid "failed to open '%s'"
 msgstr "Fehler beim Öffnen von '%s'"
@@ -882,7 +916,7 @@ msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
 msgid "Auto-merging %s"
 msgstr "automatischer Merge von %s"
 
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
 msgid "submodule"
 msgstr "Submodul"
 
@@ -911,50 +945,50 @@ msgstr ""
 "KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s "
 "hinzu."
 
-#: merge-recursive.c:1783
+#: merge-recursive.c:1781
 #, c-format
 msgid "Adding %s"
 msgstr "Füge %s hinzu"
 
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
 msgid "Fatal merge failure, shouldn't happen."
 msgstr "Fataler Merge-Fehler. Sollte nicht passieren."
 
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
 msgid "Already up-to-date!"
 msgstr "Bereits aktuell!"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
 
-#: merge-recursive.c:1858
+#: merge-recursive.c:1856
 #, c-format
 msgid "Unprocessed path??? %s"
 msgstr "unverarbeiteter Pfad??? %s"
 
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
 msgid "Merging:"
 msgstr "Merge:"
 
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden"
 msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden"
 
-#: merge-recursive.c:1956
+#: merge-recursive.c:1954
 msgid "merge returned no commit"
 msgstr "Merge hat keinen Commit zurückgegeben"
 
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
 msgid "Unable to write index."
 msgstr "Konnte Index nicht schreiben."
 
@@ -986,28 +1020,28 @@ msgstr "Ungültiger %s Wert: '%s'"
 msgid "unable to parse object: %s"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: parse-options.c:570
+#: parse-options.c:572
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:588
+#: parse-options.c:590
 #, c-format
 msgid "usage: %s"
 msgstr "Verwendung: %s"
 
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
 #, c-format
 msgid "   or: %s"
 msgstr "      oder: %s"
 
-#: parse-options.c:595
+#: parse-options.c:597
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:629
+#: parse-options.c:631
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -1016,7 +1050,7 @@ msgstr "-NUM"
 msgid "malformed object name '%s'"
 msgstr "fehlerhafter Objekt-Name '%s'"
 
-#: path.c:752
+#: path.c:796
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
@@ -1088,7 +1122,7 @@ msgstr ""
 ":(exclude) Muster, aber keine anderen Pfadspezifikationen angegeben.\n"
 "Vielleicht haben Sie vergessen entweder ':/' oder '.' hinzuzufügen?"
 
-#: pretty.c:969
+#: pretty.c:971
 msgid "unable to parse --pretty format"
 msgstr "Konnte --pretty Format nicht parsen."
 
@@ -1114,23 +1148,23 @@ msgstr ""
 "GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
 "Verwende Version %i"
 
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "Konnte '%s' nicht zum Schreiben öffnen."
 
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "Konnte Referenz %s nicht entfernen: %s"
 
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2246
 #, c-format
 msgid "could not delete references: %s"
 msgstr "Konnte Referenzen nicht entfernen: %s"
 
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
 #, c-format
 msgid "could not remove reference %s"
 msgstr "Konnte Referenz %s nicht löschen"
@@ -1269,96 +1303,96 @@ msgstr "Format: %%(end) Atom fehlt"
 msgid "malformed object name %s"
 msgstr "Missgebildeter Objektname %s"
 
-#: remote.c:745
+#: remote.c:746
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Kann 'fetch' nicht für sowohl %s als auch %s nach %s ausführen."
 
-#: remote.c:749
+#: remote.c:750
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s folgt üblicherweise %s, nicht %s"
 
-#: remote.c:753
+#: remote.c:754
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s folgt sowohl %s als auch %s"
 
-#: remote.c:761
+#: remote.c:762
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
 msgid "HEAD does not point to a branch"
 msgstr "HEAD zeigt auf keinen Branch"
 
-#: remote.c:1686
+#: remote.c:1687
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "Kein solcher Branch: '%s'"
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
 
-#: remote.c:1695
+#: remote.c:1696
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert"
 
-#: remote.c:1710
+#: remote.c:1711
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten "
 "Branch"
 
-#: remote.c:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
 
-#: remote.c:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
 
-#: remote.c:2073
+#: remote.c:2074
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr ""
 "Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n"
 
-#: remote.c:2077
+#: remote.c:2078
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
 
-#: remote.c:2080
+#: remote.c:2081
 #, c-format
 msgid "Your branch is up-to-date with '%s'.\n"
 msgstr "Ihr Branch ist auf dem selben Stand wie '%s'.\n"
 
-#: remote.c:2084
+#: remote.c:2085
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Ihr Branch ist vor '%s' um %d Commit.\n"
 msgstr[1] "Ihr Branch ist vor '%s' um %d Commits.\n"
 
-#: remote.c:2090
+#: remote.c:2091
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
 
-#: remote.c:2093
+#: remote.c:2094
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -1368,12 +1402,12 @@ msgstr[0] ""
 msgstr[1] ""
 "Ihr Branch ist zu '%s' um %d Commits hinterher, und kann vorgespult werden.\n"
 
-#: remote.c:2101
+#: remote.c:2102
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 "  (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
 
-#: remote.c:2104
+#: remote.c:2105
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -1388,22 +1422,22 @@ msgstr[1] ""
 "Ihr Branch und '%s' sind divergiert,\n"
 "und haben jeweils %d und %d unterschiedliche Commits.\n"
 
-#: remote.c:2114
+#: remote.c:2115
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 "  (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch "
 "zusammenzuführen)\n"
 
-#: revision.c:2131
+#: revision.c:2142
 msgid "your current branch appears to be broken"
 msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
 
-#: revision.c:2134
+#: revision.c:2145
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
 
-#: revision.c:2328
+#: revision.c:2339
 msgid "--first-parent is incompatible with --bisect"
 msgstr "Die Optionen --first-parent und --bisect sind inkompatibel."
 
@@ -1455,7 +1489,7 @@ msgstr ""
 "mit 'git add <Pfade>' oder 'git rm <Pfade>'und tragen Sie das Ergebnis mit\n"
 "'git commit' ein"
 
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
 #, c-format
 msgid "Could not write to %s"
 msgstr "Konnte nicht nach %s schreiben"
@@ -1467,12 +1501,11 @@ msgstr "Fehler bei Nachbereitung von %s"
 
 #: sequencer.c:208
 msgid "Your local changes would be overwritten by cherry-pick."
-msgstr ""
-"Ihre lokalen Änderungen würden von \"cherry-pick\" überschrieben werden."
+msgstr "Ihre lokalen Änderungen würden durch den Cherry-Pick überschrieben werden."
 
 #: sequencer.c:210
 msgid "Your local changes would be overwritten by revert."
-msgstr "Ihre lokalen Änderungen würden von \"revert\" überschrieben werden."
+msgstr "Ihre lokalen Änderungen würden durch den Revert überschrieben werden."
 
 #: sequencer.c:213
 msgid "Commit your changes or stash them to proceed."
@@ -1615,12 +1648,12 @@ msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\""
 msgid "Could not create sequencer directory %s"
 msgstr "Konnte \"sequencer\"-Verzeichnis %s nicht erstellen"
 
-#: sequencer.c:835 sequencer.c:917
+#: sequencer.c:835 sequencer.c:916
 #, c-format
 msgid "Error wrapping up %s."
 msgstr "Fehler beim Einpacken von %s."
 
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
 msgid "no cherry-pick or revert in progress"
 msgstr "kein \"cherry-pick\" oder \"revert\" im Gang"
 
@@ -1632,63 +1665,72 @@ msgstr "kann HEAD nicht auflösen"
 msgid "cannot abort from a branch yet to be born"
 msgstr "kann nicht abbrechen: bin auf einem Branch, der noch geboren wird"
 
-#: sequencer.c:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
 #, c-format
-msgid "cannot open %s: %s"
-msgstr "Kann %s nicht öffnen: %s"
+msgid "cannot open %s"
+msgstr "kann '%s' nicht öffnen"
 
-#: sequencer.c:881
+#: sequencer.c:880
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "Kann %s nicht lesen: %s"
 
-#: sequencer.c:882
+#: sequencer.c:881
 msgid "unexpected end of file"
 msgstr "Unerwartetes Dateiende"
 
-#: sequencer.c:888
+#: sequencer.c:887
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt"
 
-#: sequencer.c:910
+#: sequencer.c:909
 #, c-format
 msgid "Could not format %s."
 msgstr "Konnte %s nicht formatieren."
 
-#: sequencer.c:1055
+#: sequencer.c:1054
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
 
-#: sequencer.c:1058
+#: sequencer.c:1057
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: ungültiger Commit"
 
-#: sequencer.c:1092
+#: sequencer.c:1091
 msgid "Can't revert as initial commit"
 msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
 
-#: sequencer.c:1093
+#: sequencer.c:1092
 msgid "Can't cherry-pick into empty head"
 msgstr "Kann nicht als allerersten Commit einen Cherry-Pick ausführen."
 
-#: setup.c:246
+#: setup.c:248
 #, c-format
 msgid "failed to read %s"
 msgstr "Fehler beim Lesen von %s"
 
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "Unbekannte Repository-Erweiterungen gefunden:"
+
 #: sha1_file.c:1080
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
 
-#: sha1_file.c:2459
+#: sha1_file.c:2458
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "Offset vor Beginn des Pack-Index für %s (beschädigter Index?)"
 
-#: sha1_file.c:2463
+#: sha1_file.c:2462
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "Offset hinter Ende des Pack-Index für %s (abgeschnittener Index?)"
@@ -1718,31 +1760,40 @@ msgstr ""
 "indem Sie \"git config advice.objectNameWarning false\"\n"
 "ausführen."
 
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "Kann nicht zusammengeführte .gitmodules-Datei nicht ändern, lösen\n"
 "Sie zuerst die Konflikte auf"
 
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden"
 
-#: submodule.c:74
+#: submodule.c:76
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
 
-#: submodule.c:107
+#: submodule.c:109
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen"
 
-#: submodule.c:118
+#: submodule.c:120
 msgid "staging updated .gitmodules failed"
 msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
 
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "Negative Werte für submodule.fetchJobs nicht erlaubt"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "Ungültiger Wert für %s"
+
 #: trailer.c:237
 #, c-format
 msgid "running trailer command '%s' failed"
@@ -1802,7 +1853,240 @@ msgstr "konnte temporäre Datei nicht zu %s umbenennen"
 msgid "Could not read ref %s"
 msgstr "Konnte Referenz %s nicht lesen."
 
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you can switch branches."
+msgstr ""
+"Ihre lokalen Änderungen in den folgenden Dateien würden beim Auschecken\n"
+"überschrieben werden:\n"
+"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches wechseln."
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Ihre lokalen Änderungen in den folgenden Dateien würden beim Auschecken\n"
+"überschrieben werden:\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you can merge."
+msgstr ""
+"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
+"überschrieben werden:\n"
+"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen."
+
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
+"überschrieben werden:\n"
+"%%s"
+
+#: unpack-trees.c:74
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you can %s."
+msgstr ""
+"Ihre lokalen Änderungen in den folgenden Dateien würden durch %s\n"
+"überschrieben werden:\n"
+"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen."
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Ihre lokalen Änderungen würden durch %s überschrieben werden.\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"Durch die Aktualisierung der folgenden Verzeichnisse würden unversionierte\n"
+"Dateien in diesen Verzeichnissen verloren gehen:\n"
+"%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den Checkout entfernt werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Checkout entfernt werden:\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Merge entfernt werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen."
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Merge entfernt werden:\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"%s entfernt werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"%s entfernt werden:\n"
+"%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Checkout überschrieben werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Checkout überschrieben werden:\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Merge überschrieben werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Merge überschrieben werden:\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"%s überschrieben werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"%s überschrieben werden:\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"Kann partiellen Checkout nicht aktualisieren: die folgenden Einträge sind nicht\n"
+"aktuell:\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Die folgenden Dateien im Arbeitsbereich würden durch die Aktualisierung\n"
+"des partiellen Checkouts überschrieben werden:\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Die folgenden Dateien im Arbeitsbereich würden durch die Aktualisierung\n"
+"des partiellen Checkouts entfernt werden:\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "Abbruch\n"
+
+#: unpack-trees.c:237
 msgid "Checking out files"
 msgstr "Checke Dateien aus"
 
@@ -1840,210 +2124,206 @@ msgstr "ungültiges '..' Pfadsegment"
 msgid "could not open '%s' for reading and writing"
 msgstr "Konnte '%s' nicht zum Lesen und Schreiben öffnen."
 
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "Konnte '%s' nicht zum Schreiben öffnen."
 
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "Konnte '%s' nicht zum Lesen öffnen."
 
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "konnte nicht auf '%s' zugreifen: %s"
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
 #, c-format
 msgid "unable to access '%s'"
 msgstr "konnte nicht auf '%s' zugreifen"
 
-#: wrapper.c:640
+#: wrapper.c:623
 msgid "unable to get current working directory"
 msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen."
 
-#: wrapper.c:667
+#: wrapper.c:650
 #, c-format
 msgid "could not open %s for writing"
 msgstr "Konnte '%s' nicht zum Schreiben öffnen."
 
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
 #, c-format
 msgid "could not write to %s"
 msgstr "Konnte nicht nach '%s' schreiben."
 
-#: wrapper.c:684
+#: wrapper.c:667
 #, c-format
 msgid "could not close %s"
 msgstr "Konnte '%s' nicht schließen."
 
-#: wt-status.c:149
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "Nicht zusammengeführte Pfade:"
 
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr ""
 "  (benutzen Sie \"git reset %s <Datei>...\" zum Entfernen aus der Staging-"
 "Area)"
 
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 "  (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-"
 "Area)"
 
-#: wt-status.c:182
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr ""
 "  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
 
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung entsprechend zu "
 "markieren)"
 
-#: wt-status.c:186
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 "  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
 
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
 msgid "Changes to be committed:"
 msgstr "zum Commit vorgemerkte Änderungen:"
 
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
 msgid "Changes not staged for commit:"
 msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
 
-#: wt-status.c:219
+#: wt-status.c:220
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 "  (benutzen Sie \"git add <Datei>...\", um die Änderungen zum Commit "
 "vorzumerken)"
 
-#: wt-status.c:221
+#: wt-status.c:222
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (benutzen Sie \"git add/rm <Datei>...\", um die Änderungen zum Commit "
 "vorzumerken)"
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (benutzen Sie \"git checkout -- <Datei>...\", um die Änderungen im "
 "Arbeitsverzeichnis zu verwerfen)"
 
-#: wt-status.c:224
+#: wt-status.c:225
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (committen oder verwerfen Sie den unversionierten oder geänderten Inhalt "
 "in den Submodulen)"
 
-#: wt-status.c:236
+#: wt-status.c:237
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (benutzen Sie \"git %s <Datei>...\", um die Änderungen zum Commit "
 "vorzumerken)"
 
-#: wt-status.c:251
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "beide gelöscht:"
 
-#: wt-status.c:253
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "von uns hinzugefügt:"
 
-#: wt-status.c:255
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "von denen gelöscht:"
 
-#: wt-status.c:257
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "von denen hinzugefügt:"
 
-#: wt-status.c:259
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "von uns gelöscht:"
 
-#: wt-status.c:261
+#: wt-status.c:262
 msgid "both added:"
 msgstr "von beiden hinzugefügt:"
 
-#: wt-status.c:263
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "von beiden geändert:"
 
-#: wt-status.c:265
+#: wt-status.c:266
 #, c-format
 msgid "bug: unhandled unmerged status %x"
 msgstr "Bug: unbehandelter Unmerged-Status %x"
 
-#: wt-status.c:273
+#: wt-status.c:274
 msgid "new file:"
 msgstr "neue Datei:"
 
-#: wt-status.c:275
+#: wt-status.c:276
 msgid "copied:"
 msgstr "kopiert:"
 
-#: wt-status.c:277
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "gelöscht:"
 
-#: wt-status.c:279
+#: wt-status.c:280
 msgid "modified:"
 msgstr "geändert:"
 
-#: wt-status.c:281
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "umbenannt:"
 
-#: wt-status.c:283
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "Typänderung:"
 
-#: wt-status.c:285
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "unbekannt:"
 
-#: wt-status.c:287
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "nicht gemerged:"
 
-#: wt-status.c:369
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "neue Commits, "
 
-#: wt-status.c:371
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "geänderter Inhalt, "
 
-#: wt-status.c:373
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "unversionierter Inhalt, "
 
-#: wt-status.c:390
+#: wt-status.c:391
 #, c-format
 msgid "bug: unhandled diff status %c"
 msgstr "Fehler: unbehandelter Differenz-Status %c"
 
-#: wt-status.c:754
+#: wt-status.c:755
 msgid "Submodules changed but not updated:"
 msgstr "Submodule geändert, aber nicht aktualisiert:"
 
-#: wt-status.c:756
+#: wt-status.c:757
 msgid "Submodule changes to be committed:"
 msgstr "Änderungen in Submodul zum Committen:"
 
-#: wt-status.c:837
+#: wt-status.c:838
 msgid ""
 "Do not touch the line above.\n"
 "Everything below will be removed."
@@ -2051,40 +2331,40 @@ msgstr ""
 "Ändern Sie nicht die obige Zeile.\n"
 "Alles unterhalb von ihr wird entfernt."
 
-#: wt-status.c:948
+#: wt-status.c:949
 msgid "You have unmerged paths."
 msgstr "Sie haben nicht zusammengeführte Pfade."
 
-#: wt-status.c:951
+#: wt-status.c:952
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
 
-#: wt-status.c:954
+#: wt-status.c:956
 msgid "All conflicts fixed but you are still merging."
 msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
 
-#: wt-status.c:957
+#: wt-status.c:959
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (benutzen Sie \"git commit\", um den Merge abzuschließen)"
 
-#: wt-status.c:967
+#: wt-status.c:969
 msgid "You are in the middle of an am session."
 msgstr "Eine \"am\"-Sitzung ist im Gange."
 
-#: wt-status.c:970
+#: wt-status.c:972
 msgid "The current patch is empty."
 msgstr "Der aktuelle Patch ist leer."
 
-#: wt-status.c:974
+#: wt-status.c:976
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr ""
 "  (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)"
 
-#: wt-status.c:976
+#: wt-status.c:978
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
 
-#: wt-status.c:978
+#: wt-status.c:980
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 "  (benutzen Sie \"git am --abort\", um den ursprünglichen Branch "
@@ -2249,43 +2529,43 @@ msgstr ""
 "  (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch "
 "zurückzukehren)"
 
-#: wt-status.c:1438
+#: wt-status.c:1460
 msgid "On branch "
 msgstr "Auf Branch "
 
-#: wt-status.c:1444
+#: wt-status.c:1466
 msgid "interactive rebase in progress; onto "
 msgstr "interaktives Rebase im Gange; auf "
 
-#: wt-status.c:1446
+#: wt-status.c:1468
 msgid "rebase in progress; onto "
 msgstr "Rebase im Gange; auf "
 
-#: wt-status.c:1451
+#: wt-status.c:1473
 msgid "HEAD detached at "
 msgstr "HEAD losgelöst bei "
 
-#: wt-status.c:1453
+#: wt-status.c:1475
 msgid "HEAD detached from "
 msgstr "HEAD losgelöst von "
 
-#: wt-status.c:1456
+#: wt-status.c:1478
 msgid "Not currently on any branch."
 msgstr "Im Moment auf keinem Branch."
 
-#: wt-status.c:1474
+#: wt-status.c:1496
 msgid "Initial commit"
 msgstr "Initialer Commit"
 
-#: wt-status.c:1488
+#: wt-status.c:1510
 msgid "Untracked files"
 msgstr "Unversionierte Dateien"
 
-#: wt-status.c:1490
+#: wt-status.c:1512
 msgid "Ignored files"
 msgstr "Ignorierte Dateien"
 
-#: wt-status.c:1494
+#: wt-status.c:1516
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2296,32 +2576,32 @@ msgstr ""
 "'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n"
 "neue Dateien selbstständig hinzuzufügen (siehe 'git help status')."
 
-#: wt-status.c:1500
+#: wt-status.c:1522
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Unversionierte Dateien nicht aufgelistet%s"
 
-#: wt-status.c:1502
+#: wt-status.c:1524
 msgid " (use -u option to show untracked files)"
 msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
 
-#: wt-status.c:1508
+#: wt-status.c:1530
 msgid "No changes"
 msgstr "Keine Änderungen"
 
-#: wt-status.c:1513
+#: wt-status.c:1535
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder "
 "\"git commit -a\")\n"
 
-#: wt-status.c:1516
+#: wt-status.c:1538
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "keine Änderungen zum Commit vorgemerkt\n"
 
-#: wt-status.c:1519
+#: wt-status.c:1541
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -2330,56 +2610,56 @@ msgstr ""
 "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien (benutzen "
 "Sie \"git add\" zum Versionieren)\n"
 
-#: wt-status.c:1522
+#: wt-status.c:1544
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
 
-#: wt-status.c:1525
+#: wt-status.c:1547
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "nichts zu committen (Erstellen/Kopieren Sie Dateien und benutzen Sie \"git "
 "add\" zum Versionieren)\n"
 
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
 #, c-format
 msgid "nothing to commit\n"
 msgstr "nichts zu committen\n"
 
-#: wt-status.c:1531
+#: wt-status.c:1553
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien "
 "anzuzeigen)\n"
 
-#: wt-status.c:1535
+#: wt-status.c:1557
 #, c-format
 msgid "nothing to commit, working directory clean\n"
 msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
 
-#: wt-status.c:1642
+#: wt-status.c:1664
 msgid "Initial commit on "
 msgstr "Initialer Commit auf "
 
-#: wt-status.c:1646
+#: wt-status.c:1668
 msgid "HEAD (no branch)"
 msgstr "HEAD (kein Branch)"
 
-#: wt-status.c:1675
+#: wt-status.c:1697
 msgid "gone"
 msgstr "entfernt"
 
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
 msgid "behind "
 msgstr "hinterher "
 
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
 msgid "ahead "
 msgstr "voraus "
 
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "Konnte '%s' nicht entfernen."
@@ -2393,7 +2673,7 @@ msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
 msgid "unexpected diff status %c"
 msgstr "unerwarteter Differenz-Status %c"
 
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
 msgid "updating files failed"
 msgstr "Aktualisierung der Dateien fehlgeschlagen"
 
@@ -2407,7 +2687,7 @@ msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 "Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
 
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
 msgid "Could not read the index"
 msgstr "Konnte den Index nicht lesen"
 
@@ -2445,14 +2725,14 @@ msgstr ""
 "ignoriert:\n"
 
 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
 msgid "dry run"
 msgstr "Probelauf"
 
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
 msgid "be verbose"
 msgstr "erweiterte Ausgaben"
 
@@ -2460,7 +2740,7 @@ msgstr "erweiterte Ausgaben"
 msgid "interactive picking"
 msgstr "interaktives Auswählen"
 
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
 msgid "select hunks interactively"
 msgstr "Blöcke interaktiv auswählen"
 
@@ -2532,16 +2812,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Meinten Sie vielleicht 'git add .'?\n"
 
 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
 msgid "index file corrupt"
 msgstr "Index-Datei beschädigt"
 
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
 #, c-format
 msgid "could not read '%s'"
 msgstr "Konnte '%s' nicht lesen"
@@ -2569,16 +2849,6 @@ msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
 msgid "fseek failed"
 msgstr "\"fseek\" fehlgeschlagen"
 
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "Konnte '%s' nicht zum Lesen öffnen: %s"
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "Konnte '%s' nicht zum Schreiben öffnen: %s"
-
 #: builtin/am.c:788
 #, c-format
 msgid "could not parse patch '%s'"
@@ -2588,82 +2858,82 @@ msgstr "konnte Patch '%s' nicht parsen"
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden."
 
-#: builtin/am.c:901
+#: builtin/am.c:900
 msgid "invalid timestamp"
 msgstr "ungültiger Zeitstempel"
 
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
 msgid "invalid Date line"
 msgstr "Ungültige \"Date\"-Zeile"
 
-#: builtin/am.c:909
+#: builtin/am.c:908
 msgid "invalid timezone offset"
 msgstr "Ungültiger Offset in der Zeitzone"
 
-#: builtin/am.c:996
+#: builtin/am.c:995
 msgid "Patch format detection failed."
 msgstr "Patch-Formaterkennung fehlgeschlagen."
 
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
 
-#: builtin/am.c:1005
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Fehler beim Aufteilen der Patches."
 
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
 msgid "unable to write index file"
 msgstr "Konnte Index-Datei nicht schreiben."
 
-#: builtin/am.c:1188
+#: builtin/am.c:1187
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr ""
 "Wenn Sie das Problem aufgelöst haben, führen Sie \"%s --continue\" aus."
 
-#: builtin/am.c:1189
+#: builtin/am.c:1188
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 "Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --skip"
 "\" aus."
 
-#: builtin/am.c:1190
+#: builtin/am.c:1189
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Um den ursprünglichen Branch wiederherzustellen und die Anwendung der "
 "Patches abzubrechen, führen Sie \"%s --abort\" aus."
 
-#: builtin/am.c:1328
+#: builtin/am.c:1327
 msgid "Patch is empty. Was it split wrong?"
 msgstr "Patch ist leer. War dessen Aufteilung falsch?"
 
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "Ungültige Identifikationszeile: %s"
 
-#: builtin/am.c:1429
+#: builtin/am.c:1428
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "Konnte Commit '%s' nicht parsen."
 
-#: builtin/am.c:1631
+#: builtin/am.c:1630
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge "
 "zurückzufallen."
 
-#: builtin/am.c:1633
+#: builtin/am.c:1632
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
 "nachzustellen ..."
 
-#: builtin/am.c:1652
+#: builtin/am.c:1651
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -2671,39 +2941,39 @@ msgstr ""
 "Haben Sie den Patch per Hand editiert?\n"
 "Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
 
-#: builtin/am.c:1658
+#: builtin/am.c:1657
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..."
 
-#: builtin/am.c:1673
+#: builtin/am.c:1672
 msgid "Failed to merge in the changes."
 msgstr "Merge der Änderungen fehlgeschlagen."
 
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
 msgid "git write-tree failed to write a tree"
 msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
 
-#: builtin/am.c:1704
+#: builtin/am.c:1703
 msgid "applying to an empty history"
 msgstr "auf leere Historie anwenden"
 
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
 msgid "failed to write commit object"
 msgstr "Fehler beim Schreiben des Commit-Objektes."
 
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "Kann nicht fortsetzen: %s existiert nicht"
 
-#: builtin/am.c:1769
+#: builtin/am.c:1768
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem "
 "Terminal verbunden ist."
 
-#: builtin/am.c:1774
+#: builtin/am.c:1773
 msgid "Commit Body is:"
 msgstr "Commit-Beschreibung ist:"
 
@@ -2711,35 +2981,35 @@ msgstr "Commit-Beschreibung ist:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1784
+#: builtin/am.c:1783
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 
-#: builtin/am.c:1834
+#: builtin/am.c:1833
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
 
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Wende an: %.*s"
 
-#: builtin/am.c:1885
+#: builtin/am.c:1884
 msgid "No changes -- Patch already applied."
 msgstr "Keine Änderungen -- Patches bereits angewendet."
 
-#: builtin/am.c:1893
+#: builtin/am.c:1892
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
 
-#: builtin/am.c:1899
+#: builtin/am.c:1898
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "Die Kopie des fehlgeschlagenen Patches befindet sich in: %s"
 
-#: builtin/am.c:1944
+#: builtin/am.c:1943
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -2750,7 +3020,7 @@ msgstr ""
 "diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
 "auslassen."
 
-#: builtin/am.c:1951
+#: builtin/am.c:1950
 msgid ""
 "You still have unmerged paths in your index.\n"
 "Did you forget to use 'git add'?"
@@ -2758,17 +3028,17 @@ msgstr ""
 "Sie haben immer noch nicht zusammengeführte Pfade im Index.\n"
 "Haben Sie vergessen 'git add' zu benutzen?"
 
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
 #: builtin/reset.c:316
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: builtin/am.c:2111
+#: builtin/am.c:2110
 msgid "failed to clean index"
 msgstr "Fehler beim Bereinigen des Index"
 
-#: builtin/am.c:2145
+#: builtin/am.c:2144
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -2776,153 +3046,155 @@ msgstr ""
 "Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
 "Keine Zurücksetzung zu ORIG_HEAD."
 
-#: builtin/am.c:2206
+#: builtin/am.c:2205
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Ungültiger Wert für --patch-format: %s"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2238
 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
 msgstr "git am [<Optionen>] [(<mbox>|<E-Mail-Verzeichnis>)...]"
 
-#: builtin/am.c:2240
+#: builtin/am.c:2239
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2246
+#: builtin/am.c:2245
 msgid "run interactively"
 msgstr "interaktiv ausführen"
 
-#: builtin/am.c:2248
+#: builtin/am.c:2247
 msgid "historical option -- no-op"
 msgstr "historische Option -- kein Effekt"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2249
 msgid "allow fall back on 3way merging if needed"
 msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
 
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
 #: builtin/repack.c:171
 msgid "be quiet"
 msgstr "weniger Ausgaben"
 
-#: builtin/am.c:2253
+#: builtin/am.c:2252
 msgid "add a Signed-off-by line to the commit message"
 msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufügen"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2255
 msgid "recode into utf8 (default)"
 msgstr "nach UTF-8 umkodieren (Standard)"
 
-#: builtin/am.c:2258
+#: builtin/am.c:2257
 msgid "pass -k flag to git-mailinfo"
 msgstr "-k an git-mailinfo übergeben"
 
-#: builtin/am.c:2260
+#: builtin/am.c:2259
 msgid "pass -b flag to git-mailinfo"
 msgstr "-b an git-mailinfo übergeben"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2261
 msgid "pass -m flag to git-mailinfo"
 msgstr "-m an git-mailinfo übergeben"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2263
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben"
 
-#: builtin/am.c:2267
+#: builtin/am.c:2266
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "kein --keep-cr an git-mailsplit übergeben, unabhängig von am.keepcr"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "strip everything before a scissors line"
 msgstr "alles vor einer Scheren-Zeile entfernen"
 
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
 msgid "action"
 msgstr "Aktion"
 
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
 msgid "pass it through git-apply"
 msgstr "an git-apply übergeben"
 
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
 msgid "root"
 msgstr "Wurzelverzeichnis"
 
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
 msgid "path"
 msgstr "Pfad"
 
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
-#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
-#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
-#: parse-options.h:132 parse-options.h:134 parse-options.h:244
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193
+#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:244
 msgid "n"
 msgstr "Anzahl"
 
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
 msgid "num"
 msgstr "Anzahl"
 
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
 #: builtin/tag.c:372
 msgid "format"
 msgstr "Format"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "format the patch(es) are in"
 msgstr "Patch-Format"
 
-#: builtin/am.c:2302
+#: builtin/am.c:2301
 msgid "override error message when patch failure occurs"
 msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
 
-#: builtin/am.c:2304
+#: builtin/am.c:2303
 msgid "continue applying patches after resolving a conflict"
 msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
 
-#: builtin/am.c:2307
+#: builtin/am.c:2306
 msgid "synonyms for --continue"
 msgstr "Synonyme für --continue"
 
-#: builtin/am.c:2310
+#: builtin/am.c:2309
 msgid "skip the current patch"
 msgstr "den aktuellen Patch auslassen"
 
-#: builtin/am.c:2313
+#: builtin/am.c:2312
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 "ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 msgid "lie about committer date"
 msgstr "Autor-Datum als Commit-Datum verwenden"
 
-#: builtin/am.c:2319
+#: builtin/am.c:2318
 msgid "use current timestamp for author date"
 msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
 
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
 msgid "key-id"
 msgstr "GPG-Schlüsselkennung"
 
-#: builtin/am.c:2322
+#: builtin/am.c:2321
 msgid "GPG-sign commits"
 msgstr "Commits mit GPG signieren"
 
-#: builtin/am.c:2325
+#: builtin/am.c:2324
 msgid "(internal use for git-rebase)"
 msgstr "(intern für git-rebase verwendet)"
 
-#: builtin/am.c:2340
+#: builtin/am.c:2339
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -2930,16 +3202,16 @@ msgstr ""
 "Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
 "entfernt. Bitte verwenden Sie diese nicht mehr."
 
-#: builtin/am.c:2347
+#: builtin/am.c:2346
 msgid "failed to read the index"
 msgstr "Fehler beim Lesen des Index"
 
-#: builtin/am.c:2362
+#: builtin/am.c:2361
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben."
 
-#: builtin/am.c:2386
+#: builtin/am.c:2385
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -2948,7 +3220,7 @@ msgstr ""
 "Stray %s Verzeichnis gefunden.\n"
 "Benutzen Sie \"git am --abort\", um es zu entfernen."
 
-#: builtin/am.c:2392
+#: builtin/am.c:2391
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
 
@@ -2981,41 +3253,41 @@ msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s"
 msgid "unable to find filename in patch at line %d"
 msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden."
 
-#: builtin/apply.c:940
+#: builtin/apply.c:937
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile "
 "%d"
 
-#: builtin/apply.c:944
+#: builtin/apply.c:942
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d"
 
-#: builtin/apply.c:945
+#: builtin/apply.c:943
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d"
 
-#: builtin/apply.c:952
+#: builtin/apply.c:949
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d"
 
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: unerwartete Zeile: %.*s"
 
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s"
 
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -3030,65 +3302,65 @@ msgstr[1] ""
 "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
 "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)"
 
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
 msgid "new file depends on old contents"
 msgstr "neue Datei hängt von alten Inhalten ab"
 
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
 msgid "deleted file still has contents"
 msgstr "entfernte Datei hat noch Inhalte"
 
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "fehlerhafter Patch bei Zeile %d"
 
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "neue Datei %s hängt von alten Inhalten ab"
 
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "entfernte Datei %s hat noch Inhalte"
 
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt."
 
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s"
 
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "nicht erkannter Binär-Patch bei Zeile %d"
 
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
 
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "konnte symbolische Verknüpfung %s nicht lesen"
 
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
 #, c-format
 msgid "unable to open or read %s"
 msgstr "konnte %s nicht öffnen oder lesen"
 
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "Ungültiger Zeilenanfang: '%c'"
 
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -3096,12 +3368,12 @@ msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)"
 msgstr[1] ""
 "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)"
 
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden"
 
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -3110,337 +3382,347 @@ msgstr ""
 "bei der Suche nach:\n"
 "%.*s"
 
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "keine Daten in Binär-Patch für '%s'"
 
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "Konnte Binär-Patch nicht auf '%s' anwenden"
 
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)"
 
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
 
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
 #, c-format
 msgid "cannot checkout %s"
 msgstr "kann %s nicht auschecken"
 
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
 #, c-format
 msgid "read of %s failed"
 msgstr "Konnte %s nicht lesen"
 
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
 
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "Pfad %s wurde umbenannt/gelöscht"
 
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s ist nicht im Index"
 
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s entspricht nicht der Version im Index"
 
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
 msgid "removal patch leaves file contents"
 msgstr "Lösch-Patch hinterlässt Dateiinhalte"
 
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: falscher Typ"
 
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s ist vom Typ %o, erwartete %o"
 
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
 #, c-format
 msgid "invalid path '%s'"
 msgstr "Ungültiger Pfad '%s'"
 
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s ist bereits bereitgestellt"
 
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s existiert bereits im Arbeitsverzeichnis"
 
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)"
 
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s"
 
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
 
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: Patch konnte nicht angewendet werden"
 
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Prüfe Patch %s ..."
 
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
 
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "konnte %s nicht aus dem Index entfernen"
 
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "fehlerhafter Patch für Submodul %s"
 
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "konnte neu erstellte Datei '%s' nicht lesen"
 
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen"
 
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
 
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
 #, c-format
 msgid "closing file '%s'"
 msgstr "schließe Datei '%s'"
 
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
 
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s sauber angewendet"
 
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
 msgid "internal error"
 msgstr "interner Fehler"
 
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..."
 msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..."
 
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
 
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "Kann %s nicht öffnen: %s"
+
+#: builtin/apply.c:4298
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Patch-Bereich #%d sauber angewendet."
 
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Patch-Block #%d zurückgewiesen."
 
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Patch '%s' ausgelassen."
+
+#: builtin/apply.c:4395
 msgid "unrecognized input"
 msgstr "nicht erkannte Eingabe"
 
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
 msgid "unable to read index file"
 msgstr "Konnte Index-Datei nicht lesen"
 
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
 msgid "don't apply changes matching the given path"
 msgstr "keine Änderungen im angegebenen Pfad anwenden"
 
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
 msgid "apply changes matching the given path"
 msgstr "Änderungen nur im angegebenen Pfad anwenden"
 
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 "<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
 "entfernen"
 
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
 msgid "ignore additions made by the patch"
 msgstr "hinzugefügte Zeilen des Patches ignorieren"
 
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 "anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe "
 "ausgegeben"
 
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
 
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
 msgid "instead of applying the patch, output a summary for the input"
 msgstr ""
 "anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe "
 "ausgeben"
 
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr ""
 "anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann"
 
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
 msgid "make sure the patch is applicable to the current index"
 msgstr ""
 "sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann"
 
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
 msgid "apply a patch without touching the working tree"
 msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
 
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 "Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
 
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
 
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte"
 
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "einen temporären Index, basierend auf den integrierten Index-Informationen, "
 "erstellen"
 
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
 msgid "paths are separated with NUL character"
 msgstr "Pfade sind getrennt durch NUL Zeichen"
 
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
 msgid "ensure at least <n> lines of context match"
 msgstr ""
 "sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
 
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
 
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
 msgid "ignore changes in whitespace when finding context"
 msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
 
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
 msgid "apply the patch in reverse"
 msgstr "den Patch in umgekehrter Reihenfolge anwenden"
 
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
 msgid "don't expect at least one line of context"
 msgstr "keinen Kontext erwarten"
 
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 "zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
 
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
 msgid "allow overlapping hunks"
 msgstr "sich überlappende Patch-Blöcke erlauben"
 
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
 
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
 msgid "do not trust the line counts in the hunk headers"
 msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
 
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
 msgid "prepend <root> to all filenames"
 msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
 
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
 msgid "--3way outside a repository"
 msgstr ""
 "Die Option --3way kann nicht außerhalb eines Repositories verwendet werden."
 
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
 msgid "--index outside a repository"
 msgstr ""
 "Die Option --index kann nicht außerhalb eines Repositories verwendet werden."
 
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
 msgid "--cached outside a repository"
 msgstr ""
 "Die Option --cached kann nicht außerhalb eines Repositories verwendet werden."
 
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
 #, c-format
 msgid "can't open patch '%s'"
 msgstr "kann Patch '%s' nicht öffnen"
 
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "unterdrückte %d Whitespace-Fehler"
 msgstr[1] "unterdrückte %d Whitespace-Fehler"
 
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
@@ -3506,102 +3788,102 @@ msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)"
 msgid "Blaming lines"
 msgstr "Verarbeite Zeilen"
 
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
 msgid "Show blame entries as we find them, incrementally"
 msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren"
 
-#: builtin/blame.c:2531
+#: builtin/blame.c:2532
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)"
 
-#: builtin/blame.c:2532
+#: builtin/blame.c:2533
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "Ursprungs-Commit nicht als Grenzen behandeln (Standard: aus)"
 
-#: builtin/blame.c:2533
+#: builtin/blame.c:2534
 msgid "Show work cost statistics"
 msgstr "Statistiken zum Arbeitsaufwand anzeigen"
 
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
 msgid "Force progress reporting"
 msgstr "Fortschrittsanzeige erzwingen"
 
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
 msgid "Show output score for blame entries"
 msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen"
 
-#: builtin/blame.c:2536
+#: builtin/blame.c:2537
 msgid "Show original filename (Default: auto)"
 msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)"
 
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
 msgid "Show original linenumber (Default: off)"
 msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)"
 
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
 msgid "Show in a format designed for machine consumption"
 msgstr "Anzeige in einem Format für maschinelle Auswertung"
 
-#: builtin/blame.c:2539
+#: builtin/blame.c:2540
 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 "Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile"
 
-#: builtin/blame.c:2540
+#: builtin/blame.c:2541
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 "Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
 
-#: builtin/blame.c:2541
+#: builtin/blame.c:2542
 msgid "Show raw timestamp (Default: off)"
 msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
 
-#: builtin/blame.c:2542
+#: builtin/blame.c:2543
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)"
 
-#: builtin/blame.c:2543
+#: builtin/blame.c:2544
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
 
-#: builtin/blame.c:2544
+#: builtin/blame.c:2545
 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 "Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)"
 
-#: builtin/blame.c:2545
+#: builtin/blame.c:2546
 msgid "Ignore whitespace differences"
 msgstr "Unterschiede im Whitespace ignorieren"
 
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
 msgid "Spend extra cycles to find better match"
 msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden"
 
-#: builtin/blame.c:2547
+#: builtin/blame.c:2548
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen"
 
-#: builtin/blame.c:2548
+#: builtin/blame.c:2549
 msgid "Use <file>'s contents as the final image"
 msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen"
 
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
 msgid "score"
 msgstr "Bewertung"
 
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
 msgid "Find line copies within and across files"
 msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
 
-#: builtin/blame.c:2550
+#: builtin/blame.c:2551
 msgid "Find line movements within and across files"
 msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "Process only line range n,m, counting from 1"
 msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1"
 
@@ -3611,31 +3893,31 @@ msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1"
 #. takes 22 places, is the longest among various forms of
 #. relative timestamps, but your language may need more or
 #. fewer display columns.
-#: builtin/blame.c:2640
+#: builtin/blame.c:2641
 msgid "4 years, 11 months ago"
 msgstr "vor 4 Jahren, und 11 Monaten"
 
-#: builtin/branch.c:25
+#: builtin/branch.c:26
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr "git branch [<Optionen>] [-r | -a] [--merged | --no-merged]"
 
-#: builtin/branch.c:26
+#: builtin/branch.c:27
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr "git branch [<Optionen>] [-l] [-f] <Branchname> [<Startpunkt>]"
 
-#: builtin/branch.c:27
+#: builtin/branch.c:28
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<Optionen>] [-r] (-d | -D) <Branchname>..."
 
-#: builtin/branch.c:28
+#: builtin/branch.c:29
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<Optionen>] (-m | -M) [<alter-Branch>] <neuer-Branch>"
 
-#: builtin/branch.c:29
+#: builtin/branch.c:30
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<Optionen>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:142
+#: builtin/branch.c:143
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -3644,7 +3926,7 @@ msgstr ""
 "entferne Branch '%s', der zusammengeführt wurde mit\n"
 "         '%s', aber noch nicht mit HEAD zusammengeführt wurde."
 
-#: builtin/branch.c:146
+#: builtin/branch.c:147
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -3653,12 +3935,12 @@ msgstr ""
 "entferne Branch '%s' nicht, der noch nicht zusammengeführt wurde mit\n"
 "         '%s', obwohl er mit HEAD zusammengeführt wurde."
 
-#: builtin/branch.c:160
+#: builtin/branch.c:161
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen."
 
-#: builtin/branch.c:164
+#: builtin/branch.c:165
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -3668,303 +3950,323 @@ msgstr ""
 "Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D "
 "%s' aus."
 
-#: builtin/branch.c:177
+#: builtin/branch.c:178
 msgid "Update of config-file failed"
 msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen."
 
-#: builtin/branch.c:205
+#: builtin/branch.c:206
 msgid "cannot use -a with -d"
 msgstr "kann -a nicht mit -d benutzen"
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen."
 
-#: builtin/branch.c:219
+#: builtin/branch.c:226
 #, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr ""
-"Kann Branch '%s' nicht entfernen, da Sie sich gerade auf diesem befinden."
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'."
 
-#: builtin/branch.c:235
+#: builtin/branch.c:241
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "Remote-Tracking-Branch '%s' nicht gefunden"
 
-#: builtin/branch.c:236
+#: builtin/branch.c:242
 #, c-format
 msgid "branch '%s' not found."
 msgstr "Branch '%s' nicht gefunden."
 
-#: builtin/branch.c:251
+#: builtin/branch.c:257
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'"
 
-#: builtin/branch.c:252
+#: builtin/branch.c:258
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Fehler beim Entfernen des Branches '%s'"
 
-#: builtin/branch.c:259
+#: builtin/branch.c:265
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n"
 
-#: builtin/branch.c:260
+#: builtin/branch.c:266
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Branch %s entfernt (war %s).\n"
 
-#: builtin/branch.c:303
+#: builtin/branch.c:309
 #, c-format
 msgid "[%s: gone]"
 msgstr "[%s: entfernt]"
 
-#: builtin/branch.c:308
+#: builtin/branch.c:314
 #, c-format
 msgid "[%s]"
 msgstr "[%s]"
 
-#: builtin/branch.c:313
+#: builtin/branch.c:319
 #, c-format
 msgid "[%s: behind %d]"
 msgstr "[%s: %d hinterher]"
 
-#: builtin/branch.c:315
+#: builtin/branch.c:321
 #, c-format
 msgid "[behind %d]"
 msgstr "[%d hinterher]"
 
-#: builtin/branch.c:319
+#: builtin/branch.c:325
 #, c-format
 msgid "[%s: ahead %d]"
 msgstr "[%s: %d voraus]"
 
-#: builtin/branch.c:321
+#: builtin/branch.c:327
 #, c-format
 msgid "[ahead %d]"
 msgstr "[%d voraus]"
 
-#: builtin/branch.c:324
+#: builtin/branch.c:330
 #, c-format
 msgid "[%s: ahead %d, behind %d]"
 msgstr "[%s: %d voraus, %d hinterher]"
 
-#: builtin/branch.c:327
+#: builtin/branch.c:333
 #, c-format
 msgid "[ahead %d, behind %d]"
 msgstr "[%d voraus, %d hinterher]"
 
-#: builtin/branch.c:340
+#: builtin/branch.c:346
 msgid " **** invalid ref ****"
 msgstr " **** ungültige Referenz ****"
 
-#: builtin/branch.c:366
+#: builtin/branch.c:372
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(kein Branch, Rebase von Branch %s im Gange)"
 
-#: builtin/branch.c:369
+#: builtin/branch.c:375
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(kein Branch, binäre Suche begonnen bei %s)"
 
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD losgelöst bei %s)"
 
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD losgelöst von %s)"
 
-#: builtin/branch.c:382
+#: builtin/branch.c:390
 msgid "(no branch)"
 msgstr "(kein Branch)"
 
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "Branch %s wird auf %s umgesetzt"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "Binäre Suche von Branch %s zu %s im Gange"
+
+#: builtin/branch.c:560
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 "Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden."
 
-#: builtin/branch.c:534
+#: builtin/branch.c:570
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Ungültiger Branchname: '%s'"
 
-#: builtin/branch.c:549
+#: builtin/branch.c:587
 msgid "Branch rename failed"
 msgstr "Umbenennung des Branches fehlgeschlagen"
 
-#: builtin/branch.c:553
+#: builtin/branch.c:591
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "falsch benannten Branch '%s' umbenannt"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:594
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:601
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
 "fehlgeschlagen."
 
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "Konnte Beschreibungsvorlage für Branch nicht schreiben: %s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "Konnte Beschreibungsvorlage für Branch nicht schreiben."
 
-#: builtin/branch.c:615
+#: builtin/branch.c:651
 msgid "Generic options"
 msgstr "Allgemeine Optionen"
 
-#: builtin/branch.c:617
+#: builtin/branch.c:653
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:654
 msgid "suppress informational messages"
 msgstr "Informationsmeldungen unterdrücken"
 
-#: builtin/branch.c:619
+#: builtin/branch.c:655
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "den Ãœbernahmemodus einstellen (siehe git-pull(1))"
 
-#: builtin/branch.c:621
+#: builtin/branch.c:657
 msgid "change upstream info"
 msgstr "Informationen zum Upstream-Branch ändern"
 
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "Upstream"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "Informationen zum Upstream-Branch ändern"
+
+#: builtin/branch.c:661
 msgid "use colored output"
 msgstr "farbige Ausgaben verwenden"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:662
 msgid "act on remote-tracking branches"
 msgstr "auf Remote-Tracking-Branches wirken"
 
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
 msgid "print only branches that contain the commit"
 msgstr "nur Branches ausgeben, welche diesen Commit beinhalten"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:668
 msgid "Specific git-branch actions:"
 msgstr "spezifische Aktionen für \"git-branch\":"
 
-#: builtin/branch.c:633
+#: builtin/branch.c:669
 msgid "list both remote-tracking and local branches"
 msgstr "Remote-Tracking und lokale Branches auflisten"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:671
 msgid "delete fully merged branch"
 msgstr "vollständig zusammengeführten Branch entfernen"
 
-#: builtin/branch.c:636
+#: builtin/branch.c:672
 msgid "delete branch (even if not merged)"
 msgstr "Branch löschen (auch wenn nicht zusammengeführt)"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:673
 msgid "move/rename a branch and its reflog"
 msgstr "einen Branch und dessen Reflog verschieben/umbenennen"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:674
 msgid "move/rename a branch, even if target exists"
 msgstr ""
 "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:675
 msgid "list branch names"
 msgstr "Branchnamen auflisten"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:676
 msgid "create the branch's reflog"
 msgstr "das Reflog des Branches erzeugen"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:678
 msgid "edit the description for the branch"
 msgstr "die Beschreibung für den Branch bearbeiten"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:679
 msgid "force creation, move/rename, deletion"
 msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen"
 
-#: builtin/branch.c:644
+#: builtin/branch.c:680
 msgid "print only branches that are merged"
 msgstr "nur zusammengeführte Branches ausgeben"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:681
 msgid "print only branches that are not merged"
 msgstr "nur nicht zusammengeführte Branches ausgeben"
 
-#: builtin/branch.c:646
+#: builtin/branch.c:682
 msgid "list branches in columns"
 msgstr "Branches in Spalten auflisten"
 
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
 msgid "key"
 msgstr "Schüssel"
 
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
 msgid "field name to sort on"
 msgstr "sortiere nach diesem Feld"
 
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
 #: builtin/tag.c:369
 msgid "object"
 msgstr "Objekt"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:687
 msgid "print only branches of the object"
 msgstr "nur Branches von diesem Objekt ausgeben"
 
-#: builtin/branch.c:669
+#: builtin/branch.c:705
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
 
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
 
-#: builtin/branch.c:693
+#: builtin/branch.c:729
 msgid "--column and --verbose are incompatible"
 msgstr "Die Optionen --column und --verbose sind inkompatibel."
 
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
 msgid "branch name required"
 msgstr "Branchname erforderlich"
 
-#: builtin/branch.c:722
+#: builtin/branch.c:758
 msgid "Cannot give description to detached HEAD"
 msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 msgid "cannot edit description of more than one branch"
 msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden"
 
-#: builtin/branch.c:734
+#: builtin/branch.c:770
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Noch kein Commit in Branch '%s'."
 
-#: builtin/branch.c:737
+#: builtin/branch.c:773
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Branch '%s' nicht vorhanden."
 
-#: builtin/branch.c:752
+#: builtin/branch.c:788
 msgid "too many branches for a rename operation"
 msgstr "zu viele Branches für eine Umbenennen-Operation angegeben"
 
-#: builtin/branch.c:757
+#: builtin/branch.c:793
 msgid "too many branches to set new upstream"
 msgstr "zu viele Branches angegeben, um Upstream-Branch zu setzen"
 
-#: builtin/branch.c:761
+#: builtin/branch.c:797
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -3972,43 +4274,43 @@ msgstr ""
 "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n"
 "keinen Branch zeigt."
 
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
 #, c-format
 msgid "no such branch '%s'"
 msgstr "Kein solcher Branch '%s'"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:804
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "Branch '%s' existiert nicht"
 
-#: builtin/branch.c:780
+#: builtin/branch.c:816
 msgid "too many branches to unset upstream"
 msgstr ""
 "zu viele Branches angegeben, um Konfiguration zu Upstream-Branch zu entfernen"
 
-#: builtin/branch.c:784
+#: builtin/branch.c:820
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "Konnte Konfiguration zu Upstream-Branch von HEAD nicht entfernen, da dieser\n"
 "auf keinen Branch zeigt."
 
-#: builtin/branch.c:790
+#: builtin/branch.c:826
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
 
-#: builtin/branch.c:804
+#: builtin/branch.c:840
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "'HEAD' darf nicht manuell erstellt werden"
 
-#: builtin/branch.c:810
+#: builtin/branch.c:846
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 "Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem "
 "Branchnamen verwendet werden."
 
-#: builtin/branch.c:813
+#: builtin/branch.c:849
 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -4017,7 +4319,7 @@ msgstr ""
 "Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --"
 "track oder --set-upstream-to\n"
 
-#: builtin/branch.c:830
+#: builtin/branch.c:866
 #, c-format
 msgid ""
 "\n"
@@ -4028,16 +4330,6 @@ msgstr ""
 "Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, führen "
 "Sie aus:\n"
 
-#: builtin/branch.c:831
-#, c-format
-msgid "    git branch -d %s\n"
-msgstr "    git branch -d %s\n"
-
-#: builtin/branch.c:832
-#, c-format
-msgid "    git branch --set-upstream-to %s\n"
-msgstr "    git branch --set-upstream-to %s\n"
-
 #: builtin/bundle.c:51
 #, c-format
 msgid "%s is okay\n"
@@ -4140,7 +4432,7 @@ msgstr "Dateinamen von der Standard-Eingabe lesen"
 msgid "terminate input and output records by a NUL character"
 msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen"
 
-#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
 msgid "suppress progress reporting"
 msgstr "Fortschrittsanzeige unterdrücken"
 
@@ -4233,8 +4525,9 @@ msgid "write the content to temporary files"
 msgstr "den Inhalt in temporäre Dateien schreiben"
 
 #: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
 msgid "string"
 msgstr "Zeichenkette"
 
@@ -4285,80 +4578,80 @@ msgstr "Pfad '%s': kann nicht zusammenführen"
 msgid "Unable to add merge result for '%s'"
 msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen."
 
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden"
 
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' kann nicht mit '%s' verwendet werden"
 
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln"
 
-#: builtin/checkout.c:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
 msgid "corrupt index file"
 msgstr "beschädigte Index-Datei"
 
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "Pfad '%s' ist nicht zusammengeführt."
 
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
 msgid "you need to resolve your current index first"
 msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen."
 
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Kann \"reflog\" für '%s' nicht durchführen: %s\n"
 
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
 msgid "HEAD is now at"
 msgstr "HEAD ist jetzt bei"
 
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
 msgid "unable to update HEAD"
 msgstr "Konnte HEAD nicht aktualisieren."
 
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Setze Branch '%s' neu\n"
 
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Bereits auf '%s'\n"
 
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Zu neuem Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Zu Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... und %d weitere.\n"
 
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -4381,7 +4674,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4408,152 +4701,152 @@ msgstr[1] ""
 " git branch <neuer-Branchname> %s\n"
 "\n"
 
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
 msgid "internal error in revision walk"
 msgstr "interner Fehler im Revisionsgang"
 
-#: builtin/checkout.c:797
+#: builtin/checkout.c:796
 msgid "Previous HEAD position was"
 msgstr "Vorherige Position von HEAD war"
 
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
 msgid "You are on a branch yet to be born"
 msgstr "Sie sind auf einem Branch, der noch geboren wird"
 
-#: builtin/checkout.c:969
+#: builtin/checkout.c:968
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "nur eine Referenz erwartet, %d gegeben."
 
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
 #, c-format
 msgid "invalid reference: %s"
 msgstr "Ungültige Referenz: %s"
 
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
 
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1076
 msgid "paths cannot be used with switching branches"
 msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
 
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
 
-#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' kann nicht mit '%s' verwendet werden"
 
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
 
-#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
 msgid "branch"
 msgstr "Branch"
 
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
 msgid "create and checkout a new branch"
 msgstr "einen neuen Branch erzeugen und auschecken"
 
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
 msgid "create/reset and checkout a branch"
 msgstr "einen Branch erstellen/umsetzen und auschecken"
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
 msgid "create reflog for new branch"
 msgstr "das Reflog für den neuen Branch erzeugen"
 
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
 msgid "detach the HEAD at named commit"
 msgstr "HEAD zu benanntem Commit setzen"
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
 msgid "set upstream info for new branch"
 msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new-branch"
 msgstr "neuer Branch"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new unparented branch"
 msgstr "neuer Branch ohne Eltern-Commit"
 
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
 msgid "checkout our version for unmerged files"
 msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
 msgid "checkout their version for unmerged files"
 msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
 msgid "force checkout (throw away local modifications)"
 msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
 
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1150
 msgid "perform a 3-way merge with the new branch"
 msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
 
-#: builtin/checkout.c:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
 msgid "update ignored files (default)"
 msgstr "ignorierte Dateien aktualisieren (Standard)"
 
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
 msgid "style"
 msgstr "Stil"
 
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
 msgid "conflict style (merge or diff3)"
 msgstr "Konfliktstil (merge oder diff3)"
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
 
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "second guess 'git checkout <no-such-branch>'"
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 "Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis "
 "ausgecheckt wurde, deaktivieren"
 
-#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
 #: builtin/send-pack.c:168
 msgid "force progress reporting"
 msgstr "Fortschrittsanzeige erzwingen"
 
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus."
 
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1209
 msgid "--track needs a branch name"
 msgstr "Bei der Option --track muss ein Branchname angegeben werden."
 
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
 msgid "Missing branch name; try -b"
 msgstr "Vermisse Branchnamen; versuchen Sie -b"
 
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
 msgid "invalid path specification"
 msgstr "ungültige Pfadspezifikation"
 
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
 #, c-format
 msgid ""
 "Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4563,12 +4856,12 @@ msgstr ""
 "Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit aufgelöst "
 "werden kann?"
 
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'"
 
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1266
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -4720,8 +5013,8 @@ msgstr "interaktives Clean"
 msgid "remove whole directories"
 msgstr "ganze Verzeichnisse löschen"
 
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
 msgid "pattern"
 msgstr "Muster"
 
@@ -4761,105 +5054,113 @@ msgstr ""
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
 
-#: builtin/clone.c:60
+#: builtin/clone.c:62
 msgid "don't create a checkout"
 msgstr "kein Auschecken"
 
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
 msgid "create a bare repository"
 msgstr "ein Bare-Repository erstellen"
 
-#: builtin/clone.c:65
+#: builtin/clone.c:67
 msgid "create a mirror repository (implies bare)"
 msgstr "ein Spiegelarchiv erstellen (impliziert --bare)"
 
-#: builtin/clone.c:67
+#: builtin/clone.c:69
 msgid "to clone from a local repository"
 msgstr "von einem lokalen Repository klonen"
 
-#: builtin/clone.c:69
+#: builtin/clone.c:71
 msgid "don't use local hardlinks, always copy"
 msgstr "lokal keine harten Verweise verwenden, immer Kopien"
 
-#: builtin/clone.c:71
+#: builtin/clone.c:73
 msgid "setup as shared repository"
 msgstr "als verteiltes Repository einrichten"
 
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
 msgid "initialize submodules in the clone"
 msgstr "Submodule im Klon initialisieren"
 
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "Anzahl der parallel zu klonenden Submodule"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
 msgid "template-directory"
 msgstr "Vorlagenverzeichnis"
 
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
 msgid "directory from which templates will be used"
 msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
 
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
 msgid "reference repository"
 msgstr "Repository referenzieren"
 
-#: builtin/clone.c:81
+#: builtin/clone.c:85
 msgid "use --reference only while cloning"
 msgstr "--reference nur während des Klonens benutzen"
 
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
 msgid "name"
 msgstr "Name"
 
-#: builtin/clone.c:83
+#: builtin/clone.c:87
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "<Name> statt 'origin' für Upstream-Repository verwenden"
 
-#: builtin/clone.c:85
+#: builtin/clone.c:89
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:91
 msgid "path to git-upload-pack on the remote"
 msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
 
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
-#: builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201
 msgid "depth"
 msgstr "Tiefe"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:93
 msgid "create a shallow clone of that depth"
 msgstr ""
 "einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:95
 msgid "clone only one branch, HEAD or --branch"
 msgstr "nur einen Branch klonen, HEAD oder --branch"
 
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
 msgid "gitdir"
 msgstr ".git-Verzeichnis"
 
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
 msgid "separate git dir from working tree"
 msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:100
 msgid "key=value"
 msgstr "Schlüssel=Wert"
 
-#: builtin/clone.c:95
+#: builtin/clone.c:101
 msgid "set config inside the new repository"
 msgstr "Konfiguration innerhalb des neuen Repositories setzen"
 
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
 msgid "use IPv4 addresses only"
 msgstr "nur IPv4-Adressen benutzen"
 
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
 msgid "use IPv6 addresses only"
 msgstr "nur IPv6-Adressen benutzen"
 
-#: builtin/clone.c:239
+#: builtin/clone.c:241
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -4867,62 +5168,57 @@ msgstr ""
 "Konnte keinen Verzeichnisnamen erraten.\n"
 "Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
 
-#: builtin/clone.c:305
+#: builtin/clone.c:307
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "Referenziertes Repository '%s' wird noch nicht als verknüpftes\n"
 "Arbeitsverzeichnis unterstützt."
 
-#: builtin/clone.c:307
+#: builtin/clone.c:309
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
 
-#: builtin/clone.c:312
+#: builtin/clone.c:314
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 "Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
 
-#: builtin/clone.c:315
+#: builtin/clone.c:317
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""
 "Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
 "eingehängt."
 
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "Konnte '%s' nicht lesen"
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existiert und ist kein Verzeichnis"
 
-#: builtin/clone.c:396
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "Konnte %s nicht lesen\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "Konnte Verweis '%s' nicht erstellen"
 
-#: builtin/clone.c:422
+#: builtin/clone.c:424
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "Konnte Datei nicht nach '%s' kopieren"
 
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
 #, c-format
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: builtin/clone.c:459
+#: builtin/clone.c:461
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -4932,132 +5228,132 @@ msgstr ""
 "Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n"
 "und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n"
 
-#: builtin/clone.c:536
+#: builtin/clone.c:538
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
 
-#: builtin/clone.c:626
+#: builtin/clone.c:628
 #, c-format
 msgid "Checking connectivity... "
 msgstr "Prüfe Konnektivität ... "
 
-#: builtin/clone.c:629
+#: builtin/clone.c:631
 msgid "remote did not send all necessary objects"
 msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet."
 
-#: builtin/clone.c:647
+#: builtin/clone.c:649
 #, c-format
 msgid "unable to update %s"
 msgstr "kann %s nicht aktualisieren"
 
-#: builtin/clone.c:696
+#: builtin/clone.c:698
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann "
 "nicht ausgecheckt werden.\n"
 
-#: builtin/clone.c:727
+#: builtin/clone.c:729
 msgid "unable to checkout working tree"
 msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
 
-#: builtin/clone.c:753
+#: builtin/clone.c:767
 msgid "unable to write parameters to config file"
 msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:830
 msgid "cannot repack to clean up"
 msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
 
-#: builtin/clone.c:818
+#: builtin/clone.c:832
 msgid "cannot unlink temporary alternates file"
 msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
 
-#: builtin/clone.c:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
 msgid "Too many arguments."
 msgstr "Zu viele Argumente."
 
-#: builtin/clone.c:854
+#: builtin/clone.c:868
 msgid "You must specify a repository to clone."
 msgstr "Sie müssen ein Repository zum Klonen angeben."
 
-#: builtin/clone.c:865
+#: builtin/clone.c:879
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
 
-#: builtin/clone.c:868
+#: builtin/clone.c:882
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
 
-#: builtin/clone.c:881
+#: builtin/clone.c:895
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "Repository '%s' existiert nicht."
 
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "Tiefe %s ist keine positive Zahl"
 
-#: builtin/clone.c:897
+#: builtin/clone.c:911
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis."
 
-#: builtin/clone.c:907
+#: builtin/clone.c:921
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "Arbeitsverzeichnis '%s' existiert bereits."
 
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
 
-#: builtin/clone.c:925
+#: builtin/clone.c:939
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
 
-#: builtin/clone.c:943
+#: builtin/clone.c:957
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Klone in Bare-Repository '%s' ...\n"
 
-#: builtin/clone.c:945
+#: builtin/clone.c:959
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Klone nach '%s' ...\n"
 
-#: builtin/clone.c:984
+#: builtin/clone.c:998
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie "
 "stattdessen file://"
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1001
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 "Quelle ist ein Repository mit unvollständiger Historie (shallow),ignoriere --"
 "local"
 
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
 msgid "--local is ignored"
 msgstr "--local wird ignoriert"
 
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "Weiß nicht wie %s zu klonen ist."
 
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
 
-#: builtin/clone.c:1056
+#: builtin/clone.c:1070
 msgid "You appear to have cloned an empty repository."
 msgstr "Sie scheinen ein leeres Repository geklont zu haben."
 
@@ -5200,67 +5496,67 @@ msgstr ""
 "Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n"
 "Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n"
 
-#: builtin/commit.c:305
+#: builtin/commit.c:307
 msgid "failed to unpack HEAD tree object"
 msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD."
 
-#: builtin/commit.c:346
+#: builtin/commit.c:348
 msgid "unable to create temporary index"
 msgstr "Konnte temporären Index nicht erstellen."
 
-#: builtin/commit.c:352
+#: builtin/commit.c:354
 msgid "interactive add failed"
 msgstr "interaktives Hinzufügen fehlgeschlagen"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:367
 msgid "unable to update temporary index"
 msgstr "Konnte temporären Index nicht aktualisieren."
 
-#: builtin/commit.c:367
+#: builtin/commit.c:369
 msgid "Failed to update main cache tree"
 msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
 
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
 msgid "unable to write new_index file"
 msgstr "Konnte new_index Datei nicht schreiben"
 
-#: builtin/commit.c:445
+#: builtin/commit.c:447
 msgid "cannot do a partial commit during a merge."
 msgstr "Kann keinen Teil-Commit durchführen, während ein Merge im Gange ist."
 
-#: builtin/commit.c:447
+#: builtin/commit.c:449
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 "Kann keinen Teil-Commit durchführen, während \"cherry-pick\" im Gange ist."
 
-#: builtin/commit.c:456
+#: builtin/commit.c:458
 msgid "cannot read the index"
 msgstr "Kann Index nicht lesen"
 
-#: builtin/commit.c:475
+#: builtin/commit.c:477
 msgid "unable to write temporary index file"
 msgstr "Konnte temporäre Index-Datei nicht schreiben."
 
-#: builtin/commit.c:580
+#: builtin/commit.c:582
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "Commit '%s' fehlt Autor-Kopfbereich"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:584
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
 
-#: builtin/commit.c:601
+#: builtin/commit.c:603
 msgid "malformed --author parameter"
 msgstr "Fehlerhafter --author Parameter"
 
-#: builtin/commit.c:609
+#: builtin/commit.c:611
 #, c-format
 msgid "invalid date format: %s"
 msgstr "Ungültiges Datumsformat: %s"
 
-#: builtin/commit.c:653
+#: builtin/commit.c:655
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -5268,38 +5564,38 @@ msgstr ""
 "Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
 "der aktuellen Commit-Beschreibung verwendet wird."
 
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "Konnte Commit %s nicht nachschlagen"
 
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
 
-#: builtin/commit.c:704
+#: builtin/commit.c:706
 msgid "could not read log from standard input"
 msgstr "Konnte Log nicht von Standard-Eingabe lesen."
 
-#: builtin/commit.c:708
+#: builtin/commit.c:710
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "Konnte Log-Datei '%s' nicht lesen"
 
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "Konnte MERGE_MSG nicht lesen"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
 msgid "could not read SQUASH_MSG"
 msgstr "Konnte SQUASH_MSG nicht lesen"
 
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "Konnte MERGE_MSG nicht lesen"
+
+#: builtin/commit.c:796
 msgid "could not write commit template"
 msgstr "Konnte Commit-Vorlage nicht schreiben"
 
-#: builtin/commit.c:803
+#: builtin/commit.c:814
 #, c-format
 msgid ""
 "\n"
@@ -5314,7 +5610,7 @@ msgstr ""
 "\t%s\n"
 "und versuchen Sie es erneut.\n"
 
-#: builtin/commit.c:808
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -5329,7 +5625,7 @@ msgstr ""
 "\t%s\n"
 "und versuchen Sie es erneut.\n"
 
-#: builtin/commit.c:821
+#: builtin/commit.c:832
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5339,7 +5635,7 @@ msgstr ""
 "die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
 "bricht den Commit ab.\n"
 
-#: builtin/commit.c:828
+#: builtin/commit.c:839
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5352,157 +5648,157 @@ msgstr ""
 "entfernen.\n"
 "Eine leere Beschreibung bricht den Commit ab.\n"
 
-#: builtin/commit.c:848
+#: builtin/commit.c:859
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:           %.*s <%.*s>"
 
-#: builtin/commit.c:856
+#: builtin/commit.c:867
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDatum:            %s"
 
-#: builtin/commit.c:863
+#: builtin/commit.c:874
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommit-Ersteller: %.*s <%.*s>"
 
-#: builtin/commit.c:881
+#: builtin/commit.c:892
 msgid "Cannot read index"
 msgstr "Kann Index nicht lesen"
 
-#: builtin/commit.c:938
+#: builtin/commit.c:949
 msgid "Error building trees"
 msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
 
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
 "Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n"
 
-#: builtin/commit.c:1055
+#: builtin/commit.c:1066
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem "
 "vorhandenen Autor überein"
 
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Ungültiger Modus '%s' für unversionierte Dateien"
 
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
 msgid "--long and -z are incompatible"
 msgstr "Die Optionen --long und -z sind inkompatibel."
 
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
 msgid "Using both --reset-author and --author does not make sense"
 msgstr ""
 "Die Optionen --reset-author und --author können nicht gemeinsam verwendet "
 "werden."
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1157
 msgid "You have nothing to amend."
 msgstr "Sie haben nichts für \"--amend\"."
 
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen."
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1162
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen."
 
-#: builtin/commit.c:1154
+#: builtin/commit.c:1165
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 "Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden."
 
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden."
 
-#: builtin/commit.c:1166
+#: builtin/commit.c:1177
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "Die Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden."
 
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 "Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden."
 
-#: builtin/commit.c:1191
+#: builtin/commit.c:1202
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Es kann nur eine Option von --include/--only/--all/--interactive/--patch "
 "verwendet werden."
 
-#: builtin/commit.c:1193
+#: builtin/commit.c:1204
 msgid "No paths with --include/--only does not make sense."
 msgstr ""
 "Die Optionen --include und --only können nur mit der Angabe von Pfaden "
 "verwendet werden."
 
-#: builtin/commit.c:1195
+#: builtin/commit.c:1206
 msgid "Clever... amending the last one with dirty index."
 msgstr "Klug ... den letzten Commit mit einem geänderten Index nachbessern."
 
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
 msgstr "Explizite Pfade ohne -i oder -o angegeben; nehme --only an"
 
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Ungültiger \"cleanup\" Modus %s"
 
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
 msgid "Paths with -a does not make sense."
 msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden."
 
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
 msgid "show status concisely"
 msgstr "Status im Kurzformat anzeigen"
 
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
 msgid "show branch information"
 msgstr "Branchinformationen anzeigen"
 
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
 msgid "machine-readable output"
 msgstr "maschinenlesbare Ausgabe"
 
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
 msgid "show status in long format (default)"
 msgstr "Status im Langformat anzeigen (Standard)"
 
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
 msgid "terminate entries with NUL"
 msgstr "Einträge mit NUL-Zeichen abschließen"
 
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
 #: builtin/fast-export.c:984 builtin/tag.c:353
 msgid "mode"
 msgstr "Modus"
 
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: "
 "all)"
 
-#: builtin/commit.c:1340
+#: builtin/commit.c:1351
 msgid "show ignored files"
 msgstr "ignorierte Dateien anzeigen"
 
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
 msgid "when"
 msgstr "wann"
 
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -5510,203 +5806,203 @@ msgstr ""
 "Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
 "(Standard: all)"
 
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
 msgid "list untracked files in columns"
 msgstr "unversionierte Dateien in Spalten auflisten"
 
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
 msgid "couldn't look up newly created commit"
 msgstr "Konnte neu erstellten Commit nicht nachschlagen."
 
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
 msgid "could not parse newly created commit"
 msgstr "Konnte neulich erstellten Commit nicht analysieren."
 
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
 msgid "detached HEAD"
 msgstr "losgelöster HEAD"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
 msgid " (root-commit)"
 msgstr " (Basis-Commit)"
 
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
 msgid "suppress summary after successful commit"
 msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
 
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
 msgid "show diff in commit message template"
 msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
 
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
 msgid "Commit message options"
 msgstr "Optionen für Commit-Beschreibung"
 
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
 msgid "read message from file"
 msgstr "Beschreibung von Datei lesen"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "author"
 msgstr "Autor"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "override author for commit"
 msgstr "Autor eines Commits überschreiben"
 
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
 msgid "date"
 msgstr "Datum"
 
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
 msgid "override date for commit"
 msgstr "Datum eines Commits überschreiben"
 
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
 #: builtin/notes.c:558 builtin/tag.c:349
 msgid "message"
 msgstr "Beschreibung"
 
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
 msgid "commit message"
 msgstr "Commit-Beschreibung"
 
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
 msgid "commit"
 msgstr "Commit"
 
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
 msgid "reuse and edit message from specified commit"
 msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
 
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
 msgid "reuse message from specified commit"
 msgstr "Beschreibung des angegebenen Commits wiederverwenden"
 
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "eine automatisch zusammengesetzte Beschreibung zum Nachbessern des "
 "angegebenen Commits verwenden"
 
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "eine automatisch zusammengesetzte Beschreibung beim \"squash\" des "
 "angegebenen Commits verwenden"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1603
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)"
 
-#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
 msgid "add Signed-off-by:"
 msgstr "'Signed-off-by:'-Zeile hinzufügen"
 
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
 msgid "use specified template file"
 msgstr "angegebene Vorlagendatei verwenden"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
 msgid "force edit of commit"
 msgstr "Bearbeitung des Commits erzwingen"
 
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
 msgid "default"
 msgstr "Standard"
 
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
 msgid "include status in commit message template"
 msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
 
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
 #: builtin/revert.c:93
 msgid "GPG sign commit"
 msgstr "Commit mit GPG signieren"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
 msgid "Commit contents options"
 msgstr "Optionen für Commit-Inhalt"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
 msgid "commit all changed files"
 msgstr "alle geänderten Dateien committen"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
 msgid "add specified files to index for commit"
 msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
 
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
 msgid "interactively add files"
 msgstr "interaktives Hinzufügen von Dateien"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
 msgid "interactively add changes"
 msgstr "interaktives Hinzufügen von Änderungen"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
 msgid "commit only specified files"
 msgstr "nur die angegebenen Dateien committen"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
 msgid "bypass pre-commit hook"
 msgstr "\"pre-commit hook\" umgehen"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
 msgid "show what would be committed"
 msgstr "anzeigen, was committet werden würde"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
 msgid "amend previous commit"
 msgstr "vorherigen Commit ändern"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
 msgid "bypass post-rewrite hook"
 msgstr "\"post-rewrite hook\" umgehen"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
 msgid "ok to record an empty change"
 msgstr "Aufzeichnung einer leeren Änderung erlauben"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
 msgid "ok to record a change with an empty message"
 msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
 msgid "could not parse HEAD commit"
 msgstr "Konnte Commit von HEAD nicht analysieren."
 
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
 
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
 msgid "could not read MERGE_MODE"
 msgstr "Konnte MERGE_MODE nicht lesen"
 
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
 
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Commit abgebrochen; Sie haben die Beschreibung nicht editiert.\n"
 
-#: builtin/commit.c:1740
+#: builtin/commit.c:1760
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
 
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -5855,7 +6151,7 @@ msgstr ""
 msgid "unable to parse default color value"
 msgstr "konnte Standard-Farbwert nicht parsen"
 
-#: builtin/config.c:469
+#: builtin/config.c:472
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -5870,7 +6166,7 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:614
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen."
@@ -5906,7 +6202,7 @@ msgstr "annotiertes Tag %s hat keinen eingebetteten Namen"
 msgid "tag '%s' is really '%s' here"
 msgstr "Tag '%s' ist eigentlich '%s' hier"
 
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s ist kein gültiger Objekt-Name"
@@ -5999,7 +6295,7 @@ msgstr "die jüngsten <n> Tags betrachten (Standard: 10)"
 msgid "only consider tags matching <pattern>"
 msgstr "nur Tags, die <Muster> entsprechen, betrachten"
 
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
 msgid "show abbreviated commit object as fallback"
 msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft"
 
@@ -6035,21 +6331,21 @@ msgstr "'%s': keine reguläre Datei oder symbolische Verknüpfung"
 msgid "invalid option: %s"
 msgstr "Ungültige Option: %s"
 
-#: builtin/diff.c:358
+#: builtin/diff.c:360
 msgid "Not a git repository"
 msgstr "Kein Git-Repository"
 
-#: builtin/diff.c:401
+#: builtin/diff.c:403
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "Objekt '%s' ist ungültig."
 
-#: builtin/diff.c:410
+#: builtin/diff.c:412
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "Mehr als zwei Blobs angegeben: '%s'"
 
-#: builtin/diff.c:417
+#: builtin/diff.c:419
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "unbehandeltes Objekt '%s' angegeben"
@@ -6122,19 +6418,19 @@ msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]"
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<Optionen>]"
 
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
 msgid "fetch from all remotes"
 msgstr "fordert von allen Remote-Repositories an"
 
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben"
 
-#: builtin/fetch.c:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
 msgid "path to upload pack on remote end"
 msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
 
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
 msgid "force overwrite of local branch"
 msgstr "das Ãœberschreiben von lokalen Branches erzwingen"
 
@@ -6142,7 +6438,7 @@ msgstr "das Ãœberschreiben von lokalen Branches erzwingen"
 msgid "fetch from multiple remotes"
 msgstr "von mehreren Remote-Repositories anfordern"
 
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
 msgid "fetch all tags and associated objects"
 msgstr "alle Tags und verbundene Objekte anfordern"
 
@@ -6154,21 +6450,21 @@ msgstr "nicht alle Tags anfordern (--no-tags)"
 msgid "number of submodules fetched in parallel"
 msgstr "Anzahl der parallel anzufordernden Submodule"
 
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 "Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository "
 "befinden"
 
-#: builtin/fetch.c:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
 msgid "on-demand"
 msgstr "bei-Bedarf"
 
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
 msgid "control recursive fetching of submodules"
 msgstr "rekursive Anforderungen von Submodulen kontrollieren"
 
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
 msgid "keep downloaded pack"
 msgstr "heruntergeladenes Paket behalten"
 
@@ -6176,16 +6472,16 @@ msgstr "heruntergeladenes Paket behalten"
 msgid "allow updating of HEAD ref"
 msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
 
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
 msgid "deepen history of shallow clone"
 msgstr ""
 "die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen"
 
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
 msgid "convert to a complete repository"
 msgstr "zu einem vollständigen Repository konvertieren"
 
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
 msgid "dir"
 msgstr "Verzeichnis"
 
@@ -6197,15 +6493,15 @@ msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen"
 msgid "default mode for recursion"
 msgstr "Standard-Modus für Rekursion"
 
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
 msgid "accept refs that update .git/shallow"
 msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
 
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
 msgid "refmap"
 msgstr "Refmap"
 
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
 msgid "specify fetch refmap"
 msgstr "Refmap für 'fetch' angeben"
 
@@ -6264,11 +6560,6 @@ msgstr "Aktualisierung erzwungen"
 msgid "(non-fast-forward)"
 msgstr "(kein Vorspulen)"
 
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "kann %s nicht öffnen: %s\n"
-
 #: builtin/fetch.c:619
 #, c-format
 msgid "%s did not send all necessary objects\n"
@@ -6479,55 +6770,55 @@ msgstr "Prüfe Konnektivität"
 msgid "Checking object directories"
 msgstr "Prüfe Objekt-Verzeichnisse"
 
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<Optionen>] [<Objekt>...]"
 
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
 msgid "show unreachable objects"
 msgstr "unerreichbare Objekte anzeigen"
 
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
 msgid "show dangling objects"
 msgstr "unreferenzierte Objekte anzeigen"
 
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
 msgid "report tags"
 msgstr "Tags melden"
 
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
 msgid "report root nodes"
 msgstr "Hauptwurzeln melden"
 
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
 msgid "make index objects head nodes"
 msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
 msgid "make reflogs head nodes (default)"
 msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)"
 
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
 msgid "also consider packs and alternate objects"
 msgstr "ebenso Pakete und alternative Objekte betrachten"
 
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
 msgid "check only connectivity"
 msgstr "nur Konnektivität prüfen"
 
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
 msgid "enable more strict checking"
 msgstr "genauere Prüfung aktivieren"
 
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
 msgid "write dangling objects in .git/lost-found"
 msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
 
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
 msgid "show progress"
 msgstr "Fortschrittsanzeige anzeigen"
 
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
 msgid "Checking objects"
 msgstr "Prüfe Objekte"
 
@@ -6637,226 +6928,226 @@ msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
 msgid "unable to grep from object of type %s"
 msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen"
 
-#: builtin/grep.c:558
+#: builtin/grep.c:560
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "Schalter '%c' erwartet einen numerischen Wert"
 
-#: builtin/grep.c:575
+#: builtin/grep.c:577
 #, c-format
 msgid "cannot open '%s'"
 msgstr "kann '%s' nicht öffnen"
 
-#: builtin/grep.c:644
+#: builtin/grep.c:646
 msgid "search in index instead of in the work tree"
 msgstr "im Index anstatt im Arbeitsverzeichnis suchen"
 
-#: builtin/grep.c:646
+#: builtin/grep.c:648
 msgid "find in contents not managed by git"
 msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:650
 msgid "search in both tracked and untracked files"
 msgstr "in versionierten und unversionierten Dateien suchen"
 
-#: builtin/grep.c:650
+#: builtin/grep.c:652
 msgid "ignore files specified via '.gitignore'"
 msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
 
-#: builtin/grep.c:653
+#: builtin/grep.c:655
 msgid "show non-matching lines"
 msgstr "Zeilen ohne Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:655
+#: builtin/grep.c:657
 msgid "case insensitive matching"
 msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
 
-#: builtin/grep.c:657
+#: builtin/grep.c:659
 msgid "match patterns only at word boundaries"
 msgstr "nur ganze Wörter suchen"
 
-#: builtin/grep.c:659
+#: builtin/grep.c:661
 msgid "process binary files as text"
 msgstr "binäre Dateien als Text verarbeiten"
 
-#: builtin/grep.c:661
+#: builtin/grep.c:663
 msgid "don't match patterns in binary files"
 msgstr "keine Muster in Binärdateien finden"
 
-#: builtin/grep.c:664
+#: builtin/grep.c:666
 msgid "process binary files with textconv filters"
 msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
 
-#: builtin/grep.c:666
+#: builtin/grep.c:668
 msgid "descend at most <depth> levels"
 msgstr "höchstens <Tiefe> Ebenen durchlaufen"
 
-#: builtin/grep.c:670
+#: builtin/grep.c:672
 msgid "use extended POSIX regular expressions"
 msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
 
-#: builtin/grep.c:673
+#: builtin/grep.c:675
 msgid "use basic POSIX regular expressions (default)"
 msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
 
-#: builtin/grep.c:676
+#: builtin/grep.c:678
 msgid "interpret patterns as fixed strings"
 msgstr "Muster als feste Zeichenketten interpretieren"
 
-#: builtin/grep.c:679
+#: builtin/grep.c:681
 msgid "use Perl-compatible regular expressions"
 msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
 
-#: builtin/grep.c:682
+#: builtin/grep.c:684
 msgid "show line numbers"
 msgstr "Zeilennummern anzeigen"
 
-#: builtin/grep.c:683
+#: builtin/grep.c:685
 msgid "don't show filenames"
 msgstr "keine Dateinamen anzeigen"
 
-#: builtin/grep.c:684
+#: builtin/grep.c:686
 msgid "show filenames"
 msgstr "Dateinamen anzeigen"
 
-#: builtin/grep.c:686
+#: builtin/grep.c:688
 msgid "show filenames relative to top directory"
 msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
 
-#: builtin/grep.c:688
+#: builtin/grep.c:690
 msgid "show only filenames instead of matching lines"
 msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
 
-#: builtin/grep.c:690
+#: builtin/grep.c:692
 msgid "synonym for --files-with-matches"
 msgstr "Synonym für --files-with-matches"
 
-#: builtin/grep.c:693
+#: builtin/grep.c:695
 msgid "show only the names of files without match"
 msgstr "nur die Dateinamen ohne Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:695
+#: builtin/grep.c:697
 msgid "print NUL after filenames"
 msgstr "NUL-Zeichen nach Dateinamen ausgeben"
 
-#: builtin/grep.c:697
+#: builtin/grep.c:699
 msgid "show the number of matches instead of matching lines"
 msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
 
-#: builtin/grep.c:698
+#: builtin/grep.c:700
 msgid "highlight matches"
 msgstr "Ãœbereinstimmungen hervorheben"
 
-#: builtin/grep.c:700
+#: builtin/grep.c:702
 msgid "print empty line between matches from different files"
 msgstr ""
 "eine Leerzeile zwischen Ãœbereinstimmungen in verschiedenen Dateien ausgeben"
 
-#: builtin/grep.c:702
+#: builtin/grep.c:704
 msgid "show filename only once above matches from same file"
 msgstr ""
 "den Dateinamen nur einmal oberhalb der Ãœbereinstimmungen aus dieser Datei "
 "anzeigen"
 
-#: builtin/grep.c:705
+#: builtin/grep.c:707
 msgid "show <n> context lines before and after matches"
 msgstr "<n> Zeilen vor und nach den Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:708
+#: builtin/grep.c:710
 msgid "show <n> context lines before matches"
 msgstr "<n> Zeilen vor den Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:710
+#: builtin/grep.c:712
 msgid "show <n> context lines after matches"
 msgstr "<n> Zeilen nach den Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:712
+#: builtin/grep.c:714
 msgid "use <n> worker threads"
 msgstr "<n> Threads benutzen"
 
-#: builtin/grep.c:713
+#: builtin/grep.c:715
 msgid "shortcut for -C NUM"
 msgstr "Kurzform für -C NUM"
 
-#: builtin/grep.c:716
+#: builtin/grep.c:718
 msgid "show a line with the function name before matches"
 msgstr "eine Zeile mit dem Funktionsnamen vor Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:718
+#: builtin/grep.c:720
 msgid "show the surrounding function"
 msgstr "die umgebende Funktion anzeigen"
 
-#: builtin/grep.c:721
+#: builtin/grep.c:723
 msgid "read patterns from file"
 msgstr "Muster von einer Datei lesen"
 
-#: builtin/grep.c:723
+#: builtin/grep.c:725
 msgid "match <pattern>"
 msgstr "<Muster> finden"
 
-#: builtin/grep.c:725
+#: builtin/grep.c:727
 msgid "combine patterns specified with -e"
 msgstr "Muster kombinieren, die mit -e angegeben wurden"
 
-#: builtin/grep.c:737
+#: builtin/grep.c:739
 msgid "indicate hit with exit status without output"
 msgstr "Ãœbereinstimmungen nur durch Beendigungsstatus anzeigen"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:741
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "nur Ãœbereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
 
-#: builtin/grep.c:741
+#: builtin/grep.c:743
 msgid "show parse tree for grep expression"
 msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen"
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "pager"
 msgstr "Anzeigeprogramm"
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "show matching files in the pager"
 msgstr "Dateien mit Ãœbereinstimmungen im Anzeigeprogramm anzeigen"
 
-#: builtin/grep.c:748
+#: builtin/grep.c:750
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
 
-#: builtin/grep.c:811
+#: builtin/grep.c:813
 msgid "no pattern given."
 msgstr "keine Muster angegeben"
 
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "ungültige Anzahl von Threads angegeben (%d)"
 
-#: builtin/grep.c:873
+#: builtin/grep.c:875
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 "Die Option --open-files-in-pager kann nur innerhalb des "
 "Arbeitsverzeichnisses verwendet werden."
 
-#: builtin/grep.c:899
+#: builtin/grep.c:901
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr ""
 "Die Optionen --cached und --untracked können nicht mit --no-index verwendet "
 "werden."
 
-#: builtin/grep.c:904
+#: builtin/grep.c:906
 msgid "--no-index or --untracked cannot be used with revs."
 msgstr ""
 "Die Optionen --no-index und --untracked können nicht mit Commits verwendet "
 "werden."
 
-#: builtin/grep.c:907
+#: builtin/grep.c:909
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr ""
 "Die Option --[no-]exclude-standard kann nicht mit versionierten Inhalten "
 "verwendet werden."
 
-#: builtin/grep.c:915
+#: builtin/grep.c:917
 msgid "both --cached and trees are given."
 msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden."
 
@@ -6947,8 +7238,8 @@ msgstr "Version des emacsclient '%d' ist zu alt (< 22)."
 
 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
 #, c-format
-msgid "failed to exec '%s': %s"
-msgstr "Fehler beim Ausführen von '%s': %s"
+msgid "failed to exec '%s'"
+msgstr "Fehler beim Ausführen von '%s'"
 
 #: builtin/help.c:205
 #, c-format
@@ -7207,107 +7498,109 @@ msgstr "Fehler beim Auflösen der Unterschiede"
 
 #: builtin/index-pack.c:1253
 #, c-format
-msgid "completed with %d local objects"
-msgstr "abgeschlossen mit %d lokalen Objekten"
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "abgeschlossen mit %d lokalem Objekt"
+msgstr[1] "abgeschlossen mit %d lokalen Objekten"
 
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1265
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)"
 
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "Paket hat %d unaufgelöste Unterschied"
 msgstr[1] "Paket hat %d unaufgelöste Unterschiede"
 
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1293
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
 
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "lokales Objekt %s ist beschädigt"
 
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
 msgid "error while closing pack file"
 msgstr "Fehler beim Schließen der Paketdatei"
 
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben"
 
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
 msgid "cannot store pack file"
 msgstr "Kann Paketdatei nicht speichern"
 
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
 msgid "cannot store index file"
 msgstr "Kann Indexdatei nicht speichern"
 
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
 
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
 
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
 
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen"
 
-#: builtin/index-pack.c:1587
+#: builtin/index-pack.c:1589
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "kein Unterschied: %d Objekt"
 msgstr[1] "kein Unterschied: %d Objekte"
 
-#: builtin/index-pack.c:1594
+#: builtin/index-pack.c:1596
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt"
 msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte"
 
-#: builtin/index-pack.c:1624
+#: builtin/index-pack.c:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
+
+#: builtin/index-pack.c:1638
 msgid "Cannot come back to cwd"
 msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln"
 
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
 #, c-format
 msgid "bad %s"
 msgstr "%s ist ungültig"
 
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden."
 
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
-
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1731
 msgid "--verify with no packfile name given"
 msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben."
 
@@ -7346,27 +7639,27 @@ msgstr "kann '%s' nicht nach '%s' kopieren"
 msgid "ignoring template %s"
 msgstr "ignoriere Vorlage %s"
 
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
 #, c-format
 msgid "templates not found %s"
 msgstr "keine Vorlagen in '%s' gefunden"
 
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
 #, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr "kopiere keine Vorlagen mit einer falschen Formatversion %d von '%s'"
+msgid "not copying templates from '%s': %s"
+msgstr "kopiere keine Vorlagen von '%s': %s"
 
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
 #, c-format
 msgid "%s already exists"
 msgstr "%s existiert bereits"
 
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "kann nicht mit Dateityp %d umgehen"
 
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "Konnte %s nicht nach %s verschieben"
@@ -7374,24 +7667,24 @@ msgstr "Konnte %s nicht nach %s verschieben"
 #. TRANSLATORS: The first '%s' is either "Reinitialized
 #. existing" or "Initialized empty", the second " shared" or
 #. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
 #, c-format
 msgid "%s%s Git repository in %s%s\n"
 msgstr "%s%s Git-Repository in %s%s\n"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Reinitialized existing"
 msgstr "Reinitialisierte existierendes"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Initialized empty"
 msgstr "Initialisierte leeres"
 
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
 msgid " shared"
 msgstr " gemeinsames"
 
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -7399,25 +7692,25 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--"
 "shared[=<Berechtigungen>]] [<Verzeichnis>]"
 
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
 msgid "permissions"
 msgstr "Berechtigungen"
 
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "angeben, dass das Git-Repository mit mehreren Benutzern geteilt wird"
 
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "kann Verzeichnis %s nicht erstellen"
 
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "kann nicht in Verzeichnis %s wechseln"
 
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7426,7 +7719,7 @@ msgstr ""
 "%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s "
 "(oder --git-dir=<Verzeichnis>)"
 
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen."
@@ -7472,266 +7765,318 @@ msgstr "git show [<Optionen>] <Objekt>..."
 msgid "invalid --decorate option: %s"
 msgstr "Ungültige Option für --decorate: %s"
 
-#: builtin/log.c:131
+#: builtin/log.c:137
 msgid "suppress diff output"
 msgstr "Ausgabe der Unterschiede unterdrücken"
 
-#: builtin/log.c:132
+#: builtin/log.c:138
 msgid "show source"
 msgstr "Quelle anzeigen"
 
-#: builtin/log.c:133
+#: builtin/log.c:139
 msgid "Use mail map file"
 msgstr "\"mailmap\"-Datei verwenden"
 
-#: builtin/log.c:134
+#: builtin/log.c:140
 msgid "decorate options"
 msgstr "decorate-Optionen"
 
-#: builtin/log.c:137
+#: builtin/log.c:143
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Verarbeitet nur Zeilen im Bereich n,m in der Datei, gezählt von 1"
 
-#: builtin/log.c:233
+#: builtin/log.c:239
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "letzte Ausgabe: %d %s\n"
 
-#: builtin/log.c:465
+#: builtin/log.c:471
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ungültige Datei"
 
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
 #, c-format
 msgid "Could not read object %s"
 msgstr "Kann Objekt %s nicht lesen."
 
-#: builtin/log.c:596
+#: builtin/log.c:602
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Unbekannter Typ: %d"
 
-#: builtin/log.c:715
+#: builtin/log.c:722
 msgid "format.headers without value"
 msgstr "format.headers ohne Wert"
 
-#: builtin/log.c:801
+#: builtin/log.c:812
 msgid "name of output directory is too long"
 msgstr "Name des Ausgabeverzeichnisses ist zu lang."
 
-#: builtin/log.c:816
+#: builtin/log.c:827
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Kann Patch-Datei %s nicht öffnen"
 
-#: builtin/log.c:830
+#: builtin/log.c:841
 msgid "Need exactly one range."
 msgstr "Brauche genau einen Commit-Bereich."
 
-#: builtin/log.c:840
+#: builtin/log.c:851
 msgid "Not a range."
 msgstr "Kein Commit-Bereich."
 
-#: builtin/log.c:946
+#: builtin/log.c:957
 msgid "Cover letter needs email format"
 msgstr "Anschreiben benötigt E-Mail-Format"
 
-#: builtin/log.c:1025
+#: builtin/log.c:1036
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "ungültiges in-reply-to: %s"
 
-#: builtin/log.c:1053
+#: builtin/log.c:1064
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
 
-#: builtin/log.c:1098
+#: builtin/log.c:1109
 msgid "Two output directories?"
 msgstr "Zwei Ausgabeverzeichnisse?"
 
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "Unbekannter Commit %s"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr "Konnte keine exakte Merge-Basis finden."
+
+#: builtin/log.c:1235
+msgid ""
+"Failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually."
+msgstr ""
+"Fehler beim Bestimmen des Upstream-Branches. Wenn Sie den Basis-Commit\n"
+"automatisch speichern lassen möchten, benutzen Sie bitte\n"
+"'git branch --set-upstream-to', um einem Remote-Branch zu folgen.\n"
+"Oder geben Sie den Basis-Commit mit '--base=<Basis-Commit-Id>' manuell an."
+
+#: builtin/log.c:1255
+msgid "Failed to find exact merge base"
+msgstr "Fehler beim Finden einer exakten Merge-Basis."
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein."
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr "kann Patch-Id nicht lesen"
+
+#: builtin/log.c:1377
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
 
-#: builtin/log.c:1217
+#: builtin/log.c:1380
 msgid "use [PATCH] even with multiple patches"
 msgstr "[PATCH] auch mit mehreren Patches verwenden"
 
-#: builtin/log.c:1221
+#: builtin/log.c:1384
 msgid "print patches to standard out"
 msgstr "Ausgabe der Patches in Standard-Ausgabe"
 
-#: builtin/log.c:1223
+#: builtin/log.c:1386
 msgid "generate a cover letter"
 msgstr "ein Deckblatt erzeugen"
 
-#: builtin/log.c:1225
+#: builtin/log.c:1388
 msgid "use simple number sequence for output file names"
 msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden"
 
-#: builtin/log.c:1226
+#: builtin/log.c:1389
 msgid "sfx"
 msgstr "Dateiendung"
 
-#: builtin/log.c:1227
+#: builtin/log.c:1390
 msgid "use <sfx> instead of '.patch'"
 msgstr "<Dateiendung> anstatt '.patch' verwenden"
 
-#: builtin/log.c:1229
+#: builtin/log.c:1392
 msgid "start numbering patches at <n> instead of 1"
 msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen"
 
-#: builtin/log.c:1231
+#: builtin/log.c:1394
 msgid "mark the series as Nth re-roll"
 msgstr "die Serie als n-te Fassung kennzeichnen"
 
-#: builtin/log.c:1233
+#: builtin/log.c:1396
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "[<Präfix>] anstatt [PATCH] verwenden"
 
-#: builtin/log.c:1236
+#: builtin/log.c:1399
 msgid "store resulting files in <dir>"
 msgstr "erzeugte Dateien in <Verzeichnis> speichern"
 
-#: builtin/log.c:1239
+#: builtin/log.c:1402
 msgid "don't strip/add [PATCH]"
 msgstr "[PATCH] nicht entfernen/hinzufügen"
 
-#: builtin/log.c:1242
+#: builtin/log.c:1405
 msgid "don't output binary diffs"
 msgstr "keine binären Unterschiede ausgeben"
 
-#: builtin/log.c:1244
+#: builtin/log.c:1407
 msgid "output all-zero hash in From header"
 msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
 
-#: builtin/log.c:1246
+#: builtin/log.c:1409
 msgid "don't include a patch matching a commit upstream"
 msgstr ""
 "keine Patches einschließen, die einem Commit im Upstream-Branch entsprechen"
 
-#: builtin/log.c:1248
+#: builtin/log.c:1411
 msgid "show patch format instead of default (patch + stat)"
 msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
 
-#: builtin/log.c:1250
+#: builtin/log.c:1413
 msgid "Messaging"
 msgstr "E-Mail-Einstellungen"
 
-#: builtin/log.c:1251
+#: builtin/log.c:1414
 msgid "header"
 msgstr "Header"
 
-#: builtin/log.c:1252
+#: builtin/log.c:1415
 msgid "add email header"
 msgstr "E-Mail-Header hinzufügen"
 
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
 msgid "email"
 msgstr "E-Mail"
 
-#: builtin/log.c:1253
+#: builtin/log.c:1416
 msgid "add To: header"
 msgstr "\"To:\"-Header hinzufügen"
 
-#: builtin/log.c:1255
+#: builtin/log.c:1418
 msgid "add Cc: header"
 msgstr "\"Cc:\"-Header hinzufügen"
 
-#: builtin/log.c:1257
+#: builtin/log.c:1420
 msgid "ident"
 msgstr "Ident"
 
-#: builtin/log.c:1258
+#: builtin/log.c:1421
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn "
 "fehlend)"
 
-#: builtin/log.c:1260
+#: builtin/log.c:1423
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1261
+#: builtin/log.c:1424
 msgid "make first mail a reply to <message-id>"
 msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
 
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
 msgid "boundary"
 msgstr "Grenze"
 
-#: builtin/log.c:1263
+#: builtin/log.c:1426
 msgid "attach the patch"
 msgstr "den Patch anhängen"
 
-#: builtin/log.c:1266
+#: builtin/log.c:1429
 msgid "inline the patch"
 msgstr "den Patch direkt in die Nachricht einfügen"
 
-#: builtin/log.c:1270
+#: builtin/log.c:1433
 msgid "enable message threading, styles: shallow, deep"
 msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
 
-#: builtin/log.c:1272
+#: builtin/log.c:1435
 msgid "signature"
 msgstr "Signatur"
 
-#: builtin/log.c:1273
+#: builtin/log.c:1436
 msgid "add a signature"
 msgstr "eine Signatur hinzufügen"
 
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "Basis-Commit"
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen"
+
+#: builtin/log.c:1440
 msgid "add a signature from a file"
 msgstr "eine Signatur aus einer Datei hinzufügen"
 
-#: builtin/log.c:1276
+#: builtin/log.c:1441
 msgid "don't print the patch filenames"
 msgstr "keine Dateinamen der Patches anzeigen"
 
-#: builtin/log.c:1365
+#: builtin/log.c:1531
 msgid "-n and -k are mutually exclusive."
 msgstr "Die Optionen -n und -k schließen sich gegenseitig aus."
 
-#: builtin/log.c:1367
+#: builtin/log.c:1533
 msgid "--subject-prefix and -k are mutually exclusive."
 msgstr "Die Optionen --subject-prefix und -k schließen sich gegenseitig aus."
 
-#: builtin/log.c:1375
+#: builtin/log.c:1541
 msgid "--name-only does not make sense"
 msgstr "Die Option --name-only kann nicht verwendet werden."
 
-#: builtin/log.c:1377
+#: builtin/log.c:1543
 msgid "--name-status does not make sense"
 msgstr "Die Option --name-status kann nicht verwendet werden."
 
-#: builtin/log.c:1379
+#: builtin/log.c:1545
 msgid "--check does not make sense"
 msgstr "Die Option --check kann nicht verwendet werden."
 
-#: builtin/log.c:1407
+#: builtin/log.c:1573
 msgid "standard output, or directory, which one?"
 msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
 
-#: builtin/log.c:1409
+#: builtin/log.c:1575
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
 
-#: builtin/log.c:1506
+#: builtin/log.c:1672
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "Konnte Signatur-Datei '%s' nicht lesen"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1743
 msgid "Failed to create output files"
 msgstr "Fehler beim Erstellen der Ausgabedateien."
 
-#: builtin/log.c:1617
+#: builtin/log.c:1792
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
 
-#: builtin/log.c:1671
+#: builtin/log.c:1846
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7739,11 +8084,6 @@ msgstr ""
 "Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
 "manuell an.\n"
 
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr "Unbekannter Commit %s"
-
 #: builtin/ls-files.c:378
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<Optionen>] [<Datei>...]"
@@ -7943,175 +8283,179 @@ msgstr "git merge [<Optionen>] <Beschreibung> HEAD <Commit>"
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:100
+#: builtin/merge.c:101
 msgid "switch `m' requires a value"
 msgstr "Schalter 'm' erfordert einen Wert."
 
-#: builtin/merge.c:137
+#: builtin/merge.c:138
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
 
-#: builtin/merge.c:138
+#: builtin/merge.c:139
 #, c-format
 msgid "Available strategies are:"
 msgstr "Verfügbare Strategien sind:"
 
-#: builtin/merge.c:143
+#: builtin/merge.c:144
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Verfügbare benutzerdefinierte Strategien sind:"
 
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
 msgid "do not show a diffstat at the end of the merge"
 msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
 
-#: builtin/merge.c:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
 msgid "show a diffstat at the end of the merge"
 msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
 
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
 msgid "(synonym to --stat)"
 msgstr "(Synonym für --stat)"
 
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "(höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-Commits "
 "hinzufügen"
 
-#: builtin/merge.c:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
 msgid "create a single commit instead of doing a merge"
 msgstr "einen einzelnen Commit anstatt eines Merges erzeugen"
 
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)"
 
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
 msgid "edit message before committing"
 msgstr "Bearbeitung der Beschreibung vor dem Commit"
 
-#: builtin/merge.c:207
+#: builtin/merge.c:208
 msgid "allow fast-forward (default)"
 msgstr "Vorspulen erlauben (Standard)"
 
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
 msgid "abort if fast-forward is not possible"
 msgstr "abbrechen, wenn kein Vorspulen möglich ist"
 
-#: builtin/merge.c:213
+#: builtin/merge.c:214
 msgid "Verify that the named commit has a valid GPG signature"
 msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen"
 
-#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
 #: builtin/revert.c:89
 msgid "strategy"
 msgstr "Strategie"
 
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "merge strategy to use"
 msgstr "zu verwendende Merge-Strategie"
 
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
 msgid "option=value"
 msgstr "Option=Wert"
 
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
 msgid "option for selected merge strategy"
 msgstr "Option für ausgewählte Merge-Strategie"
 
-#: builtin/merge.c:219
+#: builtin/merge.c:220
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 "Commit-Beschreibung zusammenführen (für einen Merge, der kein Vorspulen war)"
 
-#: builtin/merge.c:223
+#: builtin/merge.c:224
 msgid "abort the current in-progress merge"
 msgstr "den sich im Gange befindlichen Merge abbrechen"
 
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
+
+#: builtin/merge.c:254
 msgid "could not run stash."
 msgstr "Konnte \"stash\" nicht ausführen."
 
-#: builtin/merge.c:256
+#: builtin/merge.c:259
 msgid "stash failed"
 msgstr "\"stash\" fehlgeschlagen"
 
-#: builtin/merge.c:261
+#: builtin/merge.c:264
 #, c-format
 msgid "not a valid object: %s"
 msgstr "kein gültiges Objekt: %s"
 
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
 msgid "read-tree failed"
 msgstr "read-tree fehlgeschlagen"
 
-#: builtin/merge.c:327
+#: builtin/merge.c:330
 msgid " (nothing to squash)"
 msgstr " (nichts zu quetschen)"
 
-#: builtin/merge.c:340
+#: builtin/merge.c:343
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n"
 
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
 #, c-format
 msgid "Could not write to '%s'"
 msgstr "Konnte nicht nach '%s' schreiben."
 
-#: builtin/merge.c:372
+#: builtin/merge.c:375
 msgid "Writing SQUASH_MSG"
 msgstr "Schreibe SQUASH_MSG"
 
-#: builtin/merge.c:374
+#: builtin/merge.c:377
 msgid "Finishing SQUASH_MSG"
 msgstr "Schließe SQUASH_MSG ab"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:400
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
 
-#: builtin/merge.c:448
+#: builtin/merge.c:451
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' zeigt auf keinen Commit"
 
-#: builtin/merge.c:538
+#: builtin/merge.c:541
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Ungültiger branch.%s.mergeoptions String: %s"
 
-#: builtin/merge.c:657
+#: builtin/merge.c:660
 msgid "Not handling anything other than two heads merge."
 msgstr "Es wird nur der Merge von zwei Branches behandelt."
 
-#: builtin/merge.c:671
+#: builtin/merge.c:674
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Unbekannte Option für merge-recursive: -X%s"
 
-#: builtin/merge.c:684
+#: builtin/merge.c:687
 #, c-format
 msgid "unable to write %s"
 msgstr "konnte %s nicht schreiben"
 
-#: builtin/merge.c:773
+#: builtin/merge.c:776
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "konnte nicht von '%s' lesen"
 
-#: builtin/merge.c:782
+#: builtin/merge.c:785
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Merge wurde nicht committet; benutzen Sie 'git commit', um den Merge "
 "abzuschließen.\n"
 
-#: builtin/merge.c:788
+#: builtin/merge.c:791
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -8127,55 +8471,55 @@ msgstr ""
 "Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung\n"
 "bricht den Commit ab.\n"
 
-#: builtin/merge.c:812
+#: builtin/merge.c:815
 msgid "Empty commit message."
 msgstr "Leere Commit-Beschreibung"
 
-#: builtin/merge.c:824
+#: builtin/merge.c:835
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Wunderbar.\n"
 
-#: builtin/merge.c:879
+#: builtin/merge.c:890
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen "
 "Sie dann das Ergebnis.\n"
 
-#: builtin/merge.c:895
+#: builtin/merge.c:906
 #, c-format
 msgid "'%s' is not a commit"
 msgstr "'%s' ist kein Commit"
 
-#: builtin/merge.c:936
+#: builtin/merge.c:947
 msgid "No current branch."
 msgstr "Sie befinden sich auf keinem Branch."
 
-#: builtin/merge.c:938
+#: builtin/merge.c:949
 msgid "No remote for the current branch."
 msgstr "Kein Remote-Repository für den aktuellen Branch."
 
-#: builtin/merge.c:940
+#: builtin/merge.c:951
 msgid "No default upstream defined for the current branch."
 msgstr ""
 "Es ist kein Standard-Upstream-Branch für den aktuellen Branch definiert."
 
-#: builtin/merge.c:945
+#: builtin/merge.c:956
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Kein Remote-Tracking-Branch für %s von %s"
 
-#: builtin/merge.c:1080
+#: builtin/merge.c:1091
 #, c-format
 msgid "could not close '%s'"
 msgstr "Konnte '%s' nicht schließen"
 
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Es gibt keinen Merge zum Abbrechen (MERGE_HEAD fehlt)"
 
-#: builtin/merge.c:1223
+#: builtin/merge.c:1235
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -8183,7 +8527,7 @@ msgstr ""
 "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n"
 "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
 
-#: builtin/merge.c:1230
+#: builtin/merge.c:1242
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -8191,105 +8535,109 @@ msgstr ""
 "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n"
 "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
 
-#: builtin/merge.c:1233
+#: builtin/merge.c:1245
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)."
 
-#: builtin/merge.c:1242
+#: builtin/merge.c:1254
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Sie können --squash nicht mit --no-ff kombinieren."
 
-#: builtin/merge.c:1250
+#: builtin/merge.c:1262
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
 
-#: builtin/merge.c:1267
+#: builtin/merge.c:1279
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 "Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausführen."
 
-#: builtin/merge.c:1269
+#: builtin/merge.c:1281
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 "Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet "
 "werden."
 
-#: builtin/merge.c:1275
+#: builtin/merge.c:1286
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - nichts was wir zusammenführen können"
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen."
 
-#: builtin/merge.c:1332
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "Commit %s hat eine nicht vertrauenswürdige GPG-Signatur, angeblich von %s."
 
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Commit %s hat eine ungültige GPG-Signatur, angeblich von %s."
 
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Commit %s hat keine GPG-Signatur."
 
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Commit %s hat eine gültige GPG-Signatur von %s\n"
 
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr "Verweigere den Merge von nicht zusammenhängenden Historien."
+
+#: builtin/merge.c:1439
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Aktualisiere %s..%s\n"
 
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
 
-#: builtin/merge.c:1468
+#: builtin/merge.c:1483
 #, c-format
 msgid "Nope.\n"
 msgstr "Nein.\n"
 
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
 msgid "Not possible to fast-forward, aborting."
 msgstr "Vorspulen nicht möglich, breche ab."
 
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
 
-#: builtin/merge.c:1527
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Probiere Merge-Strategie %s ...\n"
 
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
 
-#: builtin/merge.c:1595
+#: builtin/merge.c:1610
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
 
-#: builtin/merge.c:1604
+#: builtin/merge.c:1619
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n"
 
-#: builtin/merge.c:1616
+#: builtin/merge.c:1631
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -8400,7 +8748,7 @@ msgstr "git mv [<Optionen>] <Quelle>... <Ziel>"
 msgid "Directory %s is in index and no submodule?"
 msgstr "Verzeichnis %s ist zum Commit vorgemerkt und kein Submodul?"
 
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder "
@@ -8481,48 +8829,48 @@ msgstr "%s, Quelle=%s, Ziel=%s"
 msgid "Renaming %s to %s\n"
 msgstr "Benenne %s nach %s um\n"
 
-#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "Umbenennung von '%s' fehlgeschlagen"
 
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<Optionen>] <Commit>..."
 
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<Optionen>] --all"
 
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<Optionen>] --stdin"
 
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
 msgid "print only names (no SHA-1)"
 msgstr "nur Namen anzeigen (keine SHA-1)"
 
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
 msgid "only use tags to name the commits"
 msgstr "nur Tags verwenden, um die Commits zu benennen"
 
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
 msgid "only use refs matching <pattern>"
 msgstr "nur Referenzen verwenden die <Muster> entsprechen"
 
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
 msgid "list all commits reachable from all refs"
 msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind"
 
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
 msgid "read from stdin"
 msgstr "von der Standard-Eingabe lesen"
 
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
 msgid "allow to print `undefined` names (default)"
 msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)"
 
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
 msgid "dereference tags in the input (internal use)"
 msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)"
 
@@ -8671,24 +9019,16 @@ msgstr "Konnte Notiz-Objekt nicht schreiben"
 msgid "The note contents have been left in %s"
 msgstr "Die Notiz-Inhalte wurden in %s belassen"
 
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
 #, c-format
 msgid "cannot read '%s'"
 msgstr "kann '%s' nicht lesen"
 
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "konnte '%s' nicht öffnen oder lesen"
 
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
-
 #: builtin/notes.c:256
 #, c-format
 msgid "Failed to read object '%s'."
@@ -8701,7 +9041,7 @@ msgstr "Kann Notiz-Daten nicht von Nicht-Blob Objekt '%s' lesen."
 
 #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
 msgid "too many parameters"
 msgstr "zu viele Parameter"
 
@@ -8748,7 +9088,7 @@ msgstr ""
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Überschreibe existierende Notizen für Objekt %s\n"
 
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Entferne Notiz für Objekt %s\n"
@@ -8790,15 +9130,15 @@ msgstr ""
 "Die Optionen -m/-F/-c/-C sind für den Unterbefehl 'edit' veraltet.\n"
 "Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n"
 
-#: builtin/notes.c:767
+#: builtin/notes.c:768
 msgid "General options"
 msgstr "Allgemeine Optionen"
 
-#: builtin/notes.c:769
+#: builtin/notes.c:770
 msgid "Merge options"
 msgstr "Merge-Optionen"
 
-#: builtin/notes.c:771
+#: builtin/notes.c:772
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -8806,51 +9146,51 @@ msgstr ""
 "löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "Committing unmerged notes"
 msgstr "nicht zusammengeführte Notizen eintragen"
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 "Merge von Notizen abschließen, in dem nicht zusammengeführte Notizen "
 "committet werden"
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid "Aborting notes merge resolution"
 msgstr "Konfliktauflösung beim Merge von Notizen abbrechen"
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "abort notes merge"
 msgstr "Merge von Notizen abbrechen"
 
-#: builtin/notes.c:856
+#: builtin/notes.c:857
 #, c-format
 msgid "A notes merge into %s is already in-progress at %s"
 msgstr "Ein Merge von Notizen nach %s ist bereits im Gange bei %s"
 
-#: builtin/notes.c:883
+#: builtin/notes.c:884
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "Objekt %s hat keine Notiz\n"
 
-#: builtin/notes.c:895
+#: builtin/notes.c:896
 msgid "attempt to remove non-existent note is not an error"
 msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler"
 
-#: builtin/notes.c:898
+#: builtin/notes.c:899
 msgid "read object names from the standard input"
 msgstr "Objektnamen von der Standard-Eingabe lesen"
 
-#: builtin/notes.c:979
+#: builtin/notes.c:980
 msgid "notes-ref"
 msgstr "Notiz-Referenz"
 
-#: builtin/notes.c:980
+#: builtin/notes.c:981
 msgid "use notes from <notes-ref>"
 msgstr "Notizen von <Notiz-Referenz> verwenden"
 
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Unbekannter Unterbefehl: %s"
@@ -8874,176 +9214,182 @@ msgstr ""
 msgid "deflate error (%d)"
 msgstr "Fehler beim Komprimieren (%d)"
 
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+"Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n"
+"aufgetrennt."
+
+#: builtin/pack-objects.c:776
 msgid "Writing objects"
 msgstr "Schreibe Objekte"
 
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
-"Deaktiviere Schreiben des Bitmap-Index, da einige Objekte nicht in\n"
-"eine Pack-Datei geschrieben wurden"
+"Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-Datei\n"
+"geschrieben wurden."
 
-#: builtin/pack-objects.c:2172
+#: builtin/pack-objects.c:2177
 msgid "Compressing objects"
 msgstr "Komprimiere Objekte"
 
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
 #, c-format
 msgid "unsupported index version %s"
 msgstr "Nicht unterstützte Index-Version %s"
 
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2567
 #, c-format
 msgid "bad index version '%s'"
 msgstr "Ungültige Index-Version '%s'"
 
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
 msgid "do not show progress meter"
 msgstr "keine Fortschrittsanzeige anzeigen"
 
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
 msgid "show progress meter"
 msgstr "Fortschrittsanzeige anzeigen"
 
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
 msgid "show progress meter during object writing phase"
 msgstr ""
 "Forschrittsanzeige während der Phase des Schreibens der Objekte anzeigen"
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2604
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
 
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2605
 msgid "version[,offset]"
 msgstr "version[,offset]"
 
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben"
 
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2609
 msgid "maximum size of each output pack file"
 msgstr "maximale Größe für jede ausgegebene Paketdatei"
 
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2611
 msgid "ignore borrowed objects from alternate object store"
 msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
 
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2613
 msgid "ignore packed objects"
 msgstr "gepackte Objekte ignorieren"
 
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
 msgid "limit pack window by objects"
 msgstr "Paketfenster durch Objekte begrenzen"
 
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2617
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
 
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2619
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "maximale Länge der erlaubten Differenzverkettung im resultierenden Paket"
 
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2621
 msgid "reuse existing deltas"
 msgstr "existierende Unterschiede wiederverwenden"
 
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
 msgid "reuse existing objects"
 msgstr "existierende Objekte wiederverwenden"
 
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
 msgid "use OFS_DELTA objects"
 msgstr "OFS_DELTA Objekte verwenden"
 
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "Threads bei der Suche nach den besten Ãœbereinstimmungen bei Unterschieden "
 "verwenden"
 
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2629
 msgid "do not create an empty pack output"
 msgstr "keine leeren Pakete erzeugen"
 
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2631
 msgid "read revision arguments from standard input"
 msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
 
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
 msgid "limit the objects to those that are not yet packed"
 msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen"
 
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2636
 msgid "include objects reachable from any reference"
 msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
 
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2639
 msgid "include objects referred by reflog entries"
 msgstr ""
 "Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
 
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2642
 msgid "include objects referred to by the index"
 msgstr "Objekte einschließen, die vom Index referenziert werden"
 
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2645
 msgid "output pack to stdout"
 msgstr "Paket in die Standard-Ausgabe schreiben"
 
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
 msgid "include tag objects that refer to objects to be packed"
 msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren"
 
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2649
 msgid "keep unreachable objects"
 msgstr "nicht erreichbare Objekte behalten"
 
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
 msgid "time"
 msgstr "Zeit"
 
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
 msgid "unpack unreachable objects newer than <time>"
 msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
 
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2654
 msgid "create thin packs"
 msgstr "dünnere Pakete erzeugen"
 
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
 
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2658
 msgid "ignore packs that have companion .keep file"
 msgstr "Pakete ignorieren, die .keep Dateien haben"
 
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2660
 msgid "pack compression level"
 msgstr "Komprimierungsgrad für Paketierung"
 
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
 msgid "do not hide commits by grafts"
 msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
 
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2664
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen"
 
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2666
 msgid "write a bitmap index together with the pack index"
 msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
 
-#: builtin/pack-objects.c:2752
+#: builtin/pack-objects.c:2757
 msgid "Counting objects"
 msgstr "Zähle Objekte"
 
@@ -9071,15 +9417,15 @@ msgstr "Lösche doppelte Objekte"
 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--expire <Zeit>] [--] [<head>...]"
 
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
 msgid "do not remove, show only"
 msgstr "nicht löschen, nur anzeigen"
 
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
 msgid "report pruned objects"
 msgstr "gelöschte Objekte melden"
 
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
 msgid "expire objects older than <time>"
 msgstr "Objekte älter als <Zeit> verfallen lassen"
 
@@ -9091,52 +9437,56 @@ msgstr "kann \"prune\" in precious-objects Repository nicht ausführen"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]"
 
-#: builtin/pull.c:117
+#: builtin/pull.c:120
 msgid "Options related to merging"
 msgstr "Optionen bezogen auf Merge"
 
-#: builtin/pull.c:120
+#: builtin/pull.c:123
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "Integration von Änderungen durch Rebase statt Merge"
 
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
 msgid "allow fast-forward"
 msgstr "Vorspulen erlauben"
 
-#: builtin/pull.c:150
+#: builtin/pull.c:153
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen"
 
-#: builtin/pull.c:164
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "automatischer Stash/Stash-Pop vor und nach eines Rebase"
+
+#: builtin/pull.c:172
 msgid "Options related to fetching"
 msgstr "Optionen bezogen auf Fetch"
 
-#: builtin/pull.c:186
+#: builtin/pull.c:194
 msgid "number of submodules pulled in parallel"
 msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
 
-#: builtin/pull.c:275
+#: builtin/pull.c:283
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Ungültiger Wert für pull.ff: %s"
 
-#: builtin/pull.c:359
+#: builtin/pull.c:379
 msgid "Cannot pull with rebase: You have unstaged changes."
 msgstr ""
 "Kann \"pull\" mit \"rebase\" nicht ausführen: Sie haben Änderungen, die "
 "nicht zum Commit vorgemerkt sind."
 
-#: builtin/pull.c:365
+#: builtin/pull.c:385
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "Zusätzlich beinhaltet die Staging-Area nicht committete Änderungen."
 
-#: builtin/pull.c:367
+#: builtin/pull.c:387
 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
 msgstr ""
 "Kann \"pull\" mit \"rebase\" nicht ausführen: Die Staging-Area beinhaltet "
 "nicht committete Änderungen."
 
-#: builtin/pull.c:443
+#: builtin/pull.c:463
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -9144,14 +9494,14 @@ msgstr ""
 "Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben "
 "angefordert wurden."
 
-#: builtin/pull.c:445
+#: builtin/pull.c:465
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Es gibt keine Kandidaten für Merge innerhalb der Referenzen, die eben "
 "angefordert wurden."
 
-#: builtin/pull.c:446
+#: builtin/pull.c:466
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -9159,7 +9509,7 @@ msgstr ""
 "Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n"
 "haben, der auf der Gegenseite mit keinen Referenzen übereinstimmt."
 
-#: builtin/pull.c:449
+#: builtin/pull.c:469
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -9171,42 +9521,46 @@ msgstr ""
 "Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n"
 "der Befehlszeile angeben."
 
-#: builtin/pull.c:454
+#: builtin/pull.c:474 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Im Moment auf keinem Branch."
 
-#: builtin/pull.c:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr ""
 "Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausführen "
 "möchten."
 
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Bitte geben Sie den Branch an, welchen Sie zusammenführen möchten."
 
-#: builtin/pull.c:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
 msgid "See git-pull(1) for details."
 msgstr "Siehe git-pull(1) für weitere Details."
 
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<Remote-Repository>"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<Branch>"
+
+#: builtin/pull.c:489 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch."
 
-#: builtin/pull.c:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
 msgid ""
-"If you wish to set tracking information for this branch you can do so with:\n"
-"\n"
-"    git branch --set-upstream-to=%s/<branch> %s\n"
+"If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
-"Wenn Sie Tracking-Informationen für diesen Branch setzen möchten, können "
-"Sie\n"
-"dies tun mit:\n"
-"\n"
-" git branch --set-upstream-to=%s/<Branch> %s\n"
+"Wenn Sie Tracking-Informationen für diesen Branch setzen möchten, können Sie\n"
+"dies tun mit:"
 
-#: builtin/pull.c:483
+#: builtin/pull.c:503
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -9216,13 +9570,17 @@ msgstr ""
 "des Remote-Repositories durchzuführen, aber diese Referenz\n"
 "wurde nicht angefordert."
 
-#: builtin/pull.c:841
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "--[no-]autostash ist nur mit --rebase zulässig."
+
+#: builtin/pull.c:872
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 "Aktualisiere einen ungeborenen Branch mit Änderungen, die zum Commit "
 "vorgemerkt sind."
 
-#: builtin/pull.c:870
+#: builtin/pull.c:900
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -9232,7 +9590,7 @@ msgstr ""
 "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
 "Spule Ihr Arbeitsverzeichnis von Commit %s vor."
 
-#: builtin/pull.c:875
+#: builtin/pull.c:905
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -9249,11 +9607,11 @@ msgstr ""
 "$ git reset --hard\n"
 "zur Wiederherstellung aus."
 
-#: builtin/pull.c:890
+#: builtin/pull.c:920
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
 
-#: builtin/pull.c:894
+#: builtin/pull.c:924
 msgid "Cannot rebase onto multiple branches."
 msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
 
@@ -9623,12 +9981,24 @@ msgstr "weder den Index, noch das Arbeitsverzeichnis aktualisieren"
 
 #: builtin/read-tree.c:137
 msgid "skip applying sparse checkout filter"
-msgstr "Anwendung des Filters für spärliches Auschecken überspringen"
+msgstr "Anwendung des Filters für partielles Auschecken überspringen"
 
 #: builtin/read-tree.c:139
 msgid "debug unpack-trees"
 msgstr "Entpacken der Bäume protokollieren"
 
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <Git-Verzeichnis>"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "weniger Ausgaben"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "Sie müssen ein Repository angeben."
+
 #: builtin/reflog.c:423
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
@@ -9960,21 +10330,23 @@ msgstr "* Remote-Repository %s"
 msgid "  Fetch URL: %s"
 msgstr "  URL zum Abholen: %s"
 
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
 msgid "(no URL)"
 msgstr "(keine URL)"
 
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in "  Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL zum Versenden: %s"
 
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Hauptbranch: %s"
 
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -9982,159 +10354,159 @@ msgstr ""
 "  Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden "
 "sein):\n"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1181
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Remote-Branch:%s"
 msgstr[1] "  Remote-Branches:%s"
 
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
 msgid " (status not queried)"
 msgstr " (Zustand nicht abgefragt)"
 
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Lokaler Branch konfiguriert für 'git pull':"
 msgstr[1] "  Lokale Branches konfiguriert für 'git pull':"
 
-#: builtin/remote.c:1199
+#: builtin/remote.c:1201
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Lokale Referenzen werden von 'git push' gespiegelt"
 
-#: builtin/remote.c:1206
+#: builtin/remote.c:1208
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Lokale Referenz konfiguriert für 'git push'%s:"
 msgstr[1] "  Lokale Referenzen konfiguriert für 'git push'%s:"
 
-#: builtin/remote.c:1227
+#: builtin/remote.c:1229
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository"
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1231
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "entfernt refs/remotes/<Name>/HEAD"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
 msgid "Cannot determine remote HEAD"
 msgstr "Kann HEAD des Remote-Repositories nicht bestimmen"
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "Mehrere Hauptbranches im Remote-Repository. Bitte wählen Sie explizit einen "
 "aus mit:"
 
-#: builtin/remote.c:1256
+#: builtin/remote.c:1258
 #, c-format
 msgid "Could not delete %s"
 msgstr "Konnte %s nicht entfernen"
 
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "keine gültige Referenz: %s"
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
 #, c-format
 msgid "Could not setup %s"
 msgstr "Konnte %s nicht einrichten"
 
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s wird unreferenziert!"
 
-#: builtin/remote.c:1285
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s wurde unreferenziert!"
 
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
 #, c-format
 msgid "Pruning %s"
 msgstr "entferne veraltete Branches von %s"
 
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [würde veralteten Branch entfernen] %s"
 
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
 #, c-format
 msgid " * [pruned] %s"
 msgstr "* [veralteten Branch entfernt] %s"
 
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
 msgid "prune remotes after fetching"
 msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\""
 
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Kein solches Remote-Repository '%s'"
 
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
 msgid "add branch"
 msgstr "Branch hinzufügen"
 
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
 msgid "no remote specified"
 msgstr "kein Remote-Repository angegeben"
 
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
 msgid "query push URLs rather than fetch URLs"
 msgstr "nur URLs für Push ausgeben"
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1467
 msgid "return all URLs"
 msgstr "alle URLs ausgeben"
 
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "Keine URLs für Remote-Repository '%s' konfiguriert."
 
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
 msgid "manipulate push URLs"
 msgstr "URLs für \"push\" manipulieren"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
 msgid "add URL"
 msgstr "URL hinzufügen"
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
 msgid "delete URLs"
 msgstr "URLs löschen"
 
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
 msgid "--add --delete doesn't make sense"
 msgstr ""
 "Die Optionen --add und --delete können nicht gemeinsam verwendet werden."
 
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "ungültiges altes URL Format: %s"
 
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Keine solche URL gefunden: %s"
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
 msgid "Will not delete all non-push URLs"
 msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 msgid "be verbose; must be placed before a subcommand"
 msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
 
@@ -10652,13 +11024,6 @@ msgstr "rekursive Entfernung erlauben"
 msgid "exit with a zero status even if nothing matched"
 msgstr "mit Rückgabewert 0 beenden, wenn keine Übereinstimmung gefunden wurde"
 
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-"Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder "
-"benutzen\n"
-"Sie \"stash\", um fortzufahren."
-
 #: builtin/rm.c:335
 #, c-format
 msgid "not removing '%s' recursively without -r"
@@ -10869,81 +11234,182 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
 
-#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "Referenz nicht gefunden: %s"
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Vollständiger Referenzname erwartet, %s erhalten"
+
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
 msgid "alternative anchor for relative paths"
 msgstr "Alternativer Anker für relative Pfade"
 
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden"
+
+#: builtin/submodule--helper.c:366
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "Fehler beim Eintragen der URL für Submodul-Pfad '%s' in die Konfiguration."
+
+#: builtin/submodule--helper.c:370
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "Submodul '%s' (%s) für Pfad '%s' in die Konfiguration eingetragen.\n"
+
+#: builtin/submodule--helper.c:380
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "Warnung: 'update'-Modus für Submodul '%s' vorgeschlagen\n"
+
+#: builtin/submodule--helper.c:387
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr ""
+"Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad '%s' in der\n"
+"Konfiguration."
+
+#: builtin/submodule--helper.c:406
+msgid "Suppress output for initializing a submodule"
+msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken"
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<Pfad>]"
+
+#: builtin/submodule--helper.c:432
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <Pfad>"
 
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "Keine Submodul-Zuordnung in .gitmodules für Pfad '%s' gefunden"
 
-#: builtin/submodule--helper.c:164
+#: builtin/submodule--helper.c:489
 msgid "where the new submodule will be cloned to"
 msgstr "Pfad für neues Submodul"
 
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:492
 msgid "name of the new submodule"
 msgstr "Name des neuen Submoduls"
 
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
 msgid "url where to clone the submodule from"
 msgstr "URL von der das Submodul geklont wird"
 
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:501
 msgid "depth for shallow clones"
 msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
 
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
-msgstr ""
-"git submodule--helper clone [--prefix=<Pfad>] [--quiet] [--reference "
-"<Repository>] [--name <Name>] [--url <URL>][--depth <Tiefe>] [--] [<Pfad>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr "git submodule--helper clone [--prefix=<Pfad>] [--quiet] [--reference <Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth <Tiefe>] --url <URL> --path <Pfad>"
 
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
 
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen"
 
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:550
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "Kann Datei '%s' nicht öffnen"
 
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
 #, c-format
 msgid "could not close file %s"
 msgstr "Konnte Datei '%s' nicht schließen."
 
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
 
-#: builtin/submodule--helper.c:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
-msgstr "fatal: submodule--helper muss mit einem Unterbefehl aufgerufen werden"
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Submodul-Pfad '%s' nicht initialisiert"
+
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Meinten Sie vielleicht 'update --init'?"
+
+#: builtin/submodule--helper.c:639
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "Überspringe nicht zusammengeführtes Submodul %s"
+
+#: builtin/submodule--helper.c:660
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "Ãœberspringe Submodul '%s'"
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "Pfad zum Arbeitsverzeichnis"
+
+#: builtin/submodule--helper.c:771
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
+
+#: builtin/submodule--helper.c:775
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout oder none"
+
+#: builtin/submodule--helper.c:779
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr ""
+"Erstellung eines Klons mit unvollständiger Historie (shallow), abgeschnitten bei\n"
+"der angegebenen Anzahl von Commits."
+
+#: builtin/submodule--helper.c:782
+msgid "parallel jobs"
+msgstr "Parallele Ausführungen"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "keine Fortschrittsanzeige beim Klonen"
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]"
+
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr "Fehlerhafter Wert für --update Parameter"
 
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "submodule--helper muss mit einem Unterbefehl aufgerufen werden"
+
+#: builtin/submodule--helper.c:862
 #, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr "fatal: '%s' ist kein gültiger Unterbefehl von submodule--helper"
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper"
 
 #: builtin/symbolic-ref.c:7
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10998,27 +11464,22 @@ msgstr ""
 msgid "git tag -v <tagname>..."
 msgstr "git tag -v <Tagname>..."
 
-#: builtin/tag.c:80
+#: builtin/tag.c:81
 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr "Tagname zu lang: %.*s..."
 
-#: builtin/tag.c:85
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr "Tag '%s' nicht gefunden."
 
-#: builtin/tag.c:100
+#: builtin/tag.c:101
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Tag '%s' gelöscht (war %s)\n"
 
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "Konnte Tag '%s' nicht verifizieren"
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
 #, c-format
 msgid ""
 "\n"
@@ -11031,7 +11492,7 @@ msgstr ""
 "  %s\n"
 "ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n"
 
-#: builtin/tag.c:126
+#: builtin/tag.c:121
 #, c-format
 msgid ""
 "\n"
@@ -11163,21 +11624,21 @@ msgstr "Die Optionen --merged und --no-merged sind nur mit -l erlaubt."
 msgid "only one -F or -m option is allowed."
 msgstr "nur eine -F oder -m Option ist erlaubt."
 
-#: builtin/tag.c:453
+#: builtin/tag.c:452
 msgid "too many params"
 msgstr "zu viele Parameter"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:458
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' ist kein gültiger Tagname."
 
-#: builtin/tag.c:464
+#: builtin/tag.c:463
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "Tag '%s' existiert bereits"
 
-#: builtin/tag.c:489
+#: builtin/tag.c:491
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Tag '%s' aktualisiert (war %s)\n"
@@ -11445,7 +11906,7 @@ msgstr "git verify-commit [-v | --verbose] <Commit>..."
 msgid "print commit contents"
 msgstr "Commit-Inhalte ausgeben"
 
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
 msgid "print raw gpg status output"
 msgstr "unbearbeitete Ausgabe des Status von gpg ausgeben"
 
@@ -11465,7 +11926,7 @@ msgstr "nur Statistiken anzeigen"
 msgid "git verify-tag [-v | --verbose] <tag>..."
 msgstr "git verify-tag [-v | --verbose] <Tag>..."
 
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
 msgid "print tag contents"
 msgstr "Tag-Inhalte ausgeben"
 
@@ -11481,70 +11942,74 @@ msgstr "git worktree prune [<Optionen>]"
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<Optionen>]"
 
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis"
 
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht"
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen"
 
-#: builtin/worktree.c:61
+#: builtin/worktree.c:62
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Lösche worktrees/%s: ungültige gitdir-Datei"
 
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "Lösche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort"
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:113
 #, c-format
-msgid "failed to remove: %s"
-msgstr "Fehler beim Löschen: %s"
+msgid "failed to remove '%s'"
+msgstr "Fehler beim Löschen von '%s'"
 
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' existiert bereits"
 
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
 
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Bereite %s vor (Identifikation %s)"
 
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "<Branch> auschecken, auch wenn dieser bereits in einem anderen "
 "Arbeitsverzeichnis ausgecheckt ist"
 
-#: builtin/worktree.c:319
+#: builtin/worktree.c:324
 msgid "create a new branch"
 msgstr "neuen Branch erstellen"
 
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
 msgid "create or reset a branch"
 msgstr "Branch erstellen oder umsetzen"
 
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
 msgid "detach HEAD at named commit"
 msgstr "HEAD bei benanntem Commit loslösen"
 
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "das neue Arbeitsverzeichnis auschecken"
+
+#: builtin/worktree.c:336
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B und --detach schließen sich gegenseitig aus"
 
@@ -11564,7 +12029,7 @@ msgstr "das \"Tree\"-Objekt für ein Unterverzeichnis <Präfix> schreiben"
 msgid "only useful for debugging"
 msgstr "nur nützlich für Fehlersuche"
 
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben"
 
@@ -11579,7 +12044,7 @@ msgstr ""
 "oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n"
 "Konzept zu erfahren."
 
-#: http.c:321
+#: http.c:322
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr ""
 "Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.44.0\n"
@@ -11719,7 +12184,7 @@ msgstr "weniger Ausgaben"
 msgid "use <n> digits to display SHA-1s"
 msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s"
 
-#: rerere.h:38
+#: rerere.h:40
 msgid "update the index with reused conflict resolution if possible"
 msgstr ""
 "Index, wenn möglich, mit wiederverwendeter Konfliktauflösung aktualisieren"
@@ -11941,16 +12406,16 @@ msgstr ""
 "Um den ursprünglichen Branch wiederherzustellen und den Rebase abzubrechen,\n"
 "führen Sie \"git rebase --abort\" aus."
 
-#: git-rebase.sh:165
+#: git-rebase.sh:168
 msgid "Applied autostash."
 msgstr "\"autostash\" angewendet."
 
-#: git-rebase.sh:168
+#: git-rebase.sh:171
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "Kann $stash_sha1 nicht speichern."
 
-#: git-rebase.sh:169
+#: git-rebase.sh:172
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 "Your changes are safe in the stash.\n"
@@ -11960,33 +12425,29 @@ msgstr ""
 "Ihre Änderungen sind im Stash sicher.\n"
 "Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
 
-#: git-rebase.sh:208
+#: git-rebase.sh:211
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
 
-#: git-rebase.sh:213
+#: git-rebase.sh:216
 msgid "It looks like git-am is in progress. Cannot rebase."
 msgstr "\"git-am\" scheint im Gange zu sein. Kann Rebase nicht durchführen."
 
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "Die Option --exec muss mit --interactive verwendet werden."
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
 msgid "No rebase in progress?"
 msgstr "Kein Rebase im Gange?"
 
-#: git-rebase.sh:370
+#: git-rebase.sh:368
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet "
 "werden."
 
-#: git-rebase.sh:377
+#: git-rebase.sh:375
 msgid "Cannot read HEAD"
 msgstr "Kann HEAD nicht lesen"
 
-#: git-rebase.sh:380
+#: git-rebase.sh:378
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -11994,12 +12455,12 @@ msgstr ""
 "Sie müssen alle Merge-Konflikte editieren und diese dann\n"
 "mittels \"git add\" als aufgelöst markieren"
 
-#: git-rebase.sh:398
+#: git-rebase.sh:396
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "Konnte nicht zu $head_name zurückgehen"
 
-#: git-rebase.sh:417
+#: git-rebase.sh:415
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -12020,67 +12481,67 @@ msgstr ""
 "und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
 "etwas Schützenswertes vorhanden ist."
 
-#: git-rebase.sh:468
+#: git-rebase.sh:466
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "ungültiger Upstream-Branch $upstream_name"
 
-#: git-rebase.sh:492
+#: git-rebase.sh:490
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: es gibt mehr als eine Merge-Basis"
 
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: es gibt keine Merge-Basis"
 
-#: git-rebase.sh:504
+#: git-rebase.sh:502
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "$onto_name zeigt auf keinen gültigen Commit"
 
-#: git-rebase.sh:527
+#: git-rebase.sh:525
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "fatal: Branch $branch_name nicht gefunden"
 
-#: git-rebase.sh:560
+#: git-rebase.sh:558
 msgid "Cannot autostash"
 msgstr "Kann \"autostash\" nicht ausführen."
 
-#: git-rebase.sh:565
+#: git-rebase.sh:563
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "\"autostash\" erzeugt: $stash_abbrev"
 
-#: git-rebase.sh:569
+#: git-rebase.sh:567
 msgid "Please commit or stash them."
 msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
 
-#: git-rebase.sh:589
+#: git-rebase.sh:587
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "Aktueller Branch $branch_name ist auf dem neuesten Stand."
 
-#: git-rebase.sh:593
+#: git-rebase.sh:591
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr ""
 "Aktueller Branch $branch_name ist auf dem neuesten Stand, Rebase erzwungen."
 
-#: git-rebase.sh:604
+#: git-rebase.sh:602
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Änderungen von $mb zu $onto:"
 
-#: git-rebase.sh:613
+#: git-rebase.sh:611
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 "Zunächst wird der Branch zurückgespult, um Ihre Änderungen\n"
 "darauf neu anzuwenden ..."
 
-#: git-rebase.sh:623
+#: git-rebase.sh:621
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "$branch_name zu $onto_name vorgespult."
@@ -12225,28 +12686,23 @@ msgstr "Kein Branchname spezifiziert"
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)"
 
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "Kann eine Komponente von URL '$remoteurl' nicht extrahieren"
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "Relative Pfade können nur von der obersten Ebene des Arbeitsverzeichnisses "
 "benutzt werden."
 
-#: git-submodule.sh:291
+#: git-submodule.sh:229
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen"
 
-#: git-submodule.sh:308
+#: git-submodule.sh:246
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path' ist bereits zum Commit vorgemerkt"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:250
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
@@ -12257,24 +12713,24 @@ msgstr ""
 "$sm_path\n"
 "Benutzen Sie -f wenn Sie diesen wirklich hinzufügen möchten."
 
-#: git-submodule.sh:330
+#: git-submodule.sh:268
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Füge existierendes Repository in '$sm_path' dem Index hinzu."
 
-#: git-submodule.sh:332
+#: git-submodule.sh:270
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Repository"
 
-#: git-submodule.sh:340
+#: git-submodule.sh:278
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 "Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den Remote-"
 "Repositories:"
 
-#: git-submodule.sh:342
+#: git-submodule.sh:280
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from"
@@ -12282,7 +12738,7 @@ msgstr ""
 "Wenn Sie dieses lokale Git-Verzeichnis wiederverwenden möchtest, anstatt "
 "erneut zu klonen"
 
-#: git-submodule.sh:344
+#: git-submodule.sh:282
 #, sh-format
 msgid ""
 "use the '--force' option. If the local git directory is not the correct repo"
@@ -12290,7 +12746,7 @@ msgstr ""
 "benutzen Sie die Option '--force'. Wenn das lokale Git-Verzeichnis nicht das "
 "korrekte Repository ist"
 
-#: git-submodule.sh:345
+#: git-submodule.sh:283
 #, sh-format
 msgid ""
 "or you are unsure what this means choose another name with the '--name' "
@@ -12299,77 +12755,56 @@ msgstr ""
 "oder Sie sich unsicher sind, was das bedeutet, wählen Sie einen anderen "
 "Namen mit der Option '--name'."
 
-#: git-submodule.sh:347
+#: git-submodule.sh:285
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '$sm_name'."
 
-#: git-submodule.sh:359
+#: git-submodule.sh:297
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "Kann Submodul '$sm_path' nicht auschecken"
 
-#: git-submodule.sh:364
+#: git-submodule.sh:302
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen"
 
-#: git-submodule.sh:373
+#: git-submodule.sh:311
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration."
 
-#: git-submodule.sh:417
-#, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "Betrete '$prefix$displaypath'"
-
-#: git-submodule.sh:437
-#, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
-msgstr "Stoppe bei '$prefix$displaypath'; Skript gab nicht-Null Status zurück."
-
-#: git-submodule.sh:483
-#, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr "Keine URL für Submodul-Pfad '$displaypath' in .gitmodules gefunden"
-
-#: git-submodule.sh:492
+#: git-submodule.sh:355
 #, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr ""
-"Fehler beim Eintragen der URL für Submodul-Pfad '$displaypath' in die "
-"Konfiguration."
+msgid "Entering '$displaypath'"
+msgstr "Betrete '$displaypath'"
 
-#: git-submodule.sh:494
+#: git-submodule.sh:375
 #, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr ""
-"Submodul '$name' ($url) für Pfad '$displaypath' in die Konfiguration "
-"eingetragen."
+msgid "Stopping at '$displaypath'; script returned non-zero status."
+msgstr "Stoppe bei '$displaypath'; Skript gab nicht-Null Status zurück."
 
-#: git-submodule.sh:511
+#: git-submodule.sh:448
 #, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr ""
-"Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad "
-"'$displaypath' in der Konfiguration."
+msgid "pathspec and --all are incompatible"
+msgstr "Pfadspezifikationen und --all sind inkompatibel."
 
-#: git-submodule.sh:549
+#: git-submodule.sh:453
 #, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
+msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
-"Verwenden Sie '.' wenn Sie wirklich alle Submodule\n"
-"deinitialisieren möchten."
+"Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n"
+"möchten."
 
-#: git-submodule.sh:566
+#: git-submodule.sh:470
 #, sh-format
 msgid "Submodule work tree '$displaypath' contains a .git directory"
 msgstr ""
 "Arbeitsverzeichnis des Submoduls in '$displaypath' enthält ein .git-"
 "Verzeichnis"
 
-#: git-submodule.sh:567
+#: git-submodule.sh:471
 #, sh-format
 msgid ""
 "(use 'rm -rf' if you really want to remove it including all of its history)"
@@ -12377,7 +12812,7 @@ msgstr ""
 "(benutzen Sie 'rm -rf' wenn Sie dieses Submodul wirklich mitsamt\n"
 "seiner Historie löschen möchten)"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:477
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12386,142 +12821,178 @@ msgstr ""
 "Arbeitsverzeichnis von Submodul in '$displaypath' enthält lokale Änderungen; "
 "verwenden Sie '-f', um diese zu verwerfen"
 
-#: git-submodule.sh:576
+#: git-submodule.sh:480
 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr "Verzeichnis '$displaypath' bereinigt."
 
-#: git-submodule.sh:577
+#: git-submodule.sh:481
 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr ""
 "Konnte Arbeitsverzeichnis des Submoduls in '$displaypath' nicht löschen."
 
-#: git-submodule.sh:580
+#: git-submodule.sh:484
 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr ""
 "Konnte kein leeres Verzeichnis für Submodul in '$displaypath' erstellen."
 
-#: git-submodule.sh:589
+#: git-submodule.sh:493
 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr ""
 "Submodul '$name' ($url) für Pfad '$displaypath' wurde aus der Konfiguration "
 "entfernt."
 
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"Submodul-Pfad '$displaypath' ist nicht initialisiert.\n"
-"Vielleicht möchten Sie 'update --init' benutzen?"
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden."
 
-#: git-submodule.sh:745
+#: git-submodule.sh:644
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen"
 
-#: git-submodule.sh:768
+#: git-submodule.sh:667
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen"
 
-#: git-submodule.sh:788
+#: git-submodule.sh:680
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
 
-#: git-submodule.sh:789
+#: git-submodule.sh:681
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
 
-#: git-submodule.sh:793
+#: git-submodule.sh:685
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich"
 
-#: git-submodule.sh:794
+#: git-submodule.sh:686
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
 
-#: git-submodule.sh:799
+#: git-submodule.sh:691
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
 
-#: git-submodule.sh:800
+#: git-submodule.sh:692
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'"
 
-#: git-submodule.sh:805
+#: git-submodule.sh:697
 #, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
-msgstr ""
-"Ausführung von '$command $sha1' in Submodul-Pfad '$prefix$sm_path' "
-"fehlgeschlagen"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr "Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
 
-#: git-submodule.sh:806
+#: git-submodule.sh:698
 #, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "Submodul-Pfad '$prefix$sm_path': '$command $sha1'"
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Submodul-Pfad '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:836
+#: git-submodule.sh:729
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
 
-#: git-submodule.sh:944
+#: git-submodule.sh:837
 msgid "The --cached option cannot be used with the --files option"
 msgstr ""
 "Die Optionen --cached und --files können nicht gemeinsam verwendet werden."
 
-#: git-submodule.sh:996
+#: git-submodule.sh:889
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "unerwarteter Modus $mod_dst"
 
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Warnung: $display_name beinhaltet nicht Commit $sha1_src"
 
-#: git-submodule.sh:1019
+#: git-submodule.sh:912
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Warnung: $display_name beinhaltet nicht Commit $sha1_dst"
 
-#: git-submodule.sh:1022
+#: git-submodule.sh:915
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 "  Warnung: $display_name beinhaltet nicht die Commits $sha1_src und $sha1_dst"
 
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
 msgid "blob"
 msgstr "Blob"
 
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'"
 
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "Synchronisiere Submodul-URL für '$displaypath'"
 
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "Siehe git-${cmd}(1) für weitere Details."
+
+#~ msgid "'%s': %s"
+#~ msgstr "'%s': %s"
+
+#~ msgid "unable to access '%s': %s"
+#~ msgstr "konnte nicht auf '%s' zugreifen: %s"
+
+#~ msgid "could not open '%s' for reading: %s"
+#~ msgstr "Konnte '%s' nicht zum Lesen öffnen: %s"
+
+#~ msgid "could not open '%s' for writing: %s"
+#~ msgstr "Konnte '%s' nicht zum Schreiben öffnen: %s"
+
+#~ msgid "    git branch -d %s\n"
+#~ msgstr "    git branch -d %s\n"
+
+#~ msgid "    git branch --set-upstream-to %s\n"
+#~ msgstr "    git branch --set-upstream-to %s\n"
+
+#~ msgid "cannot open %s: %s\n"
+#~ msgstr "kann %s nicht öffnen: %s\n"
+
+#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+#~ msgstr ""
+#~ "Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder "
+#~ "benutzen\n"
+#~ "Sie \"stash\", um fortzufahren."
+
+#~ msgid "could not verify the tag '%s'"
+#~ msgstr "Konnte Tag '%s' nicht verifizieren"
+
+#~ msgid "failed to remove: %s"
+#~ msgstr "Fehler beim Löschen: %s"
+
+#~ msgid "The --exec option must be used with the --interactive option"
+#~ msgstr "Die Option --exec muss mit --interactive verwendet werden."
+
+#~ msgid ""
+#~ "Submodule path '$displaypath' not initialized\n"
+#~ "Maybe you want to use 'update --init'?"
+#~ msgstr ""
+#~ "Submodul-Pfad '$displaypath' ist nicht initialisiert.\n"
+#~ "Vielleicht möchten Sie 'update --init' benutzen?"
+
 #~ msgid "Forward-port local commits to the updated upstream head"
 #~ msgstr "lokale Commits auf einem aktuellerem Upstream-Branch neu aufbauen"
 
@@ -12592,9 +13063,6 @@ msgstr "Synchronisiere Submodul-URL für '$displaypath'"
 #~ msgid "Could not append '%s'"
 #~ msgstr "Konnte '%s' nicht anhängen."
 
-#~ msgid "Could not set '%s'"
-#~ msgstr "Konnte '%s' nicht setzen"
-
 #~ msgid "Missing author: %s"
 #~ msgstr "fehlender Autor: %s"
 
@@ -12732,13 +13200,6 @@ msgstr "Synchronisiere Submodul-URL für '$displaypath'"
 #~ msgstr ""
 #~ "\"pull\" ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
 
-#~ msgid ""
-#~ "You have not concluded your merge (MERGE_HEAD exists).\n"
-#~ "Please, commit your changes before you can merge."
-#~ msgstr ""
-#~ "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n"
-#~ "Bitte committen Sie Ihre Änderungen, bevor Sie \"merge\" ausführen können."
-
 #~ msgid "no branch specified"
 #~ msgstr "Kein Branch spezifiziert"
 
@@ -12951,13 +13412,6 @@ msgstr "Synchronisiere Submodul-URL für '$displaypath'"
 #~ msgstr "Eingabepfade sind durch ein NUL Zeichen abgeschlossen"
 
 #~ msgid ""
-#~ "The following untracked files would NOT be saved but need to be removed "
-#~ "by stash save:"
-#~ msgstr ""
-#~ "Die folgenden unbeobachteten Dateien würden NICHT gespeichert werden,\n"
-#~ "müssen aber durch \"stash save\" entfernt werden:"
-
-#~ msgid ""
 #~ "Aborting. Consider using either the --force or --include-untracked option."
 #~ msgstr ""
 #~ "Abgebrochen. Benutzen Sie entweder die Option --force oder --include-"
diff --git a/po/fr.po b/po/fr.po
index 55ca387ba4..b18d57f157 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -73,8 +73,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
-"PO-Revision-Date: 2016-03-14 20:26+0100\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
 "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
 "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
 "Language: fr\n"
@@ -96,7 +96,7 @@ msgstr ""
 "Corrigez-les puis lancez 'git add/rm <fichier>'\n"
 "si nécessaire pour marquer la résolution et valider."
 
-#: advice.c:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
 
@@ -140,7 +140,7 @@ msgstr "fmt"
 msgid "archive format"
 msgstr "format d'archive"
 
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
 msgid "prefix"
 msgstr "préfixe"
 
@@ -148,9 +148,9 @@ msgstr "préfixe"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "préfixer chaque chemin de fichier dans l'archive"
 
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 builtin/blame.c:2548
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549
 #: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:720 builtin/hash-object.c:100 builtin/ls-files.c:459
+#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459
 #: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561
 #: builtin/read-tree.c:109 parse-options.h:153
 msgid "file"
@@ -184,7 +184,8 @@ msgstr "compression efficace"
 msgid "list supported archive formats"
 msgstr "afficher les formats d'archive supportés"
 
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
 msgid "repo"
 msgstr "dépôt"
 
@@ -343,11 +344,16 @@ msgstr "Nom d'objet ambigu : '%s'."
 msgid "Not a valid branch point: '%s'."
 msgstr "Point d'embranchement invalide : '%s'."
 
-#: branch.c:344
+#: branch.c:345
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' est déjà extrait dans '%s'"
 
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"
+
 #: bundle.c:34
 #, c-format
 msgid "'%s' does not look like a v2 bundle file"
@@ -358,7 +364,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "en-tête non reconnu : %s%s (%d)"
 
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
 #, c-format
 msgid "could not open '%s'"
 msgstr "impossible d'ouvrir '%s'"
@@ -367,10 +373,10 @@ msgstr "impossible d'ouvrir '%s'"
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
 
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
 msgid "revision walk setup failed"
 msgstr "échec de la préparation du parcours des révisions"
 
@@ -409,21 +415,21 @@ msgstr "rev-list a disparu"
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "la référence '%s' est exclue par les options de rev-list"
 
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argument non reconnu : %s"
 
-#: bundle.c:449
+#: bundle.c:451
 msgid "Refusing to create empty bundle."
 msgstr "Refus de créer un colis vide."
 
-#: bundle.c:459
+#: bundle.c:463
 #, c-format
 msgid "cannot create '%s'"
 msgstr "impossible de créer '%s'"
 
-#: bundle.c:480
+#: bundle.c:491
 msgid "index-pack died"
 msgstr "l'index de groupe a disparu"
 
@@ -432,8 +438,8 @@ msgstr "l'index de groupe a disparu"
 msgid "invalid color value: %.*s"
 msgstr "Valeur invalide de couleur : %.*s"
 
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
 #, c-format
 msgid "could not parse %s"
 msgstr "impossible d'analyser %s"
@@ -468,21 +474,21 @@ msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
 msgid "failed to expand user dir in: '%s'"
 msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
 
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "niveau de compression zlib incorrect %d"
 
-#: config.c:891
+#: config.c:890
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "mode invalide pour la création d'objet : %s"
 
-#: config.c:1220
+#: config.c:1228
 msgid "unable to parse command-line config"
 msgstr "lecture de la configuration de ligne de commande impossible"
 
-#: config.c:1281
+#: config.c:1284
 msgid "unknown error occured while reading the configuration files"
 msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
 
@@ -503,24 +509,27 @@ msgstr ""
 msgid "%s has multiple values"
 msgstr "%s a des valeurs multiples"
 
+#: config.c:2224
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "impossible de régler '%s' à '%s'"
+
 #: config.c:2226
 #, c-format
-msgid "Could not set '%s' to '%s'"
-msgstr "Impossible de régler '%s' à '%s'"
+msgid "could not unset '%s'"
+msgstr "impossible de désinitialiser '%s'"
 
 #: connected.c:69
 msgid "Could not run 'git rev-list'"
 msgstr "Impossible de lancer 'git rev-list'"
 
 #: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "impossible d'écrire dans la rev-list : %s"
+msgid "failed write to rev-list"
+msgstr "impossible d'écrire dans la rev-list"
 
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "impossible de fermer l'entrée standard du rev-list : %s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
+msgstr "impossible de fermer l'entrée standard du rev-list"
 
 #: date.c:95
 msgid "in the future"
@@ -595,28 +604,28 @@ msgstr[1] "il y a %lu ans"
 msgid "failed to read orderfile '%s'"
 msgstr "impossible de lire le fichier de commande '%s'"
 
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
 msgid "Performing inexact rename detection"
 msgstr "Détection de renommage inexact en cours"
 
-#: diff.c:115
+#: diff.c:116
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 "  Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"
 
-#: diff.c:120
+#: diff.c:121
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Paramètre dirstat inconnu '%s'\n"
 
-#: diff.c:215
+#: diff.c:225
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
 
-#: diff.c:267
+#: diff.c:277
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -625,16 +634,16 @@ msgstr ""
 "Erreurs dans la variable de configuration 'diff.dirstat' :\n"
 "%s"
 
-#: diff.c:2997
+#: diff.c:3007
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "l'application de diff externe a disparu, arrêt à %s"
 
-#: diff.c:3393
+#: diff.c:3405
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow a besoin d'une spécification de chemin unique"
 
-#: diff.c:3556
+#: diff.c:3568
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -643,20 +652,20 @@ msgstr ""
 "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
 "%s"
 
-#: diff.c:3570
+#: diff.c:3582
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
 
-#: dir.c:2004
+#: dir.c:1823
 msgid "failed to get kernel name and information"
 msgstr "echec de l'obtention d'information de kernel"
 
-#: dir.c:2123
+#: dir.c:1942
 msgid "Untracked cache is disabled on this system or location."
 msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit."
 
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
 msgid "could not run gpg."
 msgstr "impossible de lancer gpg."
 
@@ -670,28 +679,28 @@ msgstr "gpg n'a pas pu signer les données"
 
 #: gpg-interface.c:222
 #, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "impossible de créer un fichier temporaire '%s' : %s"
+msgid "could not create temporary file '%s'"
+msgstr "impossible de créer un fichier temporaire '%s'"
 
-#: gpg-interface.c:225
+#: gpg-interface.c:224
 #, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "impossible d'écrire la signature détachée dans '%s' : %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "impossible d'écrire la signature détachée dans '%s'"
 
 #: grep.c:1718
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s' : lecture de %s impossible"
 
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
 #, c-format
-msgid "'%s': %s"
-msgstr "'%s' : %s"
+msgid "failed to stat '%s'"
+msgstr "échec du stat de '%s'"
 
 #: grep.c:1746
 #, c-format
-msgid "'%s': short read %s"
-msgstr "'%s' : lecture tronquée %s"
+msgid "'%s': short read"
+msgstr "'%s' : lecture tronquée"
 
 #: help.c:205
 #, c-format
@@ -758,12 +767,36 @@ msgstr[1] ""
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
+#: lockfile.c:152
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"Impossible de créer '%s.lock' : %s.\n"
+"\n"
+"Il semble qu'un autre processus git est déjà lancé dans ce dépôt,\n"
+"par exemple un éditeur ouvert par 'git commit'. Veuillez vous assurer\n"
+"que tous les processus sont terminés et réessayez. Si l'echec persiste,\n"
+"un processus git peut avoir planté :\n"
+"supprimez le fichier manuellement pour poursuivre."
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Impossible de créer '%s.lock' : %s"
+
 #: merge.c:41
 msgid "failed to read the cache"
 msgstr "impossible de lire le cache"
 
-#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
 msgid "unable to write new index file"
 msgstr "impossible d'écrire le nouveau fichier d'index"
 
@@ -810,7 +843,7 @@ msgstr "impossible de lire l'objet %s '%s'"
 msgid "blob expected for %s '%s'"
 msgstr "blob attendu pour %s '%s'"
 
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
 #, c-format
 msgid "failed to open '%s'"
 msgstr "échec à l'ouverture de '%s'"
@@ -946,7 +979,7 @@ msgstr "%s sauté (fusion identique à l'existant)"
 msgid "Auto-merging %s"
 msgstr "Fusion automatique de %s"
 
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
 msgid "submodule"
 msgstr "sous-module"
 
@@ -974,50 +1007,50 @@ msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"
 
-#: merge-recursive.c:1783
+#: merge-recursive.c:1781
 #, c-format
 msgid "Adding %s"
 msgstr "Ajout de %s"
 
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
 msgid "Fatal merge failure, shouldn't happen."
 msgstr "Échec fatal de fusion, qui ne devrait jamais arriver."
 
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
 msgid "Already up-to-date!"
 msgstr "Déjà à jour !"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "échec de fusion des arbres %s et %s"
 
-#: merge-recursive.c:1858
+#: merge-recursive.c:1856
 #, c-format
 msgid "Unprocessed path??? %s"
 msgstr "Chemin non traité ??? %s"
 
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
 msgid "Merging:"
 msgstr "Fusion :"
 
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "%u ancêtre commun trouvé :"
 msgstr[1] "%u ancêtres communs trouvés :"
 
-#: merge-recursive.c:1956
+#: merge-recursive.c:1954
 msgid "merge returned no commit"
 msgstr "la fusion n'a pas retourné de commit"
 
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Impossible d'analyser l'objet '%s'"
 
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
 msgid "Unable to write index."
 msgstr "Impossible d'écrire l'index."
 
@@ -1047,28 +1080,28 @@ msgstr "Mauvaise valeur de %s : '%s'"
 msgid "unable to parse object: %s"
 msgstr "impossible d'analyser l'objet : %s"
 
-#: parse-options.c:570
+#: parse-options.c:572
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:588
+#: parse-options.c:590
 #, c-format
 msgid "usage: %s"
 msgstr "usage : %s"
 
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
 #, c-format
 msgid "   or: %s"
 msgstr "   ou : %s"
 
-#: parse-options.c:595
+#: parse-options.c:597
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:629
+#: parse-options.c:631
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -1077,7 +1110,7 @@ msgstr "-NUM"
 msgid "malformed object name '%s'"
 msgstr "nom d'objet malformé '%s'"
 
-#: path.c:752
+#: path.c:796
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Impossible de rendre %s inscriptible pour le groupe"
@@ -1150,7 +1183,7 @@ msgstr ""
 "Il n'y a rien dont il faut exclure par des motifs :(exclure).\n"
 "Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?"
 
-#: pretty.c:969
+#: pretty.c:971
 msgid "unable to parse --pretty format"
 msgstr "impossible d'analyser le format --pretty"
 
@@ -1176,23 +1209,23 @@ msgstr ""
 "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
 "Utilisation de la version %i"
 
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "Impossible d'ouvrir '%s' en écriture"
 
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "Impossible de supprimer la référence %s : %s"
 
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2246
 #, c-format
 msgid "could not delete references: %s"
 msgstr "impossible de supprimer les références : %s"
 
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
 #, c-format
 msgid "could not remove reference %s"
 msgstr "impossible de supprimer la référence %s"
@@ -1331,96 +1364,96 @@ msgstr "format: atome %%(end) manquant"
 msgid "malformed object name %s"
 msgstr "nom d'objet malformé %s"
 
-#: remote.c:745
+#: remote.c:746
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Impossible de récupérer à la fois %s et %s pour %s"
 
-#: remote.c:749
+#: remote.c:750
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s suit habituellement %s, pas %s"
 
-#: remote.c:753
+#: remote.c:754
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s suit à la fois %s et %s"
 
-#: remote.c:761
+#: remote.c:762
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
 msgid "HEAD does not point to a branch"
 msgstr "HEAD ne pointe pas sur une branche"
 
-#: remote.c:1686
+#: remote.c:1687
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "pas de branche '%s'"
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "aucune branche amont configurée pour la branche '%s'"
 
-#: remote.c:1695
+#: remote.c:1696
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"
 
-#: remote.c:1710
+#: remote.c:1711
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "
 "branche locale de suivi"
 
-#: remote.c:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "la branche '%s' n'a aucune branche distante de poussée"
 
-#: remote.c:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "les références de spec pour '%s' n'incluent pas '%s'"
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 "impossible de résoudre une poussée 'simple' pour une destination unique"
 
-#: remote.c:2073
+#: remote.c:2074
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"
 
-#: remote.c:2077
+#: remote.c:2078
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (utilisez \"git branch --unset-upstream\" pour corriger)\n"
 
-#: remote.c:2080
+#: remote.c:2081
 #, c-format
 msgid "Your branch is up-to-date with '%s'.\n"
 msgstr "Votre branche est à jour avec '%s'.\n"
 
-#: remote.c:2084
+#: remote.c:2085
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"
 msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"
 
-#: remote.c:2090
+#: remote.c:2091
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (utilisez \"git push\" pour publier vos commits locaux)\n"
 
-#: remote.c:2093
+#: remote.c:2094
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -1432,11 +1465,11 @@ msgstr[1] ""
 "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
 "en avance rapide.\n"
 
-#: remote.c:2101
+#: remote.c:2102
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
 
-#: remote.c:2104
+#: remote.c:2105
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -1451,21 +1484,21 @@ msgstr[1] ""
 "Votre branche et '%s' ont divergé,\n"
 "et ont %d et %d commits différents chacune respectivement.\n"
 
-#: remote.c:2114
+#: remote.c:2115
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 "  (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
 
-#: revision.c:2131
+#: revision.c:2142
 msgid "your current branch appears to be broken"
 msgstr "votre branche actuelle semble cassée"
 
-#: revision.c:2134
+#: revision.c:2145
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "votre branche actuelle '%s' ne contient encore aucun commit"
 
-#: revision.c:2328
+#: revision.c:2339
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent est incompatible avec --bisect"
 
@@ -1516,7 +1549,7 @@ msgstr ""
 "avec 'git add <chemins>' ou 'git rm <chemins>'\n"
 "puis validez le résultat avec 'git commit'"
 
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
 #, c-format
 msgid "Could not write to %s"
 msgstr "Impossible d'écrire dans %s"
@@ -1676,12 +1709,12 @@ msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
 msgid "Could not create sequencer directory %s"
 msgstr "Impossible de créer le répertoire de séquenceur %s"
 
-#: sequencer.c:835 sequencer.c:917
+#: sequencer.c:835 sequencer.c:916
 #, c-format
 msgid "Error wrapping up %s."
 msgstr "Erreur lors de l'emballage de %s."
 
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
 msgid "no cherry-pick or revert in progress"
 msgstr "aucun picorage ou retour en cours"
 
@@ -1693,63 +1726,72 @@ msgstr "impossible de résoudre HEAD"
 msgid "cannot abort from a branch yet to be born"
 msgstr "impossible d'abandonner depuis une branche non encore créée"
 
-#: sequencer.c:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
 #, c-format
-msgid "cannot open %s: %s"
-msgstr "impossible d'ouvrir %s : %s"
+msgid "cannot open %s"
+msgstr "impossible d'ouvrir %s"
 
-#: sequencer.c:881
+#: sequencer.c:880
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "impossible de lire %s : %s"
 
-#: sequencer.c:882
+#: sequencer.c:881
 msgid "unexpected end of file"
 msgstr "fin de fichier inattendue"
 
-#: sequencer.c:888
+#: sequencer.c:887
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"
 
-#: sequencer.c:910
+#: sequencer.c:909
 #, c-format
 msgid "Could not format %s."
 msgstr "Impossible de formater %s."
 
-#: sequencer.c:1055
+#: sequencer.c:1054
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s : impossible de picorer un %s"
 
-#: sequencer.c:1058
+#: sequencer.c:1057
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s : mauvaise révision"
 
-#: sequencer.c:1092
+#: sequencer.c:1091
 msgid "Can't revert as initial commit"
 msgstr "Impossible d'annuler en tant que commit initial"
 
-#: sequencer.c:1093
+#: sequencer.c:1092
 msgid "Can't cherry-pick into empty head"
 msgstr "Impossible de picorer vers une HEAD vide"
 
-#: setup.c:246
+#: setup.c:248
 #, c-format
 msgid "failed to read %s"
 msgstr "échec de la lecture de %s"
 
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Version attendue du dépôt git <= %d, %d trouvée"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "extensions de dépôt inconnues trouvées :"
+
 #: sha1_file.c:1080
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
 
-#: sha1_file.c:2459
+#: sha1_file.c:2458
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"
 
-#: sha1_file.c:2463
+#: sha1_file.c:2462
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
@@ -1780,32 +1822,41 @@ msgstr ""
 "message\n"
 "en lançant \"git config advice.objectNameWarning false\""
 
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "Modification impossible de .gitmodules non fusionné, résolvez les conflits "
 "d'abord"
 
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "Impossible de trouver une section où path=%s dans .gitmodules"
 
-#: submodule.c:74
+#: submodule.c:76
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"
 
 # ici %s est un chemin
-#: submodule.c:107
+#: submodule.c:109
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
 
-#: submodule.c:118
+#: submodule.c:120
 msgid "staging updated .gitmodules failed"
 msgstr "échec de la mise en index du .gitmodules mis à jour"
 
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "Valeur invalide pour %s"
+
 #: trailer.c:237
 #, c-format
 msgid "running trailer command '%s' failed"
@@ -1865,7 +1916,219 @@ msgstr "impossible de renommer un fichier temporaire en %s"
 msgid "Could not read ref %s"
 msgstr "impossible de lire la réf %s"
 
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you can switch branches."
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n"
+"%%sVeuillez valider ou remiser vos modifications avant de basculer de branche."
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you can merge."
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n"
+"%%sVeuillez valider ou remiser vos modifications avant la fusion."
+
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n"
+"%%s"
+
+#: unpack-trees.c:74
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you can %s."
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
+"%%sVeuillez valider ou remiser vos modifications avant %s."
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"La mise à jour des répertoires suivants effacerait les fichiers non suivis contenus :\n"
+"%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Les fichiers suivants non suivis seraient effacés par %s :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant %s."
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient effacés par %s :\n"
+"%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Les fichiers suivants non suivis seraient écrasés par %s :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant %s."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient écrasés par %s :\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont pas à jour :\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Les fichiers suivants de la copie de travail seraient écrasés par la mise à jour par extraction creuse :\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Les fichiers suivants de la copie de travail seraient supprimés par la mise à jour par extraction creuse :\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "Abandon\n"
+
+#: unpack-trees.c:237
 msgid "Checking out files"
 msgstr "Extraction des fichiers"
 
@@ -1903,201 +2166,197 @@ msgstr "segment de chemin '..' invalide"
 msgid "could not open '%s' for reading and writing"
 msgstr "impossible d'ouvrir '%s' en lecture/écriture"
 
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "impossible d'ouvrir '%s' en écriture"
 
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "impossible d'ouvrir '%s' en lecture"
 
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "impossible d'accéder à '%s' : %s"
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
 #, c-format
 msgid "unable to access '%s'"
 msgstr "impossible d'accéder à '%s'"
 
-#: wrapper.c:640
+#: wrapper.c:623
 msgid "unable to get current working directory"
 msgstr "impossible d'accéder au répertoire de travail courant"
 
-#: wrapper.c:667
+#: wrapper.c:650
 #, c-format
 msgid "could not open %s for writing"
 msgstr "Impossible d'ouvrir '%s' en écriture"
 
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
 #, c-format
 msgid "could not write to %s"
 msgstr "Impossible d'écrire dans %s"
 
-#: wrapper.c:684
+#: wrapper.c:667
 #, c-format
 msgid "could not close %s"
 msgstr "impossible de fermer %s"
 
-#: wt-status.c:149
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "Chemins non fusionnés :"
 
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (utilisez \"git reset %s <fichier>...\" pour désindexer)"
 
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (utilisez \"git rm --cached <fichier>...\" pour désindexer)"
 
-#: wt-status.c:182
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
 
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "
 "résolu)"
 
-#: wt-status.c:186
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
 
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
 msgid "Changes to be committed:"
 msgstr "Modifications qui seront validées :"
 
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
 msgid "Changes not staged for commit:"
 msgstr "Modifications qui ne seront pas validées :"
 
-#: wt-status.c:219
+#: wt-status.c:220
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 "  (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"
 
-#: wt-status.c:221
+#: wt-status.c:222
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "
 "validé)"
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications "
 "dans la copie de travail)"
 
-#: wt-status.c:224
+#: wt-status.c:225
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"
 
-#: wt-status.c:236
+#: wt-status.c:237
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"
 
-#: wt-status.c:251
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "supprimé des deux côtés :"
 
-#: wt-status.c:253
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "ajouté par nous :"
 
-#: wt-status.c:255
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "supprimé par eux :"
 
-#: wt-status.c:257
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "ajouté par eux :"
 
-#: wt-status.c:259
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "supprimé par nous :"
 
-#: wt-status.c:261
+#: wt-status.c:262
 msgid "both added:"
 msgstr "ajouté de deux côtés :"
 
-#: wt-status.c:263
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "modifié des deux côtés :"
 
-#: wt-status.c:265
+#: wt-status.c:266
 #, c-format
 msgid "bug: unhandled unmerged status %x"
 msgstr "bogue : état de non-fusion non géré %x"
 
-#: wt-status.c:273
+#: wt-status.c:274
 msgid "new file:"
 msgstr "nouveau fichier :"
 
-#: wt-status.c:275
+#: wt-status.c:276
 msgid "copied:"
 msgstr "copié :"
 
-#: wt-status.c:277
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "supprimé :"
 
-#: wt-status.c:279
+#: wt-status.c:280
 msgid "modified:"
 msgstr "modifié :"
 
-#: wt-status.c:281
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "renommé :"
 
-#: wt-status.c:283
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "modif. type :"
 
-#: wt-status.c:285
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "inconnu :"
 
-#: wt-status.c:287
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "non fusionné :"
 
-#: wt-status.c:369
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "nouveaux commits, "
 
-#: wt-status.c:371
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "contenu modifié, "
 
-#: wt-status.c:373
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "contenu non suivi, "
 
-#: wt-status.c:390
+#: wt-status.c:391
 #, c-format
 msgid "bug: unhandled diff status %c"
 msgstr "bogue : état de diff non géré %c"
 
-#: wt-status.c:754
+#: wt-status.c:755
 msgid "Submodules changed but not updated:"
 msgstr "Sous-modules modifiés mais non mis à jour :"
 
-#: wt-status.c:756
+#: wt-status.c:757
 msgid "Submodule changes to be committed:"
 msgstr "Changements du sous-module à valider :"
 
-#: wt-status.c:837
+#: wt-status.c:838
 msgid ""
 "Do not touch the line above.\n"
 "Everything below will be removed."
@@ -2105,39 +2364,39 @@ msgstr ""
 "Ne touchez pas à la ligne ci-dessus\n"
 "Tout ce qui suit sera éliminé."
 
-#: wt-status.c:948
+#: wt-status.c:949
 msgid "You have unmerged paths."
 msgstr "Vous avez des chemins non fusionnés."
 
-#: wt-status.c:951
+#: wt-status.c:952
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (réglez les conflits puis lancez \"git commit\")"
 
-#: wt-status.c:954
+#: wt-status.c:956
 msgid "All conflicts fixed but you are still merging."
 msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée."
 
-#: wt-status.c:957
+#: wt-status.c:959
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (utilisez \"git commit\" pour terminer la fusion)"
 
-#: wt-status.c:967
+#: wt-status.c:969
 msgid "You are in the middle of an am session."
 msgstr "Vous êtes au milieu d'une session am."
 
-#: wt-status.c:970
+#: wt-status.c:972
 msgid "The current patch is empty."
 msgstr "Le patch actuel est vide."
 
-#: wt-status.c:974
+#: wt-status.c:976
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git am --continue\")"
 
-#: wt-status.c:976
+#: wt-status.c:978
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (utilisez \"git am --skip\" pour sauter ce patch)"
 
-#: wt-status.c:978
+#: wt-status.c:980
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
 
@@ -2286,43 +2545,43 @@ msgstr "Vous êtes en cours de bissection."
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"
 
-#: wt-status.c:1438
+#: wt-status.c:1460
 msgid "On branch "
 msgstr "Sur la branche "
 
-#: wt-status.c:1444
+#: wt-status.c:1466
 msgid "interactive rebase in progress; onto "
 msgstr "rebasage interactif en cours ; sur "
 
-#: wt-status.c:1446
+#: wt-status.c:1468
 msgid "rebase in progress; onto "
 msgstr "rebasage en cours ; sur "
 
-#: wt-status.c:1451
+#: wt-status.c:1473
 msgid "HEAD detached at "
 msgstr "HEAD détachée sur "
 
-#: wt-status.c:1453
+#: wt-status.c:1475
 msgid "HEAD detached from "
 msgstr "HEAD détachée depuis "
 
-#: wt-status.c:1456
+#: wt-status.c:1478
 msgid "Not currently on any branch."
 msgstr "Actuellement sur aucun branche."
 
-#: wt-status.c:1474
+#: wt-status.c:1496
 msgid "Initial commit"
 msgstr "Validation initiale"
 
-#: wt-status.c:1488
+#: wt-status.c:1510
 msgid "Untracked files"
 msgstr "Fichiers non suivis"
 
-#: wt-status.c:1490
+#: wt-status.c:1512
 msgid "Ignored files"
 msgstr "Fichiers ignorés"
 
-#: wt-status.c:1494
+#: wt-status.c:1516
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2334,32 +2593,32 @@ msgstr ""
 "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
 "status')."
 
-#: wt-status.c:1500
+#: wt-status.c:1522
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Fichiers non suivis non affichés%s"
 
-#: wt-status.c:1502
+#: wt-status.c:1524
 msgid " (use -u option to show untracked files)"
 msgstr " (utilisez -u pour afficher les fichiers non suivis)"
 
-#: wt-status.c:1508
+#: wt-status.c:1530
 msgid "No changes"
 msgstr "Aucune modification"
 
-#: wt-status.c:1513
+#: wt-status.c:1535
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "
 "\"git commit -a\")\n"
 
-#: wt-status.c:1516
+#: wt-status.c:1538
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "aucune modification ajoutée à la validation\n"
 
-#: wt-status.c:1519
+#: wt-status.c:1541
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -2368,57 +2627,57 @@ msgstr ""
 "aucune modification ajoutée à la validation mais des fichiers non suivis "
 "sont présents (utilisez \"git add\" pour les suivre)\n"
 
-#: wt-status.c:1522
+#: wt-status.c:1544
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 "aucune modification ajoutée à la validation mais des fichiers non suivis "
 "sont présents\n"
 
-#: wt-status.c:1525
+#: wt-status.c:1547
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
 "suivre)\n"
 
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
 #, c-format
 msgid "nothing to commit\n"
 msgstr "rien à valider\n"
 
-#: wt-status.c:1531
+#: wt-status.c:1553
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
 
-#: wt-status.c:1535
+#: wt-status.c:1557
 #, c-format
 msgid "nothing to commit, working directory clean\n"
 msgstr "rien à valider, la copie de travail est propre\n"
 
-#: wt-status.c:1642
+#: wt-status.c:1664
 msgid "Initial commit on "
 msgstr "Validation initiale sur "
 
-#: wt-status.c:1646
+#: wt-status.c:1668
 msgid "HEAD (no branch)"
 msgstr "HEAD (aucune branche)"
 
 # à priori on parle d'une branche ici
-#: wt-status.c:1675
+#: wt-status.c:1697
 msgid "gone"
 msgstr "disparue"
 
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
 msgid "behind "
 msgstr "derrière "
 
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
 msgid "ahead "
 msgstr "devant "
 
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "échec lors de l'unlink de '%s'"
@@ -2432,7 +2691,7 @@ msgstr "git add [<options>] [--] <chemin>..."
 msgid "unexpected diff status %c"
 msgstr "status de diff inattendu %c"
 
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
 msgid "updating files failed"
 msgstr "échec de la mise à jour des fichiers"
 
@@ -2445,7 +2704,7 @@ msgstr "suppression de '%s'\n"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Modifications non indexées après rafraîchissement de l'index :"
 
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
 msgid "Could not read the index"
 msgstr "Impossible de lire l'index"
 
@@ -2482,14 +2741,14 @@ msgstr ""
 "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
 
 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
 msgid "dry run"
 msgstr "simuler l'action"
 
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
 msgid "be verbose"
 msgstr "mode verbeux"
 
@@ -2497,7 +2756,7 @@ msgstr "mode verbeux"
 msgid "interactive picking"
 msgstr "sélection interactive"
 
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
 msgid "select hunks interactively"
 msgstr "sélection interactive des sections"
 
@@ -2569,16 +2828,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
 
 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
 msgid "index file corrupt"
 msgstr "fichier d'index corrompu"
 
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "Impossible d'écrire le nouveau fichier d'index"
 
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
 #, c-format
 msgid "could not read '%s'"
 msgstr "impossible de lire '%s'"
@@ -2606,16 +2865,6 @@ msgstr "Impossible de copier les notes de '%s' vers '%s'"
 msgid "fseek failed"
 msgstr "échec de fseek"
 
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "impossible d'ouvrir '%s' en lecture : %s"
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "impossible d'ouvrir '%s' en écriture : %s"
-
 #: builtin/am.c:788
 #, c-format
 msgid "could not parse patch '%s'"
@@ -2625,78 +2874,78 @@ msgstr "impossible d'analyser le patch '%s'"
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"
 
-#: builtin/am.c:901
+#: builtin/am.c:900
 msgid "invalid timestamp"
 msgstr "horodatage invalide"
 
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
 msgid "invalid Date line"
 msgstr "ligne de Date invalide"
 
-#: builtin/am.c:909
+#: builtin/am.c:908
 msgid "invalid timezone offset"
 msgstr "décalage horaire invalide"
 
-#: builtin/am.c:996
+#: builtin/am.c:995
 msgid "Patch format detection failed."
 msgstr "Échec de détection du format du patch."
 
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "échec de la création du répertoire '%s'"
 
-#: builtin/am.c:1005
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Échec de découpage des patchs."
 
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
 msgid "unable to write index file"
 msgstr "impossible d'écrire le fichier d'index"
 
-#: builtin/am.c:1188
+#: builtin/am.c:1187
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."
 
-#: builtin/am.c:1189
+#: builtin/am.c:1188
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."
 
-#: builtin/am.c:1190
+#: builtin/am.c:1189
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"
 "abort\"."
 
-#: builtin/am.c:1328
+#: builtin/am.c:1327
 msgid "Patch is empty. Was it split wrong?"
 msgstr "Le patch est vide. Le découpage était-il bon ?"
 
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ligne d'identification invalide : %s"
 
-#: builtin/am.c:1429
+#: builtin/am.c:1428
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "impossible d'analyser le commit %s"
 
-#: builtin/am.c:1631
+#: builtin/am.c:1630
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
 "points."
 
-#: builtin/am.c:1633
+#: builtin/am.c:1632
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Utilisation de l'information de l'index pour reconstruire un arbre de base..."
 
-#: builtin/am.c:1652
+#: builtin/am.c:1651
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -2704,38 +2953,38 @@ msgstr ""
 "Avez-vous édité le patch à la main ?\n"
 "Il ne s'applique pas aux blobs enregistrés dans son index."
 
-#: builtin/am.c:1658
+#: builtin/am.c:1657
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Retour à un patch de la base et fusion à 3 points..."
 
-#: builtin/am.c:1673
+#: builtin/am.c:1672
 msgid "Failed to merge in the changes."
 msgstr "Échec d'intégration des modifications."
 
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree a échoué à écrire un arbre"
 
-#: builtin/am.c:1704
+#: builtin/am.c:1703
 msgid "applying to an empty history"
 msgstr "application à un historique vide"
 
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
 msgid "failed to write commit object"
 msgstr "échec de l'écriture de l'objet commit"
 
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "impossible de continuer : %s n'existe pas."
 
-#: builtin/am.c:1769
+#: builtin/am.c:1768
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "impossible d'être interactif sans entrée standard connectée à un terminal."
 
-#: builtin/am.c:1774
+#: builtin/am.c:1773
 msgid "Commit Body is:"
 msgstr "Le corps de la validation est :"
 
@@ -2743,35 +2992,35 @@ msgstr "Le corps de la validation est :"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1784
+#: builtin/am.c:1783
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "
 
-#: builtin/am.c:1834
+#: builtin/am.c:1833
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
 
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Application de  %.*s"
 
-#: builtin/am.c:1885
+#: builtin/am.c:1884
 msgid "No changes -- Patch already applied."
 msgstr "Pas de changement -- Patch déjà appliqué."
 
-#: builtin/am.c:1893
+#: builtin/am.c:1892
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "le patch a échoué à %s %.*s"
 
-#: builtin/am.c:1899
+#: builtin/am.c:1898
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "La copie du patch qui a échoué se trouve dans : %s"
 
-#: builtin/am.c:1944
+#: builtin/am.c:1943
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -2782,7 +3031,7 @@ msgstr ""
 "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
 "patch."
 
-#: builtin/am.c:1951
+#: builtin/am.c:1950
 msgid ""
 "You still have unmerged paths in your index.\n"
 "Did you forget to use 'git add'?"
@@ -2790,17 +3039,17 @@ msgstr ""
 "Vous avez toujours des chemins non fusionnés dans votre index\n"
 "Auriez-vous oublié de faire 'git add' ?"
 
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
 #: builtin/reset.c:316
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Impossible d'analyser l'objet '%s'."
 
-#: builtin/am.c:2111
+#: builtin/am.c:2110
 msgid "failed to clean index"
 msgstr "échec du nettoyage de l'index"
 
-#: builtin/am.c:2145
+#: builtin/am.c:2144
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -2808,154 +3057,156 @@ msgstr ""
 "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
 "Pas de retour à ORIG_HEAD"
 
-#: builtin/am.c:2206
+#: builtin/am.c:2205
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valeur invalide pour --patch-format : %s"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2238
 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
 msgstr "git am [<options>] [(<mbox>|<Maildir>)...]"
 
-#: builtin/am.c:2240
+#: builtin/am.c:2239
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<options>] (--continue | --quit | --abort)"
 
-#: builtin/am.c:2246
+#: builtin/am.c:2245
 msgid "run interactively"
 msgstr "exécution interactive"
 
-#: builtin/am.c:2248
+#: builtin/am.c:2247
 msgid "historical option -- no-op"
 msgstr "option historique -- no-op"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2249
 msgid "allow fall back on 3way merging if needed"
 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
 
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
 #: builtin/repack.c:171
 msgid "be quiet"
 msgstr "être silencieux"
 
-#: builtin/am.c:2253
+#: builtin/am.c:2252
 msgid "add a Signed-off-by line to the commit message"
 msgstr "ajouter une ligne Signed-off-by au message de validation"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2255
 msgid "recode into utf8 (default)"
 msgstr "recoder en utf-8 (par défaut)"
 
-#: builtin/am.c:2258
+#: builtin/am.c:2257
 msgid "pass -k flag to git-mailinfo"
 msgstr "passer l'option -k à git-mailinfo"
 
-#: builtin/am.c:2260
+#: builtin/am.c:2259
 msgid "pass -b flag to git-mailinfo"
 msgstr "passer l'option -b à git-mailinfo"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2261
 msgid "pass -m flag to git-mailinfo"
 msgstr "passer l'option -m à git-mailinfo"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2263
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"
 
-#: builtin/am.c:2267
+#: builtin/am.c:2266
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "strip everything before a scissors line"
 msgstr "retirer tout le contenu avant la ligne des ciseaux"
 
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
 msgid "action"
 msgstr "action"
 
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
 msgid "pass it through git-apply"
 msgstr "le passer jusqu'à git-apply"
 
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
 msgid "root"
 msgstr "racine"
 
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
 msgid "path"
 msgstr "chemin"
 
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 builtin/pull.c:185
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193
 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
 #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
 #: parse-options.h:134 parse-options.h:244
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
 msgid "num"
 msgstr "num"
 
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
 #: builtin/tag.c:372
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "format the patch(es) are in"
 msgstr "format de présentation des patchs"
 
-#: builtin/am.c:2302
+#: builtin/am.c:2301
 msgid "override error message when patch failure occurs"
 msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"
 
-#: builtin/am.c:2304
+#: builtin/am.c:2303
 msgid "continue applying patches after resolving a conflict"
 msgstr "continuer à appliquer les patchs après résolution d'un conflit"
 
-#: builtin/am.c:2307
+#: builtin/am.c:2306
 msgid "synonyms for --continue"
 msgstr "synonymes de --continue"
 
-#: builtin/am.c:2310
+#: builtin/am.c:2309
 msgid "skip the current patch"
 msgstr "sauter le patch courant"
 
-#: builtin/am.c:2313
+#: builtin/am.c:2312
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 "restaurer la branche originale et abandonner les applications de patch."
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 msgid "lie about committer date"
 msgstr "mentir sur la date de validation"
 
-#: builtin/am.c:2319
+#: builtin/am.c:2318
 msgid "use current timestamp for author date"
 msgstr "utiliser l'horodatage actuel pour la date d'auteur"
 
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
 msgid "key-id"
 msgstr "id-clé"
 
-#: builtin/am.c:2322
+#: builtin/am.c:2321
 msgid "GPG-sign commits"
 msgstr "signer les commits avec GPG"
 
-#: builtin/am.c:2325
+#: builtin/am.c:2324
 msgid "(internal use for git-rebase)"
 msgstr "(utilisation interne pour git-rebase)"
 
-#: builtin/am.c:2340
+#: builtin/am.c:2339
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -2963,17 +3214,17 @@ msgstr ""
 "L'option -b/--binary ne fait plus rien depuis longtemps,\n"
 "et elle sera supprimée. Veuillez ne plus l'utiliser."
 
-#: builtin/am.c:2347
+#: builtin/am.c:2346
 msgid "failed to read the index"
 msgstr "échec à la lecture de l'index"
 
-#: builtin/am.c:2362
+#: builtin/am.c:2361
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "le répertoire précédent de rebasage %s existe toujours mais mbox donnée."
 
-#: builtin/am.c:2386
+#: builtin/am.c:2385
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -2982,7 +3233,7 @@ msgstr ""
 "Répertoire abandonné %s trouvé.\n"
 "Utilisez \"git am --abort\" pour le supprimer."
 
-#: builtin/am.c:2392
+#: builtin/am.c:2391
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 "Pas de résolution de l'opération en cours, nous ne sommes pas dans une "
@@ -3017,44 +3268,44 @@ msgstr "regexec a retourné %d pour l'entrée : %s"
 msgid "unable to find filename in patch at line %d"
 msgstr "nom de fichier du patch introuvable à la ligne %d"
 
-#: builtin/apply.c:940
+#: builtin/apply.c:937
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "
 "ligne %d"
 
-#: builtin/apply.c:944
+#: builtin/apply.c:942
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "
 "à la ligne %d"
 
-#: builtin/apply.c:945
+#: builtin/apply.c:943
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "
 "à la ligne %d"
 
-#: builtin/apply.c:952
+#: builtin/apply.c:949
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr ""
 "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"
 
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recomptage : ligne inattendue : %.*s"
 
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"
 
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -3069,77 +3320,77 @@ msgstr[1] ""
 "information de nom de fichier manquante dans l'en-tête de git diff lors de "
 "la suppression de %d composants de préfixe de chemin (ligne %d)"
 
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
 msgid "new file depends on old contents"
 msgstr "le nouveau fichier dépend de contenus anciens"
 
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
 msgid "deleted file still has contents"
 msgstr "le fichier supprimé a encore du contenu"
 
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "patch corrompu à la ligne %d"
 
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "le nouveau fichier %s dépend de contenus anciens"
 
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "le fichier supprimé %s a encore du contenu"
 
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"
 
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "patch binaire corrompu à la ligne %d : %.*s"
 
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "patch binaire non reconnu à la ligne %d"
 
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "patch totalement incompréhensible à la ligne %d"
 
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "lecture du lien symbolique %s impossible"
 
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
 #, c-format
 msgid "unable to open or read %s"
 msgstr "ouverture ou lecture de %s impossible"
 
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "début de ligne invalide : '%c'"
 
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)."
 msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)."
 
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d"
 
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -3148,330 +3399,340 @@ msgstr ""
 "pendant la recherche de :\n"
 "%.*s"
 
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "données de patch binaire manquantes pour '%s'"
 
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "le patch binaire ne s'applique par correctement à '%s'"
 
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "
 "trouvé)"
 
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "le patch a échoué : %s:%ld"
 
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
 #, c-format
 msgid "cannot checkout %s"
 msgstr "extraction de %s impossible"
 
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
 #, c-format
 msgid "read of %s failed"
 msgstr "échec de la lecture de %s"
 
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
 
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "le chemin %s a été renommé/supprimé"
 
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s : n'existe pas dans l'index"
 
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
 #, c-format
 msgid "%s: %s"
 msgstr "%s : %s"
 
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s : ne correspond pas à l'index"
 
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
 msgid "removal patch leaves file contents"
 msgstr "le patch de suppression laisse un contenu dans le fichier"
 
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s : type erroné"
 
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s est de type %o, mais %o attendu"
 
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
 #, c-format
 msgid "invalid path '%s'"
 msgstr "chemin invalide '%s'"
 
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s : existe déjà dans l'index"
 
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s : existe déjà dans la copie de travail"
 
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)"
 
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
 
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
 
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s : le patch ne s'applique pas"
 
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Vérification du patch %s..."
 
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "échec de make_cache_entry pour le chemin '%s'"
 
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "suppression de %s dans l'index impossible"
 
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "patch corrompu pour le sous-module %s"
 
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "stat du fichier nouvellement créé '%s' impossible"
 
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "création du magasin de stockage pour le fichier nouvellement créé %s "
 "impossible"
 
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "ajout de l'élément de cache %s impossible"
 
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
 #, c-format
 msgid "closing file '%s'"
 msgstr "fermeture du fichier '%s'"
 
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "écriture du fichier '%s' mode %o impossible"
 
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s appliqué proprement."
 
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
 msgid "internal error"
 msgstr "erreur interne"
 
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Application du patch %%s avec %d rejet..."
 msgstr[1] "Application du patch %%s avec %d rejets..."
 
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "troncature du nom de fichier .rej en %.*s.rej"
 
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "impossible d'ouvrir %s : %s"
+
+#: builtin/apply.c:4298
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Section n°%d appliquée proprement."
 
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Section n°%d rejetée."
 
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Chemin '%s' non traité."
+
+#: builtin/apply.c:4395
 msgid "unrecognized input"
 msgstr "entrée non reconnue"
 
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
 msgid "unable to read index file"
 msgstr "lecture du fichier d'index impossible"
 
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
 msgid "don't apply changes matching the given path"
 msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
 
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
 msgid "apply changes matching the given path"
 msgstr "appliquer les modifications qui correspondent au chemin donné"
 
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
 
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
 msgid "ignore additions made by the patch"
 msgstr "ignorer les additions réalisées par le patch"
 
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée"
 
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "afficher le nombre de lignes ajoutées et supprimées en notation décimale"
 
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée"
 
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "au lieu d'appliquer le patch, voir si le patch est applicable"
 
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
 msgid "make sure the patch is applicable to the current index"
 msgstr "s'assurer que le patch est applicable sur l'index actuel"
 
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
 msgid "apply a patch without touching the working tree"
 msgstr "appliquer les patch sans toucher à la copie de travail"
 
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
 msgid "accept a patch that touches outside the working area"
 msgstr "accepter un patch qui touche hors de la copie de travail"
 
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
 
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement"
 
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "construire un index temporaire fondé sur l'information de l'index embarqué"
 
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
 msgid "paths are separated with NUL character"
 msgstr "les chemins sont séparés par un caractère NUL"
 
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
 msgid "ensure at least <n> lines of context match"
 msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
 
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "
 "d'espace"
 
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
 
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
 msgid "apply the patch in reverse"
 msgstr "appliquer le patch en sens inverse"
 
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
 msgid "don't expect at least one line of context"
 msgstr "ne pas s'attendre à au moins une ligne de contexte"
 
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
 
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
 msgid "allow overlapping hunks"
 msgstr "accepter les recouvrements de sections"
 
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 "tolérer des erreurs de détection de retours chariot manquants en fin de "
 "fichier"
 
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
 msgid "do not trust the line counts in the hunk headers"
 msgstr "ne pas se fier au compte de lignes dans les en-têtes de section"
 
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
 msgid "prepend <root> to all filenames"
 msgstr "préfixer tous les noms de fichier avec <root>"
 
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
 msgid "--3way outside a repository"
 msgstr "--3way hors d'un dépôt"
 
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
 msgid "--index outside a repository"
 msgstr "--index hors d'un dépôt"
 
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
 msgid "--cached outside a repository"
 msgstr "--cached hors d'un dépôt"
 
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
 #, c-format
 msgid "can't open patch '%s'"
 msgstr "ouverture impossible du patch '%s'"
 
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "%d erreur d'espace ignorée"
 msgstr[1] "%d erreurs d'espace ignorées"
 
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
@@ -3537,104 +3798,104 @@ msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"
 msgid "Blaming lines"
 msgstr "Assignation de blâme au lignes"
 
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
 msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 "Montrer les éléments de blâme au fur et à mesure de leur découverte, de "
 "manière incrémentale"
 
-#: builtin/blame.c:2531
+#: builtin/blame.c:2532
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"
 
-#: builtin/blame.c:2532
+#: builtin/blame.c:2533
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"
 
-#: builtin/blame.c:2533
+#: builtin/blame.c:2534
 msgid "Show work cost statistics"
 msgstr "Montrer les statistiques de coût d'activité"
 
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
 msgid "Force progress reporting"
 msgstr "Forcer l'affichage de l'état d'avancement"
 
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
 msgid "Show output score for blame entries"
 msgstr "Montrer le score de sortie pour les éléments de blâme"
 
-#: builtin/blame.c:2536
+#: builtin/blame.c:2537
 msgid "Show original filename (Default: auto)"
 msgstr "Montrer les noms de fichier originaux (Défaut : auto)"
 
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
 msgid "Show original linenumber (Default: off)"
 msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"
 
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
 msgid "Show in a format designed for machine consumption"
 msgstr "Afficher dans un format propice à la consommation par machine"
 
-#: builtin/blame.c:2539
+#: builtin/blame.c:2540
 msgid "Show porcelain format with per-line commit information"
 msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
 
-#: builtin/blame.c:2540
+#: builtin/blame.c:2541
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"
 
-#: builtin/blame.c:2541
+#: builtin/blame.c:2542
 msgid "Show raw timestamp (Default: off)"
 msgstr "Afficher les horodatages bruts (Défaut : désactivé)"
 
-#: builtin/blame.c:2542
+#: builtin/blame.c:2543
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"
 
-#: builtin/blame.c:2543
+#: builtin/blame.c:2544
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"
 
-#: builtin/blame.c:2544
+#: builtin/blame.c:2545
 msgid "Show author email instead of name (Default: off)"
 msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)"
 
-#: builtin/blame.c:2545
+#: builtin/blame.c:2546
 msgid "Ignore whitespace differences"
 msgstr "Ignorer les différences d'espace"
 
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
 msgid "Spend extra cycles to find better match"
 msgstr ""
 "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
 
-#: builtin/blame.c:2547
+#: builtin/blame.c:2548
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"
 
-#: builtin/blame.c:2548
+#: builtin/blame.c:2549
 msgid "Use <file>'s contents as the final image"
 msgstr "Utiliser le contenu de <fichier> comme image finale"
 
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
 msgid "score"
 msgstr "score"
 
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
 msgid "Find line copies within and across files"
 msgstr "Trouver les copies de ligne dans et entre les fichiers"
 
-#: builtin/blame.c:2550
+#: builtin/blame.c:2551
 msgid "Find line movements within and across files"
 msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "Process only line range n,m, counting from 1"
 msgstr ""
 "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"
@@ -3645,32 +3906,32 @@ msgstr ""
 #. takes 22 places, is the longest among various forms of
 #. relative timestamps, but your language may need more or
 #. fewer display columns.
-#: builtin/blame.c:2640
+#: builtin/blame.c:2641
 msgid "4 years, 11 months ago"
 msgstr "il y a 10 ans et 11 mois"
 
-#: builtin/branch.c:25
+#: builtin/branch.c:26
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 
-#: builtin/branch.c:26
+#: builtin/branch.c:27
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]"
 
-#: builtin/branch.c:27
+#: builtin/branch.c:28
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..."
 
-#: builtin/branch.c:28
+#: builtin/branch.c:29
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr ""
 "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"
 
-#: builtin/branch.c:29
+#: builtin/branch.c:30
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<options>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:142
+#: builtin/branch.c:143
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -3679,7 +3940,7 @@ msgstr ""
 "suppression de la branche '%s' qui a été fusionnée dans\n"
 "         '%s', mais pas dans HEAD."
 
-#: builtin/branch.c:146
+#: builtin/branch.c:147
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -3688,12 +3949,12 @@ msgstr ""
 "branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"
 "         '%s', même si elle est fusionnée dans HEAD."
 
-#: builtin/branch.c:160
+#: builtin/branch.c:161
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Impossible de rechercher l'objet commit pour '%s'"
 
-#: builtin/branch.c:164
+#: builtin/branch.c:165
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -3702,301 +3963,322 @@ msgstr ""
 "La branche '%s' n'est pas totalement fusionnée.\n"
 "Si vous êtes sur que vous voulez la supprimer, lancez 'git branch -D %s'."
 
-#: builtin/branch.c:177
+#: builtin/branch.c:178
 msgid "Update of config-file failed"
 msgstr "Échec de la mise à jour du fichier de configuration"
 
-#: builtin/branch.c:205
+#: builtin/branch.c:206
 msgid "cannot use -a with -d"
 msgstr "impossible d'utiliser -a avec -d"
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Impossible de rechercher l'objet commit pour HEAD"
 
-#: builtin/branch.c:219
+#: builtin/branch.c:226
 #, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "Impossible de supprimer la branche '%s' sur laquelle vous êtes."
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
 
-#: builtin/branch.c:235
+#: builtin/branch.c:241
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "branche de suivi '%s' non trouvée."
 
-#: builtin/branch.c:236
+#: builtin/branch.c:242
 #, c-format
 msgid "branch '%s' not found."
 msgstr "branche '%s' non trouvée."
 
-#: builtin/branch.c:251
+#: builtin/branch.c:257
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Erreur lors de la suppression de la branche de suivi '%s'"
 
-#: builtin/branch.c:252
+#: builtin/branch.c:258
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Erreur lors de la suppression de la branche '%s'"
 
-#: builtin/branch.c:259
+#: builtin/branch.c:265
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Branche de suivi %s supprimée (précédemment %s).\n"
 
-#: builtin/branch.c:260
+#: builtin/branch.c:266
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Branche %s supprimée (précédemment %s).\n"
 
 # féminin pour une branche
-#: builtin/branch.c:303
+#: builtin/branch.c:309
 #, c-format
 msgid "[%s: gone]"
 msgstr "[%s: disparue]"
 
-#: builtin/branch.c:308
+#: builtin/branch.c:314
 #, c-format
 msgid "[%s]"
 msgstr "[%s]"
 
-#: builtin/branch.c:313
+#: builtin/branch.c:319
 #, c-format
 msgid "[%s: behind %d]"
 msgstr "[%s: en retard de %d]"
 
-#: builtin/branch.c:315
+#: builtin/branch.c:321
 #, c-format
 msgid "[behind %d]"
 msgstr "[en retard de %d]"
 
-#: builtin/branch.c:319
+#: builtin/branch.c:325
 #, c-format
 msgid "[%s: ahead %d]"
 msgstr "[%s : en avance de %d]"
 
-#: builtin/branch.c:321
+#: builtin/branch.c:327
 #, c-format
 msgid "[ahead %d]"
 msgstr "[en avance de %d]"
 
-#: builtin/branch.c:324
+#: builtin/branch.c:330
 #, c-format
 msgid "[%s: ahead %d, behind %d]"
 msgstr "[%s : en avance de %d, en retard de %d]"
 
-#: builtin/branch.c:327
+#: builtin/branch.c:333
 #, c-format
 msgid "[ahead %d, behind %d]"
 msgstr "[en avance de %d, en retard de %d]"
 
-#: builtin/branch.c:340
+#: builtin/branch.c:346
 msgid " **** invalid ref ****"
 msgstr " **** référence invalide ****"
 
-#: builtin/branch.c:366
+#: builtin/branch.c:372
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(aucune branche, rebasage de %s)"
 
-#: builtin/branch.c:369
+#: builtin/branch.c:375
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(aucune branche, bisect a démarré sur %s)"
 
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD détachée sur %s)"
 
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD détachée depuis %s)"
 
-#: builtin/branch.c:382
+#: builtin/branch.c:390
 msgid "(no branch)"
 msgstr "(aucune branche)"
 
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "La branche %s est en cours de rebasage sur %s"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "La branche %s est en cours de bissection sur %s"
+
+#: builtin/branch.c:560
 msgid "cannot rename the current branch while not on any."
 msgstr "impossible de renommer la branche actuelle, il n'y en a pas."
 
-#: builtin/branch.c:534
+#: builtin/branch.c:570
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nom de branche invalide : '%s'"
 
-#: builtin/branch.c:549
+#: builtin/branch.c:587
 msgid "Branch rename failed"
 msgstr "Échec de renommage de la branche"
 
-#: builtin/branch.c:553
+#: builtin/branch.c:591
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Renommage d'un branche mal nommée '%s'"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:594
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:601
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 "La branche est renommée, mais la mise à jour du fichier de configuration a "
 "échoué"
 
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "impossible d'écrire le modèle de description de branche : %s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "impossible d'écrire le modèle de description de branche"
 
-#: builtin/branch.c:615
+#: builtin/branch.c:651
 msgid "Generic options"
 msgstr "Options génériques"
 
-#: builtin/branch.c:617
+#: builtin/branch.c:653
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "afficher le hachage et le sujet, doublé pour la branche amont"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:654
 msgid "suppress informational messages"
 msgstr "supprimer les messages d'information"
 
-#: builtin/branch.c:619
+#: builtin/branch.c:655
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "régler le mode de suivi (voir git-pull(1))"
 
-#: builtin/branch.c:621
+#: builtin/branch.c:657
 msgid "change upstream info"
 msgstr "modifier l'information amont"
 
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "amont"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "modifier l'information amont"
+
+#: builtin/branch.c:661
 msgid "use colored output"
 msgstr "utiliser la coloration dans la sortie"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:662
 msgid "act on remote-tracking branches"
 msgstr "agir sur les branches de suivi distantes"
 
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
 msgid "print only branches that contain the commit"
 msgstr "afficher seulement les branches qui contiennent le commit"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:668
 msgid "Specific git-branch actions:"
 msgstr "Actions spécifiques à git-branch :"
 
-#: builtin/branch.c:633
+#: builtin/branch.c:669
 msgid "list both remote-tracking and local branches"
 msgstr "afficher à la fois les branches de suivi et les branches locales"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:671
 msgid "delete fully merged branch"
 msgstr "supprimer une branche totalement fusionnée"
 
-#: builtin/branch.c:636
+#: builtin/branch.c:672
 msgid "delete branch (even if not merged)"
 msgstr "supprimer une branche (même non fusionnée)"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:673
 msgid "move/rename a branch and its reflog"
 msgstr "déplacer/renommer une branche et son reflog"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:674
 msgid "move/rename a branch, even if target exists"
 msgstr "déplacer/renommer une branche, même si la cible existe"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:675
 msgid "list branch names"
 msgstr "afficher les noms des branches"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:676
 msgid "create the branch's reflog"
 msgstr "créer le reflog de la branche"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:678
 msgid "edit the description for the branch"
 msgstr "éditer la description de la branche"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:679
 msgid "force creation, move/rename, deletion"
 msgstr "forcer la création, le déplacement/renommage, ou la suppression"
 
-#: builtin/branch.c:644
+#: builtin/branch.c:680
 msgid "print only branches that are merged"
 msgstr "afficher seulement les branches qui sont fusionnées"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:681
 msgid "print only branches that are not merged"
 msgstr "afficher seulement les branches qui ne sont pas fusionnées"
 
-#: builtin/branch.c:646
+#: builtin/branch.c:682
 msgid "list branches in columns"
 msgstr "afficher les branches en colonnes"
 
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
 msgid "key"
 msgstr "clé"
 
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
 msgid "field name to sort on"
 msgstr "nom du champ servant à trier"
 
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
 #: builtin/tag.c:369
 msgid "object"
 msgstr "objet"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:687
 msgid "print only branches of the object"
 msgstr "afficher seulement les branches de l'objet"
 
-#: builtin/branch.c:669
+#: builtin/branch.c:705
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Échec de résolution de HEAD comme référence valide."
 
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD non trouvée sous refs/heads !"
 
-#: builtin/branch.c:693
+#: builtin/branch.c:729
 msgid "--column and --verbose are incompatible"
 msgstr "--column et --verbose sont incompatibles"
 
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
 msgid "branch name required"
 msgstr "le nom de branche est requis"
 
-#: builtin/branch.c:722
+#: builtin/branch.c:758
 msgid "Cannot give description to detached HEAD"
 msgstr "Impossible de décrire une HEAD détachée"
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 msgid "cannot edit description of more than one branch"
 msgstr "impossible d'éditer la description de plus d'une branche"
 
-#: builtin/branch.c:734
+#: builtin/branch.c:770
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Aucun commit sur la branche '%s'."
 
-#: builtin/branch.c:737
+#: builtin/branch.c:773
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Aucune branche nommée '%s'."
 
-#: builtin/branch.c:752
+#: builtin/branch.c:788
 msgid "too many branches for a rename operation"
 msgstr "trop de branches pour une opération de renommage"
 
-#: builtin/branch.c:757
+#: builtin/branch.c:793
 msgid "too many branches to set new upstream"
 msgstr "trop de branches pour spécifier une branche amont"
 
-#: builtin/branch.c:761
+#: builtin/branch.c:797
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -4004,41 +4286,41 @@ msgstr ""
 "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
 "aucune branche."
 
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
 #, c-format
 msgid "no such branch '%s'"
 msgstr "pas de branche '%s'"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:804
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la branche '%s' n'existe pas"
 
-#: builtin/branch.c:780
+#: builtin/branch.c:816
 msgid "too many branches to unset upstream"
 msgstr "trop de branches pour désactiver un amont"
 
-#: builtin/branch.c:784
+#: builtin/branch.c:820
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "
 "aucune branche."
 
-#: builtin/branch.c:790
+#: builtin/branch.c:826
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "La branche '%s' n'a aucune information de branche amont"
 
-#: builtin/branch.c:804
+#: builtin/branch.c:840
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "créer manuellement 'HEAD' n'a pas de sens"
 
-#: builtin/branch.c:810
+#: builtin/branch.c:846
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"
 
-#: builtin/branch.c:813
+#: builtin/branch.c:849
 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -4047,7 +4329,7 @@ msgstr ""
 "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"
 "track ou --set-upstream-to\n"
 
-#: builtin/branch.c:830
+#: builtin/branch.c:866
 #, c-format
 msgid ""
 "\n"
@@ -4058,16 +4340,6 @@ msgstr ""
 "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n"
 "\n"
 
-#: builtin/branch.c:831
-#, c-format
-msgid "    git branch -d %s\n"
-msgstr "    git branch -d %s\n"
-
-#: builtin/branch.c:832
-#, c-format
-msgid "    git branch --set-upstream-to %s\n"
-msgstr "    git branch --set-upstream-to %s\n"
-
 #: builtin/bundle.c:51
 #, c-format
 msgid "%s is okay\n"
@@ -4169,7 +4441,7 @@ msgid "terminate input and output records by a NUL character"
 msgstr ""
 "terminer les enregistrements en entrée et en sortie par un caractère NUL"
 
-#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
 msgid "suppress progress reporting"
 msgstr "supprimer l'état d'avancement"
 
@@ -4261,8 +4533,9 @@ msgid "write the content to temporary files"
 msgstr "écrire le contenu dans des fichiers temporaires"
 
 #: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
 msgid "string"
 msgstr "chaîne"
 
@@ -4312,81 +4585,81 @@ msgstr "chemin '%s' : impossible de fusionner"
 msgid "Unable to add merge result for '%s'"
 msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
 
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"
 
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' ne peut pas être utilisé avec %s"
 
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "
 "même temps."
 
-#: builtin/checkout.c:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
 msgid "corrupt index file"
 msgstr "fichier d'index corrompu"
 
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "le chemin '%s' n'est pas fusionné"
 
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
 msgid "you need to resolve your current index first"
 msgstr "vous devez d'abord résoudre votre index courant"
 
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Impossible de faire un reflog pour '%s' : %s\n"
 
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
 msgid "HEAD is now at"
 msgstr "HEAD est maintenant sur"
 
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
 msgid "unable to update HEAD"
 msgstr "impossible de mettre à jour HEAD"
 
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Remise à zéro de la branche '%s'\n"
 
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Déjà sur '%s'\n"
 
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Basculement et remise à zéro de la branche '%s'\n"
 
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Basculement sur la nouvelle branche '%s'\n"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Basculement sur la branche '%s'\n"
 
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... et %d en plus.\n"
 
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -4409,7 +4682,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4438,151 +4711,151 @@ msgstr[1] ""
 "git branch <nouvelle-branche> %s\n"
 "\n"
 
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
 msgid "internal error in revision walk"
 msgstr "erreur interne lors du parcours des révisions"
 
-#: builtin/checkout.c:797
+#: builtin/checkout.c:796
 msgid "Previous HEAD position was"
 msgstr "La position précédente de HEAD était sur"
 
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
 msgid "You are on a branch yet to be born"
 msgstr "Vous êtes sur une branche qui doit encore naître"
 
-#: builtin/checkout.c:969
+#: builtin/checkout.c:968
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "une seule référence attendue, %d fournies."
 
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
 #, c-format
 msgid "invalid reference: %s"
 msgstr "référence invalide : %s"
 
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la référence n'est pas un arbre : %s"
 
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1076
 msgid "paths cannot be used with switching branches"
 msgstr "impossible d'utiliser des chemins avec un basculement de branches"
 
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"
 
-#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' ne peut pas être utilisé avec '%s'"
 
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"
 
-#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
 msgid "branch"
 msgstr "branche"
 
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
 msgid "create and checkout a new branch"
 msgstr "créer et extraire une nouvelle branche"
 
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
 msgid "create/reset and checkout a branch"
 msgstr "créer/réinitialiser et extraire une branche"
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
 msgid "create reflog for new branch"
 msgstr "créer un reflog pour une nouvelle branche"
 
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
 msgid "detach the HEAD at named commit"
 msgstr "détacher la HEAD à la validation nommée"
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
 msgid "set upstream info for new branch"
 msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new-branch"
 msgstr "nouvelle branche"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new unparented branch"
 msgstr "nouvelle branche sans parent"
 
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
 msgid "checkout our version for unmerged files"
 msgstr "extraire notre version pour les fichiers non fusionnés"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
 msgid "checkout their version for unmerged files"
 msgstr "extraire leur version pour les fichiers non fusionnés"
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
 msgid "force checkout (throw away local modifications)"
 msgstr "forcer l'extraction (laisser tomber les modifications locales)"
 
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1150
 msgid "perform a 3-way merge with the new branch"
 msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
 
-#: builtin/checkout.c:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
 msgid "update ignored files (default)"
 msgstr "mettre à jour les fichiers ignorés (par défaut)"
 
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
 msgid "style"
 msgstr "style"
 
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
 msgid "conflict style (merge or diff3)"
 msgstr "style de conflit (merge (fusion) ou diff3)"
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"
 
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 "ne pas vérifier si une autre copie de travail contient le référence fournie"
 
-#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
 #: builtin/send-pack.c:168
 msgid "force progress reporting"
 msgstr "forcer l'affichage de l'état d'avancement"
 
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B et --orphan sont mutuellement exclusifs"
 
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1209
 msgid "--track needs a branch name"
 msgstr "--track requiert un nom de branche"
 
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
 msgid "Missing branch name; try -b"
 msgstr "Nom de branche manquant ; essayez -b"
 
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
 msgid "invalid path specification"
 msgstr "spécification de chemin invalide"
 
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
 #, c-format
 msgid ""
 "Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4592,12 +4865,12 @@ msgstr ""
 "en même temps.\n"
 "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"
 
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"
 
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1266
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -4749,8 +5022,8 @@ msgstr "nettoyage interactif"
 msgid "remove whole directories"
 msgstr "supprimer les répertoires entiers"
 
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
 msgid "pattern"
 msgstr "motif"
 
@@ -4790,103 +5063,112 @@ msgstr ""
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
 
-#: builtin/clone.c:60
+#: builtin/clone.c:62
 msgid "don't create a checkout"
 msgstr "ne pas créer d'extraction"
 
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
 msgid "create a bare repository"
 msgstr "créer un dépôt nu"
 
-#: builtin/clone.c:65
+#: builtin/clone.c:67
 msgid "create a mirror repository (implies bare)"
 msgstr "créer un dépôt miroir (implique dépôt nu)"
 
-#: builtin/clone.c:67
+#: builtin/clone.c:69
 msgid "to clone from a local repository"
 msgstr "pour cloner depuis un dépôt local"
 
-#: builtin/clone.c:69
+#: builtin/clone.c:71
 msgid "don't use local hardlinks, always copy"
 msgstr "ne pas utiliser de liens durs locaux, toujours copier"
 
-#: builtin/clone.c:71
+#: builtin/clone.c:73
 msgid "setup as shared repository"
 msgstr "régler comme dépôt partagé"
 
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
 msgid "initialize submodules in the clone"
 msgstr "initialiser les sous-modules dans le clone"
 
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "nombre de sous-modules clonés en parallèle"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
 msgid "template-directory"
 msgstr "répertoire-modèle"
 
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
 msgid "directory from which templates will be used"
 msgstr "répertoire depuis lequel les modèles vont être utilisés"
 
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
 msgid "reference repository"
 msgstr "dépôt de référence"
 
-#: builtin/clone.c:81
+#: builtin/clone.c:85
 msgid "use --reference only while cloning"
 msgstr "utiliser seulement --reference pour cloner"
 
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
 msgid "name"
 msgstr "nom"
 
-#: builtin/clone.c:83
+#: builtin/clone.c:87
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
 
-#: builtin/clone.c:85
+#: builtin/clone.c:89
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:91
 msgid "path to git-upload-pack on the remote"
 msgstr "chemin vers git-upload-pack sur le serveur distant"
 
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201
 msgid "depth"
 msgstr "profondeur"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:93
 msgid "create a shallow clone of that depth"
 msgstr "créer un clone superficiel de cette profondeur"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:95
 msgid "clone only one branch, HEAD or --branch"
 msgstr "cloner seulement une branche, HEAD ou --branch"
 
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "tous les sous-modules clonés seront superficiels"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
 msgid "separate git dir from working tree"
 msgstr "séparer le répertoire git de la copie de travail"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:100
 msgid "key=value"
 msgstr "clé=valeur"
 
-#: builtin/clone.c:95
+#: builtin/clone.c:101
 msgid "set config inside the new repository"
 msgstr "régler la configuration dans le nouveau dépôt"
 
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
 msgid "use IPv4 addresses only"
 msgstr "n'utiliser que des adresses IPv4"
 
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
 msgid "use IPv6 addresses only"
 msgstr "n'utiliser que des adresses IPv6"
 
-#: builtin/clone.c:239
+#: builtin/clone.c:241
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -4894,59 +5176,54 @@ msgstr ""
 "Aucun nom de répertoire n'a pu être deviné\n"
 "Veuillez spécifier un répertoire dans la ligne de commande"
 
-#: builtin/clone.c:305
+#: builtin/clone.c:307
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
 "encore supporté."
 
-#: builtin/clone.c:307
+#: builtin/clone.c:309
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "le dépôt de référence '%s' n'est pas un dépôt local."
 
-#: builtin/clone.c:312
+#: builtin/clone.c:314
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "le dépôt de référence '%s' est superficiel"
 
-#: builtin/clone.c:315
+#: builtin/clone.c:317
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "le dépôt de référence '%s' est greffé"
 
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "échec du stat de '%s'"
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existe et n'est pas un répertoire"
 
-#: builtin/clone.c:396
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "échec du stat de %s\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "échec de la création du lien '%s'"
 
-#: builtin/clone.c:422
+#: builtin/clone.c:424
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "échec de la copie vers '%s'"
 
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
 #, c-format
 msgid "done.\n"
 msgstr "fait.\n"
 
-#: builtin/clone.c:459
+#: builtin/clone.c:461
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -4956,130 +5233,130 @@ msgstr ""
 "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
 "et réessayer l'extraction avec 'git checkout -f HEAD'\n"
 
-#: builtin/clone.c:536
+#: builtin/clone.c:538
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Impossible de trouver la branche distante '%s' à cloner."
 
-#: builtin/clone.c:626
+#: builtin/clone.c:628
 #, c-format
 msgid "Checking connectivity... "
 msgstr "Vérification de la connectivité... "
 
-#: builtin/clone.c:629
+#: builtin/clone.c:631
 msgid "remote did not send all necessary objects"
 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
 
-#: builtin/clone.c:647
+#: builtin/clone.c:649
 #, c-format
 msgid "unable to update %s"
 msgstr "impossible de mettre à jour %s"
 
-#: builtin/clone.c:696
+#: builtin/clone.c:698
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "la HEAD distante réfère à une référence non existante, impossible de "
 "l'extraire.\n"
 
-#: builtin/clone.c:727
+#: builtin/clone.c:729
 msgid "unable to checkout working tree"
 msgstr "impossible d'extraire la copie de travail"
 
-#: builtin/clone.c:753
+#: builtin/clone.c:767
 msgid "unable to write parameters to config file"
 msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:830
 msgid "cannot repack to clean up"
 msgstr "impossible de remballer pour nettoyer"
 
-#: builtin/clone.c:818
+#: builtin/clone.c:832
 msgid "cannot unlink temporary alternates file"
 msgstr "impossible de unlinker le fichier temporaire alternates"
 
-#: builtin/clone.c:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
 msgid "Too many arguments."
 msgstr "Trop d'arguments."
 
-#: builtin/clone.c:854
+#: builtin/clone.c:868
 msgid "You must specify a repository to clone."
 msgstr "Vous devez spécifier un dépôt à cloner."
 
-#: builtin/clone.c:865
+#: builtin/clone.c:879
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "les options --bare et --origin %s sont incompatibles."
 
-#: builtin/clone.c:868
+#: builtin/clone.c:882
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare et --separate-git-dir sont incompatibles."
 
-#: builtin/clone.c:881
+#: builtin/clone.c:895
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "le dépôt '%s' n'existe pas"
 
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "la profondeur %s n'est pas un entier positif"
 
-#: builtin/clone.c:897
+#: builtin/clone.c:911
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."
 
-#: builtin/clone.c:907
+#: builtin/clone.c:921
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "la copie de travail '%s' existe déjà."
 
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
 
-#: builtin/clone.c:925
+#: builtin/clone.c:939
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "impossible de créer le répertoire de la copie de travail '%s'"
 
-#: builtin/clone.c:943
+#: builtin/clone.c:957
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Clonage dans le dépôt nu '%s'\n"
 
-#: builtin/clone.c:945
+#: builtin/clone.c:959
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clonage dans '%s'...\n"
 
-#: builtin/clone.c:984
+#: builtin/clone.c:998
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1001
 msgid "source repository is shallow, ignoring --local"
 msgstr "le dépôt source est superficiel, option --local ignorée"
 
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
 msgid "--local is ignored"
 msgstr "--local est ignoré"
 
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "Je ne sais pas cloner %s"
 
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"
 
-#: builtin/clone.c:1056
+#: builtin/clone.c:1070
 msgid "You appear to have cloned an empty repository."
 msgstr "Vous semblez avoir cloné un dépôt vide."
 
@@ -5222,66 +5499,66 @@ msgstr ""
 "Puis \"git cherry-pick --continue\" continuera le picorage \n"
 "des commits restants.\n"
 
-#: builtin/commit.c:305
+#: builtin/commit.c:307
 msgid "failed to unpack HEAD tree object"
 msgstr "échec du dépaquetage de l'objet arbre HEAD"
 
-#: builtin/commit.c:346
+#: builtin/commit.c:348
 msgid "unable to create temporary index"
 msgstr "impossible de créer l'index temporaire"
 
-#: builtin/commit.c:352
+#: builtin/commit.c:354
 msgid "interactive add failed"
 msgstr "échec de l'ajout interactif"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:367
 msgid "unable to update temporary index"
 msgstr "impossible de mettre à jour l'index temporaire"
 
-#: builtin/commit.c:367
+#: builtin/commit.c:369
 msgid "Failed to update main cache tree"
 msgstr "Impossible de mettre à jour l'arbre de cache principal"
 
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
 msgid "unable to write new_index file"
 msgstr "impossible d'écrire le fichier new_index"
 
-#: builtin/commit.c:445
+#: builtin/commit.c:447
 msgid "cannot do a partial commit during a merge."
 msgstr "impossible de faire une validation partielle pendant une fusion."
 
-#: builtin/commit.c:447
+#: builtin/commit.c:449
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "impossible de faire une validation partielle pendant un picorage."
 
-#: builtin/commit.c:456
+#: builtin/commit.c:458
 msgid "cannot read the index"
 msgstr "impossible de lire l'index"
 
-#: builtin/commit.c:475
+#: builtin/commit.c:477
 msgid "unable to write temporary index file"
 msgstr "impossible d'écrire le fichier d'index temporaire"
 
-#: builtin/commit.c:580
+#: builtin/commit.c:582
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "entête d'auteur manquant dans le commit '%s'"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:584
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "le commit '%s' a une ligne d'auteur malformée"
 
-#: builtin/commit.c:601
+#: builtin/commit.c:603
 msgid "malformed --author parameter"
 msgstr "paramètre --author mal formé"
 
-#: builtin/commit.c:609
+#: builtin/commit.c:611
 #, c-format
 msgid "invalid date format: %s"
 msgstr "format de date invalide : %s"
 
-#: builtin/commit.c:653
+#: builtin/commit.c:655
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -5289,38 +5566,38 @@ msgstr ""
 "impossible de sélectionner un caractère de commentaire\n"
 "qui n'est pas utilisé dans le message de validation actuel"
 
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "impossible de rechercher le commit %s"
 
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(lecture du message de journal depuis l'entrée standard)\n"
 
-#: builtin/commit.c:704
+#: builtin/commit.c:706
 msgid "could not read log from standard input"
 msgstr "impossible de lire le journal depuis l'entrée standard"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:710
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "impossible de lire le fichier de journal '%s'"
 
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "impossible de lire MERGE_MSG"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
 msgid "could not read SQUASH_MSG"
 msgstr "impossible de lire SQUASH_MSG"
 
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "impossible de lire MERGE_MSG"
+
+#: builtin/commit.c:796
 msgid "could not write commit template"
 msgstr "impossible d'écrire le modèle de commit"
 
-#: builtin/commit.c:803
+#: builtin/commit.c:814
 #, c-format
 msgid ""
 "\n"
@@ -5335,7 +5612,7 @@ msgstr ""
 "\t%s\n"
 "et essayez à nouveau.\n"
 
-#: builtin/commit.c:808
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -5350,7 +5627,7 @@ msgstr ""
 "\t%s\n"
 "et essayez à nouveau.\n"
 
-#: builtin/commit.c:821
+#: builtin/commit.c:832
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5360,7 +5637,7 @@ msgstr ""
 "commençant par '%c' seront ignorées, et un message vide abandonne la "
 "validation.\n"
 
-#: builtin/commit.c:828
+#: builtin/commit.c:839
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5371,150 +5648,150 @@ msgstr ""
 "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"
 "si vous le souhaitez. Un message vide abandonne la validation.\n"
 
-#: builtin/commit.c:848
+#: builtin/commit.c:859
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAuteur :     %.*s <%.*s>"
 
-#: builtin/commit.c:856
+#: builtin/commit.c:867
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDate :       %s"
 
-#: builtin/commit.c:863
+#: builtin/commit.c:874
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sValidateur : %.*s <%.*s>"
 
-#: builtin/commit.c:881
+#: builtin/commit.c:892
 msgid "Cannot read index"
 msgstr "Impossible de lire l'index"
 
-#: builtin/commit.c:938
+#: builtin/commit.c:949
 msgid "Error building trees"
 msgstr "Erreur lors de la construction des arbres"
 
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"
 
-#: builtin/commit.c:1055
+#: builtin/commit.c:1066
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "
 "auteur existant"
 
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Mode de fichier non suivi invalide '%s'"
 
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
 msgid "--long and -z are incompatible"
 msgstr "--long et -z sont incompatibles"
 
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1157
 msgid "You have nothing to amend."
 msgstr "Il n'y a rien à corriger."
 
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1162
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."
 
-#: builtin/commit.c:1154
+#: builtin/commit.c:1165
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"
 
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."
 
-#: builtin/commit.c:1166
+#: builtin/commit.c:1177
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."
 
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."
 
-#: builtin/commit.c:1191
+#: builtin/commit.c:1202
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Une seule option parmi --include/--only/--all/--interactive/--patch peut "
 "être utilisée."
 
-#: builtin/commit.c:1193
+#: builtin/commit.c:1204
 msgid "No paths with --include/--only does not make sense."
 msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."
 
-#: builtin/commit.c:1195
+#: builtin/commit.c:1206
 msgid "Clever... amending the last one with dirty index."
 msgstr "Malin... correction du dernier avec un index sale."
 
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
 msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."
 
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Mode de nettoyage invalide %s"
 
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
 msgid "Paths with -a does not make sense."
 msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."
 
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
 msgid "show status concisely"
 msgstr "afficher le statut avec concision"
 
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
 msgid "show branch information"
 msgstr "afficher l'information de branche"
 
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
 msgid "machine-readable output"
 msgstr "sortie pour traitement automatique"
 
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
 msgid "show status in long format (default)"
 msgstr "afficher le statut en format long (par défaut)"
 
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
 msgid "terminate entries with NUL"
 msgstr "terminer les éléments par NUL"
 
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
 #: builtin/fast-export.c:984 builtin/tag.c:353
 msgid "mode"
 msgstr "mode"
 
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
 "no. (Défaut : all)"
 
-#: builtin/commit.c:1340
+#: builtin/commit.c:1351
 msgid "show ignored files"
 msgstr "afficher les fichiers ignorés"
 
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
 msgid "when"
 msgstr "quand"
 
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -5522,201 +5799,201 @@ msgstr ""
 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
 
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
 msgid "list untracked files in columns"
 msgstr "afficher les fichiers non suivis en colonnes"
 
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
 msgid "couldn't look up newly created commit"
 msgstr "impossible de retrouver le commit nouvellement créé"
 
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
 msgid "could not parse newly created commit"
 msgstr "impossible d'analyser le commit nouvellement créé"
 
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
 msgid "detached HEAD"
 msgstr "HEAD détachée"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
 msgid " (root-commit)"
 msgstr " (commit racine)"
 
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
 msgid "suppress summary after successful commit"
 msgstr "supprimer le résumé après une validation réussie"
 
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
 msgid "show diff in commit message template"
 msgstr "afficher les diff dans le modèle de message de validation"
 
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
 msgid "Commit message options"
 msgstr "Options du message de validation"
 
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
 msgid "read message from file"
 msgstr "lire le message depuis un fichier"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "author"
 msgstr "auteur"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "override author for commit"
 msgstr "remplacer l'auteur pour la validation"
 
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
 msgid "date"
 msgstr "date"
 
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
 msgid "override date for commit"
 msgstr "remplacer la date pour la validation"
 
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
 #: builtin/notes.c:558 builtin/tag.c:349
 msgid "message"
 msgstr "message"
 
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
 msgid "commit message"
 msgstr "message de validation"
 
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
 msgid "commit"
 msgstr "commit"
 
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
 msgid "reuse and edit message from specified commit"
 msgstr "réutiliser et éditer le message du commit spécifié"
 
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
 msgid "reuse message from specified commit"
 msgstr "réutiliser le message du commit spécifié"
 
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "utiliser un message au format autosquash pour corriger le commit spécifié"
 
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "utiliser un message au format autosquash pour compresser le commit spécifié"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1603
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"
 
-#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
 msgid "add Signed-off-by:"
 msgstr "ajouter une entrée Signed-off-by :"
 
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
 msgid "use specified template file"
 msgstr "utiliser le fichier de modèle spécifié"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
 msgid "force edit of commit"
 msgstr "forcer l'édition du commit"
 
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
 msgid "default"
 msgstr "défaut"
 
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
 msgid "how to strip spaces and #comments from message"
 msgstr "comment éliminer les espaces et les commentaires # du message"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
 msgid "include status in commit message template"
 msgstr "inclure le statut dans le modèle de message de validation"
 
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
 #: builtin/revert.c:93
 msgid "GPG sign commit"
 msgstr "signer la validation avec GPG"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
 msgid "Commit contents options"
 msgstr "Valider les options des contenus"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
 msgid "commit all changed files"
 msgstr "valider tous les fichiers modifiés"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
 msgid "add specified files to index for commit"
 msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
 
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
 msgid "interactively add files"
 msgstr "ajouter des fichiers en mode interactif"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
 msgid "interactively add changes"
 msgstr "ajouter les modifications en mode interactif"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
 msgid "commit only specified files"
 msgstr "valider seulement les fichiers spécifiés"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
 msgid "bypass pre-commit hook"
 msgstr "éviter d'utiliser le crochet pre-commit"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
 msgid "show what would be committed"
 msgstr "afficher ce qui serait validé"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
 msgid "amend previous commit"
 msgstr "corriger la validation précédente"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
 msgid "bypass post-rewrite hook"
 msgstr "éviter d'utiliser le crochet post-rewrite"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
 msgid "ok to record an empty change"
 msgstr "accepter d'enregistrer une modification vide"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
 msgid "ok to record a change with an empty message"
 msgstr "accepter d'enregistrer une modification avec un message vide"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
 msgid "could not parse HEAD commit"
 msgstr "impossible d'analyser le commit HEAD"
 
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Fichier MERGE_HEAD corrompu (%s)"
 
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
 msgid "could not read MERGE_MODE"
 msgstr "impossible de lire MERGE_MODE"
 
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "impossible de lire le message de validation : %s"
 
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"
 
-#: builtin/commit.c:1740
+#: builtin/commit.c:1760
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Abandon de la validation du à un message de validation vide\n"
 
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -5865,7 +6142,7 @@ msgstr ""
 msgid "unable to parse default color value"
 msgstr "impossible de lire la valeur de couleur par défaut"
 
-#: builtin/config.c:469
+#: builtin/config.c:472
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -5880,7 +6157,7 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:614
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "création impossible du fichier de configuration '%s'"
@@ -5916,7 +6193,7 @@ msgstr "l'étiquette annotée %s n'a pas de nom embarqué"
 msgid "tag '%s' is really '%s' here"
 msgstr "l'étiquette '%s' est en fait '%s'"
 
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s n'est pas un nom d'objet valide"
@@ -6011,7 +6288,7 @@ msgstr ""
 msgid "only consider tags matching <pattern>"
 msgstr "ne considérer que les étiquettes correspondant à <motif>"
 
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
 msgid "show abbreviated commit object as fallback"
 msgstr "afficher les objets commits abrégés en dernier recours"
 
@@ -6045,21 +6322,21 @@ msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique"
 msgid "invalid option: %s"
 msgstr "option invalide : %s"
 
-#: builtin/diff.c:358
+#: builtin/diff.c:360
 msgid "Not a git repository"
 msgstr "Ce n'est pas un dépôt git !"
 
-#: builtin/diff.c:401
+#: builtin/diff.c:403
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objet spécifié '%s' invalide."
 
-#: builtin/diff.c:410
+#: builtin/diff.c:412
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "plus de deux blobs spécifiés : '%s'"
 
-#: builtin/diff.c:417
+#: builtin/diff.c:419
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "objet non géré '%s' spécifié."
@@ -6133,19 +6410,19 @@ msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<options>]"
 
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
 msgid "fetch from all remotes"
-msgstr "récupérer depuis tous le dépôts distants"
+msgstr "récupérer depuis tous les dépôts distants"
 
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
 
-#: builtin/fetch.c:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
 msgid "path to upload pack on remote end"
 msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
 
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
 msgid "force overwrite of local branch"
 msgstr "forcer l'écrasement de la branche locale"
 
@@ -6153,7 +6430,7 @@ msgstr "forcer l'écrasement de la branche locale"
 msgid "fetch from multiple remotes"
 msgstr "récupérer depuis plusieurs dépôts distants"
 
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
 msgid "fetch all tags and associated objects"
 msgstr "récupérer toutes les étiquettes et leurs objets associés"
 
@@ -6165,21 +6442,21 @@ msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
 msgid "number of submodules fetched in parallel"
 msgstr "nombre de sous-modules récupérés en parallèle"
 
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 "éliminer les branches de suivi distant si la branche n'existe plus dans le "
 "dépôt distant"
 
-#: builtin/fetch.c:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
 msgid "on-demand"
 msgstr "à la demande"
 
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
 msgid "control recursive fetching of submodules"
 msgstr "contrôler la récupération récursive dans les sous-modules"
 
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
 msgid "keep downloaded pack"
 msgstr "conserver le paquet téléchargé"
 
@@ -6187,15 +6464,15 @@ msgstr "conserver le paquet téléchargé"
 msgid "allow updating of HEAD ref"
 msgstr "permettre la mise à jour de la référence HEAD"
 
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
 msgid "deepen history of shallow clone"
 msgstr "approfondir l'historique d'un clone superficiel"
 
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
 msgid "convert to a complete repository"
 msgstr "convertir en un dépôt complet"
 
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
 msgid "dir"
 msgstr "répertoire"
 
@@ -6207,15 +6484,15 @@ msgstr "préfixer ceci à la sortie du chemin du sous-module"
 msgid "default mode for recursion"
 msgstr "mode par défaut pour la récursion"
 
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
 msgid "accept refs that update .git/shallow"
 msgstr "accepter les références qui mettent à jour .git/shallow"
 
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
 msgid "refmap"
 msgstr "correspondance de référence"
 
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
 msgid "specify fetch refmap"
 msgstr "spécifier une correspondance de référence pour la récupération"
 
@@ -6273,11 +6550,6 @@ msgstr "mise à jour forcée"
 msgid "(non-fast-forward)"
 msgstr "(pas d'avance rapide)"
 
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "impossible d'ouvrir %s : %s\n"
-
 #: builtin/fetch.c:619
 #, c-format
 msgid "%s did not send all necessary objects\n"
@@ -6480,56 +6752,56 @@ msgstr "Vérification de la connectivité"
 msgid "Checking object directories"
 msgstr "Vérification des répertoires d'objet"
 
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<options>] [<objet>...]"
 
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
 msgid "show unreachable objects"
 msgstr "afficher les objets inaccessibles"
 
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
 msgid "show dangling objects"
 msgstr "afficher les objets en suspens"
 
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
 msgid "report tags"
 msgstr "afficher les étiquettes"
 
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
 msgid "report root nodes"
 msgstr "signaler les nœuds racines"
 
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
 msgid "make index objects head nodes"
 msgstr "considérer les objets de l'index comme nœuds tête"
 
 # translated from man page
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
 msgid "make reflogs head nodes (default)"
 msgstr "considérer les reflogs comme nœuds tête (par défaut)"
 
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
 msgid "also consider packs and alternate objects"
 msgstr "inspecter aussi les objets pack et alternatifs"
 
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
 msgid "check only connectivity"
 msgstr "ne vérifier que la connectivité"
 
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
 msgid "enable more strict checking"
 msgstr "activer une vérification plus strict"
 
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
 msgid "write dangling objects in .git/lost-found"
 msgstr "écrire les objets en suspens dans .git/lost-found"
 
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
 msgid "show progress"
 msgstr "afficher la progression"
 
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
 msgid "Checking objects"
 msgstr "Vérification des objets"
 
@@ -6637,223 +6909,223 @@ msgstr "impossible de lire l'arbre (%s)"
 msgid "unable to grep from object of type %s"
 msgstr "impossible de faire un grep sur un objet de type %s"
 
-#: builtin/grep.c:558
+#: builtin/grep.c:560
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "l'option '%c' attend un valeur numérique"
 
-#: builtin/grep.c:575
+#: builtin/grep.c:577
 #, c-format
 msgid "cannot open '%s'"
 msgstr "impossible d'ouvrir '%s'"
 
-#: builtin/grep.c:644
+#: builtin/grep.c:646
 msgid "search in index instead of in the work tree"
 msgstr "rechercher dans l'index plutôt que dans la copie de travail"
 
-#: builtin/grep.c:646
+#: builtin/grep.c:648
 msgid "find in contents not managed by git"
 msgstr "rechercher dans les contenus non gérés par git"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:650
 msgid "search in both tracked and untracked files"
 msgstr "rechercher dans les fichiers suivis et non-suivis"
 
-#: builtin/grep.c:650
+#: builtin/grep.c:652
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorer les fichiers spécifiés via '.gitignore'"
 
-#: builtin/grep.c:653
+#: builtin/grep.c:655
 msgid "show non-matching lines"
 msgstr "afficher les lignes qui ne correspondent pas"
 
-#: builtin/grep.c:655
+#: builtin/grep.c:657
 msgid "case insensitive matching"
 msgstr "correspondance insensible à la casse"
 
-#: builtin/grep.c:657
+#: builtin/grep.c:659
 msgid "match patterns only at word boundaries"
 msgstr "rechercher les motifs aux séparateurs de mots"
 
-#: builtin/grep.c:659
+#: builtin/grep.c:661
 msgid "process binary files as text"
 msgstr "traiter les fichiers binaires comme texte"
 
-#: builtin/grep.c:661
+#: builtin/grep.c:663
 msgid "don't match patterns in binary files"
 msgstr "ne pas chercher les motifs dans les fichiers binaires"
 
-#: builtin/grep.c:664
+#: builtin/grep.c:666
 msgid "process binary files with textconv filters"
 msgstr "traiter les fichiers binaires avec les filtres textconv"
 
-#: builtin/grep.c:666
+#: builtin/grep.c:668
 msgid "descend at most <depth> levels"
 msgstr "descendre au plus de <profondeur> dans l'arborescence"
 
-#: builtin/grep.c:670
+#: builtin/grep.c:672
 msgid "use extended POSIX regular expressions"
 msgstr "utiliser des expressions régulières étendues POSIX"
 
-#: builtin/grep.c:673
+#: builtin/grep.c:675
 msgid "use basic POSIX regular expressions (default)"
 msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
 
-#: builtin/grep.c:676
+#: builtin/grep.c:678
 msgid "interpret patterns as fixed strings"
 msgstr "interpréter les motifs comme de chaînes fixes"
 
-#: builtin/grep.c:679
+#: builtin/grep.c:681
 msgid "use Perl-compatible regular expressions"
 msgstr "utiliser des expressions régulières compatibles avec Perl"
 
-#: builtin/grep.c:682
+#: builtin/grep.c:684
 msgid "show line numbers"
 msgstr "afficher les numéros de ligne"
 
-#: builtin/grep.c:683
+#: builtin/grep.c:685
 msgid "don't show filenames"
 msgstr "ne pas pas afficher les noms de fichier"
 
-#: builtin/grep.c:684
+#: builtin/grep.c:686
 msgid "show filenames"
 msgstr "afficher les noms de fichier"
 
-#: builtin/grep.c:686
+#: builtin/grep.c:688
 msgid "show filenames relative to top directory"
 msgstr "afficher les noms de fichiers relativement au répertoire de base"
 
-#: builtin/grep.c:688
+#: builtin/grep.c:690
 msgid "show only filenames instead of matching lines"
 msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
 
-#: builtin/grep.c:690
+#: builtin/grep.c:692
 msgid "synonym for --files-with-matches"
 msgstr "synonyme pour --files-with-matches"
 
-#: builtin/grep.c:693
+#: builtin/grep.c:695
 msgid "show only the names of files without match"
 msgstr "n'afficher que les noms des fichiers sans correspondance"
 
-#: builtin/grep.c:695
+#: builtin/grep.c:697
 msgid "print NUL after filenames"
 msgstr "imprimer une caractère NUL après le noms de fichier"
 
-#: builtin/grep.c:697
+#: builtin/grep.c:699
 msgid "show the number of matches instead of matching lines"
 msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
 
-#: builtin/grep.c:698
+#: builtin/grep.c:700
 msgid "highlight matches"
 msgstr "mettre en évidence les correspondances"
 
-#: builtin/grep.c:700
+#: builtin/grep.c:702
 msgid "print empty line between matches from different files"
 msgstr ""
 "imprimer une ligne vide entre les correspondances de fichiers différents"
 
-#: builtin/grep.c:702
+#: builtin/grep.c:704
 msgid "show filename only once above matches from same file"
 msgstr ""
 "afficher le nom de fichier une fois au dessus des correspondances du même "
 "fichier"
 
-#: builtin/grep.c:705
+#: builtin/grep.c:707
 msgid "show <n> context lines before and after matches"
 msgstr "afficher <n> lignes de contexte avant et après les correspondances"
 
-#: builtin/grep.c:708
+#: builtin/grep.c:710
 msgid "show <n> context lines before matches"
 msgstr "afficher <n> lignes de contexte avant les correspondances"
 
-#: builtin/grep.c:710
+#: builtin/grep.c:712
 msgid "show <n> context lines after matches"
 msgstr "afficher <n> lignes de contexte après les correspondances"
 
-#: builtin/grep.c:712
+#: builtin/grep.c:714
 msgid "use <n> worker threads"
 msgstr "utiliser <n> fils de travail"
 
-#: builtin/grep.c:713
+#: builtin/grep.c:715
 msgid "shortcut for -C NUM"
 msgstr "raccourci pour -C NUM"
 
-#: builtin/grep.c:716
+#: builtin/grep.c:718
 msgid "show a line with the function name before matches"
 msgstr ""
 "afficher une ligne avec le nom de la fonction avant les correspondances"
 
-#: builtin/grep.c:718
+#: builtin/grep.c:720
 msgid "show the surrounding function"
 msgstr "afficher la fonction contenante"
 
-#: builtin/grep.c:721
+#: builtin/grep.c:723
 msgid "read patterns from file"
 msgstr "lire les motifs depuis fichier"
 
-#: builtin/grep.c:723
+#: builtin/grep.c:725
 msgid "match <pattern>"
 msgstr "rechercher <motif>"
 
-#: builtin/grep.c:725
+#: builtin/grep.c:727
 msgid "combine patterns specified with -e"
 msgstr "combiner les motifs spécifiés par -e"
 
-#: builtin/grep.c:737
+#: builtin/grep.c:739
 msgid "indicate hit with exit status without output"
 msgstr ""
 "indiquer des correspondances avec le code de sortie mais sans rien afficher"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:741
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "n'afficher que les correspondances de fichiers qui correspondent à tous les "
 "motifs"
 
-#: builtin/grep.c:741
+#: builtin/grep.c:743
 msgid "show parse tree for grep expression"
 msgstr "afficher l'arbre d'analyse pour le motif grep"
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "pager"
 msgstr "pagineur"
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "show matching files in the pager"
 msgstr "afficher les fichiers correspondant dans le pagineur"
 
-#: builtin/grep.c:748
+#: builtin/grep.c:750
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
 
-#: builtin/grep.c:811
+#: builtin/grep.c:813
 msgid "no pattern given."
 msgstr "aucun motif fourni."
 
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "nombre de fils spécifié invalide (%d)"
 
-#: builtin/grep.c:873
+#: builtin/grep.c:875
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:901
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index."
 
-#: builtin/grep.c:904
+#: builtin/grep.c:906
 msgid "--no-index or --untracked cannot be used with revs."
 msgstr ""
 "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions."
 
-#: builtin/grep.c:907
+#: builtin/grep.c:909
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr ""
 "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi."
 
-#: builtin/grep.c:915
+#: builtin/grep.c:917
 msgid "both --cached and trees are given."
 msgstr "--cached et des arbres sont fournis en même temps."
 
@@ -6944,8 +7216,8 @@ msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
 
 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
 #, c-format
-msgid "failed to exec '%s': %s"
-msgstr "échec de l'exécution de '%s' : %s"
+msgid "failed to exec '%s'"
+msgstr "échec de l'exécution de '%s'"
 
 #: builtin/help.c:205
 #, c-format
@@ -7204,108 +7476,110 @@ msgstr "confusion extrême"
 
 #: builtin/index-pack.c:1253
 #, c-format
-msgid "completed with %d local objects"
-msgstr "complété avec %d objets locaux"
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "complété avec %d objet local"
+msgstr[1] "complété avec %d objets locaux"
 
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1265
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 "Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)"
 
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "le paquet a %d delta non résolu"
 msgstr[1] "le paquet a %d deltas non résolus"
 
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1293
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "impossible de compresser l'objet ajouté (%d)"
 
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "l'objet local %s est corrompu"
 
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
 msgid "error while closing pack file"
 msgstr "erreur en fermeture du fichier paquet"
 
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "impossible d'écrire le fichier \"keep\" '%s'"
 
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "impossible de fermer le fichier \"keep\" '%s'"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
 msgid "cannot store pack file"
 msgstr "impossible de stocker le fichier paquet"
 
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
 msgid "cannot store index file"
 msgstr "impossible de stocker le fichier d'index"
 
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "mauvais pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "pas de support des fils, ignore %s"
 
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
 
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"
 
-#: builtin/index-pack.c:1587
+#: builtin/index-pack.c:1589
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "pas un delta : %d objet"
 msgstr[1] "pas un delta : %d objets"
 
-#: builtin/index-pack.c:1594
+#: builtin/index-pack.c:1596
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "longueur chaînée = %d : %lu objet"
 msgstr[1] "longueur chaînée = %d : %lu objets"
 
-#: builtin/index-pack.c:1624
+#: builtin/index-pack.c:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
+
+#: builtin/index-pack.c:1638
 msgid "Cannot come back to cwd"
 msgstr "Impossible de revenir au répertoire de travail courant"
 
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
 #, c-format
 msgid "bad %s"
 msgstr "mauvais %s"
 
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
 
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
-
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1731
 msgid "--verify with no packfile name given"
 msgstr "--verify sans nom de fichier paquet donné"
 
@@ -7344,28 +7618,27 @@ msgstr "impossible de copier '%s' vers '%s'"
 msgid "ignoring template %s"
 msgstr "modèle %s ignoré"
 
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
 #, c-format
 msgid "templates not found %s"
 msgstr "modèles non trouvés %s"
 
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
 #, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr ""
-"pas de copie des modèles étant dans une mauvaise version du format %d de '%s'"
+msgid "not copying templates from '%s': %s"
+msgstr "pas de copie des modèles depuis '%s' : %s"
 
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
 #, c-format
 msgid "%s already exists"
 msgstr "%s existe déjà"
 
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "impossible de traiter le fichier de type %d"
 
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "impossible de déplacer %s vers %s"
@@ -7373,24 +7646,24 @@ msgstr "impossible de déplacer %s vers %s"
 #. TRANSLATORS: The first '%s' is either "Reinitialized
 #. existing" or "Initialized empty", the second " shared" or
 #. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
 #, c-format
 msgid "%s%s Git repository in %s%s\n"
 msgstr "Dépôt Git%2$s %1$s dans %3$s%4$s\n"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Reinitialized existing"
 msgstr "existant réinitialisé"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Initialized empty"
 msgstr "vide initialisé"
 
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
 msgid " shared"
 msgstr " partagé"
 
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -7398,25 +7671,25 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"
 "shared[=<permissions>]] [<répertoire>]"
 
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
 msgid "permissions"
 msgstr "permissions"
 
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs"
 
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "impossible de créer le répertoire (mkdir) %s"
 
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "impossible de se déplacer vers le répertoire (chdir) %s"
 
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7425,7 +7698,7 @@ msgstr ""
 "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --"
 "git-dir=<répertoire>)"
 
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Impossible d'accéder à l'arbre de travail '%s'"
@@ -7471,268 +7744,319 @@ msgstr "git show [<options>] <objet>..."
 msgid "invalid --decorate option: %s"
 msgstr "option --decorate invalide : %s"
 
-#: builtin/log.c:131
+#: builtin/log.c:137
 msgid "suppress diff output"
 msgstr "supprimer la sortie des différences"
 
-#: builtin/log.c:132
+#: builtin/log.c:138
 msgid "show source"
 msgstr "afficher la source"
 
-#: builtin/log.c:133
+#: builtin/log.c:139
 msgid "Use mail map file"
 msgstr "Utiliser le fichier de correspondance de mail"
 
-#: builtin/log.c:134
+#: builtin/log.c:140
 msgid "decorate options"
 msgstr "décorer les options"
 
-#: builtin/log.c:137
+#: builtin/log.c:143
 msgid "Process line range n,m in file, counting from 1"
 msgstr ""
 "Traiter seulement l'intervalle de lignes n,m du fichier en commençant le "
 "compte à 1"
 
-#: builtin/log.c:233
+#: builtin/log.c:239
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Sortie finale : %d %s\n"
 
-#: builtin/log.c:465
+#: builtin/log.c:471
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s : fichier incorrect"
 
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
 #, c-format
 msgid "Could not read object %s"
 msgstr "Impossible de lire l'objet %s"
 
-#: builtin/log.c:596
+#: builtin/log.c:602
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Type inconnu : %d"
 
-#: builtin/log.c:715
+#: builtin/log.c:722
 msgid "format.headers without value"
 msgstr "format.headers sans valeur"
 
-#: builtin/log.c:801
+#: builtin/log.c:812
 msgid "name of output directory is too long"
 msgstr "le nom du répertoire de sortie est trop long"
 
-#: builtin/log.c:816
+#: builtin/log.c:827
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Impossible d'ouvrir le fichier correctif %s"
 
-#: builtin/log.c:830
+#: builtin/log.c:841
 msgid "Need exactly one range."
 msgstr "Exactement une plage nécessaire."
 
-#: builtin/log.c:840
+#: builtin/log.c:851
 msgid "Not a range."
 msgstr "Ceci n'est pas une plage."
 
-#: builtin/log.c:946
+#: builtin/log.c:957
 msgid "Cover letter needs email format"
 msgstr "La lettre de motivation doit être au format e-mail"
 
-#: builtin/log.c:1025
+#: builtin/log.c:1036
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to aberrant : %s"
 
-#: builtin/log.c:1053
+#: builtin/log.c:1064
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
 
-#: builtin/log.c:1098
+#: builtin/log.c:1109
 msgid "Two output directories?"
 msgstr "Deux répertoires de sortie ?"
 
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "Commit inconnu %s"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Impossible de résoudre '%s' comme une référence valide."
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr "Impossible de trouver la base de fusion exacte."
+
+#: builtin/log.c:1235
+msgid ""
+"Failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually."
+msgstr ""
+"Impossible de récupérer l'amont, si vous voulez enregistrer le commit de base automatiquement,\n"
+"veuillez utiliser git branch --set-upstream-to pour suivre une branche distante\n"
+"ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> manuellement."
+
+#: builtin/log.c:1255
+msgid "Failed to find exact merge base"
+msgstr "Impossible de trouver la base de fusion exacte"
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr "le commit de base devrait être l'ancêtre de la liste de révisions"
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr "le commit de base ne devrait pas faire partie de la liste de révisions"
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr "impossible d'obtenir l'id du patch"
+
+#: builtin/log.c:1377
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "utiliser [PATCH n/m] même avec un patch unique"
 
-#: builtin/log.c:1217
+#: builtin/log.c:1380
 msgid "use [PATCH] even with multiple patches"
 msgstr "utiliser [PATCH] même avec des patchs multiples"
 
-#: builtin/log.c:1221
+#: builtin/log.c:1384
 msgid "print patches to standard out"
 msgstr "afficher les patchs sur la sortie standard"
 
-#: builtin/log.c:1223
+#: builtin/log.c:1386
 msgid "generate a cover letter"
 msgstr "générer une lettre de motivation"
 
-#: builtin/log.c:1225
+#: builtin/log.c:1388
 msgid "use simple number sequence for output file names"
 msgstr ""
 "utiliser une séquence simple de nombres pour les nom des fichiers de sortie"
 
-#: builtin/log.c:1226
+#: builtin/log.c:1389
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1227
+#: builtin/log.c:1390
 msgid "use <sfx> instead of '.patch'"
 msgstr "utiliser <sfx> au lieu de '.patch'"
 
-#: builtin/log.c:1229
+#: builtin/log.c:1392
 msgid "start numbering patches at <n> instead of 1"
 msgstr "démarrer la numérotation des patchs à <n> au lieu de 1"
 
-#: builtin/log.c:1231
+#: builtin/log.c:1394
 msgid "mark the series as Nth re-roll"
 msgstr "marquer la série comme une Nième réédition"
 
-#: builtin/log.c:1233
+#: builtin/log.c:1396
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
 
-#: builtin/log.c:1236
+#: builtin/log.c:1399
 msgid "store resulting files in <dir>"
 msgstr "stocker les fichiers résultats dans <répertoire>"
 
-#: builtin/log.c:1239
+#: builtin/log.c:1402
 msgid "don't strip/add [PATCH]"
 msgstr "ne pas retirer/ajouter [PATCH]"
 
-#: builtin/log.c:1242
+#: builtin/log.c:1405
 msgid "don't output binary diffs"
 msgstr "ne pas imprimer les diffs binaires"
 
-#: builtin/log.c:1244
+#: builtin/log.c:1407
 msgid "output all-zero hash in From header"
 msgstr "écrire une empreinte à zéro dans l'entête From"
 
-#: builtin/log.c:1246
+#: builtin/log.c:1409
 msgid "don't include a patch matching a commit upstream"
 msgstr "ne pas inclure un patch correspondant à un commit amont"
 
-#: builtin/log.c:1248
+#: builtin/log.c:1411
 msgid "show patch format instead of default (patch + stat)"
 msgstr "afficher le format du patch au lieu du défaut (patch + stat)"
 
-#: builtin/log.c:1250
+#: builtin/log.c:1413
 msgid "Messaging"
 msgstr "Communication"
 
-#: builtin/log.c:1251
+#: builtin/log.c:1414
 msgid "header"
 msgstr "en-tête"
 
-#: builtin/log.c:1252
+#: builtin/log.c:1415
 msgid "add email header"
 msgstr "ajouter l'en-tête d'e-mail"
 
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
 msgid "email"
 msgstr "e-mail"
 
-#: builtin/log.c:1253
+#: builtin/log.c:1416
 msgid "add To: header"
 msgstr "ajouter l'en-tête \"To:\""
 
-#: builtin/log.c:1255
+#: builtin/log.c:1418
 msgid "add Cc: header"
 msgstr "ajouter l'en-tête \"Cc:\""
 
-#: builtin/log.c:1257
+#: builtin/log.c:1420
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1258
+#: builtin/log.c:1421
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"
 
-#: builtin/log.c:1260
+#: builtin/log.c:1423
 msgid "message-id"
 msgstr "id-message"
 
-#: builtin/log.c:1261
+#: builtin/log.c:1424
 msgid "make first mail a reply to <message-id>"
 msgstr "répondre dans le premier message à <id-message>"
 
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
 msgid "boundary"
 msgstr "limite"
 
-#: builtin/log.c:1263
+#: builtin/log.c:1426
 msgid "attach the patch"
 msgstr "attacher le patch"
 
-#: builtin/log.c:1266
+#: builtin/log.c:1429
 msgid "inline the patch"
 msgstr "patch à l'intérieur"
 
-#: builtin/log.c:1270
+#: builtin/log.c:1433
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
 
-#: builtin/log.c:1272
+#: builtin/log.c:1435
 msgid "signature"
 msgstr "signature"
 
-#: builtin/log.c:1273
+#: builtin/log.c:1436
 msgid "add a signature"
 msgstr "ajouter une signature"
 
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "commit-de-base"
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr "Ajouter un arbre prérequis à la série de patchs"
+
+#: builtin/log.c:1440
 msgid "add a signature from a file"
 msgstr "ajouter une signature depuis un fichier"
 
-#: builtin/log.c:1276
+#: builtin/log.c:1441
 msgid "don't print the patch filenames"
 msgstr "ne pas afficher les noms de fichiers des patchs"
 
-#: builtin/log.c:1365
+#: builtin/log.c:1531
 msgid "-n and -k are mutually exclusive."
 msgstr "-n et -k sont mutuellement exclusifs."
 
-#: builtin/log.c:1367
+#: builtin/log.c:1533
 msgid "--subject-prefix and -k are mutually exclusive."
 msgstr "--subject-prefix et -k sont mutuellement exclusifs."
 
-#: builtin/log.c:1375
+#: builtin/log.c:1541
 msgid "--name-only does not make sense"
 msgstr "--name-only n'a pas de sens"
 
-#: builtin/log.c:1377
+#: builtin/log.c:1543
 msgid "--name-status does not make sense"
 msgstr "--name-status n'a pas de sens"
 
-#: builtin/log.c:1379
+#: builtin/log.c:1545
 msgid "--check does not make sense"
 msgstr "--check n'a pas de sens"
 
-#: builtin/log.c:1407
+#: builtin/log.c:1573
 msgid "standard output, or directory, which one?"
 msgstr "sortie standard, ou répertoire, lequel ?"
 
-#: builtin/log.c:1409
+#: builtin/log.c:1575
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Impossible de créer le répertoire '%s'"
 
-#: builtin/log.c:1506
+#: builtin/log.c:1672
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "lecture du fichier de signature '%s' impossible"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1743
 msgid "Failed to create output files"
 msgstr "Échec de création des fichiers en sortie"
 
-#: builtin/log.c:1617
+#: builtin/log.c:1792
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
 
-#: builtin/log.c:1671
+#: builtin/log.c:1846
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7740,11 +8064,6 @@ msgstr ""
 "Impossible de trouver une branche distante suivie, merci de spécifier "
 "<branche_amont> manuellement.\n"
 
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr "Commit inconnu %s"
-
 #: builtin/ls-files.c:378
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<options>] [<fichier>...]"
@@ -7942,175 +8261,179 @@ msgstr "git merge [<options>] <message> HEAD <commit>"
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:100
+#: builtin/merge.c:101
 msgid "switch `m' requires a value"
 msgstr "le commutateur `m' a besoin d'une valeur"
 
-#: builtin/merge.c:137
+#: builtin/merge.c:138
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
 
-#: builtin/merge.c:138
+#: builtin/merge.c:139
 #, c-format
 msgid "Available strategies are:"
 msgstr "Les stratégies disponibles sont :"
 
-#: builtin/merge.c:143
+#: builtin/merge.c:144
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Les stratégies personnalisées sont :"
 
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
 msgid "do not show a diffstat at the end of the merge"
 msgstr "ne pas afficher un diffstat à la fin de la fusion"
 
-#: builtin/merge.c:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
 msgid "show a diffstat at the end of the merge"
 msgstr "afficher un diffstat à la fin de la fusion"
 
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
 msgid "(synonym to --stat)"
 msgstr "(synonyme de --stat)"
 
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "ajouter (au plus <n>) éléments du journal court au message de validation de "
 "la fusion"
 
-#: builtin/merge.c:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
 msgid "create a single commit instead of doing a merge"
 msgstr "créer une validation unique au lieu de faire une fusion"
 
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "effectuer une validation si la fusion réussit (défaut)"
 
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
 msgid "edit message before committing"
 msgstr "éditer le message avant la validation"
 
-#: builtin/merge.c:207
+#: builtin/merge.c:208
 msgid "allow fast-forward (default)"
 msgstr "autoriser l'avance rapide (défaut)"
 
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
 msgid "abort if fast-forward is not possible"
 msgstr "abandonner si l'avance rapide n'est pas possible"
 
-#: builtin/merge.c:213
+#: builtin/merge.c:214
 msgid "Verify that the named commit has a valid GPG signature"
 msgstr "Vérifier que la validation a une signature GPG valide"
 
-#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
 #: builtin/revert.c:89
 msgid "strategy"
 msgstr "stratégie"
 
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "merge strategy to use"
 msgstr "stratégie de fusion à utiliser"
 
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
 msgid "option=value"
 msgstr "option=valeur"
 
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
 msgid "option for selected merge strategy"
 msgstr "option pour la stratégie de fusion sélectionnée"
 
-#: builtin/merge.c:219
+#: builtin/merge.c:220
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 "message de validation de la fusion (pour une fusion sans avance rapide)"
 
-#: builtin/merge.c:223
+#: builtin/merge.c:224
 msgid "abort the current in-progress merge"
 msgstr "abandonner la fusion en cours"
 
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "permettre la fusion d'historiques sans rapport"
+
+#: builtin/merge.c:254
 msgid "could not run stash."
 msgstr "impossible de lancer le remisage."
 
-#: builtin/merge.c:256
+#: builtin/merge.c:259
 msgid "stash failed"
 msgstr "échec du remisage"
 
-#: builtin/merge.c:261
+#: builtin/merge.c:264
 #, c-format
 msgid "not a valid object: %s"
 msgstr "pas un objet valide : %s"
 
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
 msgid "read-tree failed"
 msgstr "read-tree a échoué"
 
-#: builtin/merge.c:327
+#: builtin/merge.c:330
 msgid " (nothing to squash)"
 msgstr " (rien à compresser)"
 
-#: builtin/merge.c:340
+#: builtin/merge.c:343
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Validation compressée -- HEAD non mise à jour\n"
 
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
 #, c-format
 msgid "Could not write to '%s'"
 msgstr "Impossible d'écrire dans '%s'"
 
-#: builtin/merge.c:372
+#: builtin/merge.c:375
 msgid "Writing SQUASH_MSG"
 msgstr "Écriture de SQUASH_MSG"
 
-#: builtin/merge.c:374
+#: builtin/merge.c:377
 msgid "Finishing SQUASH_MSG"
 msgstr "Finition de SQUASH_MSG"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:400
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n"
 
-#: builtin/merge.c:448
+#: builtin/merge.c:451
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' ne pointe pas sur un commit"
 
-#: builtin/merge.c:538
+#: builtin/merge.c:541
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
 
-#: builtin/merge.c:657
+#: builtin/merge.c:660
 msgid "Not handling anything other than two heads merge."
 msgstr "Impossible de gérer autre chose que la fusion de deux têtes."
 
-#: builtin/merge.c:671
+#: builtin/merge.c:674
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Options inconnue pour merge-recursive : -X%s"
 
-#: builtin/merge.c:684
+#: builtin/merge.c:687
 #, c-format
 msgid "unable to write %s"
 msgstr "impossible d'écrire %s"
 
-#: builtin/merge.c:773
+#: builtin/merge.c:776
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Impossible de lire depuis '%s'"
 
-#: builtin/merge.c:782
+#: builtin/merge.c:785
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "
 "fusion.\n"
 
-#: builtin/merge.c:788
+#: builtin/merge.c:791
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -8127,54 +8450,54 @@ msgstr ""
 "Les lignes commençant par '%c' seront ignorées, et un message vide\n"
 "abandonne la validation.\n"
 
-#: builtin/merge.c:812
+#: builtin/merge.c:815
 msgid "Empty commit message."
 msgstr "Message de validation vide."
 
-#: builtin/merge.c:824
+#: builtin/merge.c:835
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Merveilleux.\n"
 
-#: builtin/merge.c:879
+#: builtin/merge.c:890
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "La fusion automatique a échoué ; réglez les conflits et validez le "
 "résultat.\n"
 
-#: builtin/merge.c:895
+#: builtin/merge.c:906
 #, c-format
 msgid "'%s' is not a commit"
 msgstr "'%s' n'est pas une validation"
 
-#: builtin/merge.c:936
+#: builtin/merge.c:947
 msgid "No current branch."
 msgstr "Pas de branche courante."
 
-#: builtin/merge.c:938
+#: builtin/merge.c:949
 msgid "No remote for the current branch."
 msgstr "Pas de branche distante pour la branche courante."
 
-#: builtin/merge.c:940
+#: builtin/merge.c:951
 msgid "No default upstream defined for the current branch."
 msgstr "Pas de branche amont par défaut définie pour la branche courante."
 
-#: builtin/merge.c:945
+#: builtin/merge.c:956
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Pas de branche de suivi pour %s depuis %s"
 
-#: builtin/merge.c:1080
+#: builtin/merge.c:1091
 #, c-format
 msgid "could not close '%s'"
 msgstr "impossible de fermer '%s'"
 
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)."
 
-#: builtin/merge.c:1223
+#: builtin/merge.c:1235
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -8182,7 +8505,7 @@ msgstr ""
 "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
 "Veuillez valider vos modifications avant de pouvoir fusionner."
 
-#: builtin/merge.c:1230
+#: builtin/merge.c:1242
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -8190,102 +8513,106 @@ msgstr ""
 "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
 "Veuillez valider vos modifications avant de pouvoir fusionner."
 
-#: builtin/merge.c:1233
+#: builtin/merge.c:1245
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)."
 
-#: builtin/merge.c:1242
+#: builtin/merge.c:1254
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
 
-#: builtin/merge.c:1250
+#: builtin/merge.c:1262
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."
 
-#: builtin/merge.c:1267
+#: builtin/merge.c:1279
 msgid "Squash commit into empty head not supported yet"
 msgstr "La validation compressée vers une tête vide n'est pas encore supportée"
 
-#: builtin/merge.c:1269
+#: builtin/merge.c:1281
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide"
 
-#: builtin/merge.c:1275
+#: builtin/merge.c:1286
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - pas possible de fusionner ceci"
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
 msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 "Possible de fusionner exactement une seule validation dans une tête vide"
 
-#: builtin/merge.c:1332
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "La validation %s a une signature GPG non fiable, prétendument par %s."
 
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "La validation %s a une mauvaise signature GPG prétendument par %s."
 
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "La validation %s n'a pas de signature GPG."
 
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "La validation %s a une signature GPG correcte par %s\n"
 
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr "refus de fusionner des historiques sans relation"
+
+#: builtin/merge.c:1439
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Mise à jour %s..%s\n"
 
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Essai de fusion vraiment triviale dans l'index...\n"
 
-#: builtin/merge.c:1468
+#: builtin/merge.c:1483
 #, c-format
 msgid "Nope.\n"
 msgstr "Non.\n"
 
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
 msgid "Not possible to fast-forward, aborting."
 msgstr "Pas possible d'avancer rapidement, abandon."
 
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Retour de l'arbre à l'original...\n"
 
-#: builtin/merge.c:1527
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Essai de la stratégie de fusion %s...\n"
 
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n"
 
-#: builtin/merge.c:1595
+#: builtin/merge.c:1610
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "La fusion avec la stratégie %s a échoué.\n"
 
-#: builtin/merge.c:1604
+#: builtin/merge.c:1619
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
 
-#: builtin/merge.c:1616
+#: builtin/merge.c:1631
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -8396,7 +8723,7 @@ msgstr "git mv [<options>] <source>... <destination>"
 msgid "Directory %s is in index and no submodule?"
 msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?"
 
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Veuillez indexer vos modifications de .gitmodules ou les remiser pour "
@@ -8476,49 +8803,49 @@ msgstr "%s, source=%s, destination=%s"
 msgid "Renaming %s to %s\n"
 msgstr "Renommage de %s en %s\n"
 
-#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "le renommage de '%s' a échoué"
 
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<options>] <validation>..."
 
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<options>] --all"
 
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<options>] --stdin"
 
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
 msgid "print only names (no SHA-1)"
 msgstr "afficher seulement les noms (pas de SHA-1)"
 
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
 msgid "only use tags to name the commits"
 msgstr "utiliser seulement les étiquettes pour nommer les validations"
 
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
 msgid "only use refs matching <pattern>"
 msgstr "utiliser seulement les références correspondant à <motif>"
 
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
 msgid "list all commits reachable from all refs"
 msgstr ""
 "afficher toutes les validations accessibles depuis toutes les références"
 
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
 msgid "read from stdin"
 msgstr "lire depuis l'entrée standard"
 
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
 msgid "allow to print `undefined` names (default)"
 msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
 
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
 msgid "dereference tags in the input (internal use)"
 msgstr "déréférencer les étiquettes en entrée (usage interne)"
 
@@ -8666,24 +8993,16 @@ msgstr "impossible d'écrire l'objet note"
 msgid "The note contents have been left in %s"
 msgstr "Le contenu de la note a été laissé dans %s"
 
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
 #, c-format
 msgid "cannot read '%s'"
 msgstr "impossible de lire '%s'"
 
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "impossible d'ouvrir ou lire '%s'"
 
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Impossible de résoudre '%s' comme une référence valide."
-
 #: builtin/notes.c:256
 #, c-format
 msgid "Failed to read object '%s'."
@@ -8696,7 +9015,7 @@ msgstr "Impossible de lire les informations de note d'un objet non-blob '%s'."
 
 #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
 msgid "too many parameters"
 msgstr "trop de paramètres"
 
@@ -8743,7 +9062,7 @@ msgstr ""
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Écrasement des notes existantes pour l'objet %s\n"
 
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Suppression de la note pour l'objet %s\n"
@@ -8784,15 +9103,15 @@ msgstr ""
 "Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n"
 "Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n"
 
-#: builtin/notes.c:767
+#: builtin/notes.c:768
 msgid "General options"
 msgstr "Options générales"
 
-#: builtin/notes.c:769
+#: builtin/notes.c:770
 msgid "Merge options"
 msgstr "Options de fusion"
 
-#: builtin/notes.c:771
+#: builtin/notes.c:772
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -8800,50 +9119,50 @@ msgstr ""
 "résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "Committing unmerged notes"
 msgstr "Validation des notes non fusionnées"
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "finaliser la fusion de notes en validant les notes non fusionnées"
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid "Aborting notes merge resolution"
 msgstr "Abandon de la résolution de fusion des notes"
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "abort notes merge"
 msgstr "abandonner la fusion de notes"
 
-#: builtin/notes.c:856
+#: builtin/notes.c:857
 #, c-format
 msgid "A notes merge into %s is already in-progress at %s"
 msgstr "Une fusion de notes dans %s est déjà en cours avec %s"
 
-#: builtin/notes.c:883
+#: builtin/notes.c:884
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "L'objet %s n'a pas de note\n"
 
-#: builtin/notes.c:895
+#: builtin/notes.c:896
 msgid "attempt to remove non-existent note is not an error"
 msgstr ""
 "la tentative de suppression d'une note non existante n'est pas une erreur"
 
-#: builtin/notes.c:898
+#: builtin/notes.c:899
 msgid "read object names from the standard input"
 msgstr "lire les noms d'objet depuis l'entrée standard"
 
-#: builtin/notes.c:979
+#: builtin/notes.c:980
 msgid "notes-ref"
 msgstr "références-notes"
 
-#: builtin/notes.c:980
+#: builtin/notes.c:981
 msgid "use notes from <notes-ref>"
 msgstr "utiliser les notes depuis <références-notes>"
 
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Sous-commande inconnue : %s"
@@ -8867,175 +9186,179 @@ msgstr ""
 msgid "deflate error (%d)"
 msgstr "erreur de compression (%d)"
 
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr "désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à cause de pack.packSizeLimit"
+
+#: builtin/pack-objects.c:776
 msgid "Writing objects"
 msgstr "Écriture des objets"
 
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "désactivation de l'écriture en bitmap car certains objets ne sont pas "
 "compressés"
 
-#: builtin/pack-objects.c:2172
+#: builtin/pack-objects.c:2177
 msgid "Compressing objects"
 msgstr "Compression des objets"
 
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
 #, c-format
 msgid "unsupported index version %s"
 msgstr "version d'index non supportée %s"
 
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2567
 #, c-format
 msgid "bad index version '%s'"
 msgstr "mauvaise version d'index '%s'"
 
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
 msgid "do not show progress meter"
 msgstr "ne pas afficher la barre de progression"
 
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
 msgid "show progress meter"
 msgstr "afficher la barre de progression"
 
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
 msgid "show progress meter during object writing phase"
 msgstr "afficher la barre de progression durant la phase d'écrite des objets"
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2604
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "similaire à --all-progress quand la barre de progression est affichée"
 
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2605
 msgid "version[,offset]"
 msgstr "version[,offset]"
 
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "écrire le fichier d'index du paquet dans le format d'index de version "
 "spécifié"
 
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2609
 msgid "maximum size of each output pack file"
 msgstr "taille maximum de chaque fichier paquet en sortie"
 
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2611
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorer les objets empruntés à un autre magasin d'objets"
 
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2613
 msgid "ignore packed objects"
 msgstr "ignorer les objets empaquetés"
 
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
 msgid "limit pack window by objects"
 msgstr "limiter la fenêtre d'empaquetage par objets"
 
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2617
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets"
 
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2619
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "longueur maximum de la chaîne de delta autorisée dans le paquet résultant"
 
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2621
 msgid "reuse existing deltas"
 msgstr "réutiliser les deltas existants"
 
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
 msgid "reuse existing objects"
 msgstr "réutiliser les objets existants"
 
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
 msgid "use OFS_DELTA objects"
 msgstr "utiliser les objets OFS_DELTA"
 
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "utiliser des fils lors de la recherche pour une meilleurs correspondance des "
 "deltas"
 
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2629
 msgid "do not create an empty pack output"
 msgstr "ne pas créer un paquet vide"
 
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2631
 msgid "read revision arguments from standard input"
 msgstr "lire les paramètres de révision depuis l'entrée standard"
 
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
 msgid "limit the objects to those that are not yet packed"
 msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés"
 
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2636
 msgid "include objects reachable from any reference"
 msgstr "inclure les objets accessibles depuis toute référence"
 
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2639
 msgid "include objects referred by reflog entries"
 msgstr "inclure les objets référencés par les éléments de reflog"
 
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2642
 msgid "include objects referred to by the index"
 msgstr "inclure les objets référencés par l'index"
 
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2645
 msgid "output pack to stdout"
 msgstr "afficher l'empaquetage sur la sortie standard"
 
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
 msgid "include tag objects that refer to objects to be packed"
 msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter"
 
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2649
 msgid "keep unreachable objects"
 msgstr "garder les objets inaccessibles"
 
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
 msgid "time"
 msgstr "heure"
 
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
 msgid "unpack unreachable objects newer than <time>"
 msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
 
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2654
 msgid "create thin packs"
 msgstr "créer des paquets légers"
 
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
 msgid "create packs suitable for shallow fetches"
 msgstr "créer des paquets permettant des récupérations superficielles"
 
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2658
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorer les paquets qui ont un fichier .keep"
 
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2660
 msgid "pack compression level"
 msgstr "niveau de compression du paquet"
 
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
 msgid "do not hide commits by grafts"
 msgstr "ne pas cacher les validations par greffes"
 
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2664
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "utiliser un index en bitmap si disponible pour accélerer le décompte des "
 "objets"
 
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2666
 msgid "write a bitmap index together with the pack index"
 msgstr "écrire un index en bitmap associé à l'index de paquet"
 
-#: builtin/pack-objects.c:2752
+#: builtin/pack-objects.c:2757
 msgid "Counting objects"
 msgstr "Décompte des objets"
 
@@ -9063,15 +9386,15 @@ msgstr "Suppression des objets dupliqués"
 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--expire <heure>] [--] [<head>...]"
 
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
 msgid "do not remove, show only"
 msgstr "ne pas supprimer, afficher seulement"
 
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
 msgid "report pruned objects"
 msgstr "afficher les objets éliminés"
 
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
 msgid "expire objects older than <time>"
 msgstr "faire expirer les objets plus vieux que <heure>"
 
@@ -9083,51 +9406,55 @@ msgstr "impossible de nettoyer dans un dépôt d'objets précieux"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
 
-#: builtin/pull.c:117
+#: builtin/pull.c:120
 msgid "Options related to merging"
 msgstr "Options relatives à la fusion"
 
-#: builtin/pull.c:120
+#: builtin/pull.c:123
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
 
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
 msgid "allow fast-forward"
 msgstr "autoriser l'avance rapide"
 
-#: builtin/pull.c:150
+#: builtin/pull.c:153
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "vérifier que le commit nommé a une signature GPG valide"
 
-#: builtin/pull.c:164
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "remiser avant et réappliquer après le rebasage automatiquement"
+
+#: builtin/pull.c:172
 msgid "Options related to fetching"
 msgstr "Options relatives au rapatriement"
 
-#: builtin/pull.c:186
+#: builtin/pull.c:194
 msgid "number of submodules pulled in parallel"
 msgstr "nombre de sous-modules tirés en parallèle"
 
-#: builtin/pull.c:275
+#: builtin/pull.c:283
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valeur invalide pour pull.ff : %s"
 
-#: builtin/pull.c:359
+#: builtin/pull.c:379
 msgid "Cannot pull with rebase: You have unstaged changes."
 msgstr ""
 "impossible de tirer avec rebasage. Vous avez des modifications non indexées."
 
-#: builtin/pull.c:365
+#: builtin/pull.c:385
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "De plus, votre index contient des modifications non validées."
 
-#: builtin/pull.c:367
+#: builtin/pull.c:387
 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
 msgstr ""
 "impossible de tirer avec rebasage : votre index contient des modifications "
 "non validées."
 
-#: builtin/pull.c:443
+#: builtin/pull.c:463
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -9135,14 +9462,14 @@ msgstr ""
 "Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous "
 "venez de récupérer."
 
-#: builtin/pull.c:445
+#: builtin/pull.c:465
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Il n'y a pas de candidate avec laquelle fusionner parmi les références que "
 "vous venez de récupérer."
 
-#: builtin/pull.c:446
+#: builtin/pull.c:466
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -9150,7 +9477,7 @@ msgstr ""
 "Généralement, cela signifie que vous avez indiqué un spécificateur\n"
 "de référence joker qui n'a pas eu de correspondance sur le serveur distant."
 
-#: builtin/pull.c:449
+#: builtin/pull.c:469
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -9162,39 +9489,42 @@ msgstr ""
 "configuration\n"
 "pour la branche actuelle, vous devez spécifier la branche avec la commande."
 
-#: builtin/pull.c:454
+#: builtin/pull.c:474 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Vous n'êtes actuellement sur aucune branche."
 
-#: builtin/pull.c:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser."
 
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Veuillez spécifier une branche avec laquelle fusionner."
 
-#: builtin/pull.c:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
 msgid "See git-pull(1) for details."
 msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
 
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<distant>"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<branche>"
+
+#: builtin/pull.c:489 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "Pas d'information de suivi distant pour la branche actuelle."
 
-#: builtin/pull.c:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
 msgid ""
-"If you wish to set tracking information for this branch you can do so with:\n"
-"\n"
-"    git branch --set-upstream-to=%s/<branch> %s\n"
-msgstr ""
-"Si vous souhaitez indiquer l'information de suivi distant pour cette "
-"branche, vous pouvez le faire avec :\n"
-"\n"
-"    git branch --set-upstream-to=%s/<branche> %s\n"
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr "Si vous souhaitez indiquer l'information de suivi distant pour cette branche, vous pouvez le faire avec :"
 
-#: builtin/pull.c:483
+#: builtin/pull.c:503
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -9204,13 +9534,17 @@ msgstr ""
 "'%s'\n"
 "du serveur distant, mais cette référence n'a pas été récupérée."
 
-#: builtin/pull.c:841
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase."
+
+#: builtin/pull.c:872
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 "Mise à jour d'une branche non encore créée avec les changements ajoutés dans "
 "l'index."
 
-#: builtin/pull.c:870
+#: builtin/pull.c:900
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -9221,7 +9555,7 @@ msgstr ""
 "avance rapide de votre copie de travail\n"
 "depuis le commit %s."
 
-#: builtin/pull.c:875
+#: builtin/pull.c:905
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -9239,11 +9573,11 @@ msgstr ""
 "$ git reset --hard\n"
 "pour régénérer."
 
-#: builtin/pull.c:890
+#: builtin/pull.c:920
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Impossible de fusionner de multiples branches sur une tête vide."
 
-#: builtin/pull.c:894
+#: builtin/pull.c:924
 msgid "Cannot rebase onto multiple branches."
 msgstr "Impossible de rebaser sur de multiples branches."
 
@@ -9622,6 +9956,18 @@ msgstr "sauter l'application du filtre d'extraction creuse"
 msgid "debug unpack-trees"
 msgstr "déboguer unpack-trees"
 
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <répertoire-git>"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "quiet"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "Vous devez spécifier un répertoire."
+
 #: builtin/reflog.c:423
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
@@ -9953,21 +10299,23 @@ msgstr "* distante %s"
 msgid "  Fetch URL: %s"
 msgstr "  URL de rapatriement : %s"
 
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
 msgid "(no URL)"
 msgstr "(pas d'URL)"
 
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in "  Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL push : %s"
 
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Branche HEAD : %s"
 
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -9975,158 +10323,158 @@ msgstr ""
 "  Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
 "suivantes) :\n"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1181
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Branche distante :%s"
 msgstr[1] "  Branches distantes :%s"
 
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
 msgid " (status not queried)"
 msgstr " (statut non demandé)"
 
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Branche locale configurée pour 'git pull' :"
 msgstr[1] "  Branches locales configurées pour 'git pull' :"
 
-#: builtin/remote.c:1199
+#: builtin/remote.c:1201
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Les références locales seront reflétées par 'git push'"
 
-#: builtin/remote.c:1206
+#: builtin/remote.c:1208
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Référence locale configurée pour 'git push'%s :"
 msgstr[1] "  Références locales configurées pour 'git push'%s :"
 
-#: builtin/remote.c:1227
+#: builtin/remote.c:1229
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1231
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "supprimer refs/remotes/<nom>/HEAD"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
 msgid "Cannot determine remote HEAD"
 msgstr "Impossible de déterminer la HEAD distante"
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "Il y a de multiples branches HEAD distantes. Veuillez en choisir une "
 "explicitement avec :"
 
-#: builtin/remote.c:1256
+#: builtin/remote.c:1258
 #, c-format
 msgid "Could not delete %s"
 msgstr "Impossible de supprimer %s"
 
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Référence non valide : %s"
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
 #, c-format
 msgid "Could not setup %s"
 msgstr "Impossible de paramétrer %s"
 
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s se retrouvera en suspens !"
 
-#: builtin/remote.c:1285
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s se retrouve en suspens !"
 
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
 #, c-format
 msgid "Pruning %s"
 msgstr "Élimination de %s"
 
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
 #, c-format
 msgid "URL: %s"
 msgstr "URL : %s"
 
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [serait éliminé] %s"
 
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [éliminé] %s"
 
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
 msgid "prune remotes after fetching"
 msgstr "éliminer les distants après le rapatriement"
 
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Pas de serveur remote '%s'"
 
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
 msgid "add branch"
 msgstr "ajouter une branche"
 
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
 msgid "no remote specified"
 msgstr "pas de serveur distant spécifié"
 
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
 msgid "query push URLs rather than fetch URLs"
 msgstr "interroger les URLs de poussée plutôt que les URLs de récupération"
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1467
 msgid "return all URLs"
 msgstr "retourner toutes les URLs"
 
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "aucune URL configurée pour le dépôt distant '%s'"
 
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
 msgid "manipulate push URLs"
 msgstr "manipuler les URLs push"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
 msgid "add URL"
 msgstr "ajouter une URL"
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
 msgid "delete URLs"
 msgstr "supprimer des URLs"
 
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete n'a aucun sens"
 
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Motif d'URL ancien invalide : %s"
 
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Pas d'URL trouvée : %s"
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
 msgid "Will not delete all non-push URLs"
 msgstr "Pas de suppression de toutes les URLs non-push"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 msgid "be verbose; must be placed before a subcommand"
 msgstr "être verbeux : doit être placé avant une sous-commande"
 
@@ -10642,12 +10990,6 @@ msgstr "autoriser la suppression récursive"
 msgid "exit with a zero status even if nothing matched"
 msgstr "sortir avec un statut zéro même si rien ne correspondait"
 
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-"Veuillez indexer vos modifications de .gitmodules ou remisez-les pour "
-"continuer"
-
 #: builtin/rm.c:335
 #, c-format
 msgid "not removing '%s' recursively without -r"
@@ -10862,86 +11204,180 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace"
 
-#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "Référence inexistante : %s"
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Nom de référence complet attendu, %s obtenu"
+
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "impossible de supprimer un composant de l'URL '%s'"
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
 msgid "alternative anchor for relative paths"
 msgstr "ancre alternative pour les chemins relatifs"
 
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
 
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"
+
+#: builtin/submodule--helper.c:366
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
+
+#: builtin/submodule--helper.c:370
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n"
+
+#: builtin/submodule--helper.c:380
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "attention : nous vous suggérons de spécifier une commande de mode de mise à jour pour le sous-module '%s'\n"
+
+#: builtin/submodule--helper.c:387
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr "Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module '%s'"
+
+#: builtin/submodule--helper.c:406
+msgid "Suppress output for initializing a submodule"
+msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module"
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<chemin>]"
+
+#: builtin/submodule--helper.c:432
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper <nom> <chemin>"
 
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 "Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le "
 "chemin '%s'"
 
-#: builtin/submodule--helper.c:164
+#: builtin/submodule--helper.c:489
 msgid "where the new submodule will be cloned to"
 msgstr "emplacement où le sous-module sera cloné"
 
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:492
 msgid "name of the new submodule"
 msgstr "nom du nouveau sous-module"
 
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
 msgid "url where to clone the submodule from"
 msgstr "URL depuis laquelle cloner le sous-module"
 
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:501
 msgid "depth for shallow clones"
 msgstr "profondeur de l'historique des clones superficiels"
 
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
-msgstr ""
-"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
-"<dépôt>] [--name <nom>] [--url <url>][--depth <profondeur>] [--] "
-"[<chemin>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference <dépôt>] [--name <nom>] [--depth <profondeur>]  --url <url> --path <chemin>"
 
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "impossible de créer le répertoire '%s'"
 
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "Le clonage de '%s' dans le chemin de sous-module '%s' a échoué"
 
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:550
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "impossible d'ouvrir le fichier '%s'"
 
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
 #, c-format
 msgid "could not close file %s"
 msgstr "impossible de fermer le fichier %s"
 
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "impossible de créer le répertoire de sous-module pour '%s'"
 
-#: builtin/submodule--helper.c:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
-msgstr ""
-"fatal : la sous-commande submodule--helper doit être appelée avec une sous-"
-"commande"
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
+
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
+
+#: builtin/submodule--helper.c:639
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "Sous-module non fusionné %s non traité"
+
+#: builtin/submodule--helper.c:660
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "Sous-module '%s' non traité"
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "chemin dans la copie de travail"
+
+#: builtin/submodule--helper.c:771
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "chemin dans la copie de travail, traversant les frontières de sous-modules"
+
+#: builtin/submodule--helper.c:775
+msgid "rebase, merge, checkout or none"
+msgstr "valeurs possibles : rebase, merge, checkout ou none"
 
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:779
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "Créer un clone superficiel tronqué au nombre de révisions spécifié"
+
+#: builtin/submodule--helper.c:782
+msgid "parallel jobs"
+msgstr "jobs parallèles"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "ne pas afficher la progression du clonage"
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]"
+
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr "valeur invalide pour la mise à jour du paramètre"
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "la sous-commande submodule--helper doit être appelée avec une sous-commande"
+
+#: builtin/submodule--helper.c:862
 #, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr "fatal : '%s' n'est pas une sous-commande valide de submodule--helper"
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
 
 #: builtin/symbolic-ref.c:7
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10996,27 +11432,22 @@ msgstr ""
 msgid "git tag -v <tagname>..."
 msgstr "git tag -v <nométiquette>..."
 
-#: builtin/tag.c:80
+#: builtin/tag.c:81
 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr "nom d'étiquette trop long : %.*s..."
 
-#: builtin/tag.c:85
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr "étiquette '%s' non trouvée."
 
-#: builtin/tag.c:100
+#: builtin/tag.c:101
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Étiquette '%s' supprimée (elle était sur %s)\n"
 
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "impossible de vérifier l'étiquette '%s'"
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
 #, c-format
 msgid ""
 "\n"
@@ -11029,7 +11460,7 @@ msgstr ""
 "  %s\n"
 "Les lignes commençant par '%c' seront ignorées.\n"
 
-#: builtin/tag.c:126
+#: builtin/tag.c:121
 #, c-format
 msgid ""
 "\n"
@@ -11161,21 +11592,21 @@ msgstr "les options --merged et --no-merged ne sont autorisées qu'avec -l"
 msgid "only one -F or -m option is allowed."
 msgstr "une seule option -F ou -m est autorisée."
 
-#: builtin/tag.c:453
+#: builtin/tag.c:452
 msgid "too many params"
 msgstr "trop de paramètres"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:458
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' n'est pas un nom d'étiquette valide."
 
-#: builtin/tag.c:464
+#: builtin/tag.c:463
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "l'étiquette '%s' existe déjà"
 
-#: builtin/tag.c:489
+#: builtin/tag.c:491
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
@@ -11438,7 +11869,7 @@ msgstr "git verify-commit [-v | --verbose] <commit>..."
 msgid "print commit contents"
 msgstr "afficher le contenu du commit"
 
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
 msgid "print raw gpg status output"
 msgstr "afficher les messages bruts de gpg"
 
@@ -11458,7 +11889,7 @@ msgstr "afficher seulement les statistiques"
 msgid "git verify-tag [-v | --verbose] <tag>..."
 msgstr "git verify-tag [-v | --verbose] <étiquette>..."
 
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
 msgid "print tag contents"
 msgstr "afficher le contenu de l'étiquette"
 
@@ -11474,73 +11905,77 @@ msgstr "git worktree prune [<options>]"
 msgid "git worktree list [<options>]"
 msgstr "git worktree prune [<options>]"
 
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Suppression de worktrees/%s : répertoire invalide"
 
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas"
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr ""
 "Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)"
 
-#: builtin/worktree.c:61
+#: builtin/worktree.c:62
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
 
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 "Suppression de worktrees/%s : le fichier gitdir point sur un endroit "
 "inexistant"
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:113
 #, c-format
-msgid "failed to remove: %s"
-msgstr "échec de la suppression de %s"
+msgid "failed to remove '%s'"
+msgstr "échec de la suppression de '%s'"
 
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' existe déjà"
 
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "impossible de créer le répertoire de '%s'"
 
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Préparation de %s (identifiant %s)"
 
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "extraire la <branche> même si elle est déjà extraite dans une autre copie de "
 "travail"
 
-#: builtin/worktree.c:319
+#: builtin/worktree.c:324
 msgid "create a new branch"
 msgstr "créer une nouvelle branche"
 
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
 msgid "create or reset a branch"
 msgstr "créer ou réinitialiser une branche"
 
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
 msgid "detach HEAD at named commit"
 msgstr "détacher la HEAD au commit nommé"
 
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "remplissage de la nouvelle copie de travail"
+
+#: builtin/worktree.c:336
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B et --detach sont mutuellement exclusifs"
 
@@ -11560,7 +11995,7 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>"
 msgid "only useful for debugging"
 msgstr "seulement utile pour le débogage"
 
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "afficher les messages de debug sur stderr"
 
@@ -11574,7 +12009,7 @@ msgstr ""
 "quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n"
 "pour en lire plus à propos d'une commande spécifique ou d'un concept."
 
-#: http.c:321
+#: http.c:322
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0"
 
@@ -11706,7 +12141,7 @@ msgstr "être plus silencieux"
 msgid "use <n> digits to display SHA-1s"
 msgstr "utiliser <n> chiffres pour afficher les SHA-1s"
 
-#: rerere.h:38
+#: rerere.h:40
 msgid "update the index with reused conflict resolution if possible"
 msgstr ""
 "met à jour l'index avec les résolutions de conflit réutilisées si possible"
@@ -11926,16 +12361,16 @@ msgstr ""
 "Pour extraire la branche d'origine et stopper le rebasage, lancez \"git "
 "rebase --abort\"."
 
-#: git-rebase.sh:165
+#: git-rebase.sh:168
 msgid "Applied autostash."
 msgstr "Autoremisage appliqué."
 
-#: git-rebase.sh:168
+#: git-rebase.sh:171
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "Impossible de stocker $stash_sha1"
 
-#: git-rebase.sh:169
+#: git-rebase.sh:172
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 "Your changes are safe in the stash.\n"
@@ -11945,33 +12380,29 @@ msgstr ""
 "Vos  modifications sont à l'abri dans la remise.\n"
 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
 
-#: git-rebase.sh:208
+#: git-rebase.sh:211
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Le crochet pre-rebase a refusé de rebaser."
 
-#: git-rebase.sh:213
+#: git-rebase.sh:216
 msgid "It looks like git-am is in progress. Cannot rebase."
 msgstr "Il semble que git-am soit en cours. Impossible de rebaser."
 
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "L'option --exec doit être utilisée avec l'option --interactive"
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
 msgid "No rebase in progress?"
 msgstr "Pas de rebasage en cours ?"
 
-#: git-rebase.sh:370
+#: git-rebase.sh:368
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "L'action --edit-todo peut seulement être utilisée lors d'un rebasage "
 "interactif."
 
-#: git-rebase.sh:377
+#: git-rebase.sh:375
 msgid "Cannot read HEAD"
 msgstr "Impossible de lire HEAD"
 
-#: git-rebase.sh:380
+#: git-rebase.sh:378
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -11979,12 +12410,12 @@ msgstr ""
 "Vous devez éditer tous les conflits de fusion et\n"
 "les marquer comme résolus avec git add"
 
-#: git-rebase.sh:398
+#: git-rebase.sh:396
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "Impossible de revenir à $head_name"
 
-#: git-rebase.sh:417
+#: git-rebase.sh:415
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -12006,65 +12437,65 @@ msgstr ""
 "chose\n"
 "d'important ici."
 
-#: git-rebase.sh:468
+#: git-rebase.sh:466
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "invalide $upstream_name en amont"
 
-#: git-rebase.sh:492
+#: git-rebase.sh:490
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name : il y a plus d'une base de fusion"
 
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name : il n'y a pas de base de fusion"
 
-#: git-rebase.sh:504
+#: git-rebase.sh:502
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "Ne pointe pas sur une validation valide : $onto_name"
 
-#: git-rebase.sh:527
+#: git-rebase.sh:525
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "fatal : pas de branche : $branch_name"
 
-#: git-rebase.sh:560
+#: git-rebase.sh:558
 msgid "Cannot autostash"
 msgstr "Autoremisage impossible"
 
-#: git-rebase.sh:565
+#: git-rebase.sh:563
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "Autoremisage créé : $stash_abbrev"
 
-#: git-rebase.sh:569
+#: git-rebase.sh:567
 msgid "Please commit or stash them."
 msgstr "Veuillez les valider ou les remiser."
 
-#: git-rebase.sh:589
+#: git-rebase.sh:587
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "La branche courante $branch_name est à jour."
 
-#: git-rebase.sh:593
+#: git-rebase.sh:591
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "La branche courante $branch_name est à jour, rebasage forcé."
 
-#: git-rebase.sh:604
+#: git-rebase.sh:602
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Changements de $mb sur $onto :"
 
-#: git-rebase.sh:613
+#: git-rebase.sh:611
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 "Premièrement, rembobinons head pour rejouer votre travail par-dessus..."
 
-#: git-rebase.sh:623
+#: git-rebase.sh:621
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "$branch_name mise à jour en avance rapide sur $onto_name."
@@ -12208,28 +12639,23 @@ msgstr "Aucune branche spécifiée"
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Pour les restaurer tapez \"git stash apply\")"
 
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "impossible de supprimer un composant de l'URL '$remoteurl'"
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "Un chemin relatif ne peut être utilisé que depuis la racine de la copie de "
 "travail"
 
-#: git-submodule.sh:291
+#: git-submodule.sh:229
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "L'URL de dépôt '$repo' doit être absolu ou commencer par ./|../"
 
-#: git-submodule.sh:308
+#: git-submodule.sh:246
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path' existe déjà dans l'index"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:250
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
@@ -12240,24 +12666,24 @@ msgstr ""
 "$sm_path\n"
 "Utilisez -f si vous voulez vraiment l'ajouter."
 
-#: git-submodule.sh:330
+#: git-submodule.sh:268
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Ajout du dépôt existant à '$sm_path' dans l'index"
 
-#: git-submodule.sh:332
+#: git-submodule.sh:270
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide"
 
-#: git-submodule.sh:340
+#: git-submodule.sh:278
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 "Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) "
 "distant(s) :"
 
-#: git-submodule.sh:342
+#: git-submodule.sh:280
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from"
@@ -12265,7 +12691,7 @@ msgstr ""
 "Si vous voulez réutiliser ce répertoire git local au lieu de cloner à "
 "nouveau depuis"
 
-#: git-submodule.sh:344
+#: git-submodule.sh:282
 #, sh-format
 msgid ""
 "use the '--force' option. If the local git directory is not the correct repo"
@@ -12273,7 +12699,7 @@ msgstr ""
 "utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt "
 "correct"
 
-#: git-submodule.sh:345
+#: git-submodule.sh:283
 #, sh-format
 msgid ""
 "or you are unsure what this means choose another name with the '--name' "
@@ -12282,74 +12708,53 @@ msgstr ""
 "ou vous ne savez pas ce que cela signifie de choisir un autre nom avec "
 "l'option '--name'."
 
-#: git-submodule.sh:347
+#: git-submodule.sh:285
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'."
 
-#: git-submodule.sh:359
+#: git-submodule.sh:297
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "Impossible d'extraire le sous-module '$sm_path'"
 
-#: git-submodule.sh:364
+#: git-submodule.sh:302
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Échec d'ajout du sous-module '$sm_path'"
 
-#: git-submodule.sh:373
+#: git-submodule.sh:311
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Échec d'enregistrement du sous-module '$sm_path'"
 
-#: git-submodule.sh:417
+#: git-submodule.sh:355
 #, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "Entrée dans '$prefix$displaypath'"
+msgid "Entering '$displaypath'"
+msgstr "Entrée dans '$displaypath'"
 
-#: git-submodule.sh:437
+#: git-submodule.sh:375
 #, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
-msgstr ""
-"Arrêt sur '$prefix$displaypath' ; le script a retourné un statut non nul."
+msgid "Stopping at '$displaypath'; script returned non-zero status."
+msgstr "Arrêt sur '$displaypath' ; le script a retourné un statut non nul."
 
-#: git-submodule.sh:483
+#: git-submodule.sh:448
 #, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr ""
-"URL non trouvée pour le chemin de sous-module '$displaypath' dans .gitmodules"
+msgid "pathspec and --all are incompatible"
+msgstr "un spécificateur de chemin et --all sont incompatibles"
 
-#: git-submodule.sh:492
+#: git-submodule.sh:453
 #, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr ""
-"Échec d'enregistrement de l'URL pour le chemin de sous-module '$displaypath'"
-
-#: git-submodule.sh:494
-#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr "Sous-module '$name' ($url) enregistré pour le chemin '$displaypath'"
-
-#: git-submodule.sh:511
-#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr ""
-"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module "
-"'$displaypath'"
-
-#: git-submodule.sh:549
-#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr ""
-"Utilisez '.' si vous voulez vraiment réinitialiser tous les sous-modules"
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
 
-#: git-submodule.sh:566
+#: git-submodule.sh:470
 #, sh-format
 msgid "Submodule work tree '$displaypath' contains a .git directory"
 msgstr ""
 "La copie de travail du sous-module '$displaypath' contient un répertoire .git"
 
-#: git-submodule.sh:567
+#: git-submodule.sh:471
 #, sh-format
 msgid ""
 "(use 'rm -rf' if you really want to remove it including all of its history)"
@@ -12357,7 +12762,7 @@ msgstr ""
 "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
 "historique)"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:477
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12366,146 +12771,181 @@ msgstr ""
 "La copie de travail du sous-module '$displaypath' contient des modifications "
 "locales ; utilisez '-f' pour les annuler"
 
-#: git-submodule.sh:576
+#: git-submodule.sh:480
 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr "Répertoire '$displaypath' nettoyé"
 
-#: git-submodule.sh:577
+#: git-submodule.sh:481
 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr ""
 "Impossible de supprimer la copie de travail du sous-module '$displaypath'"
 
-#: git-submodule.sh:580
+#: git-submodule.sh:484
 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr "Impossible de créer le répertoire vide du sous-module '$displaypath'"
 
-#: git-submodule.sh:589
+#: git-submodule.sh:493
 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr ""
 "Le sous-module '$name' ($url) n'est pas enregistré pour le chemin "
 "'$displaypath'"
 
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"Chemin de sous-module '$displaypath' non initialisé\n"
-"Peut-être souhaitez-vous utiliser 'update --init' ?"
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "Impossible de trouver la révision courante dans le chemin de sous-module "
 "'$displaypath'"
 
-#: git-submodule.sh:745
+#: git-submodule.sh:644
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'"
 
-#: git-submodule.sh:768
+#: git-submodule.sh:667
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'"
 
-#: git-submodule.sh:788
+#: git-submodule.sh:680
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'"
 
-#: git-submodule.sh:789
+#: git-submodule.sh:681
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
 
-#: git-submodule.sh:793
+#: git-submodule.sh:685
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'"
 
-#: git-submodule.sh:794
+#: git-submodule.sh:686
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
 
-#: git-submodule.sh:799
+#: git-submodule.sh:691
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'"
 
-#: git-submodule.sh:800
+#: git-submodule.sh:692
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
 
-#: git-submodule.sh:805
+#: git-submodule.sh:697
 #, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
-msgstr ""
-"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module "
-"'$prefix$sm_path'"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr "L'exécution de '$command $sha1' a échoué dans le chemin de sous-module '$displaypath'"
 
-#: git-submodule.sh:806
+#: git-submodule.sh:698
 #, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "Chemin de sous-module '$prefix$sm_path' : '$command $sha1'"
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
 
-#: git-submodule.sh:836
+#: git-submodule.sh:729
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
 
-#: git-submodule.sh:944
+#: git-submodule.sh:837
 msgid "The --cached option cannot be used with the --files option"
 msgstr "L'option --cached ne peut pas être utilisée avec l'option --files"
 
-#: git-submodule.sh:996
+#: git-submodule.sh:889
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "mode $mod_dst inattendu"
 
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Attention : $display_name ne contient pas la validation $sha1_src"
 
-#: git-submodule.sh:1019
+#: git-submodule.sh:912
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Attention : $display_name ne contient pas la validation $sha1_dst"
 
-#: git-submodule.sh:1022
+#: git-submodule.sh:915
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 "  Attention : $display_name ne contient pas les validations $sha1_src et "
 "$sha1_dst"
 
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
 msgid "blob"
 msgstr "blob"
 
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
 
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
 
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails."
+
+#~ msgid "'%s': %s"
+#~ msgstr "'%s' : %s"
+
+#~ msgid "unable to access '%s': %s"
+#~ msgstr "impossible d'accéder à '%s' : %s"
+
+#~ msgid "could not open '%s' for reading: %s"
+#~ msgstr "impossible d'ouvrir '%s' en lecture : %s"
+
+#~ msgid "could not open '%s' for writing: %s"
+#~ msgstr "impossible d'ouvrir '%s' en écriture : %s"
+
+#~ msgid "    git branch -d %s\n"
+#~ msgstr "    git branch -d %s\n"
+
+#~ msgid "    git branch --set-upstream-to %s\n"
+#~ msgstr "    git branch --set-upstream-to %s\n"
+
+#~ msgid "cannot open %s: %s\n"
+#~ msgstr "impossible d'ouvrir %s : %s\n"
+
+#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+#~ msgstr ""
+#~ "Veuillez indexer vos modifications de .gitmodules ou remisez-les pour "
+#~ "continuer"
+
+#~ msgid "could not verify the tag '%s'"
+#~ msgstr "impossible de vérifier l'étiquette '%s'"
+
+#~ msgid "failed to remove: %s"
+#~ msgstr "échec de la suppression de %s"
+
+#~ msgid "The --exec option must be used with the --interactive option"
+#~ msgstr "L'option --exec doit être utilisée avec l'option --interactive"
+
+#~ msgid ""
+#~ "Submodule path '$displaypath' not initialized\n"
+#~ "Maybe you want to use 'update --init'?"
+#~ msgstr ""
+#~ "Chemin de sous-module '$displaypath' non initialisé\n"
+#~ "Peut-être souhaitez-vous utiliser 'update --init' ?"
+
 #~ msgid "Forward-port local commits to the updated upstream head"
 #~ msgstr ""
 #~ "Reporter les validations locales sur le sommet mis à jour d'une branche "
@@ -12578,9 +13018,6 @@ msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
 #~ msgid "Could not append '%s'"
 #~ msgstr "Impossible d'ajouter '%s'"
 
-#~ msgid "Could not set '%s'"
-#~ msgstr "Impossible de définir '%s'"
-
 #~ msgid "Missing author: %s"
 #~ msgstr "Auteur manquant : %s"
 
@@ -12923,12 +13360,5 @@ msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
 #~ msgstr "les chemins en entrée sont terminés par le caractère nul"
 
 #~ msgid ""
-#~ "The following untracked files would NOT be saved but need to be removed "
-#~ "by stash save:"
-#~ msgstr ""
-#~ "Les fichiers suivants non suivis ne seront PAS sauvés mais doivent être "
-#~ "supprimés par le remisage :"
-
-#~ msgid ""
 #~ "Aborting. Consider using either the --force or --include-untracked option."
 #~ msgstr "Abandon. Utilisez l'option --force ou --include-untracked."
diff --git a/po/git.pot b/po/git.pot
index 72ef798cde..c9be5dfebe 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgid ""
 "as appropriate to mark resolution and make a commit."
 msgstr ""
 
-#: advice.c:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr ""
 
@@ -71,7 +71,7 @@ msgstr ""
 msgid "archive format"
 msgstr ""
 
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
 msgid "prefix"
 msgstr ""
 
@@ -79,9 +79,9 @@ msgstr ""
 msgid "prepend prefix to each pathname in the archive"
 msgstr ""
 
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547
-#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548
+#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
 #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
 #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
 msgid "file"
@@ -115,7 +115,8 @@ msgstr ""
 msgid "list supported archive formats"
 msgstr ""
 
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
 msgid "repo"
 msgstr ""
 
@@ -251,11 +252,16 @@ msgstr ""
 msgid "Not a valid branch point: '%s'."
 msgstr ""
 
-#: branch.c:344
+#: branch.c:345
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr ""
 
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr ""
+
 #: bundle.c:34
 #, c-format
 msgid "'%s' does not look like a v2 bundle file"
@@ -266,7 +272,7 @@ msgstr ""
 msgid "unrecognized header: %s%s (%d)"
 msgstr ""
 
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
 #, c-format
 msgid "could not open '%s'"
 msgstr ""
@@ -275,10 +281,10 @@ msgstr ""
 msgid "Repository lacks these prerequisite commits:"
 msgstr ""
 
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
 msgid "revision walk setup failed"
 msgstr ""
 
@@ -317,21 +323,21 @@ msgstr ""
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
 
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr ""
 
-#: bundle.c:449
+#: bundle.c:451
 msgid "Refusing to create empty bundle."
 msgstr ""
 
-#: bundle.c:459
+#: bundle.c:463
 #, c-format
 msgid "cannot create '%s'"
 msgstr ""
 
-#: bundle.c:480
+#: bundle.c:491
 msgid "index-pack died"
 msgstr ""
 
@@ -340,8 +346,8 @@ msgstr ""
 msgid "invalid color value: %.*s"
 msgstr ""
 
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
 #, c-format
 msgid "could not parse %s"
 msgstr ""
@@ -375,21 +381,21 @@ msgstr ""
 msgid "failed to expand user dir in: '%s'"
 msgstr ""
 
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr ""
 
-#: config.c:891
+#: config.c:890
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr ""
 
-#: config.c:1220
+#: config.c:1228
 msgid "unable to parse command-line config"
 msgstr ""
 
-#: config.c:1281
+#: config.c:1284
 msgid "unknown error occured while reading the configuration files"
 msgstr ""
 
@@ -408,9 +414,14 @@ msgstr ""
 msgid "%s has multiple values"
 msgstr ""
 
+#: config.c:2224
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr ""
+
 #: config.c:2226
 #, c-format
-msgid "Could not set '%s' to '%s'"
+msgid "could not unset '%s'"
 msgstr ""
 
 #: connected.c:69
@@ -418,13 +429,11 @@ msgid "Could not run 'git rev-list'"
 msgstr ""
 
 #: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
+msgid "failed write to rev-list"
 msgstr ""
 
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
 msgstr ""
 
 #: date.c:95
@@ -500,62 +509,62 @@ msgstr[1] ""
 msgid "failed to read orderfile '%s'"
 msgstr ""
 
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
 msgid "Performing inexact rename detection"
 msgstr ""
 
-#: diff.c:115
+#: diff.c:116
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 
-#: diff.c:120
+#: diff.c:121
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr ""
 
-#: diff.c:215
+#: diff.c:225
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 
-#: diff.c:267
+#: diff.c:277
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
 "%s"
 msgstr ""
 
-#: diff.c:2997
+#: diff.c:3007
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr ""
 
-#: diff.c:3393
+#: diff.c:3405
 msgid "--follow requires exactly one pathspec"
 msgstr ""
 
-#: diff.c:3556
+#: diff.c:3568
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
 "%s"
 msgstr ""
 
-#: diff.c:3570
+#: diff.c:3582
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr ""
 
-#: dir.c:2004
+#: dir.c:1823
 msgid "failed to get kernel name and information"
 msgstr ""
 
-#: dir.c:2123
+#: dir.c:1942
 msgid "Untracked cache is disabled on this system or location."
 msgstr ""
 
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
 msgid "could not run gpg."
 msgstr ""
 
@@ -569,12 +578,12 @@ msgstr ""
 
 #: gpg-interface.c:222
 #, c-format
-msgid "could not create temporary file '%s': %s"
+msgid "could not create temporary file '%s'"
 msgstr ""
 
-#: gpg-interface.c:225
+#: gpg-interface.c:224
 #, c-format
-msgid "failed writing detached signature to '%s': %s"
+msgid "failed writing detached signature to '%s'"
 msgstr ""
 
 #: grep.c:1718
@@ -582,14 +591,14 @@ msgstr ""
 msgid "'%s': unable to read %s"
 msgstr ""
 
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
 #, c-format
-msgid "'%s': %s"
+msgid "failed to stat '%s'"
 msgstr ""
 
 #: grep.c:1746
 #, c-format
-msgid "'%s': short read %s"
+msgid "'%s': short read"
 msgstr ""
 
 #: help.c:205
@@ -648,12 +657,29 @@ msgstr[1] ""
 msgid "%s: %s - %s"
 msgstr ""
 
+#: lockfile.c:152
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr ""
+
 #: merge.c:41
 msgid "failed to read the cache"
 msgstr ""
 
-#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
 msgid "unable to write new index file"
 msgstr ""
 
@@ -700,7 +726,7 @@ msgstr ""
 msgid "blob expected for %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
 #, c-format
 msgid "failed to open '%s'"
 msgstr ""
@@ -827,7 +853,7 @@ msgstr ""
 msgid "Auto-merging %s"
 msgstr ""
 
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
 msgid "submodule"
 msgstr ""
 
@@ -854,50 +880,50 @@ msgstr ""
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 
-#: merge-recursive.c:1783
+#: merge-recursive.c:1781
 #, c-format
 msgid "Adding %s"
 msgstr ""
 
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
 msgid "Fatal merge failure, shouldn't happen."
 msgstr ""
 
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
 msgid "Already up-to-date!"
 msgstr ""
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr ""
 
-#: merge-recursive.c:1858
+#: merge-recursive.c:1856
 #, c-format
 msgid "Unprocessed path??? %s"
 msgstr ""
 
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
 msgid "Merging:"
 msgstr ""
 
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: merge-recursive.c:1956
+#: merge-recursive.c:1954
 msgid "merge returned no commit"
 msgstr ""
 
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr ""
 
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
 msgid "Unable to write index."
 msgstr ""
 
@@ -927,28 +953,28 @@ msgstr ""
 msgid "unable to parse object: %s"
 msgstr ""
 
-#: parse-options.c:570
+#: parse-options.c:572
 msgid "..."
 msgstr ""
 
-#: parse-options.c:588
+#: parse-options.c:590
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
 #, c-format
 msgid "   or: %s"
 msgstr ""
 
-#: parse-options.c:595
+#: parse-options.c:597
 #, c-format
 msgid "    %s"
 msgstr ""
 
-#: parse-options.c:629
+#: parse-options.c:631
 msgid "-NUM"
 msgstr ""
 
@@ -957,7 +983,7 @@ msgstr ""
 msgid "malformed object name '%s'"
 msgstr ""
 
-#: path.c:752
+#: path.c:796
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr ""
@@ -1022,7 +1048,7 @@ msgid ""
 "Perhaps you forgot to add either ':/' or '.' ?"
 msgstr ""
 
-#: pretty.c:969
+#: pretty.c:971
 msgid "unable to parse --pretty format"
 msgstr ""
 
@@ -1044,23 +1070,23 @@ msgid ""
 "Using version %i"
 msgstr ""
 
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr ""
 
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr ""
 
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2246
 #, c-format
 msgid "could not delete references: %s"
 msgstr ""
 
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
 #, c-format
 msgid "could not remove reference %s"
 msgstr ""
@@ -1199,93 +1225,93 @@ msgstr ""
 msgid "malformed object name %s"
 msgstr ""
 
-#: remote.c:745
+#: remote.c:746
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr ""
 
-#: remote.c:749
+#: remote.c:750
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr ""
 
-#: remote.c:753
+#: remote.c:754
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr ""
 
-#: remote.c:761
+#: remote.c:762
 msgid "Internal error"
 msgstr ""
 
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
 msgid "HEAD does not point to a branch"
 msgstr ""
 
-#: remote.c:1686
+#: remote.c:1687
 #, c-format
 msgid "no such branch: '%s'"
 msgstr ""
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr ""
 
-#: remote.c:1695
+#: remote.c:1696
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr ""
 
-#: remote.c:1710
+#: remote.c:1711
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 
-#: remote.c:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr ""
 
-#: remote.c:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr ""
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr ""
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 
-#: remote.c:2073
+#: remote.c:2074
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr ""
 
-#: remote.c:2077
+#: remote.c:2078
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr ""
 
-#: remote.c:2080
+#: remote.c:2081
 #, c-format
 msgid "Your branch is up-to-date with '%s'.\n"
 msgstr ""
 
-#: remote.c:2084
+#: remote.c:2085
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:2090
+#: remote.c:2091
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr ""
 
-#: remote.c:2093
+#: remote.c:2094
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -1293,11 +1319,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:2101
+#: remote.c:2102
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 
-#: remote.c:2104
+#: remote.c:2105
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -1308,20 +1334,20 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:2114
+#: remote.c:2115
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 
-#: revision.c:2131
+#: revision.c:2142
 msgid "your current branch appears to be broken"
 msgstr ""
 
-#: revision.c:2134
+#: revision.c:2145
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr ""
 
-#: revision.c:2328
+#: revision.c:2339
 msgid "--first-parent is incompatible with --bisect"
 msgstr ""
 
@@ -1365,7 +1391,7 @@ msgid ""
 "and commit the result with 'git commit'"
 msgstr ""
 
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
 #, c-format
 msgid "Could not write to %s"
 msgstr ""
@@ -1523,12 +1549,12 @@ msgstr ""
 msgid "Could not create sequencer directory %s"
 msgstr ""
 
-#: sequencer.c:835 sequencer.c:917
+#: sequencer.c:835 sequencer.c:916
 #, c-format
 msgid "Error wrapping up %s."
 msgstr ""
 
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 
@@ -1540,63 +1566,72 @@ msgstr ""
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 
-#: sequencer.c:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
 #, c-format
-msgid "cannot open %s: %s"
+msgid "cannot open %s"
 msgstr ""
 
-#: sequencer.c:881
+#: sequencer.c:880
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: sequencer.c:882
+#: sequencer.c:881
 msgid "unexpected end of file"
 msgstr ""
 
-#: sequencer.c:888
+#: sequencer.c:887
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 
-#: sequencer.c:910
+#: sequencer.c:909
 #, c-format
 msgid "Could not format %s."
 msgstr ""
 
-#: sequencer.c:1055
+#: sequencer.c:1054
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr ""
 
-#: sequencer.c:1058
+#: sequencer.c:1057
 #, c-format
 msgid "%s: bad revision"
 msgstr ""
 
-#: sequencer.c:1092
+#: sequencer.c:1091
 msgid "Can't revert as initial commit"
 msgstr ""
 
-#: sequencer.c:1093
+#: sequencer.c:1092
 msgid "Can't cherry-pick into empty head"
 msgstr ""
 
-#: setup.c:246
+#: setup.c:248
 #, c-format
 msgid "failed to read %s"
 msgstr ""
 
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr ""
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr ""
+
 #: sha1_file.c:1080
 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 
-#: sha1_file.c:2459
+#: sha1_file.c:2458
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 
-#: sha1_file.c:2463
+#: sha1_file.c:2462
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
@@ -1614,29 +1649,38 @@ msgid ""
 "running \"git config advice.objectNameWarning false\""
 msgstr ""
 
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr ""
 
-#: submodule.c:74
+#: submodule.c:76
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr ""
 
-#: submodule.c:107
+#: submodule.c:109
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr ""
 
-#: submodule.c:118
+#: submodule.c:120
 msgid "staging updated .gitmodules failed"
 msgstr ""
 
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr ""
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr ""
+
 #: trailer.c:237
 #, c-format
 msgid "running trailer command '%s' failed"
@@ -1696,7 +1740,175 @@ msgstr ""
 msgid "Could not read ref %s"
 msgstr ""
 
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you can switch branches."
+msgstr ""
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:69
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you can merge."
+msgstr ""
+
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:74
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you can %s."
+msgstr ""
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr ""
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr ""
+
+#: unpack-trees.c:237
 msgid "Checking out files"
 msgstr ""
 
@@ -1734,230 +1946,226 @@ msgstr ""
 msgid "could not open '%s' for reading and writing"
 msgstr ""
 
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr ""
 
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr ""
 
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr ""
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
 #, c-format
 msgid "unable to access '%s'"
 msgstr ""
 
-#: wrapper.c:640
+#: wrapper.c:623
 msgid "unable to get current working directory"
 msgstr ""
 
-#: wrapper.c:667
+#: wrapper.c:650
 #, c-format
 msgid "could not open %s for writing"
 msgstr ""
 
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
 #, c-format
 msgid "could not write to %s"
 msgstr ""
 
-#: wrapper.c:684
+#: wrapper.c:667
 #, c-format
 msgid "could not close %s"
 msgstr ""
 
-#: wt-status.c:149
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr ""
 
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr ""
 
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 
-#: wt-status.c:182
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr ""
 
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 
-#: wt-status.c:186
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
 msgid "Changes to be committed:"
 msgstr ""
 
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
 msgid "Changes not staged for commit:"
 msgstr ""
 
-#: wt-status.c:219
+#: wt-status.c:220
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 
-#: wt-status.c:221
+#: wt-status.c:222
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 
-#: wt-status.c:224
+#: wt-status.c:225
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 
-#: wt-status.c:236
+#: wt-status.c:237
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 
-#: wt-status.c:251
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr ""
 
-#: wt-status.c:253
+#: wt-status.c:254
 msgid "added by us:"
 msgstr ""
 
-#: wt-status.c:255
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr ""
 
-#: wt-status.c:257
+#: wt-status.c:258
 msgid "added by them:"
 msgstr ""
 
-#: wt-status.c:259
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr ""
 
-#: wt-status.c:261
+#: wt-status.c:262
 msgid "both added:"
 msgstr ""
 
-#: wt-status.c:263
+#: wt-status.c:264
 msgid "both modified:"
 msgstr ""
 
-#: wt-status.c:265
+#: wt-status.c:266
 #, c-format
 msgid "bug: unhandled unmerged status %x"
 msgstr ""
 
-#: wt-status.c:273
+#: wt-status.c:274
 msgid "new file:"
 msgstr ""
 
-#: wt-status.c:275
+#: wt-status.c:276
 msgid "copied:"
 msgstr ""
 
-#: wt-status.c:277
+#: wt-status.c:278
 msgid "deleted:"
 msgstr ""
 
-#: wt-status.c:279
+#: wt-status.c:280
 msgid "modified:"
 msgstr ""
 
-#: wt-status.c:281
+#: wt-status.c:282
 msgid "renamed:"
 msgstr ""
 
-#: wt-status.c:283
+#: wt-status.c:284
 msgid "typechange:"
 msgstr ""
 
-#: wt-status.c:285
+#: wt-status.c:286
 msgid "unknown:"
 msgstr ""
 
-#: wt-status.c:287
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr ""
 
-#: wt-status.c:369
+#: wt-status.c:370
 msgid "new commits, "
 msgstr ""
 
-#: wt-status.c:371
+#: wt-status.c:372
 msgid "modified content, "
 msgstr ""
 
-#: wt-status.c:373
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr ""
 
-#: wt-status.c:390
+#: wt-status.c:391
 #, c-format
 msgid "bug: unhandled diff status %c"
 msgstr ""
 
-#: wt-status.c:754
+#: wt-status.c:755
 msgid "Submodules changed but not updated:"
 msgstr ""
 
-#: wt-status.c:756
+#: wt-status.c:757
 msgid "Submodule changes to be committed:"
 msgstr ""
 
-#: wt-status.c:837
+#: wt-status.c:838
 msgid ""
 "Do not touch the line above.\n"
 "Everything below will be removed."
 msgstr ""
 
-#: wt-status.c:948
+#: wt-status.c:949
 msgid "You have unmerged paths."
 msgstr ""
 
-#: wt-status.c:951
+#: wt-status.c:952
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 
-#: wt-status.c:954
+#: wt-status.c:956
 msgid "All conflicts fixed but you are still merging."
 msgstr ""
 
-#: wt-status.c:957
+#: wt-status.c:959
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 
-#: wt-status.c:967
+#: wt-status.c:969
 msgid "You are in the middle of an am session."
 msgstr ""
 
-#: wt-status.c:970
+#: wt-status.c:972
 msgid "The current patch is empty."
 msgstr ""
 
-#: wt-status.c:974
+#: wt-status.c:976
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr ""
 
-#: wt-status.c:976
+#: wt-status.c:978
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:978
+#: wt-status.c:980
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 
@@ -2096,43 +2304,43 @@ msgstr ""
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 
-#: wt-status.c:1438
+#: wt-status.c:1460
 msgid "On branch "
 msgstr ""
 
-#: wt-status.c:1444
+#: wt-status.c:1466
 msgid "interactive rebase in progress; onto "
 msgstr ""
 
-#: wt-status.c:1446
+#: wt-status.c:1468
 msgid "rebase in progress; onto "
 msgstr ""
 
-#: wt-status.c:1451
+#: wt-status.c:1473
 msgid "HEAD detached at "
 msgstr ""
 
-#: wt-status.c:1453
+#: wt-status.c:1475
 msgid "HEAD detached from "
 msgstr ""
 
-#: wt-status.c:1456
+#: wt-status.c:1478
 msgid "Not currently on any branch."
 msgstr ""
 
-#: wt-status.c:1474
+#: wt-status.c:1496
 msgid "Initial commit"
 msgstr ""
 
-#: wt-status.c:1488
+#: wt-status.c:1510
 msgid "Untracked files"
 msgstr ""
 
-#: wt-status.c:1490
+#: wt-status.c:1512
 msgid "Ignored files"
 msgstr ""
 
-#: wt-status.c:1494
+#: wt-status.c:1516
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2140,82 +2348,82 @@ msgid ""
 "new files yourself (see 'git help status')."
 msgstr ""
 
-#: wt-status.c:1500
+#: wt-status.c:1522
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr ""
 
-#: wt-status.c:1502
+#: wt-status.c:1524
 msgid " (use -u option to show untracked files)"
 msgstr ""
 
-#: wt-status.c:1508
+#: wt-status.c:1530
 msgid "No changes"
 msgstr ""
 
-#: wt-status.c:1513
+#: wt-status.c:1535
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 
-#: wt-status.c:1516
+#: wt-status.c:1538
 #, c-format
 msgid "no changes added to commit\n"
 msgstr ""
 
-#: wt-status.c:1519
+#: wt-status.c:1541
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr ""
 
-#: wt-status.c:1522
+#: wt-status.c:1544
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 
-#: wt-status.c:1525
+#: wt-status.c:1547
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
 #, c-format
 msgid "nothing to commit\n"
 msgstr ""
 
-#: wt-status.c:1531
+#: wt-status.c:1553
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 
-#: wt-status.c:1535
+#: wt-status.c:1557
 #, c-format
 msgid "nothing to commit, working directory clean\n"
 msgstr ""
 
-#: wt-status.c:1642
+#: wt-status.c:1664
 msgid "Initial commit on "
 msgstr ""
 
-#: wt-status.c:1646
+#: wt-status.c:1668
 msgid "HEAD (no branch)"
 msgstr ""
 
-#: wt-status.c:1675
+#: wt-status.c:1697
 msgid "gone"
 msgstr ""
 
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
 msgid "behind "
 msgstr ""
 
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
 msgid "ahead "
 msgstr ""
 
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr ""
@@ -2229,7 +2437,7 @@ msgstr ""
 msgid "unexpected diff status %c"
 msgstr ""
 
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
 msgid "updating files failed"
 msgstr ""
 
@@ -2242,7 +2450,7 @@ msgstr ""
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
 msgid "Could not read the index"
 msgstr ""
 
@@ -2278,14 +2486,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 
 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
 msgid "dry run"
 msgstr ""
 
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
 msgid "be verbose"
 msgstr ""
 
@@ -2293,7 +2501,7 @@ msgstr ""
 msgid "interactive picking"
 msgstr ""
 
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
 msgid "select hunks interactively"
 msgstr ""
 
@@ -2361,16 +2569,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr ""
 
 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
 msgid "index file corrupt"
 msgstr ""
 
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr ""
 
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
 #, c-format
 msgid "could not read '%s'"
 msgstr ""
@@ -2398,16 +2606,6 @@ msgstr ""
 msgid "fseek failed"
 msgstr ""
 
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr ""
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr ""
-
 #: builtin/am.c:788
 #, c-format
 msgid "could not parse patch '%s'"
@@ -2417,109 +2615,109 @@ msgstr ""
 msgid "Only one StGIT patch series can be applied at once"
 msgstr ""
 
-#: builtin/am.c:901
+#: builtin/am.c:900
 msgid "invalid timestamp"
 msgstr ""
 
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
 msgid "invalid Date line"
 msgstr ""
 
-#: builtin/am.c:909
+#: builtin/am.c:908
 msgid "invalid timezone offset"
 msgstr ""
 
-#: builtin/am.c:996
+#: builtin/am.c:995
 msgid "Patch format detection failed."
 msgstr ""
 
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr ""
 
-#: builtin/am.c:1005
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr ""
 
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
 msgid "unable to write index file"
 msgstr ""
 
-#: builtin/am.c:1188
+#: builtin/am.c:1187
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr ""
 
-#: builtin/am.c:1189
+#: builtin/am.c:1188
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 
-#: builtin/am.c:1190
+#: builtin/am.c:1189
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 
-#: builtin/am.c:1328
+#: builtin/am.c:1327
 msgid "Patch is empty. Was it split wrong?"
 msgstr ""
 
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
 #, c-format
 msgid "invalid ident line: %s"
 msgstr ""
 
-#: builtin/am.c:1429
+#: builtin/am.c:1428
 #, c-format
 msgid "unable to parse commit %s"
 msgstr ""
 
-#: builtin/am.c:1631
+#: builtin/am.c:1630
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 
-#: builtin/am.c:1633
+#: builtin/am.c:1632
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 
-#: builtin/am.c:1652
+#: builtin/am.c:1651
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr ""
 
-#: builtin/am.c:1658
+#: builtin/am.c:1657
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 
-#: builtin/am.c:1673
+#: builtin/am.c:1672
 msgid "Failed to merge in the changes."
 msgstr ""
 
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
 msgid "git write-tree failed to write a tree"
 msgstr ""
 
-#: builtin/am.c:1704
+#: builtin/am.c:1703
 msgid "applying to an empty history"
 msgstr ""
 
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
 msgid "failed to write commit object"
 msgstr ""
 
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr ""
 
-#: builtin/am.c:1769
+#: builtin/am.c:1768
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 
-#: builtin/am.c:1774
+#: builtin/am.c:1773
 msgid "Commit Body is:"
 msgstr ""
 
@@ -2527,231 +2725,233 @@ msgstr ""
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1784
+#: builtin/am.c:1783
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 
-#: builtin/am.c:1834
+#: builtin/am.c:1833
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
 #, c-format
 msgid "Applying: %.*s"
 msgstr ""
 
-#: builtin/am.c:1885
+#: builtin/am.c:1884
 msgid "No changes -- Patch already applied."
 msgstr ""
 
-#: builtin/am.c:1893
+#: builtin/am.c:1892
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr ""
 
-#: builtin/am.c:1899
+#: builtin/am.c:1898
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr ""
 
-#: builtin/am.c:1944
+#: builtin/am.c:1943
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
 "already introduced the same changes; you might want to skip this patch."
 msgstr ""
 
-#: builtin/am.c:1951
+#: builtin/am.c:1950
 msgid ""
 "You still have unmerged paths in your index.\n"
 "Did you forget to use 'git add'?"
 msgstr ""
 
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
 #: builtin/reset.c:316
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr ""
 
-#: builtin/am.c:2111
+#: builtin/am.c:2110
 msgid "failed to clean index"
 msgstr ""
 
-#: builtin/am.c:2145
+#: builtin/am.c:2144
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr ""
 
-#: builtin/am.c:2206
+#: builtin/am.c:2205
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr ""
 
-#: builtin/am.c:2239
+#: builtin/am.c:2238
 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
 msgstr ""
 
-#: builtin/am.c:2240
+#: builtin/am.c:2239
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr ""
 
-#: builtin/am.c:2246
+#: builtin/am.c:2245
 msgid "run interactively"
 msgstr ""
 
-#: builtin/am.c:2248
+#: builtin/am.c:2247
 msgid "historical option -- no-op"
 msgstr ""
 
-#: builtin/am.c:2250
+#: builtin/am.c:2249
 msgid "allow fall back on 3way merging if needed"
 msgstr ""
 
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
 #: builtin/repack.c:171
 msgid "be quiet"
 msgstr ""
 
-#: builtin/am.c:2253
+#: builtin/am.c:2252
 msgid "add a Signed-off-by line to the commit message"
 msgstr ""
 
-#: builtin/am.c:2256
+#: builtin/am.c:2255
 msgid "recode into utf8 (default)"
 msgstr ""
 
-#: builtin/am.c:2258
+#: builtin/am.c:2257
 msgid "pass -k flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2260
+#: builtin/am.c:2259
 msgid "pass -b flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2262
+#: builtin/am.c:2261
 msgid "pass -m flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2264
+#: builtin/am.c:2263
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 
-#: builtin/am.c:2267
+#: builtin/am.c:2266
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "strip everything before a scissors line"
 msgstr ""
 
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
 msgid "action"
 msgstr ""
 
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
 msgid "pass it through git-apply"
 msgstr ""
 
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
 msgid "root"
 msgstr ""
 
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
 msgid "path"
 msgstr ""
 
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
-#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134
+#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182
 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
 #: parse-options.h:132 parse-options.h:134 parse-options.h:244
 msgid "n"
 msgstr ""
 
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
 msgid "num"
 msgstr ""
 
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
 #: builtin/tag.c:372
 msgid "format"
 msgstr ""
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "format the patch(es) are in"
 msgstr ""
 
-#: builtin/am.c:2302
+#: builtin/am.c:2301
 msgid "override error message when patch failure occurs"
 msgstr ""
 
-#: builtin/am.c:2304
+#: builtin/am.c:2303
 msgid "continue applying patches after resolving a conflict"
 msgstr ""
 
-#: builtin/am.c:2307
+#: builtin/am.c:2306
 msgid "synonyms for --continue"
 msgstr ""
 
-#: builtin/am.c:2310
+#: builtin/am.c:2309
 msgid "skip the current patch"
 msgstr ""
 
-#: builtin/am.c:2313
+#: builtin/am.c:2312
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 msgid "lie about committer date"
 msgstr ""
 
-#: builtin/am.c:2319
+#: builtin/am.c:2318
 msgid "use current timestamp for author date"
 msgstr ""
 
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
 msgid "key-id"
 msgstr ""
 
-#: builtin/am.c:2322
+#: builtin/am.c:2321
 msgid "GPG-sign commits"
 msgstr ""
 
-#: builtin/am.c:2325
+#: builtin/am.c:2324
 msgid "(internal use for git-rebase)"
 msgstr ""
 
-#: builtin/am.c:2340
+#: builtin/am.c:2339
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
 msgstr ""
 
-#: builtin/am.c:2347
+#: builtin/am.c:2346
 msgid "failed to read the index"
 msgstr ""
 
-#: builtin/am.c:2362
+#: builtin/am.c:2361
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 
-#: builtin/am.c:2386
+#: builtin/am.c:2385
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr ""
 
-#: builtin/am.c:2392
+#: builtin/am.c:2391
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 
@@ -2784,37 +2984,37 @@ msgstr ""
 msgid "unable to find filename in patch at line %d"
 msgstr ""
 
-#: builtin/apply.c:940
+#: builtin/apply.c:937
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 
-#: builtin/apply.c:944
+#: builtin/apply.c:942
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 
-#: builtin/apply.c:945
+#: builtin/apply.c:943
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 
-#: builtin/apply.c:952
+#: builtin/apply.c:949
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr ""
 
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr ""
 
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr ""
 
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -2825,396 +3025,406 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
 msgid "new file depends on old contents"
 msgstr ""
 
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
 msgid "deleted file still has contents"
 msgstr ""
 
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr ""
 
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr ""
 
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr ""
 
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr ""
 
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr ""
 
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr ""
 
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr ""
 
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
 #, c-format
 msgid "unable to read symlink %s"
 msgstr ""
 
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
 #, c-format
 msgid "unable to open or read %s"
 msgstr ""
 
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr ""
 
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
 #, c-format
 msgid ""
 "while searching for:\n"
 "%.*s"
 msgstr ""
 
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr ""
 
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr ""
 
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr ""
 
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
 #, c-format
 msgid "cannot checkout %s"
 msgstr ""
 
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
 #, c-format
 msgid "read of %s failed"
 msgstr ""
 
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr ""
 
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr ""
 
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
 #, c-format
 msgid "%s: does not exist in index"
 msgstr ""
 
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
 #, c-format
 msgid "%s: %s"
 msgstr ""
 
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
 #, c-format
 msgid "%s: does not match index"
 msgstr ""
 
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
 msgid "removal patch leaves file contents"
 msgstr ""
 
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
 #, c-format
 msgid "%s: wrong type"
 msgstr ""
 
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr ""
 
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
 #, c-format
 msgid "invalid path '%s'"
 msgstr ""
 
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
 #, c-format
 msgid "%s: already exists in index"
 msgstr ""
 
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr ""
 
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr ""
 
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr ""
 
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
 #, c-format
 msgid "%s: patch does not apply"
 msgstr ""
 
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
 #, c-format
 msgid "Checking patch %s..."
 msgstr ""
 
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr ""
 
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
 #, c-format
 msgid "unable to remove %s from index"
 msgstr ""
 
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr ""
 
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr ""
 
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr ""
 
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
 #, c-format
 msgid "closing file '%s'"
 msgstr ""
 
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr ""
 
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr ""
 
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
 msgid "internal error"
 msgstr ""
 
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr ""
 
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr ""
+
+#: builtin/apply.c:4298
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr ""
 
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr ""
 
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr ""
+
+#: builtin/apply.c:4395
 msgid "unrecognized input"
 msgstr ""
 
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
 msgid "unable to read index file"
 msgstr ""
 
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
 msgid "don't apply changes matching the given path"
 msgstr ""
 
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
 msgid "apply changes matching the given path"
 msgstr ""
 
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
 msgid "ignore additions made by the patch"
 msgstr ""
 
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
 msgid "instead of applying the patch, output a summary for the input"
 msgstr ""
 
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr ""
 
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
 msgid "make sure the patch is applicable to the current index"
 msgstr ""
 
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
 msgid "apply a patch without touching the working tree"
 msgstr ""
 
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
 msgid "attempt three-way merge if a patch does not apply"
 msgstr ""
 
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
 msgid "paths are separated with NUL character"
 msgstr ""
 
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
 msgid "ensure at least <n> lines of context match"
 msgstr ""
 
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
 msgid "apply the patch in reverse"
 msgstr ""
 
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
 msgid "don't expect at least one line of context"
 msgstr ""
 
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
 msgid "allow overlapping hunks"
 msgstr ""
 
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
 msgid "do not trust the line counts in the hunk headers"
 msgstr ""
 
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
 msgid "prepend <root> to all filenames"
 msgstr ""
 
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
 msgid "--3way outside a repository"
 msgstr ""
 
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
 msgid "--index outside a repository"
 msgstr ""
 
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
 msgid "--cached outside a repository"
 msgstr ""
 
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
 #, c-format
 msgid "can't open patch '%s'"
 msgstr ""
 
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
@@ -3280,99 +3490,99 @@ msgstr ""
 msgid "Blaming lines"
 msgstr ""
 
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
 msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 
-#: builtin/blame.c:2531
+#: builtin/blame.c:2532
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:2532
+#: builtin/blame.c:2533
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:2533
+#: builtin/blame.c:2534
 msgid "Show work cost statistics"
 msgstr ""
 
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
 msgid "Force progress reporting"
 msgstr ""
 
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
 msgid "Show output score for blame entries"
 msgstr ""
 
-#: builtin/blame.c:2536
+#: builtin/blame.c:2537
 msgid "Show original filename (Default: auto)"
 msgstr ""
 
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
 msgid "Show original linenumber (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
 msgid "Show in a format designed for machine consumption"
 msgstr ""
 
-#: builtin/blame.c:2539
+#: builtin/blame.c:2540
 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 
-#: builtin/blame.c:2540
+#: builtin/blame.c:2541
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:2541
+#: builtin/blame.c:2542
 msgid "Show raw timestamp (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:2542
+#: builtin/blame.c:2543
 msgid "Show long commit SHA1 (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:2543
+#: builtin/blame.c:2544
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:2544
+#: builtin/blame.c:2545
 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:2545
+#: builtin/blame.c:2546
 msgid "Ignore whitespace differences"
 msgstr ""
 
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
 msgid "Spend extra cycles to find better match"
 msgstr ""
 
-#: builtin/blame.c:2547
+#: builtin/blame.c:2548
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 
-#: builtin/blame.c:2548
+#: builtin/blame.c:2549
 msgid "Use <file>'s contents as the final image"
 msgstr ""
 
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
 msgid "score"
 msgstr ""
 
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
 msgid "Find line copies within and across files"
 msgstr ""
 
-#: builtin/blame.c:2550
+#: builtin/blame.c:2551
 msgid "Find line movements within and across files"
 msgstr ""
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "n,m"
 msgstr ""
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "Process only line range n,m, counting from 1"
 msgstr ""
 
@@ -3382,392 +3592,413 @@ msgstr ""
 #. takes 22 places, is the longest among various forms of
 #. relative timestamps, but your language may need more or
 #. fewer display columns.
-#: builtin/blame.c:2640
+#: builtin/blame.c:2641
 msgid "4 years, 11 months ago"
 msgstr ""
 
-#: builtin/branch.c:25
+#: builtin/branch.c:26
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr ""
 
-#: builtin/branch.c:26
+#: builtin/branch.c:27
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr ""
 
-#: builtin/branch.c:27
+#: builtin/branch.c:28
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr ""
 
-#: builtin/branch.c:28
+#: builtin/branch.c:29
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr ""
 
-#: builtin/branch.c:29
+#: builtin/branch.c:30
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr ""
 
-#: builtin/branch.c:142
+#: builtin/branch.c:143
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD."
 msgstr ""
 
-#: builtin/branch.c:146
+#: builtin/branch.c:147
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 "         '%s', even though it is merged to HEAD."
 msgstr ""
 
-#: builtin/branch.c:160
+#: builtin/branch.c:161
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr ""
 
-#: builtin/branch.c:164
+#: builtin/branch.c:165
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
 "If you are sure you want to delete it, run 'git branch -D %s'."
 msgstr ""
 
-#: builtin/branch.c:177
+#: builtin/branch.c:178
 msgid "Update of config-file failed"
 msgstr ""
 
-#: builtin/branch.c:205
+#: builtin/branch.c:206
 msgid "cannot use -a with -d"
 msgstr ""
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "Couldn't look up commit object for HEAD"
 msgstr ""
 
-#: builtin/branch.c:219
+#: builtin/branch.c:226
 #, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
+msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr ""
 
-#: builtin/branch.c:235
+#: builtin/branch.c:241
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr ""
 
-#: builtin/branch.c:236
+#: builtin/branch.c:242
 #, c-format
 msgid "branch '%s' not found."
 msgstr ""
 
-#: builtin/branch.c:251
+#: builtin/branch.c:257
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr ""
 
-#: builtin/branch.c:252
+#: builtin/branch.c:258
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr ""
 
-#: builtin/branch.c:259
+#: builtin/branch.c:265
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr ""
 
-#: builtin/branch.c:260
+#: builtin/branch.c:266
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr ""
 
-#: builtin/branch.c:303
+#: builtin/branch.c:309
 #, c-format
 msgid "[%s: gone]"
 msgstr ""
 
-#: builtin/branch.c:308
+#: builtin/branch.c:314
 #, c-format
 msgid "[%s]"
 msgstr ""
 
-#: builtin/branch.c:313
+#: builtin/branch.c:319
 #, c-format
 msgid "[%s: behind %d]"
 msgstr ""
 
-#: builtin/branch.c:315
+#: builtin/branch.c:321
 #, c-format
 msgid "[behind %d]"
 msgstr ""
 
-#: builtin/branch.c:319
+#: builtin/branch.c:325
 #, c-format
 msgid "[%s: ahead %d]"
 msgstr ""
 
-#: builtin/branch.c:321
+#: builtin/branch.c:327
 #, c-format
 msgid "[ahead %d]"
 msgstr ""
 
-#: builtin/branch.c:324
+#: builtin/branch.c:330
 #, c-format
 msgid "[%s: ahead %d, behind %d]"
 msgstr ""
 
-#: builtin/branch.c:327
+#: builtin/branch.c:333
 #, c-format
 msgid "[ahead %d, behind %d]"
 msgstr ""
 
-#: builtin/branch.c:340
+#: builtin/branch.c:346
 msgid " **** invalid ref ****"
 msgstr ""
 
-#: builtin/branch.c:366
+#: builtin/branch.c:372
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr ""
 
-#: builtin/branch.c:369
+#: builtin/branch.c:375
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr ""
 
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr ""
 
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr ""
 
-#: builtin/branch.c:382
+#: builtin/branch.c:390
 msgid "(no branch)"
 msgstr ""
 
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr ""
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr ""
+
+#: builtin/branch.c:560
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 
-#: builtin/branch.c:534
+#: builtin/branch.c:570
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr ""
 
-#: builtin/branch.c:549
+#: builtin/branch.c:587
 msgid "Branch rename failed"
 msgstr ""
 
-#: builtin/branch.c:553
+#: builtin/branch.c:591
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr ""
 
-#: builtin/branch.c:557
+#: builtin/branch.c:594
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr ""
 
-#: builtin/branch.c:564
+#: builtin/branch.c:601
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
 msgstr ""
 
-#: builtin/branch.c:615
+#: builtin/branch.c:651
 msgid "Generic options"
 msgstr ""
 
-#: builtin/branch.c:617
+#: builtin/branch.c:653
 msgid "show hash and subject, give twice for upstream branch"
 msgstr ""
 
-#: builtin/branch.c:618
+#: builtin/branch.c:654
 msgid "suppress informational messages"
 msgstr ""
 
-#: builtin/branch.c:619
+#: builtin/branch.c:655
 msgid "set up tracking mode (see git-pull(1))"
 msgstr ""
 
-#: builtin/branch.c:621
+#: builtin/branch.c:657
 msgid "change upstream info"
 msgstr ""
 
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr ""
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr ""
+
+#: builtin/branch.c:661
 msgid "use colored output"
 msgstr ""
 
-#: builtin/branch.c:626
+#: builtin/branch.c:662
 msgid "act on remote-tracking branches"
 msgstr ""
 
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
 msgid "print only branches that contain the commit"
 msgstr ""
 
-#: builtin/branch.c:632
+#: builtin/branch.c:668
 msgid "Specific git-branch actions:"
 msgstr ""
 
-#: builtin/branch.c:633
+#: builtin/branch.c:669
 msgid "list both remote-tracking and local branches"
 msgstr ""
 
-#: builtin/branch.c:635
+#: builtin/branch.c:671
 msgid "delete fully merged branch"
 msgstr ""
 
-#: builtin/branch.c:636
+#: builtin/branch.c:672
 msgid "delete branch (even if not merged)"
 msgstr ""
 
-#: builtin/branch.c:637
+#: builtin/branch.c:673
 msgid "move/rename a branch and its reflog"
 msgstr ""
 
-#: builtin/branch.c:638
+#: builtin/branch.c:674
 msgid "move/rename a branch, even if target exists"
 msgstr ""
 
-#: builtin/branch.c:639
+#: builtin/branch.c:675
 msgid "list branch names"
 msgstr ""
 
-#: builtin/branch.c:640
+#: builtin/branch.c:676
 msgid "create the branch's reflog"
 msgstr ""
 
-#: builtin/branch.c:642
+#: builtin/branch.c:678
 msgid "edit the description for the branch"
 msgstr ""
 
-#: builtin/branch.c:643
+#: builtin/branch.c:679
 msgid "force creation, move/rename, deletion"
 msgstr ""
 
-#: builtin/branch.c:644
+#: builtin/branch.c:680
 msgid "print only branches that are merged"
 msgstr ""
 
-#: builtin/branch.c:645
+#: builtin/branch.c:681
 msgid "print only branches that are not merged"
 msgstr ""
 
-#: builtin/branch.c:646
+#: builtin/branch.c:682
 msgid "list branches in columns"
 msgstr ""
 
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
 msgid "key"
 msgstr ""
 
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
 msgid "field name to sort on"
 msgstr ""
 
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
 #: builtin/tag.c:369
 msgid "object"
 msgstr ""
 
-#: builtin/branch.c:651
+#: builtin/branch.c:687
 msgid "print only branches of the object"
 msgstr ""
 
-#: builtin/branch.c:669
+#: builtin/branch.c:705
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr ""
 
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
 msgid "HEAD not found below refs/heads!"
 msgstr ""
 
-#: builtin/branch.c:693
+#: builtin/branch.c:729
 msgid "--column and --verbose are incompatible"
 msgstr ""
 
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
 msgid "branch name required"
 msgstr ""
 
-#: builtin/branch.c:722
+#: builtin/branch.c:758
 msgid "Cannot give description to detached HEAD"
 msgstr ""
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 msgid "cannot edit description of more than one branch"
 msgstr ""
 
-#: builtin/branch.c:734
+#: builtin/branch.c:770
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr ""
 
-#: builtin/branch.c:737
+#: builtin/branch.c:773
 #, c-format
 msgid "No branch named '%s'."
 msgstr ""
 
-#: builtin/branch.c:752
+#: builtin/branch.c:788
 msgid "too many branches for a rename operation"
 msgstr ""
 
-#: builtin/branch.c:757
+#: builtin/branch.c:793
 msgid "too many branches to set new upstream"
 msgstr ""
 
-#: builtin/branch.c:761
+#: builtin/branch.c:797
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
 
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
 #, c-format
 msgid "no such branch '%s'"
 msgstr ""
 
-#: builtin/branch.c:768
+#: builtin/branch.c:804
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr ""
 
-#: builtin/branch.c:780
+#: builtin/branch.c:816
 msgid "too many branches to unset upstream"
 msgstr ""
 
-#: builtin/branch.c:784
+#: builtin/branch.c:820
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 
-#: builtin/branch.c:790
+#: builtin/branch.c:826
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr ""
 
-#: builtin/branch.c:804
+#: builtin/branch.c:840
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr ""
 
-#: builtin/branch.c:810
+#: builtin/branch.c:846
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 
-#: builtin/branch.c:813
+#: builtin/branch.c:849
 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using --"
 "track or --set-upstream-to\n"
 msgstr ""
 
-#: builtin/branch.c:830
+#: builtin/branch.c:866
 #, c-format
 msgid ""
 "\n"
@@ -3775,16 +4006,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: builtin/branch.c:831
-#, c-format
-msgid "    git branch -d %s\n"
-msgstr ""
-
-#: builtin/branch.c:832
-#, c-format
-msgid "    git branch --set-upstream-to %s\n"
-msgstr ""
-
 #: builtin/bundle.c:51
 #, c-format
 msgid "%s is okay\n"
@@ -3880,7 +4101,7 @@ msgstr ""
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 
-#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
 msgid "suppress progress reporting"
 msgstr ""
 
@@ -3970,8 +4191,9 @@ msgid "write the content to temporary files"
 msgstr ""
 
 #: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
 msgid "string"
 msgstr ""
 
@@ -4021,79 +4243,79 @@ msgstr ""
 msgid "Unable to add merge result for '%s'"
 msgstr ""
 
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr ""
 
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr ""
 
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 
-#: builtin/checkout.c:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
 msgid "corrupt index file"
 msgstr ""
 
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr ""
 
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
 msgid "you need to resolve your current index first"
 msgstr ""
 
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr ""
 
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
 msgid "HEAD is now at"
 msgstr ""
 
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
 msgid "unable to update HEAD"
 msgstr ""
 
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -4108,7 +4330,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4125,162 +4347,162 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
 msgid "internal error in revision walk"
 msgstr ""
 
-#: builtin/checkout.c:797
+#: builtin/checkout.c:796
 msgid "Previous HEAD position was"
 msgstr ""
 
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
 msgid "You are on a branch yet to be born"
 msgstr ""
 
-#: builtin/checkout.c:969
+#: builtin/checkout.c:968
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr ""
 
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
 #, c-format
 msgid "invalid reference: %s"
 msgstr ""
 
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1076
 msgid "paths cannot be used with switching branches"
 msgstr ""
 
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr ""
 
-#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
 msgid "branch"
 msgstr ""
 
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
 msgid "create and checkout a new branch"
 msgstr ""
 
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
 msgid "create/reset and checkout a branch"
 msgstr ""
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
 msgid "create reflog for new branch"
 msgstr ""
 
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
 msgid "detach the HEAD at named commit"
 msgstr ""
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
 msgid "set upstream info for new branch"
 msgstr ""
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new-branch"
 msgstr ""
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new unparented branch"
 msgstr ""
 
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
 msgid "checkout our version for unmerged files"
 msgstr ""
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
 msgid "checkout their version for unmerged files"
 msgstr ""
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
 msgid "force checkout (throw away local modifications)"
 msgstr ""
 
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1150
 msgid "perform a 3-way merge with the new branch"
 msgstr ""
 
-#: builtin/checkout.c:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
 msgid "update ignored files (default)"
 msgstr ""
 
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
 msgid "style"
 msgstr ""
 
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
 msgid "conflict style (merge or diff3)"
 msgstr ""
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr ""
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 
-#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
 #: builtin/send-pack.c:168
 msgid "force progress reporting"
 msgstr ""
 
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr ""
 
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1209
 msgid "--track needs a branch name"
 msgstr ""
 
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
 msgid "Missing branch name; try -b"
 msgstr ""
 
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
 msgid "invalid path specification"
 msgstr ""
 
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
 #, c-format
 msgid ""
 "Cannot update paths and switch to branch '%s' at the same time.\n"
 "Did you intend to checkout '%s' which can not be resolved as commit?"
 msgstr ""
 
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1266
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -4410,8 +4632,8 @@ msgstr ""
 msgid "remove whole directories"
 msgstr ""
 
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
 msgid "pattern"
 msgstr ""
 
@@ -4447,286 +4669,290 @@ msgstr ""
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr ""
 
-#: builtin/clone.c:60
+#: builtin/clone.c:62
 msgid "don't create a checkout"
 msgstr ""
 
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
 msgid "create a bare repository"
 msgstr ""
 
-#: builtin/clone.c:65
+#: builtin/clone.c:67
 msgid "create a mirror repository (implies bare)"
 msgstr ""
 
-#: builtin/clone.c:67
+#: builtin/clone.c:69
 msgid "to clone from a local repository"
 msgstr ""
 
-#: builtin/clone.c:69
+#: builtin/clone.c:71
 msgid "don't use local hardlinks, always copy"
 msgstr ""
 
-#: builtin/clone.c:71
+#: builtin/clone.c:73
 msgid "setup as shared repository"
 msgstr ""
 
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
 msgid "initialize submodules in the clone"
 msgstr ""
 
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr ""
+
+#: builtin/clone.c:80 builtin/init-db.c:470
 msgid "template-directory"
 msgstr ""
 
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
 msgid "directory from which templates will be used"
 msgstr ""
 
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
 msgid "reference repository"
 msgstr ""
 
-#: builtin/clone.c:81
+#: builtin/clone.c:85
 msgid "use --reference only while cloning"
 msgstr ""
 
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
 msgid "name"
 msgstr ""
 
-#: builtin/clone.c:83
+#: builtin/clone.c:87
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr ""
 
-#: builtin/clone.c:85
+#: builtin/clone.c:89
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr ""
 
-#: builtin/clone.c:87
+#: builtin/clone.c:91
 msgid "path to git-upload-pack on the remote"
 msgstr ""
 
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
-#: builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667
+#: builtin/pull.c:201
 msgid "depth"
 msgstr ""
 
-#: builtin/clone.c:89
+#: builtin/clone.c:93
 msgid "create a shallow clone of that depth"
 msgstr ""
 
-#: builtin/clone.c:91
+#: builtin/clone.c:95
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr ""
+
+#: builtin/clone.c:98 builtin/init-db.c:479
 msgid "gitdir"
 msgstr ""
 
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
 msgid "separate git dir from working tree"
 msgstr ""
 
-#: builtin/clone.c:94
+#: builtin/clone.c:100
 msgid "key=value"
 msgstr ""
 
-#: builtin/clone.c:95
+#: builtin/clone.c:101
 msgid "set config inside the new repository"
 msgstr ""
 
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
 msgid "use IPv4 addresses only"
 msgstr ""
 
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
 msgid "use IPv6 addresses only"
 msgstr ""
 
-#: builtin/clone.c:239
+#: builtin/clone.c:241
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
 msgstr ""
 
-#: builtin/clone.c:305
+#: builtin/clone.c:307
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 
-#: builtin/clone.c:307
+#: builtin/clone.c:309
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr ""
 
-#: builtin/clone.c:312
+#: builtin/clone.c:314
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 
-#: builtin/clone.c:315
+#: builtin/clone.c:317
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""
 
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr ""
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr ""
 
-#: builtin/clone.c:396
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to stat %s\n"
 msgstr ""
 
-#: builtin/clone.c:418
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to create link '%s'"
 msgstr ""
 
-#: builtin/clone.c:422
+#: builtin/clone.c:424
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr ""
 
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
 #, c-format
 msgid "done.\n"
 msgstr ""
 
-#: builtin/clone.c:459
+#: builtin/clone.c:461
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
 "and retry the checkout with 'git checkout -f HEAD'\n"
 msgstr ""
 
-#: builtin/clone.c:536
+#: builtin/clone.c:538
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 
-#: builtin/clone.c:626
+#: builtin/clone.c:628
 #, c-format
 msgid "Checking connectivity... "
 msgstr ""
 
-#: builtin/clone.c:629
+#: builtin/clone.c:631
 msgid "remote did not send all necessary objects"
 msgstr ""
 
-#: builtin/clone.c:647
+#: builtin/clone.c:649
 #, c-format
 msgid "unable to update %s"
 msgstr ""
 
-#: builtin/clone.c:696
+#: builtin/clone.c:698
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 
-#: builtin/clone.c:727
+#: builtin/clone.c:729
 msgid "unable to checkout working tree"
 msgstr ""
 
-#: builtin/clone.c:753
+#: builtin/clone.c:767
 msgid "unable to write parameters to config file"
 msgstr ""
 
-#: builtin/clone.c:816
+#: builtin/clone.c:830
 msgid "cannot repack to clean up"
 msgstr ""
 
-#: builtin/clone.c:818
+#: builtin/clone.c:832
 msgid "cannot unlink temporary alternates file"
 msgstr ""
 
-#: builtin/clone.c:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
 msgid "Too many arguments."
 msgstr ""
 
-#: builtin/clone.c:854
+#: builtin/clone.c:868
 msgid "You must specify a repository to clone."
 msgstr ""
 
-#: builtin/clone.c:865
+#: builtin/clone.c:879
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr ""
 
-#: builtin/clone.c:868
+#: builtin/clone.c:882
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr ""
 
-#: builtin/clone.c:881
+#: builtin/clone.c:895
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr ""
 
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr ""
 
-#: builtin/clone.c:897
+#: builtin/clone.c:911
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 
-#: builtin/clone.c:907
+#: builtin/clone.c:921
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr ""
 
-#: builtin/clone.c:925
+#: builtin/clone.c:939
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr ""
 
-#: builtin/clone.c:943
+#: builtin/clone.c:957
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 
-#: builtin/clone.c:945
+#: builtin/clone.c:959
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 
-#: builtin/clone.c:984
+#: builtin/clone.c:998
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1001
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
 msgid "--local is ignored"
 msgstr ""
 
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr ""
 
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr ""
 
-#: builtin/clone.c:1056
+#: builtin/clone.c:1070
 msgid "You appear to have cloned an empty repository."
 msgstr ""
 
@@ -4829,103 +5055,103 @@ msgid ""
 "the remaining commits.\n"
 msgstr ""
 
-#: builtin/commit.c:305
+#: builtin/commit.c:307
 msgid "failed to unpack HEAD tree object"
 msgstr ""
 
-#: builtin/commit.c:346
+#: builtin/commit.c:348
 msgid "unable to create temporary index"
 msgstr ""
 
-#: builtin/commit.c:352
+#: builtin/commit.c:354
 msgid "interactive add failed"
 msgstr ""
 
-#: builtin/commit.c:365
+#: builtin/commit.c:367
 msgid "unable to update temporary index"
 msgstr ""
 
-#: builtin/commit.c:367
+#: builtin/commit.c:369
 msgid "Failed to update main cache tree"
 msgstr ""
 
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
 msgid "unable to write new_index file"
 msgstr ""
 
-#: builtin/commit.c:445
+#: builtin/commit.c:447
 msgid "cannot do a partial commit during a merge."
 msgstr ""
 
-#: builtin/commit.c:447
+#: builtin/commit.c:449
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 
-#: builtin/commit.c:456
+#: builtin/commit.c:458
 msgid "cannot read the index"
 msgstr ""
 
-#: builtin/commit.c:475
+#: builtin/commit.c:477
 msgid "unable to write temporary index file"
 msgstr ""
 
-#: builtin/commit.c:580
+#: builtin/commit.c:582
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr ""
 
-#: builtin/commit.c:582
+#: builtin/commit.c:584
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr ""
 
-#: builtin/commit.c:601
+#: builtin/commit.c:603
 msgid "malformed --author parameter"
 msgstr ""
 
-#: builtin/commit.c:609
+#: builtin/commit.c:611
 #, c-format
 msgid "invalid date format: %s"
 msgstr ""
 
-#: builtin/commit.c:653
+#: builtin/commit.c:655
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr ""
 
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
 #, c-format
 msgid "could not lookup commit %s"
 msgstr ""
 
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr ""
 
-#: builtin/commit.c:704
+#: builtin/commit.c:706
 msgid "could not read log from standard input"
 msgstr ""
 
-#: builtin/commit.c:708
+#: builtin/commit.c:710
 #, c-format
 msgid "could not read log file '%s'"
 msgstr ""
 
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
+#: builtin/commit.c:737 builtin/commit.c:745
+msgid "could not read SQUASH_MSG"
 msgstr ""
 
-#: builtin/commit.c:734
-msgid "could not read SQUASH_MSG"
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
 msgstr ""
 
-#: builtin/commit.c:785
+#: builtin/commit.c:796
 msgid "could not write commit template"
 msgstr ""
 
-#: builtin/commit.c:803
+#: builtin/commit.c:814
 #, c-format
 msgid ""
 "\n"
@@ -4935,7 +5161,7 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
-#: builtin/commit.c:808
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -4945,14 +5171,14 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
-#: builtin/commit.c:821
+#: builtin/commit.c:832
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
 "with '%c' will be ignored, and an empty message aborts the commit.\n"
 msgstr ""
 
-#: builtin/commit.c:828
+#: builtin/commit.c:839
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -4960,341 +5186,341 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr ""
 
-#: builtin/commit.c:848
+#: builtin/commit.c:859
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr ""
 
-#: builtin/commit.c:856
+#: builtin/commit.c:867
 #, c-format
 msgid "%sDate:      %s"
 msgstr ""
 
-#: builtin/commit.c:863
+#: builtin/commit.c:874
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr ""
 
-#: builtin/commit.c:881
+#: builtin/commit.c:892
 msgid "Cannot read index"
 msgstr ""
 
-#: builtin/commit.c:938
+#: builtin/commit.c:949
 msgid "Error building trees"
 msgstr ""
 
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
 
-#: builtin/commit.c:1055
+#: builtin/commit.c:1066
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
 msgid "--long and -z are incompatible"
 msgstr ""
 
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
 msgid "Using both --reset-author and --author does not make sense"
 msgstr ""
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1157
 msgid "You have nothing to amend."
 msgstr ""
 
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr ""
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1162
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr ""
 
-#: builtin/commit.c:1154
+#: builtin/commit.c:1165
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr ""
 
-#: builtin/commit.c:1166
+#: builtin/commit.c:1177
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr ""
 
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 
-#: builtin/commit.c:1191
+#: builtin/commit.c:1202
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 
-#: builtin/commit.c:1193
+#: builtin/commit.c:1204
 msgid "No paths with --include/--only does not make sense."
 msgstr ""
 
-#: builtin/commit.c:1195
+#: builtin/commit.c:1206
 msgid "Clever... amending the last one with dirty index."
 msgstr ""
 
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
 msgstr ""
 
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
 msgid "Paths with -a does not make sense."
 msgstr ""
 
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
 msgid "show status concisely"
 msgstr ""
 
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
 msgid "show branch information"
 msgstr ""
 
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
 msgid "machine-readable output"
 msgstr ""
 
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
 msgid "show status in long format (default)"
 msgstr ""
 
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
 msgid "terminate entries with NUL"
 msgstr ""
 
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
 #: builtin/fast-export.c:984 builtin/tag.c:353
 msgid "mode"
 msgstr ""
 
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 
-#: builtin/commit.c:1340
+#: builtin/commit.c:1351
 msgid "show ignored files"
 msgstr ""
 
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
 msgid "when"
 msgstr ""
 
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
 msgid "list untracked files in columns"
 msgstr ""
 
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
 msgid "couldn't look up newly created commit"
 msgstr ""
 
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
 msgid "could not parse newly created commit"
 msgstr ""
 
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
 msgid "detached HEAD"
 msgstr ""
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
 msgid " (root-commit)"
 msgstr ""
 
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
 msgid "suppress summary after successful commit"
 msgstr ""
 
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
 msgid "show diff in commit message template"
 msgstr ""
 
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
 msgid "Commit message options"
 msgstr ""
 
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
 msgid "read message from file"
 msgstr ""
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "author"
 msgstr ""
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "override author for commit"
 msgstr ""
 
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
 msgid "date"
 msgstr ""
 
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
 msgid "override date for commit"
 msgstr ""
 
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
 #: builtin/notes.c:558 builtin/tag.c:349
 msgid "message"
 msgstr ""
 
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
 msgid "commit message"
 msgstr ""
 
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
 msgid "commit"
 msgstr ""
 
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
 msgid "reuse and edit message from specified commit"
 msgstr ""
 
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
 msgid "reuse message from specified commit"
 msgstr ""
 
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1603
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 
-#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
 msgid "add Signed-off-by:"
 msgstr ""
 
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
 msgid "use specified template file"
 msgstr ""
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
 msgid "force edit of commit"
 msgstr ""
 
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
 msgid "default"
 msgstr ""
 
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
 msgid "include status in commit message template"
 msgstr ""
 
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
 #: builtin/revert.c:93
 msgid "GPG sign commit"
 msgstr ""
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
 msgid "Commit contents options"
 msgstr ""
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
 msgid "commit all changed files"
 msgstr ""
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
 msgid "add specified files to index for commit"
 msgstr ""
 
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
 msgid "interactively add files"
 msgstr ""
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
 msgid "interactively add changes"
 msgstr ""
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
 msgid "commit only specified files"
 msgstr ""
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
 msgid "bypass pre-commit hook"
 msgstr ""
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
 msgid "show what would be committed"
 msgstr ""
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
 msgid "amend previous commit"
 msgstr ""
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
 msgid "bypass post-rewrite hook"
 msgstr ""
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
 msgid "ok to record an empty change"
 msgstr ""
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
 msgid "ok to record a change with an empty message"
 msgstr ""
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
 msgid "could not parse HEAD commit"
 msgstr ""
 
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
 msgid "could not read MERGE_MODE"
 msgstr ""
 
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
 #, c-format
 msgid "could not read commit message: %s"
 msgstr ""
 
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr ""
 
-#: builtin/commit.c:1740
+#: builtin/commit.c:1760
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr ""
 
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -5437,7 +5663,7 @@ msgstr ""
 msgid "unable to parse default color value"
 msgstr ""
 
-#: builtin/config.c:469
+#: builtin/config.c:472
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -5447,7 +5673,7 @@ msgid ""
 "#\temail = %s\n"
 msgstr ""
 
-#: builtin/config.c:611
+#: builtin/config.c:614
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr ""
@@ -5483,7 +5709,7 @@ msgstr ""
 msgid "tag '%s' is really '%s' here"
 msgstr ""
 
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
 #, c-format
 msgid "Not a valid object name %s"
 msgstr ""
@@ -5570,7 +5796,7 @@ msgstr ""
 msgid "only consider tags matching <pattern>"
 msgstr ""
 
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
 msgid "show abbreviated commit object as fallback"
 msgstr ""
 
@@ -5604,21 +5830,21 @@ msgstr ""
 msgid "invalid option: %s"
 msgstr ""
 
-#: builtin/diff.c:358
+#: builtin/diff.c:360
 msgid "Not a git repository"
 msgstr ""
 
-#: builtin/diff.c:401
+#: builtin/diff.c:403
 #, c-format
 msgid "invalid object '%s' given."
 msgstr ""
 
-#: builtin/diff.c:410
+#: builtin/diff.c:412
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr ""
 
-#: builtin/diff.c:417
+#: builtin/diff.c:419
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr ""
@@ -5691,19 +5917,19 @@ msgstr ""
 msgid "git fetch --all [<options>]"
 msgstr ""
 
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
 msgid "fetch from all remotes"
 msgstr ""
 
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ""
 
-#: builtin/fetch.c:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
 msgid "path to upload pack on remote end"
 msgstr ""
 
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
 msgid "force overwrite of local branch"
 msgstr ""
 
@@ -5711,7 +5937,7 @@ msgstr ""
 msgid "fetch from multiple remotes"
 msgstr ""
 
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
 msgid "fetch all tags and associated objects"
 msgstr ""
 
@@ -5723,19 +5949,19 @@ msgstr ""
 msgid "number of submodules fetched in parallel"
 msgstr ""
 
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 
-#: builtin/fetch.c:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
 msgid "on-demand"
 msgstr ""
 
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
 msgid "control recursive fetching of submodules"
 msgstr ""
 
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
 msgid "keep downloaded pack"
 msgstr ""
 
@@ -5743,15 +5969,15 @@ msgstr ""
 msgid "allow updating of HEAD ref"
 msgstr ""
 
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
 msgid "deepen history of shallow clone"
 msgstr ""
 
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
 msgid "convert to a complete repository"
 msgstr ""
 
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
 msgid "dir"
 msgstr ""
 
@@ -5763,15 +5989,15 @@ msgstr ""
 msgid "default mode for recursion"
 msgstr ""
 
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
 msgid "accept refs that update .git/shallow"
 msgstr ""
 
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
 msgid "refmap"
 msgstr ""
 
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
 msgid "specify fetch refmap"
 msgstr ""
 
@@ -5829,11 +6055,6 @@ msgstr ""
 msgid "(non-fast-forward)"
 msgstr ""
 
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr ""
-
 #: builtin/fetch.c:619
 #, c-format
 msgid "%s did not send all necessary objects\n"
@@ -6028,55 +6249,55 @@ msgstr ""
 msgid "Checking object directories"
 msgstr ""
 
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
 msgid "git fsck [<options>] [<object>...]"
 msgstr ""
 
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
 msgid "show unreachable objects"
 msgstr ""
 
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
 msgid "show dangling objects"
 msgstr ""
 
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
 msgid "report tags"
 msgstr ""
 
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
 msgid "report root nodes"
 msgstr ""
 
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
 msgid "make index objects head nodes"
 msgstr ""
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
 msgid "make reflogs head nodes (default)"
 msgstr ""
 
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
 msgid "also consider packs and alternate objects"
 msgstr ""
 
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
 msgid "check only connectivity"
 msgstr ""
 
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
 msgid "enable more strict checking"
 msgstr ""
 
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
 msgid "show progress"
 msgstr ""
 
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
 msgid "Checking objects"
 msgstr ""
 
@@ -6170,214 +6391,214 @@ msgstr ""
 msgid "unable to grep from object of type %s"
 msgstr ""
 
-#: builtin/grep.c:558
+#: builtin/grep.c:560
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr ""
 
-#: builtin/grep.c:575
+#: builtin/grep.c:577
 #, c-format
 msgid "cannot open '%s'"
 msgstr ""
 
-#: builtin/grep.c:644
+#: builtin/grep.c:646
 msgid "search in index instead of in the work tree"
 msgstr ""
 
-#: builtin/grep.c:646
+#: builtin/grep.c:648
 msgid "find in contents not managed by git"
 msgstr ""
 
-#: builtin/grep.c:648
+#: builtin/grep.c:650
 msgid "search in both tracked and untracked files"
 msgstr ""
 
-#: builtin/grep.c:650
+#: builtin/grep.c:652
 msgid "ignore files specified via '.gitignore'"
 msgstr ""
 
-#: builtin/grep.c:653
+#: builtin/grep.c:655
 msgid "show non-matching lines"
 msgstr ""
 
-#: builtin/grep.c:655
+#: builtin/grep.c:657
 msgid "case insensitive matching"
 msgstr ""
 
-#: builtin/grep.c:657
+#: builtin/grep.c:659
 msgid "match patterns only at word boundaries"
 msgstr ""
 
-#: builtin/grep.c:659
+#: builtin/grep.c:661
 msgid "process binary files as text"
 msgstr ""
 
-#: builtin/grep.c:661
+#: builtin/grep.c:663
 msgid "don't match patterns in binary files"
 msgstr ""
 
-#: builtin/grep.c:664
+#: builtin/grep.c:666
 msgid "process binary files with textconv filters"
 msgstr ""
 
-#: builtin/grep.c:666
+#: builtin/grep.c:668
 msgid "descend at most <depth> levels"
 msgstr ""
 
-#: builtin/grep.c:670
+#: builtin/grep.c:672
 msgid "use extended POSIX regular expressions"
 msgstr ""
 
-#: builtin/grep.c:673
+#: builtin/grep.c:675
 msgid "use basic POSIX regular expressions (default)"
 msgstr ""
 
-#: builtin/grep.c:676
+#: builtin/grep.c:678
 msgid "interpret patterns as fixed strings"
 msgstr ""
 
-#: builtin/grep.c:679
+#: builtin/grep.c:681
 msgid "use Perl-compatible regular expressions"
 msgstr ""
 
-#: builtin/grep.c:682
+#: builtin/grep.c:684
 msgid "show line numbers"
 msgstr ""
 
-#: builtin/grep.c:683
+#: builtin/grep.c:685
 msgid "don't show filenames"
 msgstr ""
 
-#: builtin/grep.c:684
+#: builtin/grep.c:686
 msgid "show filenames"
 msgstr ""
 
-#: builtin/grep.c:686
+#: builtin/grep.c:688
 msgid "show filenames relative to top directory"
 msgstr ""
 
-#: builtin/grep.c:688
+#: builtin/grep.c:690
 msgid "show only filenames instead of matching lines"
 msgstr ""
 
-#: builtin/grep.c:690
+#: builtin/grep.c:692
 msgid "synonym for --files-with-matches"
 msgstr ""
 
-#: builtin/grep.c:693
+#: builtin/grep.c:695
 msgid "show only the names of files without match"
 msgstr ""
 
-#: builtin/grep.c:695
+#: builtin/grep.c:697
 msgid "print NUL after filenames"
 msgstr ""
 
-#: builtin/grep.c:697
+#: builtin/grep.c:699
 msgid "show the number of matches instead of matching lines"
 msgstr ""
 
-#: builtin/grep.c:698
+#: builtin/grep.c:700
 msgid "highlight matches"
 msgstr ""
 
-#: builtin/grep.c:700
+#: builtin/grep.c:702
 msgid "print empty line between matches from different files"
 msgstr ""
 
-#: builtin/grep.c:702
+#: builtin/grep.c:704
 msgid "show filename only once above matches from same file"
 msgstr ""
 
-#: builtin/grep.c:705
+#: builtin/grep.c:707
 msgid "show <n> context lines before and after matches"
 msgstr ""
 
-#: builtin/grep.c:708
+#: builtin/grep.c:710
 msgid "show <n> context lines before matches"
 msgstr ""
 
-#: builtin/grep.c:710
+#: builtin/grep.c:712
 msgid "show <n> context lines after matches"
 msgstr ""
 
-#: builtin/grep.c:712
+#: builtin/grep.c:714
 msgid "use <n> worker threads"
 msgstr ""
 
-#: builtin/grep.c:713
+#: builtin/grep.c:715
 msgid "shortcut for -C NUM"
 msgstr ""
 
-#: builtin/grep.c:716
+#: builtin/grep.c:718
 msgid "show a line with the function name before matches"
 msgstr ""
 
-#: builtin/grep.c:718
+#: builtin/grep.c:720
 msgid "show the surrounding function"
 msgstr ""
 
-#: builtin/grep.c:721
+#: builtin/grep.c:723
 msgid "read patterns from file"
 msgstr ""
 
-#: builtin/grep.c:723
+#: builtin/grep.c:725
 msgid "match <pattern>"
 msgstr ""
 
-#: builtin/grep.c:725
+#: builtin/grep.c:727
 msgid "combine patterns specified with -e"
 msgstr ""
 
-#: builtin/grep.c:737
+#: builtin/grep.c:739
 msgid "indicate hit with exit status without output"
 msgstr ""
 
-#: builtin/grep.c:739
+#: builtin/grep.c:741
 msgid "show only matches from files that match all patterns"
 msgstr ""
 
-#: builtin/grep.c:741
+#: builtin/grep.c:743
 msgid "show parse tree for grep expression"
 msgstr ""
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "pager"
 msgstr ""
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "show matching files in the pager"
 msgstr ""
 
-#: builtin/grep.c:748
+#: builtin/grep.c:750
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr ""
 
-#: builtin/grep.c:811
+#: builtin/grep.c:813
 msgid "no pattern given."
 msgstr ""
 
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""
 
-#: builtin/grep.c:873
+#: builtin/grep.c:875
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 
-#: builtin/grep.c:899
+#: builtin/grep.c:901
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr ""
 
-#: builtin/grep.c:904
+#: builtin/grep.c:906
 msgid "--no-index or --untracked cannot be used with revs."
 msgstr ""
 
-#: builtin/grep.c:907
+#: builtin/grep.c:909
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr ""
 
-#: builtin/grep.c:915
+#: builtin/grep.c:917
 msgid "both --cached and trees are given."
 msgstr ""
 
@@ -6464,7 +6685,7 @@ msgstr ""
 
 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
 #, c-format
-msgid "failed to exec '%s': %s"
+msgid "failed to exec '%s'"
 msgstr ""
 
 #: builtin/help.c:205
@@ -6719,107 +6940,109 @@ msgstr ""
 
 #: builtin/index-pack.c:1253
 #, c-format
-msgid "completed with %d local objects"
-msgstr ""
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] ""
+msgstr[1] ""
 
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1265
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1293
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr ""
 
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
 #, c-format
 msgid "local object %s is corrupt"
 msgstr ""
 
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
 msgid "error while closing pack file"
 msgstr ""
 
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
 msgid "cannot store pack file"
 msgstr ""
 
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
 msgid "cannot store index file"
 msgstr ""
 
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1587
+#: builtin/index-pack.c:1589
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1594
+#: builtin/index-pack.c:1596
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1624
+#: builtin/index-pack.c:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr ""
+
+#: builtin/index-pack.c:1638
 msgid "Cannot come back to cwd"
 msgstr ""
 
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
 #, c-format
 msgid "bad %s"
 msgstr ""
 
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
 msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr ""
-
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1731
 msgid "--verify with no packfile name given"
 msgstr ""
 
@@ -6858,27 +7081,27 @@ msgstr ""
 msgid "ignoring template %s"
 msgstr ""
 
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
 #, c-format
 msgid "templates not found %s"
 msgstr ""
 
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
 #, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
+msgid "not copying templates from '%s': %s"
 msgstr ""
 
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
 #, c-format
 msgid "%s already exists"
 msgstr ""
 
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
 #, c-format
 msgid "unable to handle file type %d"
 msgstr ""
 
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
 #, c-format
 msgid "unable to move %s to %s"
 msgstr ""
@@ -6886,55 +7109,55 @@ msgstr ""
 #. TRANSLATORS: The first '%s' is either "Reinitialized
 #. existing" or "Initialized empty", the second " shared" or
 #. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
 #, c-format
 msgid "%s%s Git repository in %s%s\n"
 msgstr ""
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Reinitialized existing"
 msgstr ""
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Initialized empty"
 msgstr ""
 
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
 msgid " shared"
 msgstr ""
 
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
 msgstr ""
 
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
 msgid "permissions"
 msgstr ""
 
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
 #, c-format
 msgid "cannot mkdir %s"
 msgstr ""
 
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
 #, c-format
 msgid "cannot chdir to %s"
 msgstr ""
 
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr ""
 
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr ""
@@ -6978,273 +7201,316 @@ msgstr ""
 msgid "invalid --decorate option: %s"
 msgstr ""
 
-#: builtin/log.c:131
+#: builtin/log.c:137
 msgid "suppress diff output"
 msgstr ""
 
-#: builtin/log.c:132
+#: builtin/log.c:138
 msgid "show source"
 msgstr ""
 
-#: builtin/log.c:133
+#: builtin/log.c:139
 msgid "Use mail map file"
 msgstr ""
 
-#: builtin/log.c:134
+#: builtin/log.c:140
 msgid "decorate options"
 msgstr ""
 
-#: builtin/log.c:137
+#: builtin/log.c:143
 msgid "Process line range n,m in file, counting from 1"
 msgstr ""
 
-#: builtin/log.c:233
+#: builtin/log.c:239
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr ""
 
-#: builtin/log.c:465
+#: builtin/log.c:471
 #, c-format
 msgid "git show %s: bad file"
 msgstr ""
 
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
 #, c-format
 msgid "Could not read object %s"
 msgstr ""
 
-#: builtin/log.c:596
+#: builtin/log.c:602
 #, c-format
 msgid "Unknown type: %d"
 msgstr ""
 
-#: builtin/log.c:715
+#: builtin/log.c:722
 msgid "format.headers without value"
 msgstr ""
 
-#: builtin/log.c:801
+#: builtin/log.c:812
 msgid "name of output directory is too long"
 msgstr ""
 
-#: builtin/log.c:816
+#: builtin/log.c:827
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr ""
 
-#: builtin/log.c:830
+#: builtin/log.c:841
 msgid "Need exactly one range."
 msgstr ""
 
-#: builtin/log.c:840
+#: builtin/log.c:851
 msgid "Not a range."
 msgstr ""
 
-#: builtin/log.c:946
+#: builtin/log.c:957
 msgid "Cover letter needs email format"
 msgstr ""
 
-#: builtin/log.c:1025
+#: builtin/log.c:1036
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr ""
 
-#: builtin/log.c:1053
+#: builtin/log.c:1064
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr ""
 
-#: builtin/log.c:1098
+#: builtin/log.c:1109
 msgid "Two output directories?"
 msgstr ""
 
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr ""
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr ""
+
+#: builtin/log.c:1235
+msgid ""
+"Failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually."
+msgstr ""
+
+#: builtin/log.c:1255
+msgid "Failed to find exact merge base"
+msgstr ""
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr ""
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr ""
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr ""
+
+#: builtin/log.c:1377
 msgid "use [PATCH n/m] even with a single patch"
 msgstr ""
 
-#: builtin/log.c:1217
+#: builtin/log.c:1380
 msgid "use [PATCH] even with multiple patches"
 msgstr ""
 
-#: builtin/log.c:1221
+#: builtin/log.c:1384
 msgid "print patches to standard out"
 msgstr ""
 
-#: builtin/log.c:1223
+#: builtin/log.c:1386
 msgid "generate a cover letter"
 msgstr ""
 
-#: builtin/log.c:1225
+#: builtin/log.c:1388
 msgid "use simple number sequence for output file names"
 msgstr ""
 
-#: builtin/log.c:1226
+#: builtin/log.c:1389
 msgid "sfx"
 msgstr ""
 
-#: builtin/log.c:1227
+#: builtin/log.c:1390
 msgid "use <sfx> instead of '.patch'"
 msgstr ""
 
-#: builtin/log.c:1229
+#: builtin/log.c:1392
 msgid "start numbering patches at <n> instead of 1"
 msgstr ""
 
-#: builtin/log.c:1231
+#: builtin/log.c:1394
 msgid "mark the series as Nth re-roll"
 msgstr ""
 
-#: builtin/log.c:1233
+#: builtin/log.c:1396
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1236
+#: builtin/log.c:1399
 msgid "store resulting files in <dir>"
 msgstr ""
 
-#: builtin/log.c:1239
+#: builtin/log.c:1402
 msgid "don't strip/add [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1242
+#: builtin/log.c:1405
 msgid "don't output binary diffs"
 msgstr ""
 
-#: builtin/log.c:1244
+#: builtin/log.c:1407
 msgid "output all-zero hash in From header"
 msgstr ""
 
-#: builtin/log.c:1246
+#: builtin/log.c:1409
 msgid "don't include a patch matching a commit upstream"
 msgstr ""
 
-#: builtin/log.c:1248
+#: builtin/log.c:1411
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 
-#: builtin/log.c:1250
+#: builtin/log.c:1413
 msgid "Messaging"
 msgstr ""
 
-#: builtin/log.c:1251
+#: builtin/log.c:1414
 msgid "header"
 msgstr ""
 
-#: builtin/log.c:1252
+#: builtin/log.c:1415
 msgid "add email header"
 msgstr ""
 
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
 msgid "email"
 msgstr ""
 
-#: builtin/log.c:1253
+#: builtin/log.c:1416
 msgid "add To: header"
 msgstr ""
 
-#: builtin/log.c:1255
+#: builtin/log.c:1418
 msgid "add Cc: header"
 msgstr ""
 
-#: builtin/log.c:1257
+#: builtin/log.c:1420
 msgid "ident"
 msgstr ""
 
-#: builtin/log.c:1258
+#: builtin/log.c:1421
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 
-#: builtin/log.c:1260
+#: builtin/log.c:1423
 msgid "message-id"
 msgstr ""
 
-#: builtin/log.c:1261
+#: builtin/log.c:1424
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
 msgid "boundary"
 msgstr ""
 
-#: builtin/log.c:1263
+#: builtin/log.c:1426
 msgid "attach the patch"
 msgstr ""
 
-#: builtin/log.c:1266
+#: builtin/log.c:1429
 msgid "inline the patch"
 msgstr ""
 
-#: builtin/log.c:1270
+#: builtin/log.c:1433
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 
-#: builtin/log.c:1272
+#: builtin/log.c:1435
 msgid "signature"
 msgstr ""
 
-#: builtin/log.c:1273
+#: builtin/log.c:1436
 msgid "add a signature"
 msgstr ""
 
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr ""
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr ""
+
+#: builtin/log.c:1440
 msgid "add a signature from a file"
 msgstr ""
 
-#: builtin/log.c:1276
+#: builtin/log.c:1441
 msgid "don't print the patch filenames"
 msgstr ""
 
-#: builtin/log.c:1365
+#: builtin/log.c:1531
 msgid "-n and -k are mutually exclusive."
 msgstr ""
 
-#: builtin/log.c:1367
+#: builtin/log.c:1533
 msgid "--subject-prefix and -k are mutually exclusive."
 msgstr ""
 
-#: builtin/log.c:1375
+#: builtin/log.c:1541
 msgid "--name-only does not make sense"
 msgstr ""
 
-#: builtin/log.c:1377
+#: builtin/log.c:1543
 msgid "--name-status does not make sense"
 msgstr ""
 
-#: builtin/log.c:1379
+#: builtin/log.c:1545
 msgid "--check does not make sense"
 msgstr ""
 
-#: builtin/log.c:1407
+#: builtin/log.c:1573
 msgid "standard output, or directory, which one?"
 msgstr ""
 
-#: builtin/log.c:1409
+#: builtin/log.c:1575
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr ""
 
-#: builtin/log.c:1506
+#: builtin/log.c:1672
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr ""
 
-#: builtin/log.c:1569
+#: builtin/log.c:1743
 msgid "Failed to create output files"
 msgstr ""
 
-#: builtin/log.c:1617
+#: builtin/log.c:1792
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr ""
 
-#: builtin/log.c:1671
+#: builtin/log.c:1846
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr ""
 
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr ""
-
 #: builtin/ls-files.c:378
 msgid "git ls-files [<options>] [<file>...]"
 msgstr ""
@@ -7432,170 +7698,174 @@ msgstr ""
 msgid "git merge --abort"
 msgstr ""
 
-#: builtin/merge.c:100
+#: builtin/merge.c:101
 msgid "switch `m' requires a value"
 msgstr ""
 
-#: builtin/merge.c:137
+#: builtin/merge.c:138
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr ""
 
-#: builtin/merge.c:138
+#: builtin/merge.c:139
 #, c-format
 msgid "Available strategies are:"
 msgstr ""
 
-#: builtin/merge.c:143
+#: builtin/merge.c:144
 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
 msgid "do not show a diffstat at the end of the merge"
 msgstr ""
 
-#: builtin/merge.c:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
 msgid "show a diffstat at the end of the merge"
 msgstr ""
 
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
 msgid "(synonym to --stat)"
 msgstr ""
 
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 
-#: builtin/merge.c:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
 msgid "create a single commit instead of doing a merge"
 msgstr ""
 
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
 msgid "edit message before committing"
 msgstr ""
 
-#: builtin/merge.c:207
+#: builtin/merge.c:208
 msgid "allow fast-forward (default)"
 msgstr ""
 
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
 msgid "abort if fast-forward is not possible"
 msgstr ""
 
-#: builtin/merge.c:213
+#: builtin/merge.c:214
 msgid "Verify that the named commit has a valid GPG signature"
 msgstr ""
 
-#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
 #: builtin/revert.c:89
 msgid "strategy"
 msgstr ""
 
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "merge strategy to use"
 msgstr ""
 
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
 msgid "option=value"
 msgstr ""
 
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
 msgid "option for selected merge strategy"
 msgstr ""
 
-#: builtin/merge.c:219
+#: builtin/merge.c:220
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 
-#: builtin/merge.c:223
+#: builtin/merge.c:224
 msgid "abort the current in-progress merge"
 msgstr ""
 
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:254
 msgid "could not run stash."
 msgstr ""
 
-#: builtin/merge.c:256
+#: builtin/merge.c:259
 msgid "stash failed"
 msgstr ""
 
-#: builtin/merge.c:261
+#: builtin/merge.c:264
 #, c-format
 msgid "not a valid object: %s"
 msgstr ""
 
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
 msgid "read-tree failed"
 msgstr ""
 
-#: builtin/merge.c:327
+#: builtin/merge.c:330
 msgid " (nothing to squash)"
 msgstr ""
 
-#: builtin/merge.c:340
+#: builtin/merge.c:343
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr ""
 
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
 #, c-format
 msgid "Could not write to '%s'"
 msgstr ""
 
-#: builtin/merge.c:372
+#: builtin/merge.c:375
 msgid "Writing SQUASH_MSG"
 msgstr ""
 
-#: builtin/merge.c:374
+#: builtin/merge.c:377
 msgid "Finishing SQUASH_MSG"
 msgstr ""
 
-#: builtin/merge.c:397
+#: builtin/merge.c:400
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr ""
 
-#: builtin/merge.c:448
+#: builtin/merge.c:451
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr ""
 
-#: builtin/merge.c:538
+#: builtin/merge.c:541
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""
 
-#: builtin/merge.c:657
+#: builtin/merge.c:660
 msgid "Not handling anything other than two heads merge."
 msgstr ""
 
-#: builtin/merge.c:671
+#: builtin/merge.c:674
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr ""
 
-#: builtin/merge.c:684
+#: builtin/merge.c:687
 #, c-format
 msgid "unable to write %s"
 msgstr ""
 
-#: builtin/merge.c:773
+#: builtin/merge.c:776
 #, c-format
 msgid "Could not read from '%s'"
 msgstr ""
 
-#: builtin/merge.c:782
+#: builtin/merge.c:785
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 
-#: builtin/merge.c:788
+#: builtin/merge.c:791
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -7605,157 +7875,161 @@ msgid ""
 "the commit.\n"
 msgstr ""
 
-#: builtin/merge.c:812
+#: builtin/merge.c:815
 msgid "Empty commit message."
 msgstr ""
 
-#: builtin/merge.c:824
+#: builtin/merge.c:835
 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 
-#: builtin/merge.c:879
+#: builtin/merge.c:890
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 
-#: builtin/merge.c:895
+#: builtin/merge.c:906
 #, c-format
 msgid "'%s' is not a commit"
 msgstr ""
 
-#: builtin/merge.c:936
+#: builtin/merge.c:947
 msgid "No current branch."
 msgstr ""
 
-#: builtin/merge.c:938
+#: builtin/merge.c:949
 msgid "No remote for the current branch."
 msgstr ""
 
-#: builtin/merge.c:940
+#: builtin/merge.c:951
 msgid "No default upstream defined for the current branch."
 msgstr ""
 
-#: builtin/merge.c:945
+#: builtin/merge.c:956
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr ""
 
-#: builtin/merge.c:1080
+#: builtin/merge.c:1091
 #, c-format
 msgid "could not close '%s'"
 msgstr ""
 
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 
-#: builtin/merge.c:1223
+#: builtin/merge.c:1235
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 
-#: builtin/merge.c:1230
+#: builtin/merge.c:1242
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 
-#: builtin/merge.c:1233
+#: builtin/merge.c:1245
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 
-#: builtin/merge.c:1242
+#: builtin/merge.c:1254
 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 
-#: builtin/merge.c:1250
+#: builtin/merge.c:1262
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 
-#: builtin/merge.c:1267
+#: builtin/merge.c:1279
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 
-#: builtin/merge.c:1269
+#: builtin/merge.c:1281
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 
-#: builtin/merge.c:1275
+#: builtin/merge.c:1286
 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
 msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 
-#: builtin/merge.c:1332
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr ""
 
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr ""
 
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:1439
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr ""
 
-#: builtin/merge.c:1468
+#: builtin/merge.c:1483
 #, c-format
 msgid "Nope.\n"
 msgstr ""
 
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 
-#: builtin/merge.c:1527
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr ""
 
-#: builtin/merge.c:1595
+#: builtin/merge.c:1610
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 
-#: builtin/merge.c:1604
+#: builtin/merge.c:1619
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr ""
 
-#: builtin/merge.c:1616
+#: builtin/merge.c:1631
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -7863,7 +8137,7 @@ msgstr ""
 msgid "Directory %s is in index and no submodule?"
 msgstr ""
 
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 
@@ -7941,48 +8215,48 @@ msgstr ""
 msgid "Renaming %s to %s\n"
 msgstr ""
 
-#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
 #, c-format
 msgid "renaming '%s' failed"
 msgstr ""
 
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
 msgid "git name-rev [<options>] <commit>..."
 msgstr ""
 
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
 msgid "git name-rev [<options>] --all"
 msgstr ""
 
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
 msgid "git name-rev [<options>] --stdin"
 msgstr ""
 
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
 msgid "print only names (no SHA-1)"
 msgstr ""
 
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
 msgid "only use tags to name the commits"
 msgstr ""
 
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
 msgid "only use refs matching <pattern>"
 msgstr ""
 
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
 msgid "list all commits reachable from all refs"
 msgstr ""
 
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
 msgid "read from stdin"
 msgstr ""
 
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
 msgid "allow to print `undefined` names (default)"
 msgstr ""
 
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
 msgid "dereference tags in the input (internal use)"
 msgstr ""
 
@@ -8123,24 +8397,16 @@ msgstr ""
 msgid "The note contents have been left in %s"
 msgstr ""
 
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
 #, c-format
 msgid "cannot read '%s'"
 msgstr ""
 
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
 #, c-format
 msgid "could not open or read '%s'"
 msgstr ""
 
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr ""
-
 #: builtin/notes.c:256
 #, c-format
 msgid "Failed to read object '%s'."
@@ -8153,7 +8419,7 @@ msgstr ""
 
 #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
 msgid "too many parameters"
 msgstr ""
 
@@ -8198,7 +8464,7 @@ msgstr ""
 msgid "Overwriting existing notes for object %s\n"
 msgstr ""
 
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr ""
@@ -8234,63 +8500,63 @@ msgid ""
 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
 msgstr ""
 
-#: builtin/notes.c:767
+#: builtin/notes.c:768
 msgid "General options"
 msgstr ""
 
-#: builtin/notes.c:769
+#: builtin/notes.c:770
 msgid "Merge options"
 msgstr ""
 
-#: builtin/notes.c:771
+#: builtin/notes.c:772
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgstr ""
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "Committing unmerged notes"
 msgstr ""
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid "Aborting notes merge resolution"
 msgstr ""
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "abort notes merge"
 msgstr ""
 
-#: builtin/notes.c:856
+#: builtin/notes.c:857
 #, c-format
 msgid "A notes merge into %s is already in-progress at %s"
 msgstr ""
 
-#: builtin/notes.c:883
+#: builtin/notes.c:884
 #, c-format
 msgid "Object %s has no note\n"
 msgstr ""
 
-#: builtin/notes.c:895
+#: builtin/notes.c:896
 msgid "attempt to remove non-existent note is not an error"
 msgstr ""
 
-#: builtin/notes.c:898
+#: builtin/notes.c:899
 msgid "read object names from the standard input"
 msgstr ""
 
-#: builtin/notes.c:979
+#: builtin/notes.c:980
 msgid "notes-ref"
 msgstr ""
 
-#: builtin/notes.c:980
+#: builtin/notes.c:981
 msgid "use notes from <notes-ref>"
 msgstr ""
 
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr ""
@@ -8310,165 +8576,169 @@ msgstr ""
 msgid "deflate error (%d)"
 msgstr ""
 
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+
+#: builtin/pack-objects.c:776
 msgid "Writing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 
-#: builtin/pack-objects.c:2172
+#: builtin/pack-objects.c:2177
 msgid "Compressing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2567
 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
 msgid "do not show progress meter"
 msgstr ""
 
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
 msgid "show progress meter"
 msgstr ""
 
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
 msgid "show progress meter during object writing phase"
 msgstr ""
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2604
 msgid "similar to --all-progress when progress meter is shown"
 msgstr ""
 
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2605
 msgid "version[,offset]"
 msgstr ""
 
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2609
 msgid "maximum size of each output pack file"
 msgstr ""
 
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2611
 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2613
 msgid "ignore packed objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
 msgid "limit pack window by objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2617
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2619
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2621
 msgid "reuse existing deltas"
 msgstr ""
 
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
 msgid "reuse existing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
 msgid "use OFS_DELTA objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
 msgid "use threads when searching for best delta matches"
 msgstr ""
 
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2629
 msgid "do not create an empty pack output"
 msgstr ""
 
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2631
 msgid "read revision arguments from standard input"
 msgstr ""
 
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
 msgid "limit the objects to those that are not yet packed"
 msgstr ""
 
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2636
 msgid "include objects reachable from any reference"
 msgstr ""
 
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2639
 msgid "include objects referred by reflog entries"
 msgstr ""
 
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2642
 msgid "include objects referred to by the index"
 msgstr ""
 
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2645
 msgid "output pack to stdout"
 msgstr ""
 
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2649
 msgid "keep unreachable objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
 msgid "time"
 msgstr ""
 
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2654
 msgid "create thin packs"
 msgstr ""
 
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2658
 msgid "ignore packs that have companion .keep file"
 msgstr ""
 
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2660
 msgid "pack compression level"
 msgstr ""
 
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
 msgid "do not hide commits by grafts"
 msgstr ""
 
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2664
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2666
 msgid "write a bitmap index together with the pack index"
 msgstr ""
 
-#: builtin/pack-objects.c:2752
+#: builtin/pack-objects.c:2757
 msgid "Counting objects"
 msgstr ""
 
@@ -8496,15 +8766,15 @@ msgstr ""
 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
 msgstr ""
 
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
 msgid "do not remove, show only"
 msgstr ""
 
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
 msgid "report pruned objects"
 msgstr ""
 
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
 msgid "expire objects older than <time>"
 msgstr ""
 
@@ -8516,65 +8786,69 @@ msgstr ""
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 
-#: builtin/pull.c:117
+#: builtin/pull.c:120
 msgid "Options related to merging"
 msgstr ""
 
-#: builtin/pull.c:120
+#: builtin/pull.c:123
 msgid "incorporate changes by rebasing rather than merging"
 msgstr ""
 
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
 msgid "allow fast-forward"
 msgstr ""
 
-#: builtin/pull.c:150
+#: builtin/pull.c:153
 msgid "verify that the named commit has a valid GPG signature"
 msgstr ""
 
-#: builtin/pull.c:164
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr ""
+
+#: builtin/pull.c:172
 msgid "Options related to fetching"
 msgstr ""
 
-#: builtin/pull.c:186
+#: builtin/pull.c:194
 msgid "number of submodules pulled in parallel"
 msgstr ""
 
-#: builtin/pull.c:275
+#: builtin/pull.c:283
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr ""
 
-#: builtin/pull.c:359
+#: builtin/pull.c:379
 msgid "Cannot pull with rebase: You have unstaged changes."
 msgstr ""
 
-#: builtin/pull.c:365
+#: builtin/pull.c:385
 msgid "Additionally, your index contains uncommitted changes."
 msgstr ""
 
-#: builtin/pull.c:367
+#: builtin/pull.c:387
 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
 msgstr ""
 
-#: builtin/pull.c:443
+#: builtin/pull.c:463
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr ""
 
-#: builtin/pull.c:445
+#: builtin/pull.c:465
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 
-#: builtin/pull.c:446
+#: builtin/pull.c:466
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr ""
 
-#: builtin/pull.c:449
+#: builtin/pull.c:469
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -8582,46 +8856,57 @@ msgid ""
 "for your current branch, you must specify a branch on the command line."
 msgstr ""
 
-#: builtin/pull.c:454
+#: builtin/pull.c:474 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr ""
 
-#: builtin/pull.c:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr ""
 
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr ""
 
-#: builtin/pull.c:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
 msgid "See git-pull(1) for details."
 msgstr ""
 
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr ""
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr ""
+
+#: builtin/pull.c:489 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr ""
 
-#: builtin/pull.c:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
 msgid ""
-"If you wish to set tracking information for this branch you can do so with:\n"
-"\n"
-"    git branch --set-upstream-to=%s/<branch> %s\n"
+"If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 
-#: builtin/pull.c:483
+#: builtin/pull.c:503
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 "from the remote, but no such ref was fetched."
 msgstr ""
 
-#: builtin/pull.c:841
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr ""
+
+#: builtin/pull.c:872
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 
-#: builtin/pull.c:870
+#: builtin/pull.c:900
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -8629,7 +8914,7 @@ msgid ""
 "commit %s."
 msgstr ""
 
-#: builtin/pull.c:875
+#: builtin/pull.c:905
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -8640,11 +8925,11 @@ msgid ""
 "to recover."
 msgstr ""
 
-#: builtin/pull.c:890
+#: builtin/pull.c:920
 msgid "Cannot merge multiple branches into empty head."
 msgstr ""
 
-#: builtin/pull.c:894
+#: builtin/pull.c:924
 msgid "Cannot rebase onto multiple branches."
 msgstr ""
 
@@ -8950,6 +9235,18 @@ msgstr ""
 msgid "debug unpack-trees"
 msgstr ""
 
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr ""
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr ""
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr ""
+
 #: builtin/reflog.c:423
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
@@ -9261,176 +9558,178 @@ msgstr ""
 msgid "  Fetch URL: %s"
 msgstr ""
 
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
 msgid "(no URL)"
 msgstr ""
 
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in "  Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
 #, c-format
 msgid "  Push  URL: %s"
 msgstr ""
 
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr ""
 
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1181
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
 msgid " (status not queried)"
 msgstr ""
 
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:1199
+#: builtin/remote.c:1201
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr ""
 
-#: builtin/remote.c:1206
+#: builtin/remote.c:1208
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:1227
+#: builtin/remote.c:1229
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr ""
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1231
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr ""
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
 msgid "Cannot determine remote HEAD"
 msgstr ""
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 
-#: builtin/remote.c:1256
+#: builtin/remote.c:1258
 #, c-format
 msgid "Could not delete %s"
 msgstr ""
 
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr ""
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
 #, c-format
 msgid "Could not setup %s"
 msgstr ""
 
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
 #, c-format
 msgid " %s will become dangling!"
 msgstr ""
 
-#: builtin/remote.c:1285
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s has become dangling!"
 msgstr ""
 
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
 #, c-format
 msgid "Pruning %s"
 msgstr ""
 
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
 #, c-format
 msgid " * [would prune] %s"
 msgstr ""
 
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
 #, c-format
 msgid " * [pruned] %s"
 msgstr ""
 
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
 msgid "prune remotes after fetching"
 msgstr ""
 
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
 #, c-format
 msgid "No such remote '%s'"
 msgstr ""
 
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
 msgid "add branch"
 msgstr ""
 
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
 msgid "no remote specified"
 msgstr ""
 
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
 msgid "query push URLs rather than fetch URLs"
 msgstr ""
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1467
 msgid "return all URLs"
 msgstr ""
 
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr ""
 
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
 msgid "manipulate push URLs"
 msgstr ""
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
 msgid "add URL"
 msgstr ""
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
 msgid "delete URLs"
 msgstr ""
 
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
 msgid "--add --delete doesn't make sense"
 msgstr ""
 
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr ""
 
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
 #, c-format
 msgid "No such URL found: %s"
 msgstr ""
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
 msgid "Will not delete all non-push URLs"
 msgstr ""
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 msgid "be verbose; must be placed before a subcommand"
 msgstr ""
 
@@ -9916,10 +10215,6 @@ msgstr ""
 msgid "exit with a zero status even if nothing matched"
 msgstr ""
 
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-
 #: builtin/rm.c:335
 #, c-format
 msgid "not removing '%s' recursively without -r"
@@ -10112,78 +10407,177 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr ""
 
-#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
 msgid "alternative anchor for relative paths"
 msgstr ""
 
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:366
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:370
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:380
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:387
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:406
+msgid "Suppress output for initializing a submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:432
 msgid "git submodule--helper name <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:164
+#: builtin/submodule--helper.c:489
 msgid "where the new submodule will be cloned to"
 msgstr ""
 
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:492
 msgid "name of the new submodule"
 msgstr ""
 
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
 msgid "url where to clone the submodule from"
 msgstr ""
 
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:501
 msgid "depth for shallow clones"
 msgstr ""
 
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
 #, c-format
 msgid "could not create directory '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr ""
 
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:550
 #, c-format
 msgid "cannot open file '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
 #, c-format
 msgid "could not close file %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr ""
+
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr ""
+
+#: builtin/submodule--helper.c:639
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:660
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr ""
+
+#: builtin/submodule--helper.c:771
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr ""
+
+#: builtin/submodule--helper.c:775
+msgid "rebase, merge, checkout or none"
+msgstr ""
+
+#: builtin/submodule--helper.c:779
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr ""
+
+#: builtin/submodule--helper.c:782
+msgid "parallel jobs"
 msgstr ""
 
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr ""
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr ""
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr ""
+
+#: builtin/submodule--helper.c:862
 #, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
+msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr ""
 
 #: builtin/symbolic-ref.c:7
@@ -10234,27 +10628,22 @@ msgstr ""
 msgid "git tag -v <tagname>..."
 msgstr ""
 
-#: builtin/tag.c:80
+#: builtin/tag.c:81
 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr ""
 
-#: builtin/tag.c:85
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr ""
 
-#: builtin/tag.c:100
+#: builtin/tag.c:101
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr ""
 
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr ""
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
 #, c-format
 msgid ""
 "\n"
@@ -10263,7 +10652,7 @@ msgid ""
 "Lines starting with '%c' will be ignored.\n"
 msgstr ""
 
-#: builtin/tag.c:126
+#: builtin/tag.c:121
 #, c-format
 msgid ""
 "\n"
@@ -10390,21 +10779,21 @@ msgstr ""
 msgid "only one -F or -m option is allowed."
 msgstr ""
 
-#: builtin/tag.c:453
+#: builtin/tag.c:452
 msgid "too many params"
 msgstr ""
 
-#: builtin/tag.c:459
+#: builtin/tag.c:458
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr ""
 
-#: builtin/tag.c:464
+#: builtin/tag.c:463
 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 
-#: builtin/tag.c:489
+#: builtin/tag.c:491
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""
@@ -10652,7 +11041,7 @@ msgstr ""
 msgid "print commit contents"
 msgstr ""
 
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
 msgid "print raw gpg status output"
 msgstr ""
 
@@ -10672,7 +11061,7 @@ msgstr ""
 msgid "git verify-tag [-v | --verbose] <tag>..."
 msgstr ""
 
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
 msgid "print tag contents"
 msgstr ""
 
@@ -10688,68 +11077,72 @@ msgstr ""
 msgid "git worktree list [<options>]"
 msgstr ""
 
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr ""
 
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr ""
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr ""
 
-#: builtin/worktree.c:61
+#: builtin/worktree.c:62
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr ""
 
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:113
 #, c-format
-msgid "failed to remove: %s"
+msgid "failed to remove '%s'"
 msgstr ""
 
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr ""
 
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr ""
 
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 
-#: builtin/worktree.c:319
+#: builtin/worktree.c:324
 msgid "create a new branch"
 msgstr ""
 
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
 msgid "create or reset a branch"
 msgstr ""
 
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
 msgid "detach HEAD at named commit"
 msgstr ""
 
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr ""
+
+#: builtin/worktree.c:336
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr ""
 
@@ -10769,7 +11162,7 @@ msgstr ""
 msgid "only useful for debugging"
 msgstr ""
 
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr ""
 
@@ -10780,7 +11173,7 @@ msgid ""
 "to read about a specific subcommand or concept."
 msgstr ""
 
-#: http.c:321
+#: http.c:322
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr ""
 
@@ -10908,7 +11301,7 @@ msgstr ""
 msgid "use <n> digits to display SHA-1s"
 msgstr ""
 
-#: rerere.h:38
+#: rerere.h:40
 msgid "update the index with reused conflict resolution if possible"
 msgstr ""
 
@@ -11101,58 +11494,54 @@ msgid ""
 "\"."
 msgstr ""
 
-#: git-rebase.sh:165
+#: git-rebase.sh:168
 msgid "Applied autostash."
 msgstr ""
 
-#: git-rebase.sh:168
+#: git-rebase.sh:171
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr ""
 
-#: git-rebase.sh:169
+#: git-rebase.sh:172
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 "Your changes are safe in the stash.\n"
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
 
-#: git-rebase.sh:208
+#: git-rebase.sh:211
 msgid "The pre-rebase hook refused to rebase."
 msgstr ""
 
-#: git-rebase.sh:213
+#: git-rebase.sh:216
 msgid "It looks like git-am is in progress. Cannot rebase."
 msgstr ""
 
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr ""
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
 msgid "No rebase in progress?"
 msgstr ""
 
-#: git-rebase.sh:370
+#: git-rebase.sh:368
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 
-#: git-rebase.sh:377
+#: git-rebase.sh:375
 msgid "Cannot read HEAD"
 msgstr ""
 
-#: git-rebase.sh:380
+#: git-rebase.sh:378
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
 msgstr ""
 
-#: git-rebase.sh:398
+#: git-rebase.sh:396
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr ""
 
-#: git-rebase.sh:417
+#: git-rebase.sh:415
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -11165,64 +11554,64 @@ msgid ""
 "valuable there."
 msgstr ""
 
-#: git-rebase.sh:468
+#: git-rebase.sh:466
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr ""
 
-#: git-rebase.sh:492
+#: git-rebase.sh:490
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr ""
 
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr ""
 
-#: git-rebase.sh:504
+#: git-rebase.sh:502
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr ""
 
-#: git-rebase.sh:527
+#: git-rebase.sh:525
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr ""
 
-#: git-rebase.sh:560
+#: git-rebase.sh:558
 msgid "Cannot autostash"
 msgstr ""
 
-#: git-rebase.sh:565
+#: git-rebase.sh:563
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr ""
 
-#: git-rebase.sh:569
+#: git-rebase.sh:567
 msgid "Please commit or stash them."
 msgstr ""
 
-#: git-rebase.sh:589
+#: git-rebase.sh:587
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr ""
 
-#: git-rebase.sh:593
+#: git-rebase.sh:591
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr ""
 
-#: git-rebase.sh:604
+#: git-rebase.sh:602
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr ""
 
-#: git-rebase.sh:613
+#: git-rebase.sh:611
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 
-#: git-rebase.sh:623
+#: git-rebase.sh:621
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr ""
@@ -11364,26 +11753,21 @@ msgstr ""
 msgid "(To restore them type \"git stash apply\")"
 msgstr ""
 
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr ""
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 
-#: git-submodule.sh:291
+#: git-submodule.sh:229
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr ""
 
-#: git-submodule.sh:308
+#: git-submodule.sh:246
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr ""
 
-#: git-submodule.sh:312
+#: git-submodule.sh:250
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
@@ -11391,235 +11775,217 @@ msgid ""
 "Use -f if you really want to add it."
 msgstr ""
 
-#: git-submodule.sh:330
+#: git-submodule.sh:268
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr ""
 
-#: git-submodule.sh:332
+#: git-submodule.sh:270
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr ""
 
-#: git-submodule.sh:340
+#: git-submodule.sh:278
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 
-#: git-submodule.sh:342
+#: git-submodule.sh:280
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from"
 msgstr ""
 
-#: git-submodule.sh:344
+#: git-submodule.sh:282
 #, sh-format
 msgid ""
 "use the '--force' option. If the local git directory is not the correct repo"
 msgstr ""
 
-#: git-submodule.sh:345
+#: git-submodule.sh:283
 #, sh-format
 msgid ""
 "or you are unsure what this means choose another name with the '--name' "
 "option."
 msgstr ""
 
-#: git-submodule.sh:347
+#: git-submodule.sh:285
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr ""
 
-#: git-submodule.sh:359
+#: git-submodule.sh:297
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:364
+#: git-submodule.sh:302
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:373
+#: git-submodule.sh:311
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:417
-#, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:437
+#: git-submodule.sh:355
 #, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
+msgid "Entering '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:483
+#: git-submodule.sh:375
 #, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
+msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr ""
 
-#: git-submodule.sh:492
+#: git-submodule.sh:448
 #, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
+msgid "pathspec and --all are incompatible"
 msgstr ""
 
-#: git-submodule.sh:494
+#: git-submodule.sh:453
 #, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
+msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 
-#: git-submodule.sh:511
-#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:549
-#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr ""
-
-#: git-submodule.sh:566
+#: git-submodule.sh:470
 #, sh-format
 msgid "Submodule work tree '$displaypath' contains a .git directory"
 msgstr ""
 
-#: git-submodule.sh:567
+#: git-submodule.sh:471
 #, sh-format
 msgid ""
 "(use 'rm -rf' if you really want to remove it including all of its history)"
 msgstr ""
 
-#: git-submodule.sh:573
+#: git-submodule.sh:477
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
 "discard them"
 msgstr ""
 
-#: git-submodule.sh:576
+#: git-submodule.sh:480
 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:577
+#: git-submodule.sh:481
 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:580
+#: git-submodule.sh:484
 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:589
+#: git-submodule.sh:493
 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:745
+#: git-submodule.sh:644
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:768
+#: git-submodule.sh:667
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:788
+#: git-submodule.sh:680
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:789
+#: git-submodule.sh:681
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr ""
 
-#: git-submodule.sh:793
+#: git-submodule.sh:685
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:794
+#: git-submodule.sh:686
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr ""
 
-#: git-submodule.sh:799
+#: git-submodule.sh:691
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:800
+#: git-submodule.sh:692
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr ""
 
-#: git-submodule.sh:805
+#: git-submodule.sh:697
 #, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:806
+#: git-submodule.sh:698
 #, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
+msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr ""
 
-#: git-submodule.sh:836
+#: git-submodule.sh:729
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:944
+#: git-submodule.sh:837
 msgid "The --cached option cannot be used with the --files option"
 msgstr ""
 
-#: git-submodule.sh:996
+#: git-submodule.sh:889
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr ""
 
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr ""
 
-#: git-submodule.sh:1019
+#: git-submodule.sh:912
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr ""
 
-#: git-submodule.sh:1022
+#: git-submodule.sh:915
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
 msgid "blob"
 msgstr ""
 
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr ""
+
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr ""
diff --git a/po/is.po b/po/is.po
index 8692a8b5b2..b8b34fd65e 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,14 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2010-09-20 14:44+0000\n"
-"PO-Revision-Date: 2010-06-05 19:06 +0000\n"
-"Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
+"POT-Creation-Date: 2016-06-17 18:55+0000\n"
+"PO-Revision-Date: 2016-06-17 19:17+0000\n"
+"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Git Mailing List <git@vger.kernel.org>\n"
 "Language: is\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.5\n"
 
 #. TRANSLATORS: This is a test. You don't need to translate it.
 #: t/t0200/test.c:5
@@ -72,22 +73,31 @@ msgstr "TILRAUN: Perl tilraunastrengur"
 msgid "TEST: A Perl test variable %s"
 msgstr "TILRAUN: Perl tilraunastrengur með breytunni %s"
 
-#. TRANSLATORS: The first '%s' is either "Reinitialized
-#. existing" or "Initialized empty", the second " shared" or
-#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:355
+#: builtin/init-db.c:402
 #, c-format
-msgid "%s%s Git repository in %s%s\n"
-msgstr "%s%s Git lind í %s%s\n"
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "Endurgerði Git lind í %s%s\n"
 
-#: builtin/init-db.c:356
-msgid "Reinitialized existing"
-msgstr "Endurgerði"
+#: builtin/init-db.c:403
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "Endurgerði Git lind í %s%s\n"
+
+#: builtin/init-db.c:407
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "Bjó til tóma sameiginlega Git lind í %s%s\n"
+
+#: builtin/init-db.c:408
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "Bjó til tóma Git lind í %s%s\n"
+
+#~ msgid "Reinitialized existing"
+#~ msgstr "Endurgerði"
 
-#: builtin/init-db.c:356
-msgid "Initialized empty"
-msgstr "Bjó til tóma"
+#~ msgid "Initialized empty"
+#~ msgstr "Bjó til tóma"
 
-#: builtin/init-db.c:357
-msgid " shared"
-msgstr " sameiginlega"
+#~ msgid " shared"
+#~ msgstr " sameiginlega"
diff --git a/po/ko.po b/po/ko.po
index 3ff3b9bfec..c9f431cedd 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -57,8 +57,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
-"PO-Revision-Date: 2016-03-16 10:30+0900\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"PO-Revision-Date: 2016-06-12 01:20+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-"
 "ko>\n"
@@ -81,7 +81,7 @@ msgstr ""
 "작업 ���서 문제를 바로잡� 다�, 'git add/rm <파�>'� �절히\n"
 "사용해 해결 표시하고 커밋하십시오."
 
-#: advice.c:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "병합 작업� 다 마치지 않았습니다 (MERGE_HEAD 파�� 있습니다)."
 
@@ -125,7 +125,7 @@ msgstr "형�"
 msgid "archive format"
 msgstr "압축 형�"
 
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
 msgid "prefix"
 msgstr "접�어"
 
@@ -133,9 +133,9 @@ msgstr "접�어"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "아카�브� � 경로 �름� 앞� 지정한 경로를 붙입니다"
 
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 builtin/blame.c:2548
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549
 #: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:720 builtin/hash-object.c:100 builtin/ls-files.c:459
+#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459
 #: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561
 #: builtin/read-tree.c:109 parse-options.h:153
 msgid "file"
@@ -169,7 +169,8 @@ msgstr "� 작게 압축"
 msgid "list supported archive formats"
 msgstr "지�하는 압축 형�� 목�� 표시합니다"
 
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
 msgid "repo"
 msgstr "저장소"
 
@@ -323,11 +324,16 @@ msgstr "애매한 오브�트 �름: '%s'."
 msgid "Not a valid branch point: '%s'."
 msgstr "올바른 브랜치 위치가 아닙니다: '%s'."
 
-#: branch.c:344
+#: branch.c:345
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s'�(는) �미 '%s' 위치� 받아져 있습니다"
 
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "작업 �� %s� 헤드가 업��트�지 않았습니다"
+
 #: bundle.c:34
 #, c-format
 msgid "'%s' does not look like a v2 bundle file"
@@ -338,7 +344,7 @@ msgstr "'%s' 파�� 버전2 번들 파�로 보�지 않습니다"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "��할 수 없는 헤�: %s%s (%d)"
 
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
 #, c-format
 msgid "could not open '%s'"
 msgstr "'%s'�(를) 열 수 없습니다"
@@ -347,10 +353,10 @@ msgstr "'%s'�(를) 열 수 없습니다"
 msgid "Repository lacks these prerequisite commits:"
 msgstr "저장소� 필수�� 다� 커밋� 없습니다:"
 
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
 msgid "revision walk setup failed"
 msgstr "리비전 walk 준비가 실패했습니다"
 
@@ -387,21 +393,21 @@ msgstr "rev-list 명령� 죽었습니다"
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "rev-list 옵션�서 '%s' 레�런스가 제외�었습니다"
 
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "알 수 없는 ��: %s"
 
-#: bundle.c:449
+#: bundle.c:451
 msgid "Refusing to create empty bundle."
 msgstr "빈 번들� 만들지 않습니다."
 
-#: bundle.c:459
+#: bundle.c:463
 #, c-format
 msgid "cannot create '%s'"
 msgstr "'%s'�(를) 만들 수 없습니다"
 
-#: bundle.c:480
+#: bundle.c:491
 msgid "index-pack died"
 msgstr "index-pack 명령� 죽었습니다"
 
@@ -410,8 +416,8 @@ msgstr "index-pack 명령� 죽었습니다"
 msgid "invalid color value: %.*s"
 msgstr "잘못� 색 값: %.*s"
 
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
 #, c-format
 msgid "could not parse %s"
 msgstr "parse %s�(를) 파싱할 수 없습니다"
@@ -445,21 +451,21 @@ msgstr "잘못� 수치 설정 값 '%s' (키 '%s'): %s"
 msgid "failed to expand user dir in: '%s'"
 msgstr "다�� 사용� 디렉터리 확장� 실패: '%s'"
 
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "%d번� 올바른 zlib 압축 단계가 아닙니다"
 
-#: config.c:891
+#: config.c:890
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "오브�트 �성 모드가 올바르지 않습니다: %s"
 
-#: config.c:1220
+#: config.c:1228
 msgid "unable to parse command-line config"
 msgstr "명령행 설정� 파싱할 수 없습니다"
 
-#: config.c:1281
+#: config.c:1284
 msgid "unknown error occured while reading the configuration files"
 msgstr "설정 파�� �는 중 알 수 없는 오류가 �겼습니다"
 
@@ -478,24 +484,27 @@ msgstr "'%2$s' 파ì�¼ì�˜ %3$d번 줄 '%1$s' 설정 변수가 잘못ë�˜ì—ˆìŠµë‹ˆë
 msgid "%s has multiple values"
 msgstr "%s�(는) 여러 개 값� 있습니다"
 
+#: config.c:2224
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "'%s'�(를) '%s'(으)로 설정할 수 없습니다"
+
 #: config.c:2226
 #, c-format
-msgid "Could not set '%s' to '%s'"
-msgstr "'%s'�(를) '%s'� 설정할 수 없습니다"
+msgid "could not unset '%s'"
+msgstr "'%s' 설정� 지울 수 없습니다"
 
 #: connected.c:69
 msgid "Could not run 'git rev-list'"
 msgstr "'git rev-list'를 실행할 수 없습니다"
 
 #: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "rev-list 쓰기� 실패했습니다: %s"
+msgid "failed write to rev-list"
+msgstr "rev-list 쓰기� 실패했습니다"
 
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "rev-list� 표준입력� 닫는� 실패했습니다: %s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
+msgstr "rev-list� 표준입력� 닫는� 실패했습니다"
 
 #: date.c:95
 msgid "in the future"
@@ -561,26 +570,26 @@ msgstr[0] "%luë…„ ì „"
 msgid "failed to read orderfile '%s'"
 msgstr "'%s' 순서 파�� �는� 실패했습니다"
 
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
 msgid "Performing inexact rename detection"
 msgstr "부정확한 �름 바꾸기 �색� 수행하는 중"
 
-#: diff.c:115
+#: diff.c:116
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  dirstat �름 �센트 값 '%s' 파싱� 실패했습니다\n"
 
-#: diff.c:120
+#: diff.c:121
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  알 수 없는 dirstat 파�미터 '%s'\n"
 
-#: diff.c:215
+#: diff.c:225
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "'diff.submodule' 설정 변수� 알 수 없는 값: '%s'"
 
-#: diff.c:267
+#: diff.c:277
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -589,16 +598,16 @@ msgstr ""
 "'diff.submodule' 설정 변수� 오류:\n"
 "%s'"
 
-#: diff.c:2997
+#: diff.c:3007
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "외부 diff 프로그램� 죽�, %s 위치�서 멈춤"
 
-#: diff.c:3393
+#: diff.c:3405
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow 옵션�는 정확히 하나� 경로명세가 필요합니다"
 
-#: diff.c:3556
+#: diff.c:3568
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -607,20 +616,20 @@ msgstr ""
 "--dirstat/-X 옵션 파�미터를 파싱하는� 실패했습니다:\n"
 "%s"
 
-#: diff.c:3570
+#: diff.c:3582
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "--submodule 옵션 파�미터 파싱� 실패했습니다: '%s'"
 
-#: dir.c:2004
+#: dir.c:1823
 msgid "failed to get kernel name and information"
 msgstr "커� �름과 정보를 가져오는� 실패했습니다"
 
-#: dir.c:2123
+#: dir.c:1942
 msgid "Untracked cache is disabled on this system or location."
 msgstr "� 시스템 �는 위치�서는 추��지 않는 �시를 사용하지 않습니다."
 
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
 msgid "could not run gpg."
 msgstr "gpg를 실행할 수 없습니다."
 
@@ -634,28 +643,28 @@ msgstr "gpg�서 ��터를 서명하는� 실패했습니다."
 
 #: gpg-interface.c:222
 #, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "임시 파� '%s'�(를) 만들 수 없습니다: %s"
+msgid "could not create temporary file '%s'"
+msgstr "'%s' 임시 파�� 만들 수 없습니다"
 
-#: gpg-interface.c:225
+#: gpg-interface.c:224
 #, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "분리� 서명� '%s'� 쓰는� 실패했습니다: %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "분리� 서명� '%s'� 쓰는� 실패했습니다"
 
 #: grep.c:1718
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': %s�(를) �� 수 없습니다"
 
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
 #, c-format
-msgid "'%s': %s"
-msgstr "'%s': %s"
+msgid "failed to stat '%s'"
+msgstr "'%s'� 대해 stat()� 실패했습니다"
 
 #: grep.c:1746
 #, c-format
-msgid "'%s': short read %s"
-msgstr "'%s': %s�서 �다가 잘림"
+msgid "'%s': short read"
+msgstr "'%s': �다가 잘림"
 
 #: help.c:205
 #, c-format
@@ -718,12 +727,36 @@ msgstr[0] ""
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
+#: lockfile.c:152
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"'%s.lock' 파�� 만들 수 없습니다: %s.\n"
+"\n"
+"� 저장소�서 다른 깃 프로세스가 실행 중� 것으로 보입니다. (예를\n"
+"들어 'git commit' 명령으로 편집기가 열려 있다든지.) 모든 프로세스를\n"
+"�냈는지 확�하시고 다시 시�해 보십시오. 그래� 계� 실패하면, �\n"
+"저장소�서 깃 프로세스가 전� �� 종료했� 수� 있습니다:\n"
+"수�으로 해당 파�� 제거하고 계�하십시오."
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "'%s.lock'� 만들 수 없습니다: %s"
+
 #: merge.c:41
 msgid "failed to read the cache"
 msgstr "�시를 �는� 실패했습니다"
 
-#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
 msgid "unable to write new index file"
 msgstr "새 ��스 파�� 쓸 수 없습니다"
 
@@ -770,7 +803,7 @@ msgstr "%s '%s' 오브�트를 �� 수 없�"
 msgid "blob expected for %s '%s'"
 msgstr "%s '%s'� 대해 블롭� 예�"
 
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
 #, c-format
 msgid "failed to open '%s'"
 msgstr "'%s'�(를) 여는� 실패"
@@ -904,7 +937,7 @@ msgstr "건너뛰기: %s (기존과 같게 병합)"
 msgid "Auto-merging %s"
 msgstr "�� 병합: %s"
 
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
 msgid "submodule"
 msgstr "하위 모듈"
 
@@ -933,49 +966,49 @@ msgstr ""
 "충�! (%s): �름� %s� 디렉터리가 %s� 있습니다. %s�(를) %s(으)로 추가합니"
 "다"
 
-#: merge-recursive.c:1783
+#: merge-recursive.c:1781
 #, c-format
 msgid "Adding %s"
 msgstr "추가: %s"
 
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
 msgid "Fatal merge failure, shouldn't happen."
 msgstr "치명�� 병합 실패, �어날 수 없는 �황."
 
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
 msgid "Already up-to-date!"
 msgstr "�미 업��트 �태입니다!"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "%s � %s 트리� 병합� 실패했습니다"
 
-#: merge-recursive.c:1858
+#: merge-recursive.c:1856
 #, c-format
 msgid "Unprocessed path??? %s"
 msgstr "처리�지 않� 경로??? %s"
 
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
 msgid "Merging:"
 msgstr "병합:"
 
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "과거� 공통 커밋 %u개 발견:"
 
-#: merge-recursive.c:1956
+#: merge-recursive.c:1954
 msgid "merge returned no commit"
 msgstr "병합 결과� 커밋� 없습니다"
 
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "'%s' 오브�트를 파싱할 수 없습니다"
 
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
 msgid "Unable to write index."
 msgstr "��스를 쓸 수 없습니다."
 
@@ -1005,28 +1038,28 @@ msgstr "잘못� %s 값: '%s'"
 msgid "unable to parse object: %s"
 msgstr "오브�트를 파싱할 수 없습니다: %s"
 
-#: parse-options.c:570
+#: parse-options.c:572
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:588
+#: parse-options.c:590
 #, c-format
 msgid "usage: %s"
 msgstr "사용법: %s"
 
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
 #, c-format
 msgid "   or: %s"
 msgstr "  �는: %s"
 
-#: parse-options.c:595
+#: parse-options.c:597
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:629
+#: parse-options.c:631
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -1035,7 +1068,7 @@ msgstr "-NUM"
 msgid "malformed object name '%s'"
 msgstr "잘못� 형�� 오브�트 �름 '%s'"
 
-#: path.c:752
+#: path.c:796
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "%s�(를) 그룹�서 쓰기 가능하�� 만들 수 없습니다"
@@ -1103,7 +1136,7 @@ msgstr ""
 ":(exclude) 패턴으로 제외할 사항� 없습니다.\n"
 "':/' �는 '.' 추가를 잊으신 것 아닙니까?"
 
-#: pretty.c:969
+#: pretty.c:971
 msgid "unable to parse --pretty format"
 msgstr "--pretty 형�� 파싱할 수 없습니다"
 
@@ -1129,23 +1162,23 @@ msgstr ""
 "GIT_INDEX_VERSION� 설정�었지만, � 값� 잘못�었습니다.\n"
 "%i 버전� 사용합니다"
 
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "'%s'�(를) 쓰기용으로 열 수 없습니다"
 
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "%s 레�런스를 삭제할 수 없습니다: %s"
 
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2246
 #, c-format
 msgid "could not delete references: %s"
 msgstr "레�런스를 삭제할 수 없습니다: %s"
 
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
 #, c-format
 msgid "could not remove reference %s"
 msgstr "%s 레�런스를 제거할 수 없습니다"
@@ -1284,103 +1317,103 @@ msgstr "형�: %%(end) 아톰� 없습니다"
 msgid "malformed object name %s"
 msgstr "잘못� 형�� 오브�트 �름 %s"
 
-#: remote.c:745
+#: remote.c:746
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "%s � %s�(를) 모� %s� 가져올 수 없습니다"
 
-#: remote.c:749
+#: remote.c:750
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s�(는) 보통 %s�(를) 추�하고, %s�(를) 추�하지 않습니다"
 
-#: remote.c:753
+#: remote.c:754
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s�(는) %s � %s 모� 추�합니다"
 
-#: remote.c:761
+#: remote.c:762
 msgid "Internal error"
 msgstr "내부 오류"
 
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
 msgid "HEAD does not point to a branch"
 msgstr "HEAD가 브랜치를 가리키지 않습니다"
 
-#: remote.c:1686
+#: remote.c:1687
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "그런 브랜치가 없습니다: '%s'"
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "'%s' 브랜치� 대해 업스트림� 설정하지 않았습니다"
 
-#: remote.c:1695
+#: remote.c:1696
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "업스트림 '%s' 브랜치가 리모트 추� 브랜치로 저장�지 않았습니다"
 
-#: remote.c:1710
+#: remote.c:1711
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "리모트 '%2$s'� 푸시 대� '%1$s'� 로컬 추� 브랜치가 없습니다"
 
-#: remote.c:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "'%s' 브랜치� 푸시 리모트가 없습니다"
 
-#: remote.c:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "'%s'� 대한 푸시 레�런스명세� '%s'�(가) 들어 있지 않습니다"
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "푸시� 대�� 없습니다 (push.default가 'nothing'입니다)"
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "하나� 대�� 대해 'simple' 푸시를 처리할 수 없습니다"
 
-#: remote.c:2073
+#: remote.c:2074
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "현재 브랜치가 '%s' 기반�지만, 업스트림� 없어졌습니다.\n"
 
-#: remote.c:2077
+#: remote.c:2078
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (바로잡으려면 \"git branch --unset-upstream\"� 사용하십시오)\n"
 
-#: remote.c:2080
+#: remote.c:2081
 #, c-format
 msgid "Your branch is up-to-date with '%s'.\n"
 msgstr "브랜치가 '%s'� 맞게 업��트� �태입니다.\n"
 
-#: remote.c:2084
+#: remote.c:2085
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "브랜치가 '%s'보다 %d개 커밋만� 앞� 있습니다.\n"
 
-#: remote.c:2090
+#: remote.c:2091
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (로컬� 있는 커밋� 제출하려면 \"git push\"를 사용하십시오)\n"
 
-#: remote.c:2093
+#: remote.c:2094
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
 msgstr[0] "브랜치가 '%s'보다 %d개 커밋 뒤� 있고, 앞으로 �릴 수 있습니다.\n"
 
-#: remote.c:2101
+#: remote.c:2102
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (로컬 브랜치를 업��트하려면 \"git pull\"� 사용하십시오)\n"
 
-#: remote.c:2104
+#: remote.c:2105
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -1392,21 +1425,21 @@ msgstr[0] ""
 "현재 브랜치와 '%s'�(가) 갈�졌습니다,\n"
 "다른 커밋� �� %d개와 %d개 있습니다.\n"
 
-#: remote.c:2114
+#: remote.c:2115
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 "  (리모트� 브랜치를 현재 브랜치로 병합하려면 \"git pull\"� 사용하십시오)\n"
 
-#: revision.c:2131
+#: revision.c:2142
 msgid "your current branch appears to be broken"
 msgstr "현재 브랜치가 �가진 것처럼 보입니다"
 
-#: revision.c:2134
+#: revision.c:2145
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "현재 '%s' 브랜치� 아� 아무 커밋� 없습니다"
 
-#: revision.c:2328
+#: revision.c:2339
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent 옵션� --bisect 옵션과 호환�지 않습니다"
 
@@ -1456,7 +1489,7 @@ msgstr ""
 "'git add <경로>' �는 'git rm <경로>'로 표시하십시오.\n"
 "그리고 결과물� 'git commit'으로 커밋하십시오"
 
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
 #, c-format
 msgid "Could not write to %s"
 msgstr "%s� 쓸 수 없습니다"
@@ -1615,12 +1648,12 @@ msgstr "\"git cherry-pick (--continue | --quit | --abort)\" 명령� 해 보십
 msgid "Could not create sequencer directory %s"
 msgstr "%s 시퀀서 디렉터리를 만들 수 없습니다"
 
-#: sequencer.c:835 sequencer.c:917
+#: sequencer.c:835 sequencer.c:916
 #, c-format
 msgid "Error wrapping up %s."
 msgstr "%s 잠그는� 오류."
 
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
 msgid "no cherry-pick or revert in progress"
 msgstr "빼오기(cherry-pick) �는 ��리기(revert)가 진행 중�지 않습니다"
 
@@ -1632,63 +1665,72 @@ msgstr "HEAD를 구해 올 수 없습니다"
 msgid "cannot abort from a branch yet to be born"
 msgstr "새로 만들고 있는 브랜치�서 중지할 수 없습니다"
 
-#: sequencer.c:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
 #, c-format
-msgid "cannot open %s: %s"
-msgstr "%s�(를) 열 수 없습니다: %s"
+msgid "cannot open %s"
+msgstr "%s�(를) 열 수 없습니다"
 
-#: sequencer.c:881
+#: sequencer.c:880
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "%s�(를) �� 수 없습니다: %s"
 
-#: sequencer.c:882
+#: sequencer.c:881
 msgid "unexpected end of file"
 msgstr "예�치 못하게 파�� �났습니다"
 
-#: sequencer.c:888
+#: sequencer.c:887
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "빼오기 전� 저장한 HEAD 파��('%s') ���었습니다"
 
-#: sequencer.c:910
+#: sequencer.c:909
 #, c-format
 msgid "Could not format %s."
 msgstr "%s� �매팅할 수 없습니다."
 
-#: sequencer.c:1055
+#: sequencer.c:1054
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: %s 커밋� 빼올 수 없습니다"
 
-#: sequencer.c:1058
+#: sequencer.c:1057
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: 잘못� 리비전"
 
-#: sequencer.c:1092
+#: sequencer.c:1091
 msgid "Can't revert as initial commit"
 msgstr "최초� 커밋� ��릴 수 없습니다"
 
-#: sequencer.c:1093
+#: sequencer.c:1092
 msgid "Can't cherry-pick into empty head"
 msgstr "빈 헤드로 커밋� 빼올 수 없습니다."
 
-#: setup.c:246
+#: setup.c:248
 #, c-format
 msgid "failed to read %s"
 msgstr "%s�(를) �는� 실패했습니다"
 
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "깃 저장소 버전 <= %d 버전� 기대하지만, %d 버전� 발견�었습니다"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "알 수 없는 저장소 확장� 있습니다:"
+
 #: sha1_file.c:1080
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "오프셋� 묶� 파� 앞입니다 (�가진 .idx?)"
 
-#: sha1_file.c:2459
+#: sha1_file.c:2458
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "오프셋� %s� 묶� ��스 시작보다 앞입니다 (�가진 ��스?)"
 
-#: sha1_file.c:2463
+#: sha1_file.c:2462
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "오프셋� %s� 묶� ��스 �보다 뒤입니다 (�가진 ��스?)"
@@ -1715,30 +1757,39 @@ msgstr ""
 "확�해 보시고 잘못 만들어진 것�면 지우십시오. � 메시지를 보고 싶지\n"
 "않으면 \"git config advice.objectNameWarning false\" 명령� 사용하십시오."
 
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "병합하지 않� .gitmodules를 바꿀 수 없습니다. 병합 충�� 먼저 해결하십시오"
 
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "경로가 %s� 때 .gitmodules� 섹션� 찾� 수 없습니다"
 
-#: submodule.c:74
+#: submodule.c:76
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr ".gitmodules 항목 %s�(를) 업��트할 수 없습니다"
 
-#: submodule.c:107
+#: submodule.c:109
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "%s� 대한 .gitmodules 항목� 제거할 수 없습니다"
 
-#: submodule.c:118
+#: submodule.c:120
 msgid "staging updated .gitmodules failed"
 msgstr "업��트한 .gitmodules를 커밋할 사항으로 표시하는� 실패"
 
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "submodule.fetchJobs 값� �수를 쓸 수 없습니다"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "%s� 값� 올바르지 않습니다"
+
 #: trailer.c:237
 #, c-format
 msgid "running trailer command '%s' failed"
@@ -1798,7 +1849,217 @@ msgstr "임시 파� �름� '%s'(으)로 바꿀 수 없습니다"
 msgid "Could not read ref %s"
 msgstr "%s 레�런스를 �� 수 없습니다"
 
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you can switch branches."
+msgstr ""
+"다� 파�� 로컬 변경 사항� 체�아웃 때문� �어 쓰게 �니다:\n"
+"%%s브랜치를 전환하기 전� 변경 사항� 커밋하거나 스태시하십시오."
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"다� 파�� 로컬 변경 사항� 체�아웃 때문� �어 쓰게 �니다:\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you can merge."
+msgstr ""
+"다� 파�� 로컬 변경 사항� 병합 때문� �어 쓰게 �니다:\n"
+"%%s병합하기 전� 변경 사항� 커밋하거나 스태시하십시오."
+
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr "다� 파�� 로컬 변경 사항� 병합 때문� �어 쓰게 �니다."
+
+#: unpack-trees.c:74
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you can %s."
+msgstr ""
+"다� 파�� 로컬 변경 사항� %s 때문� �어 쓰게 �니다:\n"
+"%%s%s 전� 변경 사항� 커밋하거나 스태시하십시오."
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"다� 파�� 로컬 변경 사항� %s 때문� �어 쓰게 �니다:\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"다� 디렉터리를 업��트하면 그 안� 추�하지 않는 파�� 잃어버립니다:\n"
+"%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"체�아웃 때문� 추�하지 않는 다� 작업 �� 파�� 제거�니다:\n"
+"%%s브랜치를 전환하기 전� � 파�� 옮기거나 제거하십시오."
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"체�아웃 때문� 추�하지 않는 다� 작업 �� 파�� 제거�니다:\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"병합 때문� 추�하지 않는 다� 작업 �� 파�� 제거�니다:\n"
+"%%s병합하기 전� � 파�� 옮기거나 제거하십시오."
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"병합 때문� 추�하지 않는 다� 작업 �� 파�� 제거�니다:\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"%s 때문� 추�하지 않는 다� 작업 �� 파�� 제거�니다:\n"
+"%%s%s 하기 전� � 파�� 옮기거나 제거하십시오."
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"%s 때문� 추�하지 않는 다� 작업 �� 파�� 제거�니다:\n"
+"%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"체�아웃 때문� 추�하지 않는 다� 작업 �� 파�� �어�니다:\n"
+"%%s브랜치를 전환하기 전� � 파�� 옮기거나 제거하십시오."
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"체�아웃 때문� 추�하지 않는 다� 작업 �� 파�� �어�니다:\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"병합 때문� 추�하지 않는 다� 작업 �� 파�� �어�니다:\n"
+"%%s병합하기 전� � 파�� 옮기거나 제거하십시오."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"병합 때문� 추�하지 않는 다� 작업 �� 파�� �어�니다:\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"%s 때문� 추�하지 않는 다� 작업 �� 파�� �어�니다:\n"
+"%%s%s 하기 전� � 파�� 옮기거나 제거하십시오."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"%s 때문� 추�하지 않는 다� 작업 �� 파�� �어�니다:\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "'%s' 항목� '%s'와(과) 겹칩니다.  묶� 수 없습니다."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"드문 체�아웃� 업��트할 수 없습니다; 다� 항목� 최신으로 업��트�지 않았습니다:\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"드문 체�아웃 업��트 때문� 추�하지 않는 다� 작업 �� 파�� �어�니다:\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"드문 체�아웃 업��트 때문� 추�하지 않는 다� 작업 �� 파�� 제거합니다:\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "중지함\n"
+
+#: unpack-trees.c:237
 msgid "Checking out files"
 msgstr "파�� 가져옵니다"
 
@@ -1836,196 +2097,192 @@ msgstr "경로�서 잘못� '..' 부분"
 msgid "could not open '%s' for reading and writing"
 msgstr "�기와 쓰기용으로 '%s'�(를) 열 수 없습니다"
 
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "'%s'�(를) 쓰기용으로 열 수 없습니다"
 
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "'%s'�(를) �기용으로 열 수 없습니다"
 
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "'%s'� 접근할 수 없습니다: %s"
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
 #, c-format
 msgid "unable to access '%s'"
 msgstr "'%s'� 접근할 수 없습니다"
 
-#: wrapper.c:640
+#: wrapper.c:623
 msgid "unable to get current working directory"
 msgstr "현재 작업 디렉터리를 가져올 수 없습니다"
 
-#: wrapper.c:667
+#: wrapper.c:650
 #, c-format
 msgid "could not open %s for writing"
 msgstr "%s�(를) 쓰기용으로 열 수 없습니다"
 
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
 #, c-format
 msgid "could not write to %s"
 msgstr "%s� 쓸 수 없습니다"
 
-#: wrapper.c:684
+#: wrapper.c:667
 #, c-format
 msgid "could not close %s"
 msgstr "%s�(를) 닫� 수 없습니다"
 
-#: wt-status.c:149
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "병합하지 않� 경로:"
 
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (스테�지 해제하려면 \"git reset %s <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (스테�지 해제하려면 \"git rm --cached <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:182
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (해결했다고 표시하려면 \"git add <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (해결했다고 표시하려면 알맞게 \"git add/rm <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:186
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (해결했다고 표시하려면 \"git rm <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
 msgid "Changes to be committed:"
 msgstr "커밋할 변경 사항:"
 
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
 msgid "Changes not staged for commit:"
 msgstr "커밋하�� 정하지 않� 변경 사항:"
 
-#: wt-status.c:219
+#: wt-status.c:220
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  (무엇� 커밋할지 바꾸려면 \"git add <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:221
+#: wt-status.c:222
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  (무엇� 커밋할지 바꾸려면 \"git add/rm <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (작업 ��� 변경 사항� 버리려면 \"git checkout -- <파�>...\"� 사용하십"
 "시오)"
 
-#: wt-status.c:224
+#: wt-status.c:225
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (하위 모듈� 추��지 않는 파��나 수정� 내용� 커밋하거나 버리십시오)"
 
-#: wt-status.c:236
+#: wt-status.c:237
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr "  (커밋할 사항� �함하려면 \"git %s <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:251
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "양쪽�서 삭제:"
 
-#: wt-status.c:253
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "� 쪽�서 추가:"
 
-#: wt-status.c:255
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "저 쪽�서 삭제:"
 
-#: wt-status.c:257
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "저 쪽�서 추가:"
 
-#: wt-status.c:259
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "� 쪽�서 삭제:"
 
-#: wt-status.c:261
+#: wt-status.c:262
 msgid "both added:"
 msgstr "양쪽�서 추가:"
 
-#: wt-status.c:263
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "양쪽�서 수정:"
 
-#: wt-status.c:265
+#: wt-status.c:266
 #, c-format
 msgid "bug: unhandled unmerged status %x"
 msgstr "bug: 병합하지 않� �태 %x 처리�지 않�"
 
-#: wt-status.c:273
+#: wt-status.c:274
 msgid "new file:"
 msgstr "새 파�:"
 
-#: wt-status.c:275
+#: wt-status.c:276
 msgid "copied:"
 msgstr "복사함:"
 
-#: wt-status.c:277
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "삭제함:"
 
-#: wt-status.c:279
+#: wt-status.c:280
 msgid "modified:"
 msgstr "수정함:"
 
-#: wt-status.c:281
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "�름 바꿈:"
 
-#: wt-status.c:283
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "종류 바뀜:"
 
-#: wt-status.c:285
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "알 수 없�:"
 
-#: wt-status.c:287
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "병합하지 않�:"
 
-#: wt-status.c:369
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "새 커밋, "
 
-#: wt-status.c:371
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "수정한 내용, "
 
-#: wt-status.c:373
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "추�하지 않� 내용, "
 
-#: wt-status.c:390
+#: wt-status.c:391
 #, c-format
 msgid "bug: unhandled diff status %c"
 msgstr "버그: 처리�지 않� diff �태 %c"
 
-#: wt-status.c:754
+#: wt-status.c:755
 msgid "Submodules changed but not updated:"
 msgstr "변경�었지만 업��트하지 않� 하위 모듈:"
 
-#: wt-status.c:756
+#: wt-status.c:757
 msgid "Submodule changes to be committed:"
 msgstr "커밋할 하위 모듈� 변경 사항:"
 
-#: wt-status.c:837
+#: wt-status.c:838
 msgid ""
 "Do not touch the line above.\n"
 "Everything below will be removed."
@@ -2033,39 +2290,39 @@ msgstr ""
 "위� 줄� 바꾸지 마십시오.\n"
 "아래 있는 내용� 모� 제거�니다."
 
-#: wt-status.c:948
+#: wt-status.c:949
 msgid "You have unmerged paths."
 msgstr "병합하지 않� 경로가 있습니다."
 
-#: wt-status.c:951
+#: wt-status.c:952
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (충�� 바로잡고 \"git commit\"� 실행하십시오)"
 
-#: wt-status.c:954
+#: wt-status.c:956
 msgid "All conflicts fixed but you are still merging."
 msgstr "모든 충�� 바로잡았지만 아� 병합하는 중입니다."
 
-#: wt-status.c:957
+#: wt-status.c:959
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (병합� 마무리하려면 \"git commit\"� 사용하십시오)"
 
-#: wt-status.c:967
+#: wt-status.c:969
 msgid "You are in the middle of an am session."
 msgstr "am 세션 중간� 있습니다."
 
-#: wt-status.c:970
+#: wt-status.c:972
 msgid "The current patch is empty."
 msgstr "현재 패치가 비어 있습니다."
 
-#: wt-status.c:974
+#: wt-status.c:976
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (충�� 바로잡� 다� \"git am --continue\"를 사용하십시오)"
 
-#: wt-status.c:976
+#: wt-status.c:978
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (� 패치를 건너 뛰려면 \"git am --skip\"� 사용하십시오)"
 
-#: wt-status.c:978
+#: wt-status.c:980
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (�본 브랜치를 복구하려면 \"git am --abort\"를 사용하십시오)"
 
@@ -2205,43 +2462,43 @@ msgstr "'�등분하는 중입니다."
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (�래 브랜치로 �아가려면 \"git bisect reset\"� 사용하십시오)"
 
-#: wt-status.c:1438
+#: wt-status.c:1460
 msgid "On branch "
 msgstr "현재 브랜치 "
 
-#: wt-status.c:1444
+#: wt-status.c:1466
 msgid "interactive rebase in progress; onto "
 msgstr "대화형 리베�스 진행 중. 갈 위치는 "
 
-#: wt-status.c:1446
+#: wt-status.c:1468
 msgid "rebase in progress; onto "
 msgstr "리베�스 진행 중. 갈 위치는 "
 
-#: wt-status.c:1451
+#: wt-status.c:1473
 msgid "HEAD detached at "
 msgstr "HEAD가 다� 위치�서 분리: "
 
-#: wt-status.c:1453
+#: wt-status.c:1475
 msgid "HEAD detached from "
 msgstr "HEAD가 다�으로부터 분리: "
 
-#: wt-status.c:1456
+#: wt-status.c:1478
 msgid "Not currently on any branch."
 msgstr "현재 어떤 브랜치� 사용하지 않�."
 
-#: wt-status.c:1474
+#: wt-status.c:1496
 msgid "Initial commit"
 msgstr "최초 커밋"
 
-#: wt-status.c:1488
+#: wt-status.c:1510
 msgid "Untracked files"
 msgstr "추�하지 않는 파�"
 
-#: wt-status.c:1490
+#: wt-status.c:1512
 msgid "Ignored files"
 msgstr "무시한 파�"
 
-#: wt-status.c:1494
+#: wt-status.c:1516
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2252,20 +2509,20 @@ msgstr ""
 "'status -uno' 옵션� 쓰면 빨�질 수� 있지만, 새 파��\n"
 "�접 찾아서 추가해야 합니다. ('git help status' 참고)"
 
-#: wt-status.c:1500
+#: wt-status.c:1522
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "추�하지 않는 파�� 보지 않습니다%s"
 
-#: wt-status.c:1502
+#: wt-status.c:1524
 msgid " (use -u option to show untracked files)"
 msgstr " (추�하지 않는 파�� 보려면 -u 옵션� 사용하십시오)"
 
-#: wt-status.c:1508
+#: wt-status.c:1530
 msgid "No changes"
 msgstr "변경 사항 없�"
 
-#: wt-status.c:1513
+#: wt-status.c:1535
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
@@ -2273,12 +2530,12 @@ msgstr ""
 "\"를\n"
 "사용하십시오)\n"
 
-#: wt-status.c:1516
+#: wt-status.c:1538
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "커밋할 변경 사항� 추가하지 않았습니다\n"
 
-#: wt-status.c:1519
+#: wt-status.c:1541
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -2288,55 +2545,55 @@ msgstr ""
 "\"git\n"
 "add\"를 사용하십시오)\n"
 
-#: wt-status.c:1522
+#: wt-status.c:1544
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "커밋할 사항� 추가하지 않았지만 추�하지 않는 파�� 있습니다\n"
 
-#: wt-status.c:1525
+#: wt-status.c:1547
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "커밋할 사항 없� (파�� 만들거나 복사하고 \"git add\"를 사용하면 추�합니"
 "다)\n"
 
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
 #, c-format
 msgid "nothing to commit\n"
 msgstr "커밋할 사항 없�\n"
 
-#: wt-status.c:1531
+#: wt-status.c:1553
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "커밋할 사항 없� (추�하지 않는 파�� 보려면 -u 옵션� 사용하십시오)\n"
 
-#: wt-status.c:1535
+#: wt-status.c:1557
 #, c-format
 msgid "nothing to commit, working directory clean\n"
 msgstr "커밋할 사항 없�, 작업 �� 깨�함\n"
 
-#: wt-status.c:1642
+#: wt-status.c:1664
 msgid "Initial commit on "
 msgstr "최초 커밋, 브랜치: "
 
-#: wt-status.c:1646
+#: wt-status.c:1668
 msgid "HEAD (no branch)"
 msgstr "HEAD (브랜치 없�)"
 
-#: wt-status.c:1675
+#: wt-status.c:1697
 msgid "gone"
 msgstr "없�"
 
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
 msgid "behind "
 msgstr "다� 뒤�: "
 
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
 msgid "ahead "
 msgstr "다� 앞�: "
 
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "'%s' 파� 삭제� 실패했습니다"
@@ -2350,7 +2607,7 @@ msgstr "git add [<옵션>] [--] <경로명세>..."
 msgid "unexpected diff status %c"
 msgstr "예�치 못한 diff �태 %c"
 
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
 msgid "updating files failed"
 msgstr "파� 업��트가 실패했습니다"
 
@@ -2363,7 +2620,7 @@ msgstr "'%s' 제거\n"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "��스를 새로 고친 다� 커밋 표시하지 않� 변경 사항:"
 
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
 msgid "Could not read the index"
 msgstr "��스를 �� 수 없습니다"
 
@@ -2399,14 +2656,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "다� 경로는 .gitignore 파� 중 하나 때문� 무시합니다:\n"
 
 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
 msgid "dry run"
 msgstr "가짜로 실행"
 
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
 msgid "be verbose"
 msgstr "�세히 표시"
 
@@ -2414,7 +2671,7 @@ msgstr "�세히 표시"
 msgid "interactive picking"
 msgstr "대화�으로 고릅니다"
 
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
 msgid "select hunks interactively"
 msgstr "대화�으로 변경� 부분� 선�합니다"
 
@@ -2483,16 +2740,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "'git add .' 명령� 실행하려고 한 것 아니었습니까?\n"
 
 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
 msgid "index file corrupt"
 msgstr "��스 파�� ���었습니다"
 
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "새 ��스 파�� 쓸 수 없습니다"
 
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
 #, c-format
 msgid "could not read '%s'"
 msgstr "'%s'�서 �� 수 없습니다"
@@ -2520,16 +2777,6 @@ msgstr "'%s'�서 '%s'(으)로 노트를 복사하는� 실패했습니다"
 msgid "fseek failed"
 msgstr "fseek 실패"
 
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "'%s'�(를) �기용으로 열 수 없습니다: %s"
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "'%s'�(를) 쓰기용으로 열 수 없습니다: %s"
-
 #: builtin/am.c:788
 #, c-format
 msgid "could not parse patch '%s'"
@@ -2539,74 +2786,74 @@ msgstr "'%s' 패치를 파싱할 수 없습니다"
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "한번� 하나� StGIT 패치 시리즈만 �용할 수 있습니다"
 
-#: builtin/am.c:901
+#: builtin/am.c:900
 msgid "invalid timestamp"
 msgstr "시�� 잘못�었습니다"
 
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
 msgid "invalid Date line"
 msgstr "Date 줄� 잘못�었습니다"
 
-#: builtin/am.c:909
+#: builtin/am.c:908
 msgid "invalid timezone offset"
 msgstr "시간대 오프셋� 잘못�었습니다"
 
-#: builtin/am.c:996
+#: builtin/am.c:995
 msgid "Patch format detection failed."
 msgstr "패치 형� 검색� 실패했습니다."
 
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "'%s' 디렉터리 만들기가 실패했습니다"
 
-#: builtin/am.c:1005
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "패치를 쪼개는� 실패했습니다."
 
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
 msgid "unable to write index file"
 msgstr "��스 파�� 쓸 수 없습니다"
 
-#: builtin/am.c:1188
+#: builtin/am.c:1187
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "� 문제를 해결했� 때 \"%s --continue\"를 실행하십시오."
 
-#: builtin/am.c:1189
+#: builtin/am.c:1188
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "� 패치를 건너뛰려면, 그 대신 \"%s --skip\"� 실행하십시오."
 
-#: builtin/am.c:1190
+#: builtin/am.c:1189
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "�래 브랜치를 복구하고 패치 �용� 중지하려면 \"%s --abort\"를 실행하십시오."
 
-#: builtin/am.c:1328
+#: builtin/am.c:1327
 msgid "Patch is empty. Was it split wrong?"
 msgstr "패치가 비어 있습니다. 잘못 쪼개지지 않았나요?"
 
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "잘못� 신� 줄: %s"
 
-#: builtin/am.c:1429
+#: builtin/am.c:1428
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "%s 커밋� 파싱할 수 없습니다"
 
-#: builtin/am.c:1631
+#: builtin/am.c:1630
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "저장소� 3-방향 병합으로 대신할 때 필요한 블롭� 없습니다."
 
-#: builtin/am.c:1633
+#: builtin/am.c:1632
 msgid "Using index info to reconstruct a base tree..."
 msgstr "��스 정보를 사용해 기본 트리를 다시 만듭니다..."
 
-#: builtin/am.c:1652
+#: builtin/am.c:1651
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -2614,38 +2861,38 @@ msgstr ""
 "패치를 �접 편집하셨습니까?\n"
 "� 패치는 ��스� 기�� 블롭�는 �용�지 않습니다."
 
-#: builtin/am.c:1658
+#: builtin/am.c:1657
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "베�스 패치 �용 � 3-방향 병합으로 대신합니다..."
 
-#: builtin/am.c:1673
+#: builtin/am.c:1672
 msgid "Failed to merge in the changes."
 msgstr "변경 사항�서 병합하는� 실패했습니다."
 
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree가 트리를 쓰는� 실패했습니다"
 
-#: builtin/am.c:1704
+#: builtin/am.c:1703
 msgid "applying to an empty history"
 msgstr "빈 커밋 내역� 대해 �용합니다"
 
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
 msgid "failed to write commit object"
 msgstr "커밋 오브�트를 쓰는� 실패했습니다"
 
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "다시 시작할 수 없습니다: %s�(가) 없습니다."
 
-#: builtin/am.c:1769
+#: builtin/am.c:1768
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "터미�� 표준 입력� 연결�지 않� �태�서 대화형으로 실행할 수 없습니다."
 
-#: builtin/am.c:1774
+#: builtin/am.c:1773
 msgid "Commit Body is:"
 msgstr "커밋 본문�:"
 
@@ -2653,35 +2900,35 @@ msgstr "커밋 본문�:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1784
+#: builtin/am.c:1783
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "�용? 예[y]/아니오[n]/편집[e]/패치 보기[v]/모� �용[a]: "
 
-#: builtin/am.c:1834
+#: builtin/am.c:1833
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "변경� ��스: 패치를 �용할 수 없습니다 (dirty: %s)"
 
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
 #, c-format
 msgid "Applying: %.*s"
 msgstr "�용하는 중: %.*s"
 
-#: builtin/am.c:1885
+#: builtin/am.c:1884
 msgid "No changes -- Patch already applied."
 msgstr "변경 사항 없� -- 패치가 �미 �용�었습니다."
 
-#: builtin/am.c:1893
+#: builtin/am.c:1892
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "패치가 %s %.*s 위치�서 실패했습니다"
 
-#: builtin/am.c:1899
+#: builtin/am.c:1898
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "실패한 패치� 복사본� 다� 위치� 있습니다: %s"
 
-#: builtin/am.c:1944
+#: builtin/am.c:1943
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -2691,7 +2938,7 @@ msgstr ""
 "커밋으로 표시할 사항� 남아 있지 않으면, �미 같� 패치�서 �용�\n"
 "경우� 수� 있습니다. 그런 경우�는 � 패치를 건너뛰면 �니다."
 
-#: builtin/am.c:1951
+#: builtin/am.c:1950
 msgid ""
 "You still have unmerged paths in your index.\n"
 "Did you forget to use 'git add'?"
@@ -2699,17 +2946,17 @@ msgstr ""
 "��스� 병합하지 않� 경로가 남아 있습니다.\n"
 "'git add' 사용� 잊지 않으셨습니까?"
 
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
 #: builtin/reset.c:316
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "'%s' 오브�트를 파싱할 수 없습니다."
 
-#: builtin/am.c:2111
+#: builtin/am.c:2110
 msgid "failed to clean index"
 msgstr "��스 지우기� 실패했습니다"
 
-#: builtin/am.c:2145
+#: builtin/am.c:2144
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -2717,155 +2964,157 @@ msgstr ""
 "마지막 'am' 실패 �후 HEAD를 옮긴 것 같습니다.\n"
 "ORIG_HEAD로 ��리지 않습니다."
 
-#: builtin/am.c:2206
+#: builtin/am.c:2205
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "--patch-format 옵션� 대해 잘못� 값: %s"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2238
 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
 msgstr "git am [<옵션>] [(<mbox>|<Maildir>)...]"
 
-#: builtin/am.c:2240
+#: builtin/am.c:2239
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<옵션>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2246
+#: builtin/am.c:2245
 msgid "run interactively"
 msgstr "대화형으로 실행합니다"
 
-#: builtin/am.c:2248
+#: builtin/am.c:2247
 msgid "historical option -- no-op"
 msgstr "아무 �작� 하지 않습니다 (과거부터 있었� 옵션)"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2249
 msgid "allow fall back on 3way merging if needed"
 msgstr "필요하면 3-방향 병합으로 대신하�� 허용합니다"
 
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
 #: builtin/repack.c:171
 msgid "be quiet"
 msgstr "간략히 표시합니다"
 
-#: builtin/am.c:2253
+#: builtin/am.c:2252
 msgid "add a Signed-off-by line to the commit message"
 msgstr "커밋 메시지� Signed-off-by 줄� 남�니다"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2255
 msgid "recode into utf8 (default)"
 msgstr "UTF-8 �코딩으로 변환합니다 (기본값)"
 
-#: builtin/am.c:2258
+#: builtin/am.c:2257
 msgid "pass -k flag to git-mailinfo"
 msgstr "git-mailinfo� -k 옵션� �니다"
 
-#: builtin/am.c:2260
+#: builtin/am.c:2259
 msgid "pass -b flag to git-mailinfo"
 msgstr "git-mailinfo� -b 옵션� �니다"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2261
 msgid "pass -m flag to git-mailinfo"
 msgstr "git-mailinfo� -m 옵션� �니다"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2263
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "mbox 형�� 대해 git-mailsplit� --keep-cr 옵션� 사용합니다"
 
-#: builtin/am.c:2267
+#: builtin/am.c:2266
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "am.keepcr� 무관하게 git-mailsplit� --keep-cr 옵션� 사용하지 않습니다."
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "strip everything before a scissors line"
 msgstr "절취선 앞� 모든 사항� 무시합니다"
 
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
 msgid "action"
 msgstr "�작"
 
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
 msgid "pass it through git-apply"
 msgstr "git-apply� 넘�니다"
 
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
 msgid "root"
 msgstr "최�위"
 
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
 msgid "path"
 msgstr "경로"
 
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 builtin/pull.c:185
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193
 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
 #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
 #: parse-options.h:134 parse-options.h:244
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
 msgid "num"
 msgstr "개수"
 
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
 #: builtin/tag.c:372
 msgid "format"
 msgstr "형�"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "format the patch(es) are in"
 msgstr "패치� 형�"
 
-#: builtin/am.c:2302
+#: builtin/am.c:2301
 msgid "override error message when patch failure occurs"
 msgstr "패치 실패가 발�했� 때 오류 메시지 대신 사용합니다"
 
-#: builtin/am.c:2304
+#: builtin/am.c:2303
 msgid "continue applying patches after resolving a conflict"
 msgstr "충�� 해결한 다� 패치 �용� 계�합니다"
 
-#: builtin/am.c:2307
+#: builtin/am.c:2306
 msgid "synonyms for --continue"
 msgstr "--continue 옵션과 ��"
 
-#: builtin/am.c:2310
+#: builtin/am.c:2309
 msgid "skip the current patch"
 msgstr "현재 패치 건너뛰기"
 
-#: builtin/am.c:2313
+#: builtin/am.c:2312
 msgid "restore the original branch and abort the patching operation."
 msgstr "�래 브랜치를 복구하고 패치 �용 작업� 중지합니다."
 
 # NOTE: 옵션� �미는 �게 맞다. �문�서는 사용�가
 # --committer-date-is-author-date�는 옵션� 보고 �미를 알 수 있다고 가정하고 있다.
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 msgid "lie about committer date"
 msgstr "커미터 시�� 작성� 시�으로 넣습니다"
 
-#: builtin/am.c:2319
+#: builtin/am.c:2318
 msgid "use current timestamp for author date"
 msgstr "현재 시�� 작성� 시�으로 사용합니다"
 
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
 msgid "key-id"
 msgstr "키-ID"
 
-#: builtin/am.c:2322
+#: builtin/am.c:2321
 msgid "GPG-sign commits"
 msgstr "GPG 서명 커밋"
 
-#: builtin/am.c:2325
+#: builtin/am.c:2324
 msgid "(internal use for git-rebase)"
 msgstr "(git-rebase를 위한 내부 용�)"
 
-#: builtin/am.c:2340
+#: builtin/am.c:2339
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -2873,16 +3122,16 @@ msgstr ""
 "-b/--binary 옵션� 오랜 시간 �안 아무 �작� 하지 않았으므로, �\n"
 "옵션� 제거� 예정입니다. �제 사용하지 마십시오."
 
-#: builtin/am.c:2347
+#: builtin/am.c:2346
 msgid "failed to read the index"
 msgstr "��스 �기� 실패했습니다"
 
-#: builtin/am.c:2362
+#: builtin/am.c:2361
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "�전 리베�스 디렉터리 %s�(가) 아� 있고 mbox를 지정했습니다."
 
-#: builtin/am.c:2386
+#: builtin/am.c:2385
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -2891,7 +3140,7 @@ msgstr ""
 "벗어난 %s 디렉터리가 발견�었습니다.\n"
 "제거하려면 \"git am --abort\"를 사용하십시오."
 
-#: builtin/am.c:2392
+#: builtin/am.c:2391
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "해소 작업� 진행 중입니다. 다시 시작하지 않습니다."
 
@@ -2924,41 +3173,41 @@ msgstr "regexec()�서 다� 입력� 대해 %d번� 리턴했습니다: %s"
 msgid "unable to find filename in patch at line %d"
 msgstr "패치� %d번 줄� 파� �름� 찾� 수 없습니다"
 
-#: builtin/apply.c:940
+#: builtin/apply.c:937
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: 잘못� git-diff - %2$d번 줄�서 /dev/null� 기대했지만, '%1$s'�"
 "(가) 왔습니다"
 
-#: builtin/apply.c:944
+#: builtin/apply.c:942
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply: 잘못� git-diff - %d번 줄� 새 파� �름� 올바르지 않습니다"
 
-#: builtin/apply.c:945
+#: builtin/apply.c:943
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply: 잘못� git-diff - %d번 줄� 예전 파� �름� 올바르지 않습니다"
 
-#: builtin/apply.c:952
+#: builtin/apply.c:949
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: 잘못� git-diff - %d번 줄�서 /dev/null� 기대했습니다"
 
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: 예�치 못한 줄: %.*s"
 
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "%d번 줄� 헤� 없는 패치 부분: %.*s"
 
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -2970,76 +3219,76 @@ msgstr[0] ""
 "경로 �름 부분�서 %d개를 제거� 때 git diff 헤�� 파� �름 정보가 없습니"
 "다. (%d번 줄)"
 
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
 msgid "new file depends on old contents"
 msgstr "새 파�� 예전 내용� �존합니다"
 
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
 msgid "deleted file still has contents"
 msgstr "삭제한 파�� 아� 내용� 들어 있습니다"
 
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "패치가 %d번 줄�서 �가졌습니다"
 
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "새 파� %s�(가) 예전 내용� �존합니다"
 
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "삭제한 파� %s�(가) 아� 내용� 들어 있습니다"
 
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** 경고: %s 파�� 내용� 비어 있지만 삭제�지 않았습니다"
 
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "%d번 줄� 바�너리 패치가 ���었습니다: %.*s"
 
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "%d번 줄� 바�너리 패치가 �해할 수 없습니다"
 
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "%d번 줄� 쓰레기 ��터만 있는 패치"
 
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "%s 심볼릭 ��를 �� 수 없습니다"
 
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
 #, c-format
 msgid "unable to open or read %s"
 msgstr "%s�(를) 열거나 �� 수 없습니다"
 
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "줄 시작� 잘못�: '%c'"
 
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "패치 %d번 부분 %d번 줄�서 성공 (오프셋 %d줄)"
 
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "컨�스트가 (%ld/%ld)로 줄어듭니다. (%d번 줄�서 �용)"
 
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -3048,319 +3297,329 @@ msgstr ""
 "다�� 검색하� 중:\n"
 "%.*s"
 
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "'%s'� 대한 바�너리 패치 ��터가 없습니다"
 
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "바�너리 패치를 '%s'� �용할 수 없습니다"
 
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "'%s'� 대한 바�너리 패치가 올바르지 않� 결과를 만듭니다. (기대한 값 %s, 실"
 "제 %s)"
 
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "패치 실패: %s:%ld"
 
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
 #, c-format
 msgid "cannot checkout %s"
 msgstr "%s�(를) 가져올 수 없습니다"
 
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
 #, c-format
 msgid "read of %s failed"
 msgstr "%s �기가 실패했습니다"
 
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "심볼릭 �� 뒤� 있는 '%s' �기"
 
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "%s 경로가 �름� 바뀌었거나 삭제�었습니다"
 
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: ��스� 없습니다"
 
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: ��스와 맞지 않습니다"
 
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
 msgid "removal patch leaves file contents"
 msgstr "제거하는 패치 다�� 파� 내용� 남았습니다"
 
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: 잘못� 종류"
 
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s� 종류가 %o�지만 %o�(가) �어야 합니다"
 
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
 #, c-format
 msgid "invalid path '%s'"
 msgstr "잘못� 경로 '%s'"
 
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: �미 ��스� 있습니다"
 
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: �미 작업 디렉터리� 있습니다"
 
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "%2$s� 새 모드(%1$o)가 예전 모드(%3$o)와 다릅니다"
 
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "%2$s� 새 모드(%1$o)가 %4$s� 예전 모드(%3$o)와 다릅니다"
 
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "�향 받는 '%s' 파�� 심볼릭 �� 뒤� 있습니다"
 
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: 패치를 �용하지 않습니다"
 
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
 #, c-format
 msgid "Checking patch %s..."
 msgstr "%s 패치를 확�하는 중입니다..."
 
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "경로 '%s'� 대해 make_cache_entry 실패"
 
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "��스�서 %s�(를) 제거할 수 없습니다"
 
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "하위 모듈 %s� 대해 ��� 패치"
 
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "새로 만든 파� '%s'� 대해 stat()할 수 없습니다"
 
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "새로 만든 파� '%s'� 대해 예비 저장소를 만들 수 없습니다"
 
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "%s� 대해 �시 항목� 추가할 수 없습니다"
 
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
 #, c-format
 msgid "closing file '%s'"
 msgstr "'%s' 파�� 닫는 중입니다"
 
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "'%s' 파�� 쓸 수 없습니다 ('%o' 모드)"
 
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "%s 패치 깔�하게 �용."
 
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
 msgid "internal error"
 msgstr "내부 오류"
 
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "%%s 패치를 (%d개 거부) �용..."
 
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "truncating .rej 파� �름� '%.*s.rej'(으)로 �름"
 
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "%s�(를) 열 수 없습니다: %s"
+
+#: builtin/apply.c:4298
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "패치 부위 #%d 깔�하게 �용."
 
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "패치 부위 #%d 거부�."
 
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "패치 '%s' 건너뜀."
+
+#: builtin/apply.c:4395
 msgid "unrecognized input"
 msgstr "��할 수 없는 입력"
 
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
 msgid "unable to read index file"
 msgstr "��스 파�� �� 수 없습니다"
 
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
 msgid "don't apply changes matching the given path"
 msgstr "주어진 경로� 해당하는 변경 사항� �용하지 않습니다"
 
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
 msgid "apply changes matching the given path"
 msgstr "주어진 경로� 해당하는 변경 사항� �용합니다"
 
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "전통�� diff 경로 앞� <개수>개� 앞 슬래시(/)를 제거합니다"
 
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
 msgid "ignore additions made by the patch"
 msgstr "패치�서 추가하는 파�� 무시합니다"
 
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "패치를 �용하는 대신, 입력� 대한 diffstat� 출력합니다"
 
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "십진수로 추가 � 삭제한 줄 수를 표시합니다"
 
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "패치를 �용하는 대신, 입력� 대한 요약� 출력합니다"
 
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "패치를 �용하는 대신, 패치를 �용 가능한지 확�합니다"
 
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
 msgid "make sure the patch is applicable to the current index"
 msgstr "현재 ��스�서 패치가 �용 가능한지 확�합니다"
 
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
 msgid "apply a patch without touching the working tree"
 msgstr "작업 ��를 바꾸지 않고 패치를 �용합니다"
 
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
 msgid "accept a patch that touches outside the working area"
 msgstr "작업 �역 밖� 파�� 바꾸는 패치를 허용합니다"
 
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "그리고 패치� �용합니다 (--stat/--summary/--check 옵션과 같� 사용)"
 
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "패치를 �용하지 않으면 3-방향 병합� 시�합니다"
 
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
 msgid "build a temporary index based on embedded index information"
 msgstr "내장 ��스 정보를 사용해 임시 ��스를 만듭니다"
 
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
 msgid "paths are separated with NUL character"
 msgstr "경로를 NUL 문�로 구분합니다"
 
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
 msgid "ensure at least <n> lines of context match"
 msgstr "최소한 <n>줄� 컨�스트와 �치하는지 확�합니다"
 
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "공백 오류가 있는 추가�거나 수정� 줄� 찾습니다"
 
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
 msgid "ignore changes in whitespace when finding context"
 msgstr "컨�스트를 찾� 때 공백 변경 사항� 무시합니다"
 
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
 msgid "apply the patch in reverse"
 msgstr "패치를 반대 순서로 �용합니다"
 
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
 msgid "don't expect at least one line of context"
 msgstr "최소한� 컨�스트 한 줄� 없� �용합니다"
 
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "거부� 패치 부분� 대��는 *.rej 파�� 남겨둡니다"
 
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
 msgid "allow overlapping hunks"
 msgstr "패치 부분� 겹�� 허용합니다"
 
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "파� �� 줄바꿈� 빠졌�� 잘못 검색한 경우� 무시합니다"
 
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
 msgid "do not trust the line counts in the hunk headers"
 msgstr "패치 부분� 헤�� 줄 수를 신용하지 않습니다"
 
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
 msgid "prepend <root> to all filenames"
 msgstr "모든 파� �름� <최�위>를 앞� 붙입니다"
 
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
 msgid "--3way outside a repository"
 msgstr "저장소 밖�서 --3way 옵션 사용"
 
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
 msgid "--index outside a repository"
 msgstr "저장소 밖�서 --index 옵션 사용"
 
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
 msgid "--cached outside a repository"
 msgstr "저장소 밖�서 --cached 옵션 사용"
 
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
 #, c-format
 msgid "can't open patch '%s'"
 msgstr "'%s' 패치를 열 수 없습니다"
 
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "공백 오류 %d개를 넘어갑니다"
 
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
@@ -3425,99 +3684,99 @@ msgstr "<리비전-옵션>� git-rev-list(1)� 설명�어 있습니다"
 msgid "Blaming lines"
 msgstr "블레임 줄"
 
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
 msgid "Show blame entries as we find them, incrementally"
 msgstr "블레임 항목� 찾�마� �진�으로 표시합니다"
 
-#: builtin/blame.c:2531
+#: builtin/blame.c:2532
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "가장�리 커밋� 대해 빈 SHA-1� 표시합니다 (기본값: 꺼�)"
 
-#: builtin/blame.c:2532
+#: builtin/blame.c:2533
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "최�위 커밋� 가장�리 커밋으로 취급하지 않습니다 (기본값: 꺼�)"
 
-#: builtin/blame.c:2533
+#: builtin/blame.c:2534
 msgid "Show work cost statistics"
 msgstr "작업 비용 통계를 표시합니다"
 
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
 msgid "Force progress reporting"
 msgstr "강제로 진행 �황� 표시합니다"
 
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
 msgid "Show output score for blame entries"
 msgstr "블레임 항목� 대해 출력 �수를 표시합니다"
 
-#: builtin/blame.c:2536
+#: builtin/blame.c:2537
 msgid "Show original filename (Default: auto)"
 msgstr "�래 파� �름 표시 (기본값: ��)"
 
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
 msgid "Show original linenumber (Default: off)"
 msgstr "�래 줄 번호 표시 (기본값: 하지 않�)"
 
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
 msgid "Show in a format designed for machine consumption"
 msgstr "컴퓨터 처리용으로 설계� 형�으로 표시합니다"
 
-#: builtin/blame.c:2539
+#: builtin/blame.c:2540
 msgid "Show porcelain format with per-line commit information"
 msgstr "줄마다 커밋 정보가 표시�는 사용�용 형�으로 표시합니다"
 
-#: builtin/blame.c:2540
+#: builtin/blame.c:2541
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "git-annotate와 ��한 형�� 사용합니다 (기본값: 꺼�)"
 
-#: builtin/blame.c:2541
+#: builtin/blame.c:2542
 msgid "Show raw timestamp (Default: off)"
 msgstr "내부 형�으로 시�� 표시합니다 (기본값: 꺼�)"
 
-#: builtin/blame.c:2542
+#: builtin/blame.c:2543
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "길게 커밋 SHA1� 표시합니다 (기본값: 꺼�)"
 
-#: builtin/blame.c:2543
+#: builtin/blame.c:2544
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "작성� �름과 시�� 표시하지 않습니다 (기본값: 꺼�)"
 
-#: builtin/blame.c:2544
+#: builtin/blame.c:2545
 msgid "Show author email instead of name (Default: off)"
 msgstr "작성� �름 대신� 전�메�� 표시합니다 (기본값: 꺼�)"
 
-#: builtin/blame.c:2545
+#: builtin/blame.c:2546
 msgid "Ignore whitespace differences"
 msgstr "공백 문� 차��� 무시합니다"
 
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
 msgid "Spend extra cycles to find better match"
 msgstr "� �치하는 항목� 찾는� � 시간� 소모합니다"
 
-#: builtin/blame.c:2547
+#: builtin/blame.c:2548
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "git-rev-list를 호출하는 대신 <파�>�서 리비전� 사용합니다"
 
-#: builtin/blame.c:2548
+#: builtin/blame.c:2549
 msgid "Use <file>'s contents as the final image"
 msgstr "<파�>� 내용� 최종 �미지로 사용합니다"
 
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
 msgid "score"
 msgstr "�수"
 
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
 msgid "Find line copies within and across files"
 msgstr "파� 내부와 파� 사�� 복사� 줄� 찾습니다"
 
-#: builtin/blame.c:2550
+#: builtin/blame.c:2551
 msgid "Find line movements within and across files"
 msgstr "파� 내부와 파� 사�� 옮겨진 줄� 찾습니다"
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "Process only line range n,m, counting from 1"
 msgstr "n,m줄 (1번 줄부터 시작) 사�� 범위만 처리"
 
@@ -3527,31 +3786,31 @@ msgstr "n,m줄 (1번 줄부터 시작) 사�� 범위만 처리"
 #. takes 22 places, is the longest among various forms of
 #. relative timestamps, but your language may need more or
 #. fewer display columns.
-#: builtin/blame.c:2640
+#: builtin/blame.c:2641
 msgid "4 years, 11 months ago"
 msgstr "4년 11달 전"
 
-#: builtin/branch.c:25
+#: builtin/branch.c:26
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr "git branch [<옵션>] [-r | -a] [--merged | --no-merged]"
 
-#: builtin/branch.c:26
+#: builtin/branch.c:27
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr "git branch [<옵션>] [-l] [-f] <브랜치-�름> [<시작-지�>]"
 
-#: builtin/branch.c:27
+#: builtin/branch.c:28
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<옵션>] [-r] (-d | -D) <브랜치-�름>..."
 
-#: builtin/branch.c:28
+#: builtin/branch.c:29
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<옵션>] (-m | -M) [<과거-브랜치>] <새-브랜치>"
 
-#: builtin/branch.c:29
+#: builtin/branch.c:30
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<옵션>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:142
+#: builtin/branch.c:143
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -3560,7 +3819,7 @@ msgstr ""
 "'%s' 브랜치를 삭제합니다. � 브랜치는 '%s'�\n"
 "         병합�었지만, HEAD�는 병합�지 않았습니다."
 
-#: builtin/branch.c:146
+#: builtin/branch.c:147
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -3569,12 +3828,12 @@ msgstr ""
 "'%s' 브랜치를 삭제하지 않습니다. � 브랜치는 '%s'�\n"
 "         병합�지 않았지만, HEAD�는 병합�었습니다."
 
-#: builtin/branch.c:160
+#: builtin/branch.c:161
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "'%s'� 대한 커밋 오브�트를 찾아볼 수 없습니다"
 
-#: builtin/branch.c:164
+#: builtin/branch.c:165
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -3583,299 +3842,320 @@ msgstr ""
 "'%s' 브랜치가 완전히 병합�지 않았습니다.\n"
 "정�로 삭제하려면 'git branch -D %s' 명령� 실행하십시오."
 
-#: builtin/branch.c:177
+#: builtin/branch.c:178
 msgid "Update of config-file failed"
 msgstr "config-file 업��트가 실패했습니다"
 
-#: builtin/branch.c:205
+#: builtin/branch.c:206
 msgid "cannot use -a with -d"
 msgstr "-a 옵션� -d 옵션과 같� 쓸 수 없습니다"
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "Couldn't look up commit object for HEAD"
 msgstr "HEAD� 대한 커밋 오브�트를 찾아볼 수 없습니다"
 
-#: builtin/branch.c:219
+#: builtin/branch.c:226
 #, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "'%s' 브랜치는 현재 위치한 브랜치�기 때문� 삭제할 수 없습니다."
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "'%2$s' 위치� 체�아웃한 '%1$s' 브랜치를 삭제할 수 없습니다"
 
-#: builtin/branch.c:235
+#: builtin/branch.c:241
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "리모트 추� '%s' 브랜치가 없습니다."
 
-#: builtin/branch.c:236
+#: builtin/branch.c:242
 #, c-format
 msgid "branch '%s' not found."
 msgstr "'%s' 브랜치가 없습니다."
 
-#: builtin/branch.c:251
+#: builtin/branch.c:257
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "리모트 추� '%s' 브랜치를 삭제하는� 오류"
 
-#: builtin/branch.c:252
+#: builtin/branch.c:258
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "'%s' 브랜치를 삭제하는� 오류"
 
-#: builtin/branch.c:259
+#: builtin/branch.c:265
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "리모트 추� '%s' 브랜치를 삭제합니다. (과거 %s)\n"
 
-#: builtin/branch.c:260
+#: builtin/branch.c:266
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "%s 브랜치 삭제 (과거 %s).\n"
 
-#: builtin/branch.c:303
+#: builtin/branch.c:309
 #, c-format
 msgid "[%s: gone]"
 msgstr "[%s: 사��]"
 
-#: builtin/branch.c:308
+#: builtin/branch.c:314
 #, c-format
 msgid "[%s]"
 msgstr "[%s]"
 
-#: builtin/branch.c:313
+#: builtin/branch.c:319
 #, c-format
 msgid "[%s: behind %d]"
 msgstr "[%s: %d개 뒤]"
 
-#: builtin/branch.c:315
+#: builtin/branch.c:321
 #, c-format
 msgid "[behind %d]"
 msgstr "[%d개 뒤]"
 
-#: builtin/branch.c:319
+#: builtin/branch.c:325
 #, c-format
 msgid "[%s: ahead %d]"
 msgstr "[%s: %d개 앞]"
 
-#: builtin/branch.c:321
+#: builtin/branch.c:327
 #, c-format
 msgid "[ahead %d]"
 msgstr "[%d개 앞]"
 
-#: builtin/branch.c:324
+#: builtin/branch.c:330
 #, c-format
 msgid "[%s: ahead %d, behind %d]"
 msgstr "[%s: %d개 앞, %d개 뒤]"
 
-#: builtin/branch.c:327
+#: builtin/branch.c:333
 #, c-format
 msgid "[ahead %d, behind %d]"
 msgstr "[%d개 앞, %d개 뒤]"
 
-#: builtin/branch.c:340
+#: builtin/branch.c:346
 msgid " **** invalid ref ****"
 msgstr " **** 잘못� 레�런스 ****"
 
-#: builtin/branch.c:366
+#: builtin/branch.c:372
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(브랜치 없�, %s 리베�스)"
 
-#: builtin/branch.c:369
+#: builtin/branch.c:375
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(브랜치 없�, �등분 %s�서 시작)"
 
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD %s 위치�서 분리�)"
 
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD %s(으)로부터 분리�)"
 
-#: builtin/branch.c:382
+#: builtin/branch.c:390
 msgid "(no branch)"
 msgstr "(브랜치 없�)"
 
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "%s 브랜치를 %s 위치� 리베�스합니다"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "%s 브랜치를 %s 위치�서 bisect합니다"
+
+#: builtin/branch.c:560
 msgid "cannot rename the current branch while not on any."
 msgstr "브랜치 위� 없으면서 현재 브랜치 �름� 바꿀 수 없습니다."
 
-#: builtin/branch.c:534
+#: builtin/branch.c:570
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "잘못� 브랜치 �름: '%s'"
 
-#: builtin/branch.c:549
+#: builtin/branch.c:587
 msgid "Branch rename failed"
 msgstr "브랜치 �름 바꾸기 실패"
 
-#: builtin/branch.c:553
+#: builtin/branch.c:591
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "�름� 잘못� '%s' 브랜치� �름� 다르게 바꿉니다"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:594
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "브랜치 �름� %s(으)로 바꾸지만, HEAD를 업��트하지 않습니다!"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:601
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "브랜치� �름� 바꾸지만, config-file 업��트가 실패했습니다"
 
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "브랜치 설명 서�� 쓸 수 없습니다: %s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "브랜치 설명 서�� 쓸 수 없습니다"
 
-#: builtin/branch.c:615
+#: builtin/branch.c:651
 msgid "Generic options"
 msgstr "�반 옵션"
 
 # FIXME: give twice?
-#: builtin/branch.c:617
+#: builtin/branch.c:653
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "해시와 제목� 표시하고, 업스트림 브랜치� 대한 위치를 표시합니다"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:654
 msgid "suppress informational messages"
 msgstr "여러가지 안내 메시지를 표시하지 않습니다"
 
-#: builtin/branch.c:619
+#: builtin/branch.c:655
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "추� 모드를 설정합니다 (git-pull(1) 참고)"
 
-#: builtin/branch.c:621
+#: builtin/branch.c:657
 msgid "change upstream info"
 msgstr "업스트림 정보를 바꿉니다"
 
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "업스트림"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "업스트림 정보를 바꿉니다"
+
+#: builtin/branch.c:661
 msgid "use colored output"
 msgstr "여러 색으로 출력합니다"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:662
 msgid "act on remote-tracking branches"
 msgstr "리모트 추� 브랜치� 대해 �작합니다"
 
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
 msgid "print only branches that contain the commit"
 msgstr "커밋� 있는 브랜치만 표시합니다"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:668
 msgid "Specific git-branch actions:"
 msgstr "특정 git-branch �작:"
 
-#: builtin/branch.c:633
+#: builtin/branch.c:669
 msgid "list both remote-tracking and local branches"
 msgstr "리모트와 로컬� 브랜치 목�� 모� 표시합니다"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:671
 msgid "delete fully merged branch"
 msgstr "완전히 병합� 브랜치를 삭제합니다"
 
-#: builtin/branch.c:636
+#: builtin/branch.c:672
 msgid "delete branch (even if not merged)"
 msgstr "브랜치를 삭제합니다 (병합�지 않았���)"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:673
 msgid "move/rename a branch and its reflog"
 msgstr "브랜치와 그 reflog를 옮기거나 �름� 바꿉니다"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:674
 msgid "move/rename a branch, even if target exists"
 msgstr "대�� �미 있��� 브랜치를 옮기거나 �름� 바꿉니다"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:675
 msgid "list branch names"
 msgstr "브랜치 �름 목�� 표시합니다"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:676
 msgid "create the branch's reflog"
 msgstr "브랜치� reflog를 만듭니다"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:678
 msgid "edit the description for the branch"
 msgstr "브랜치� 설명� 편집합니다"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:679
 msgid "force creation, move/rename, deletion"
 msgstr "강제로 만들고, 옮기거나 �름� 바꾸고, 삭제합니다"
 
-#: builtin/branch.c:644
+#: builtin/branch.c:680
 msgid "print only branches that are merged"
 msgstr "병합�는 브랜치만 표시합니다"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:681
 msgid "print only branches that are not merged"
 msgstr "병합�지 않는 브랜치만 표시합니다"
 
-#: builtin/branch.c:646
+#: builtin/branch.c:682
 msgid "list branches in columns"
 msgstr "목�� 여러 열로 표시합니다"
 
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
 msgid "key"
 msgstr "키"
 
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
 msgid "field name to sort on"
 msgstr "정렬한 기준� �는 필드 �름"
 
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
 #: builtin/tag.c:369
 msgid "object"
 msgstr "오브�트"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:687
 msgid "print only branches of the object"
 msgstr "해당 오브�트� 브랜치만 표시합니다"
 
-#: builtin/branch.c:669
+#: builtin/branch.c:705
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "HEAD를 올바른 레�런스로 구해내는� 실패했습니다."
 
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
 msgid "HEAD not found below refs/heads!"
 msgstr "레�런스/헤드 아래� HEAD가 없습니다!"
 
-#: builtin/branch.c:693
+#: builtin/branch.c:729
 msgid "--column and --verbose are incompatible"
 msgstr "--column � --verbose 옵션� 호환�지 않습니다"
 
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
 msgid "branch name required"
 msgstr "브랜치 �름� 필요합니다"
 
-#: builtin/branch.c:722
+#: builtin/branch.c:758
 msgid "Cannot give description to detached HEAD"
 msgstr "분리� HEAD� 대한 설명� 부여할 수 없습니다"
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 msgid "cannot edit description of more than one branch"
 msgstr "여러 브랜치� 대한 설명� 편집할 수 없습니다"
 
-#: builtin/branch.c:734
+#: builtin/branch.c:770
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "아� '%s' 브랜치� 커밋� 없습니다."
 
-#: builtin/branch.c:737
+#: builtin/branch.c:773
 #, c-format
 msgid "No branch named '%s'."
 msgstr "�름� '%s'� 브랜치가 없습니다."
 
-#: builtin/branch.c:752
+#: builtin/branch.c:788
 msgid "too many branches for a rename operation"
 msgstr "�름 바꾸기 작업� 대해 브랜치가 너무 많습니다"
 
-#: builtin/branch.c:757
+#: builtin/branch.c:793
 msgid "too many branches to set new upstream"
 msgstr "새 업스트림� 설정하는� 브랜치가 너무 많습니다"
 
-#: builtin/branch.c:761
+#: builtin/branch.c:797
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -3883,41 +4163,41 @@ msgstr ""
 "HEAD� 업스트림� %s(으)로 설정할 수 없습니다. 어떤 브랜치� 가리키지 않습니"
 "다."
 
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
 #, c-format
 msgid "no such branch '%s'"
 msgstr "그런 브랜치가 ('%s') 없습니다"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:804
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "'%s' 브랜치가 없습니다"
 
-#: builtin/branch.c:780
+#: builtin/branch.c:816
 msgid "too many branches to unset upstream"
 msgstr "업스트림 설정� 해제하는� 브랜치가 너무 많습니다"
 
-#: builtin/branch.c:784
+#: builtin/branch.c:820
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "HEAD� 업스트림 설정� 해제할 수 없습니다. 어떤 브랜치� 가리키지 않습니다."
 
-#: builtin/branch.c:790
+#: builtin/branch.c:826
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "'%s' 브랜치� 업스트림 정보가 없습니다"
 
-#: builtin/branch.c:804
+#: builtin/branch.c:840
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "'HEAD'를 수�으로 만드는 건 앞뒤가 맞지 않습니다"
 
-#: builtin/branch.c:810
+#: builtin/branch.c:846
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 "'git branch'� 대해 -a � -r 옵션� 브랜치 �름과 같� 쓰면 앞뒤가 맞지 않습"
 "니다"
 
-#: builtin/branch.c:813
+#: builtin/branch.c:849
 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3926,7 +4206,7 @@ msgstr ""
 "--set-upstream 옵션� � �� 사용�지 않고 제거� 예정입니다. --track �는 "
 "--set-upstream-to 옵션� 사용해 보십시오\n"
 
-#: builtin/branch.c:830
+#: builtin/branch.c:866
 #, c-format
 msgid ""
 "\n"
@@ -3936,16 +4216,6 @@ msgstr ""
 "\n"
 "'%s'�(를) 만들고 '%s'�(를) 추�하게 하려면, 다�� 하십시오:\n"
 
-#: builtin/branch.c:831
-#, c-format
-msgid "    git branch -d %s\n"
-msgstr "    git branch -d %s\n"
-
-#: builtin/branch.c:832
-#, c-format
-msgid "    git branch --set-upstream-to %s\n"
-msgstr "    git branch --set-upstream-to %s\n"
-
 #: builtin/bundle.c:51
 #, c-format
 msgid "%s is okay\n"
@@ -4044,7 +4314,7 @@ msgstr "표준 입력�서 파� �름� �습니다"
 msgid "terminate input and output records by a NUL character"
 msgstr "NUL 문�를 기준으로 �료 입력 � 출력� 멈춥니다"
 
-#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
 msgid "suppress progress reporting"
 msgstr "진행 �황 표시를 하지 않습니다"
 
@@ -4134,8 +4404,9 @@ msgid "write the content to temporary files"
 msgstr "내용� 임시 파�� �니다"
 
 #: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
 msgid "string"
 msgstr "문�열"
 
@@ -4185,79 +4456,79 @@ msgstr "'%s' 경로: 병합할 수 없습니다"
 msgid "Unable to add merge result for '%s'"
 msgstr "'%s'� 대한 병합 결과를 추가할 수 없습니다"
 
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' 옵션� 업��트하는 경로�서 쓸 수 없습니다"
 
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' 옵션� %s 옵션과 같� 쓸 수 없습니다"
 
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "경로를 업��트하고 '%s' 브랜치로 전환하는 �� �시� 할 수 없습니다."
 
-#: builtin/checkout.c:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
 msgid "corrupt index file"
 msgstr "��� ��스 파�"
 
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "'%s' 경로를 병합하지 않았습니다"
 
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
 msgid "you need to resolve your current index first"
 msgstr "현재 ��스를 먼저 해결해야 합니다"
 
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "'%s'� 대해 reflog할 수 없습니다: %s\n"
 
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
 msgid "HEAD is now at"
 msgstr "HEAD� 현재 위치는"
 
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
 msgid "unable to update HEAD"
 msgstr "HEAD를 업��트할 수 없습니다"
 
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "'%s' 브랜치 리셋\n"
 
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "�미 '%s'� 있습니다\n"
 
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "'%s' 브랜치로 전환하고 리셋합니다\n"
 
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "새로 만든 '%s' 브랜치로 전환합니다\n"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "'%s' 브랜치로 전환합니다\n"
 
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... 그리고 %d개 �.\n"
 
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -4275,7 +4546,7 @@ msgstr[0] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4296,151 +4567,151 @@ msgstr[0] ""
 " git branch <새-브랜치-�름> %s\n"
 "\n"
 
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
 msgid "internal error in revision walk"
 msgstr "리비전 walk� 내부 오류"
 
-#: builtin/checkout.c:797
+#: builtin/checkout.c:796
 msgid "Previous HEAD position was"
 msgstr "�전 HEAD 위치는"
 
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
 msgid "You are on a branch yet to be born"
 msgstr "현재 위치가 만들 예정� 브랜치� 있습니다"
 
-#: builtin/checkout.c:969
+#: builtin/checkout.c:968
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "하나� 레�런스만 지정해야 하지만 %d개를 지정했습니다."
 
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
 #, c-format
 msgid "invalid reference: %s"
 msgstr "잘못� 레�런스: %s"
 
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "레�런스가 트리가 아닙니다: %s"
 
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1076
 msgid "paths cannot be used with switching branches"
 msgstr "브랜치를 전환하는� 경로를 사용할 수 없습니다"
 
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' 옵션� 브랜치를 전환할 때 쓸 수 없습니다"
 
-#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' 옵션� '%s' 옵션과 같� 쓸 수 없습니다"
 
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "브랜치를 커밋� 아닌 '%s'(으)로 전환할 수 없습니다"
 
-#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
 msgid "branch"
 msgstr "브랜치"
 
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
 msgid "create and checkout a new branch"
 msgstr "새 브랜치를 만들고 가져옵니다"
 
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
 msgid "create/reset and checkout a branch"
 msgstr "브랜치를 만들거나 리셋하고 가져옵니다"
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
 msgid "create reflog for new branch"
 msgstr "새 브랜치� 대한 reflog를 만듭니다"
 
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
 msgid "detach the HEAD at named commit"
 msgstr "지정한 커밋�서 HEAD를 분리합니다"
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
 msgid "set upstream info for new branch"
 msgstr "새 브랜치� 대한 업스트림 정보를 설정합니다"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new-branch"
 msgstr "새-브랜치"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new unparented branch"
 msgstr "�위 브랜치가 없는 새 브랜치"
 
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
 msgid "checkout our version for unmerged files"
 msgstr "병합�지 않� 파�� 대해 우리쪽 버전� 가져옵니다"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
 msgid "checkout their version for unmerged files"
 msgstr "병합�지 않� 파�� 대해 �대편 버전� 가져옵니다"
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
 msgid "force checkout (throw away local modifications)"
 msgstr "강제로 체�아웃합니다 (로컬�서 수정한 사항� 버립니다)"
 
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1150
 msgid "perform a 3-way merge with the new branch"
 msgstr "새 브랜치� 대해 3-방향 병합� 수행합니다"
 
-#: builtin/checkout.c:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
 msgid "update ignored files (default)"
 msgstr "무시하는 파�� 업��트합니다 (기본값)"
 
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
 msgid "style"
 msgstr "스타�"
 
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
 msgid "conflict style (merge or diff3)"
 msgstr "충� 스타� (merge �는 diff3)"
 
 # FIXME: �미 불명
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "경로명세를 드문 항목�만 제한하지 않습니다"
 
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "'git checkout <없는-브랜치>'� 대해 추측합니다"
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
 msgid "do not check if another worktree is holding the given ref"
 msgstr "다른 작업��� 주어진 레�런스가 있는지 확�하지 않습니다"
 
-#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
 #: builtin/send-pack.c:168
 msgid "force progress reporting"
 msgstr "강제로 진행 �황� 표시합니다"
 
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B � --orphan 옵션� 서로 호환�지 않습니다"
 
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1209
 msgid "--track needs a branch name"
 msgstr "--track 옵션� 브랜치 �름� 필요합니다"
 
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
 msgid "Missing branch name; try -b"
 msgstr "브랜치 �름� 없습니다. -b 옵션� 사용해 보십시오"
 
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
 msgid "invalid path specification"
 msgstr "경로 명세가 잘못�었습니다"
 
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
 #, c-format
 msgid ""
 "Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4449,12 +4720,12 @@ msgstr ""
 "�시� 경로를 업��트하고 '%s' 브랜치로 전환할 수 없습니다.\n"
 "커밋� 확�할 수 없는 '%s'�(를) 가져오려고 하셨습니까?"
 
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach 옵션� 경로 ��를 받지 않습니다 '%s'"
 
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1266
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -4605,8 +4876,8 @@ msgstr "대화형 지우기"
 msgid "remove whole directories"
 msgstr "전체 디렉터리 제거"
 
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
 msgid "pattern"
 msgstr "패턴"
 
@@ -4646,103 +4917,112 @@ msgstr ""
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<옵션>] [--] <저장소> [<디렉터리>]"
 
-#: builtin/clone.c:60
+#: builtin/clone.c:62
 msgid "don't create a checkout"
 msgstr "체�아웃� 만들지 않습니다"
 
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
 msgid "create a bare repository"
 msgstr "간략한 저장소를 만듭니다"
 
-#: builtin/clone.c:65
+#: builtin/clone.c:67
 msgid "create a mirror repository (implies bare)"
 msgstr "미러 저장소를 만듭니다 (간략한 저장소로 취급)"
 
-#: builtin/clone.c:67
+#: builtin/clone.c:69
 msgid "to clone from a local repository"
 msgstr "로컬 저장소�서 복제합니다"
 
-#: builtin/clone.c:69
+#: builtin/clone.c:71
 msgid "don't use local hardlinks, always copy"
 msgstr "로컬 하드��를 사용하지 않고, 항� 복사합니다"
 
-#: builtin/clone.c:71
+#: builtin/clone.c:73
 msgid "setup as shared repository"
 msgstr "공유 저장소로 설정합니다"
 
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
 msgid "initialize submodules in the clone"
 msgstr "복제한 결과물�서 하위 모듈� 초기화합니다"
 
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "병렬�으로 복제하는 하위모듈 개수"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
 msgid "template-directory"
 msgstr "서�-디렉터리"
 
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
 msgid "directory from which templates will be used"
 msgstr "서�� 사용할 디렉터리 위치"
 
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
 msgid "reference repository"
 msgstr "레�런스 저장소"
 
-#: builtin/clone.c:81
+#: builtin/clone.c:85
 msgid "use --reference only while cloning"
 msgstr "복제할 경우�만 --reference를 사용합니다"
 
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
 msgid "name"
 msgstr "�름"
 
-#: builtin/clone.c:83
+#: builtin/clone.c:87
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "업스트림 추�� 'origin' 대신 <�름>� 사용합니다"
 
-#: builtin/clone.c:85
+#: builtin/clone.c:89
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "리모트� HEAD 대신 <브랜치>를 가져옵니다"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:91
 msgid "path to git-upload-pack on the remote"
 msgstr "리모트� git-upload-pack 경로"
 
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201
 msgid "depth"
 msgstr "깊�"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:93
 msgid "create a shallow clone of that depth"
 msgstr "지정한 깊�� 얕� 복제를 만듭니다"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:95
 msgid "clone only one branch, HEAD or --branch"
 msgstr "하나� 브랜치만 복제합니다 (HEAD �는 --branch로 지정)"
 
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "모든 복제한 하위 모듈� 얕� 모듈입니다"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
 msgid "separate git dir from working tree"
 msgstr "깃 디렉터리를 작업 ��와 별개� 위치� 놓습니다"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:100
 msgid "key=value"
 msgstr "키=값"
 
-#: builtin/clone.c:95
+#: builtin/clone.c:101
 msgid "set config inside the new repository"
 msgstr "새 저장소 안�서 설정합니다"
 
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
 msgid "use IPv4 addresses only"
 msgstr "IPv4 주소만 사용합니다"
 
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
 msgid "use IPv6 addresses only"
 msgstr "IPv6 주소만 사용합니다"
 
-#: builtin/clone.c:239
+#: builtin/clone.c:241
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -4750,58 +5030,53 @@ msgstr ""
 "디렉터리 �름� 알아낼 수 없습니다.\n"
 "명령행�서 디렉터리를 지정하십시오"
 
-#: builtin/clone.c:305
+#: builtin/clone.c:307
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "레�런스 '%s' 저장소를 연결� 체�아웃으로 쓰기는 아� 지�하지 않습니다."
 
-#: builtin/clone.c:307
+#: builtin/clone.c:309
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "레�런스 '%s' 저장소가 로컬 저장소가 아닙니다."
 
-#: builtin/clone.c:312
+#: builtin/clone.c:314
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "레�런스 '%s' 저장소가 얕� 저장소입니다"
 
-#: builtin/clone.c:315
+#: builtin/clone.c:317
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "레�런스 '%s' 저장소가 붙어 있는 저장소입니다"
 
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "'%s'� 대해 stat()� 실패했습니다"
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "'%s'�(가) 있지만 디렉터리가 아닙니다"
 
-#: builtin/clone.c:396
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "'%s'� 대해 stat()� 실패했습니다\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "'%s' ��를 만드는� 실패했습니다"
 
-#: builtin/clone.c:422
+#: builtin/clone.c:424
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "파�� '%s'(으)로 복사하는� 실패했습니다"
 
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
 #, c-format
 msgid "done.\n"
 msgstr "완료.\n"
 
-#: builtin/clone.c:459
+#: builtin/clone.c:461
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -4811,127 +5086,127 @@ msgstr ""
 "'git status' 명령으로 무엇� 체�아웃했는지 살펴볼 수 있고\n"
 "'git checkout -f HEAD'로 체�아웃� 다시 할 수 있습니다\n"
 
-#: builtin/clone.c:536
+#: builtin/clone.c:538
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "복제할 리모트� %s 브랜치를 찾� 수 없습니다."
 
-#: builtin/clone.c:626
+#: builtin/clone.c:628
 #, c-format
 msgid "Checking connectivity... "
 msgstr "연결� 확�하는 중입니다..."
 
-#: builtin/clone.c:629
+#: builtin/clone.c:631
 msgid "remote did not send all necessary objects"
 msgstr "리모트�서 필요한 오브�트를 모� 보내지 않았습니다"
 
-#: builtin/clone.c:647
+#: builtin/clone.c:649
 #, c-format
 msgid "unable to update %s"
 msgstr "%s�(를) 업��트할 수 없습니다"
 
-#: builtin/clone.c:696
+#: builtin/clone.c:698
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "리모트 HEAD가 없는 레�런스를 참고하므로, 체�아웃할 수 없습니다.\n"
 
-#: builtin/clone.c:727
+#: builtin/clone.c:729
 msgid "unable to checkout working tree"
 msgstr "작업 ��를 체�아웃할 수 없습니다"
 
-#: builtin/clone.c:753
+#: builtin/clone.c:767
 msgid "unable to write parameters to config file"
 msgstr "파�미터를 설정 파�� 쓸 수 없습니다"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:830
 msgid "cannot repack to clean up"
 msgstr "정리용으로 repack할 수 없습니다"
 
-#: builtin/clone.c:818
+#: builtin/clone.c:832
 msgid "cannot unlink temporary alternates file"
 msgstr "보조 임시 파�� 삭제할 수 없습니다"
 
-#: builtin/clone.c:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
 msgid "Too many arguments."
 msgstr "너무 ��가 많습니다."
 
-#: builtin/clone.c:854
+#: builtin/clone.c:868
 msgid "You must specify a repository to clone."
 msgstr "복제할 저장소를 지정해야 합니다."
 
-#: builtin/clone.c:865
+#: builtin/clone.c:879
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "--bare � --origin %s 옵션� 호환�지 않습니다."
 
-#: builtin/clone.c:868
+#: builtin/clone.c:882
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare � --separate-git-dir 옵션� 호환�지 않습니다."
 
-#: builtin/clone.c:881
+#: builtin/clone.c:895
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "'%s' 저장소가 없습니다"
 
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "깊�가(%s) 0보다 � 수가 아닙니다"
 
-#: builtin/clone.c:897
+#: builtin/clone.c:911
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "대� 경로가('%s') �미 있고 빈 디렉터리가 아닙니다."
 
-#: builtin/clone.c:907
+#: builtin/clone.c:921
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "작업 ��가('%s') �미 있습니다."
 
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "'%s'� 앞 디렉터리를 만들 수 없습니다"
 
-#: builtin/clone.c:925
+#: builtin/clone.c:939
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "작업 디렉터리를('%s') 만들 수 없습니다"
 
-#: builtin/clone.c:943
+#: builtin/clone.c:957
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "간략한 저장소로('%s') 복제합니다...\n"
 
-#: builtin/clone.c:945
+#: builtin/clone.c:959
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "'%s'� 복제합니다...\n"
 
-#: builtin/clone.c:984
+#: builtin/clone.c:998
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "--depth 옵션� 로컬 복제�서 무시�니다. 대신� 'file://'� 사용하십시오."
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1001
 msgid "source repository is shallow, ignoring --local"
 msgstr "�본 저장소가 얕� 저장소�므로, --local 옵션� 무시합니다"
 
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
 msgid "--local is ignored"
 msgstr "--local 옵션� 무시�니다"
 
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "%s� 복제 방법� 알지 못합니다"
 
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "리모트� %s 브랜치가 업스트림 %s� 없습니다"
 
-#: builtin/clone.c:1056
+#: builtin/clone.c:1070
 msgid "You appear to have cloned an empty repository."
 msgstr "빈 저장소를 복제한 것처럼 보입니다."
 
@@ -5071,66 +5346,66 @@ msgstr ""
 "그 다�� \"git cherry-pick --continue\"를 하면 나머지 커밋�\n"
 "대해 커밋 빼오기를 다시 시작합니다.\n"
 
-#: builtin/commit.c:305
+#: builtin/commit.c:307
 msgid "failed to unpack HEAD tree object"
 msgstr "HEAD 트리 오브�트� 묶�� 푸는� 실패했습니다"
 
-#: builtin/commit.c:346
+#: builtin/commit.c:348
 msgid "unable to create temporary index"
 msgstr "임시 ��스를 만들 수 없습니다"
 
-#: builtin/commit.c:352
+#: builtin/commit.c:354
 msgid "interactive add failed"
 msgstr "대화형 추가가 실패했습니다"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:367
 msgid "unable to update temporary index"
 msgstr "임시 ��스를 업��트할 수 없습니다"
 
-#: builtin/commit.c:367
+#: builtin/commit.c:369
 msgid "Failed to update main cache tree"
 msgstr "주요 �시 트리를 업��트하는� 실패했습니다"
 
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
 msgid "unable to write new_index file"
 msgstr "new_index 파�� 쓸 수 없습니다"
 
-#: builtin/commit.c:445
+#: builtin/commit.c:447
 msgid "cannot do a partial commit during a merge."
 msgstr "병합하는 중 부분 커밋� 할 수 없습니다."
 
-#: builtin/commit.c:447
+#: builtin/commit.c:449
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "커밋 빼오기를 하는 중 부분 커밋� 할 수 없습니다."
 
-#: builtin/commit.c:456
+#: builtin/commit.c:458
 msgid "cannot read the index"
 msgstr "��스를 �� 수 없습니다"
 
-#: builtin/commit.c:475
+#: builtin/commit.c:477
 msgid "unable to write temporary index file"
 msgstr "임시 ��스 파�� 쓸 수 없습니다"
 
-#: builtin/commit.c:580
+#: builtin/commit.c:582
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "'%s' 커밋� 작성� 헤�가 없습니다"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:584
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "'%s' 커밋� 작성� 헤� 형�� 잘못�었습니다"
 
-#: builtin/commit.c:601
+#: builtin/commit.c:603
 msgid "malformed --author parameter"
 msgstr "--author 파�미터 형�� 잘못�었습니다"
 
-#: builtin/commit.c:609
+#: builtin/commit.c:611
 #, c-format
 msgid "invalid date format: %s"
 msgstr "시� 형�� 잘못�었습니다: %s"
 
-#: builtin/commit.c:653
+#: builtin/commit.c:655
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -5138,38 +5413,38 @@ msgstr ""
 "현재 커밋 메시지�서 사용�지 않는 주� 문�를\n"
 "선�할 수 없습니다"
 
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "%s 커밋� 찾아볼 수 없습니다"
 
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(표준 입력�서 로그 메시지를 ��)\n"
 
-#: builtin/commit.c:704
+#: builtin/commit.c:706
 msgid "could not read log from standard input"
 msgstr "표준 입력�서 로그 메시지를 �� 수 없습니다"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:710
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "'%s' 로그 파�� �� 수 없습니다"
 
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "MERGE_MSG를 �� 수 없습니다"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
 msgid "could not read SQUASH_MSG"
 msgstr "SQUASH_MSG를 �� 수 없습니다"
 
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "MERGE_MSG를 �� 수 없습니다"
+
+#: builtin/commit.c:796
 msgid "could not write commit template"
 msgstr "커밋 서�� 쓸 수 없습니다"
 
-#: builtin/commit.c:803
+#: builtin/commit.c:814
 #, c-format
 msgid ""
 "\n"
@@ -5184,7 +5459,7 @@ msgstr ""
 "\t%s\n"
 "다시 시�하십시오.\n"
 
-#: builtin/commit.c:808
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -5199,7 +5474,7 @@ msgstr ""
 "\t%s\n"
 "다시 시�하십시오.\n"
 
-#: builtin/commit.c:821
+#: builtin/commit.c:832
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5208,7 +5483,7 @@ msgstr ""
 "변경 사항� 대한 커밋 메시지를 입력하십시오. '%c' 문�로 시작하는\n"
 "줄� 무시�고, 메시지를 입력하지 않으면 커밋� 중지�니다.\n"
 
-#: builtin/commit.c:828
+#: builtin/commit.c:839
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5219,149 +5494,149 @@ msgstr ""
 "줄� 보존�니, 필요하면 �접 제거하십시오. 메시지를 입력하지\n"
 "않으면 커밋� 중지�니다.\n"
 
-#: builtin/commit.c:848
+#: builtin/commit.c:859
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s작성�:    %.*s <%.*s>"
 
-#: builtin/commit.c:856
+#: builtin/commit.c:867
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%s시�:      %s"
 
-#: builtin/commit.c:863
+#: builtin/commit.c:874
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%s커미터: %.*s <%.*s>"
 
-#: builtin/commit.c:881
+#: builtin/commit.c:892
 msgid "Cannot read index"
 msgstr "��스를 �� 수 없습니다"
 
-#: builtin/commit.c:938
+#: builtin/commit.c:949
 msgid "Error building trees"
 msgstr "트리를 만드는� 오류"
 
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "메시지를 -m �는 -F 옵션으로 입력하십시오.\n"
 
-#: builtin/commit.c:1055
+#: builtin/commit.c:1066
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' 옵션� '�름 <전�메�>' 형�� 아니고 기존 작성��� 없습니다"
 
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "추��지 않는 파� 모드가 ('%s') 잘못�었습니다"
 
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
 msgid "--long and -z are incompatible"
 msgstr "--long � -z 옵션� 호환�지 않습니다"
 
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "--reset-author � --author 옵션� 모� 사용하면 앞뒤가 맞지 않습니다"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1157
 msgid "You have nothing to amend."
 msgstr "바꿀 사항� 없습니다."
 
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "병합 중� 있습니다 -- 커밋� 바꿀 수 없습니다."
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1162
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "커밋 빼오기 중� 있습니다 -- 커밋� 바꿀 수 없습니다."
 
-#: builtin/commit.c:1154
+#: builtin/commit.c:1165
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "--squash � --fixup 옵션� 같� 쓸 수 없습니다"
 
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "-c/-C/-F/--fixup 옵션 중� 하나만 사용할 수 있습니다."
 
-#: builtin/commit.c:1166
+#: builtin/commit.c:1177
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "-m 옵션� -c/-C/-F/--fixup 옵션과 같� 쓸 수 없습니다."
 
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author 옵션� -C, -c �는 --amend 옵션과 같� �야 합니다."
 
-#: builtin/commit.c:1191
+#: builtin/commit.c:1202
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "--include/--only/--all/--interactive/--patch 옵션 중 하나만 사용할 수 있습니"
 "다."
 
-#: builtin/commit.c:1193
+#: builtin/commit.c:1204
 msgid "No paths with --include/--only does not make sense."
 msgstr "경로가 없� --include/--only 옵션� 쓰면 앞뒤가 맞지 않습니다."
 
-#: builtin/commit.c:1195
+#: builtin/commit.c:1206
 msgid "Clever... amending the last one with dirty index."
 msgstr "기발하네요... 마지막� 변경� ��스로 바꿉니다."
 
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
 msgstr ""
 "-i �는 -o 없� 명시�� 경로를 지정했습니다. --only 경로를 가정합니다..."
 
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "잘못� 정리 모드 %s"
 
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
 msgid "Paths with -a does not make sense."
 msgstr "-a 옵션과 경로를 같� 사용하면 앞뒤가 맞지 않습니다."
 
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
 msgid "show status concisely"
 msgstr "�태를 간략하게 표시합니다"
 
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
 msgid "show branch information"
 msgstr "브랜치 정보를 표시합니다"
 
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
 msgid "machine-readable output"
 msgstr "컴퓨터가 �� 수 있는 형�"
 
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
 msgid "show status in long format (default)"
 msgstr "긴 형�으로 �태를 표시합니다 (기본값)"
 
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
 msgid "terminate entries with NUL"
 msgstr "NUL 문�로 항목� �냅니다"
 
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
 #: builtin/fast-export.c:984 builtin/tag.c:353
 msgid "mode"
 msgstr "모드"
 
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "추��지 않는 파�� 표시합니다. 추가 옵션: all, normal, no (기본값: all)"
 
-#: builtin/commit.c:1340
+#: builtin/commit.c:1351
 msgid "show ignored files"
 msgstr "무시�는 파�� 표시합니다"
 
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
 msgid "when"
 msgstr "언제"
 
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -5369,198 +5644,198 @@ msgstr ""
 "하위 모듈� 변경� 무시합니다. 추가 옵션: all, dirty, untracked. (기본값: "
 "all)"
 
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
 msgid "list untracked files in columns"
 msgstr "추��지 않는 파�� 목�� 여러 열로 표시합니다"
 
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
 msgid "couldn't look up newly created commit"
 msgstr "새로 만든 커밋� 찾아볼 수 없습니다"
 
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
 msgid "could not parse newly created commit"
 msgstr "새로 만든 커밋� 파싱할 수 없습니다"
 
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
 msgid "detached HEAD"
 msgstr "HEAD 분리�"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
 msgid " (root-commit)"
 msgstr " (최�위-커밋)"
 
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
 msgid "suppress summary after successful commit"
 msgstr "성공�� 커밋 후� 요약� 표시하지 않습니다"
 
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
 msgid "show diff in commit message template"
 msgstr "커밋 메시지 서�� diff를 표시합니다"
 
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
 msgid "Commit message options"
 msgstr "커밋 메시지 옵션"
 
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
 msgid "read message from file"
 msgstr "파��서 메시지를 �습니다"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "author"
 msgstr "작성�"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "override author for commit"
 msgstr "커밋� 작성�를 지정합니다"
 
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
 msgid "date"
 msgstr "시�"
 
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
 msgid "override date for commit"
 msgstr "커밋� 시�� 지정합니다"
 
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
 #: builtin/notes.c:558 builtin/tag.c:349
 msgid "message"
 msgstr "메시지"
 
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
 msgid "commit message"
 msgstr "커밋 메시지"
 
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
 msgid "commit"
 msgstr "커밋"
 
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
 msgid "reuse and edit message from specified commit"
 msgstr "지정한 커밋� 메시지를 재사용하고 편집합니다"
 
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
 msgid "reuse message from specified commit"
 msgstr "지정한 커밋�서 메시지를 재사용합니다"
 
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr "지정한 커밋� 수정하는� autosquash 형� 메시지를 사용합니다"
 
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "지정한 커밋� 합치는� autosquash 형� 메시지를 사용합니다"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1603
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "커밋� 내가 작성한 것으로 만듭니다 (-C/-c/--amend와 같� 사용)"
 
-#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
 msgid "add Signed-off-by:"
 msgstr "Signed-off-by: 줄� 추가합니다"
 
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
 msgid "use specified template file"
 msgstr "지정한 서� 파�� 사용합니다"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
 msgid "force edit of commit"
 msgstr "커밋 편집� 강제합니다"
 
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
 msgid "default"
 msgstr "기본값"
 
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
 msgid "how to strip spaces and #comments from message"
 msgstr "메시지�서 공백과 #주�� 지�니다"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
 msgid "include status in commit message template"
 msgstr "커밋 메시지 서�� �태를 �함합니다"
 
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
 #: builtin/revert.c:93
 msgid "GPG sign commit"
 msgstr "GPG 서명 커밋"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
 msgid "Commit contents options"
 msgstr "커밋 내용 옵션"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
 msgid "commit all changed files"
 msgstr "변경� 파�� 모� 커밋합니다"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
 msgid "add specified files to index for commit"
 msgstr "지정한 파�� 커밋할 ��스� 추가합니다"
 
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
 msgid "interactively add files"
 msgstr "대화형으로 파�� 추가합니다"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
 msgid "interactively add changes"
 msgstr "대화형으로 변경 사항� 추가합니다"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
 msgid "commit only specified files"
 msgstr "지정한 파�만 커밋합니다"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
 msgid "bypass pre-commit hook"
 msgstr "커밋 전 후�를 건너�니다"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
 msgid "show what would be committed"
 msgstr "무엇� 커밋할지 표시합니다"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
 msgid "amend previous commit"
 msgstr "바로 앞 커밋� 바꿉니다"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
 msgid "bypass post-rewrite hook"
 msgstr "다시쓰기 후 후�를 건너�니다"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
 msgid "ok to record an empty change"
 msgstr "빈 변경 사항� 기�하�� 허용합니다"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
 msgid "ok to record a change with an empty message"
 msgstr "빈 메시지와 같� 변경 사항� 기�하�� 허용합니다"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
 msgid "could not parse HEAD commit"
 msgstr "HEAD 커밋� 파싱할 수 없습니다"
 
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "��� MERGE_HEAD 파� (%s)"
 
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
 msgid "could not read MERGE_MODE"
 msgstr "MERGE_MODE를 �� 수 없습니다"
 
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "커밋 메시지를 �� 수 없습니다: %s"
 
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "커밋� 중지합니다. 메시지를 편집하지 않았습니다.\n"
 
-#: builtin/commit.c:1740
+#: builtin/commit.c:1760
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "커밋� 중지합니다. 커밋 메시지가 비어 있습니다.\n"
 
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -5706,7 +5981,7 @@ msgstr "설정ì�˜ 출처를 표시합니다 (파ì�¼, 표준 ìž…ë ¥, 블롭, 명ë
 msgid "unable to parse default color value"
 msgstr "기본 색 값� 파싱할 수 없습니다"
 
-#: builtin/config.c:469
+#: builtin/config.c:472
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -5721,7 +5996,7 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:614
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "%s 설정 파�� 만들 수 없습니다"
@@ -5757,7 +6032,7 @@ msgstr "주� 달린 %s 태그� 내장� �름� 없습니다"
 msgid "tag '%s' is really '%s' here"
 msgstr "'%s' 태그가 실제 여기 '%s'입니다"
 
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "올바른 오브�트 �름� 아닙니다 (%s)"
@@ -5850,7 +6125,7 @@ msgstr "<n>개� 가장 최근� 태그만 고려합니다 (기본값: 10)"
 msgid "only consider tags matching <pattern>"
 msgstr "<패턴>과 �치하는 태그만 고려합니다"
 
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
 msgid "show abbreviated commit object as fallback"
 msgstr "대안으로 요약한 커밋 오브�트를 표시합니다"
 
@@ -5884,21 +6159,21 @@ msgstr "'%s': �반 파��나 심볼릭 ��가 아닙니다"
 msgid "invalid option: %s"
 msgstr "잘못� 옵션: %s"
 
-#: builtin/diff.c:358
+#: builtin/diff.c:360
 msgid "Not a git repository"
 msgstr "깃 저장소가 아닙니다"
 
-#: builtin/diff.c:401
+#: builtin/diff.c:403
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "잘못� '%s' 오브�트가 주어졌습니다."
 
-#: builtin/diff.c:410
+#: builtin/diff.c:412
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "� 개보다 많� 블롭� 주어졌습니다: '%s'"
 
-#: builtin/diff.c:417
+#: builtin/diff.c:419
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "처리하지 않� '%s' 오브�트가 주어졌습니다."
@@ -5971,19 +6246,19 @@ msgstr "git fetch --multiple [<옵션>] [(<저장소> | <그룹>)...]"
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<옵션>]"
 
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
 msgid "fetch from all remotes"
 msgstr "모든 리모트�서 가져옵니다"
 
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "�어쓰지 �고 .git/FETCH_HEAD� �붙입니다"
 
-#: builtin/fetch.c:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
 msgid "path to upload pack on remote end"
 msgstr "리모트 쪽� 묶�� 업로드할 경로"
 
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
 msgid "force overwrite of local branch"
 msgstr "로컬 브랜치를 강제로 �어�니다"
 
@@ -5991,7 +6266,7 @@ msgstr "로컬 브랜치를 강제로 �어�니다"
 msgid "fetch from multiple remotes"
 msgstr "여러 리모트�서 가져옵니다"
 
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
 msgid "fetch all tags and associated objects"
 msgstr "모든 태그와 관련 오브�트를 가져옵니다"
 
@@ -6003,19 +6278,19 @@ msgstr "모든 태그를 가져오지 않습니다 (--no-tags)"
 msgid "number of submodules fetched in parallel"
 msgstr "병렬�으로 받아오는 하위모듈 개수"
 
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "리모트� �제 없는 리모트 추� 브랜치를 잘�냅니다"
 
-#: builtin/fetch.c:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
 msgid "on-demand"
 msgstr "주문형"
 
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
 msgid "control recursive fetching of submodules"
 msgstr "하위 모듈 재귀�으로 가져오기 방�� 설정합니다"
 
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
 msgid "keep downloaded pack"
 msgstr "다운로드한 묶�� 보존합니다"
 
@@ -6023,15 +6298,15 @@ msgstr "다운로드한 묶�� 보존합니다"
 msgid "allow updating of HEAD ref"
 msgstr "HEAD 레�런스 업��트를 허용합니다"
 
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
 msgid "deepen history of shallow clone"
 msgstr "얕� 복제� 커밋 내역� 깊게 만듭니다"
 
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
 msgid "convert to a complete repository"
 msgstr "완전한 저장소로 전환합니다"
 
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
 msgid "dir"
 msgstr "디렉터리"
 
@@ -6043,15 +6318,15 @@ msgstr "하위 모듈 경로 출력� 앞� � 디렉터리를 붙입니다"
 msgid "default mode for recursion"
 msgstr "재귀 기본 모드"
 
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
 msgid "accept refs that update .git/shallow"
 msgstr ".git/shallow를 업��트하는 레�런스를 허용합니다"
 
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
 msgid "refmap"
 msgstr "레�런스맵"
 
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
 msgid "specify fetch refmap"
 msgstr "레�런스맵 가져오기를 지정합니다"
 
@@ -6109,11 +6384,6 @@ msgstr "강제 업��트"
 msgid "(non-fast-forward)"
 msgstr "(정방향 진행� 아님)"
 
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "%s�(를) 열 수 없습니다: %s\n"
-
 #: builtin/fetch.c:619
 #, c-format
 msgid "%s did not send all necessary objects\n"
@@ -6314,55 +6584,55 @@ msgstr "연결� 확�하는 중입니다"
 msgid "Checking object directories"
 msgstr "오브�트 디렉터리를 확�하는 중입니다"
 
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<옵션>] [<오브�트>...]"
 
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
 msgid "show unreachable objects"
 msgstr "�근할 수 없는 오브�트를 표시합니다"
 
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
 msgid "show dangling objects"
 msgstr "연결� �어진 오브�트를 표시합니다"
 
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
 msgid "report tags"
 msgstr "태그를 알립니다"
 
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
 msgid "report root nodes"
 msgstr "최�위 노드를 알립니다"
 
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
 msgid "make index objects head nodes"
 msgstr "��스 오브�트 헤드 노드를 만듭니다"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
 msgid "make reflogs head nodes (default)"
 msgstr "reflog 헤드 노드를 만듭니다 (기본값)"
 
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
 msgid "also consider packs and alternate objects"
 msgstr "묶�과 보조 오브�트� 만듭니다"
 
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
 msgid "check only connectivity"
 msgstr "연결만 확�합니다"
 
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
 msgid "enable more strict checking"
 msgstr "� 엄격하게 확�합니다"
 
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
 msgid "write dangling objects in .git/lost-found"
 msgstr ".git/lost-found 안� 연결� �어진 오브�트를 �니다"
 
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
 msgid "show progress"
 msgstr "진행 �황� 표시합니다"
 
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
 msgid "Checking objects"
 msgstr "오브�트를 확�합니다"
 
@@ -6464,215 +6734,215 @@ msgstr "트리를 �� 수 없습니다 (%s)"
 msgid "unable to grep from object of type %s"
 msgstr "종류가 %s� 오브�트�서 grep� 할 수 없습니다"
 
-#: builtin/grep.c:558
+#: builtin/grep.c:560
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "`%c' 옵션�는 숫� 값� 와야 합니다"
 
-#: builtin/grep.c:575
+#: builtin/grep.c:577
 #, c-format
 msgid "cannot open '%s'"
 msgstr "'%s'�(를) 열 수 없습니다"
 
-#: builtin/grep.c:644
+#: builtin/grep.c:646
 msgid "search in index instead of in the work tree"
 msgstr "작업 �� 대신� ��스�서 검색합니다"
 
-#: builtin/grep.c:646
+#: builtin/grep.c:648
 msgid "find in contents not managed by git"
 msgstr "깃으로 관리하지 않� 내용�서 찾습니다"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:650
 msgid "search in both tracked and untracked files"
 msgstr "추��는 파�과 추��지 않는 파� 모��서 검색합니다"
 
-#: builtin/grep.c:650
+#: builtin/grep.c:652
 msgid "ignore files specified via '.gitignore'"
 msgstr "'.gitignore'로 지정한 파�� 무시합니다"
 
-#: builtin/grep.c:653
+#: builtin/grep.c:655
 msgid "show non-matching lines"
 msgstr "�치하지 않는 줄� 표시합니다"
 
-#: builtin/grep.c:655
+#: builtin/grep.c:657
 msgid "case insensitive matching"
 msgstr "대소문� 구별하지 않고 맞춥니다"
 
-#: builtin/grep.c:657
+#: builtin/grep.c:659
 msgid "match patterns only at word boundaries"
 msgstr "단어 경계 부분� 대해서만 패턴� 맞춥니다"
 
-#: builtin/grep.c:659
+#: builtin/grep.c:661
 msgid "process binary files as text"
 msgstr "바�너리 파�� �스트로 처리합니다"
 
-#: builtin/grep.c:661
+#: builtin/grep.c:663
 msgid "don't match patterns in binary files"
 msgstr "바�너리 파��서 패턴� 맞추지 않습니다"
 
-#: builtin/grep.c:664
+#: builtin/grep.c:666
 msgid "process binary files with textconv filters"
 msgstr "textconv 필터를 사용해 바�너리 파�� 처리합니다"
 
-#: builtin/grep.c:666
+#: builtin/grep.c:668
 msgid "descend at most <depth> levels"
 msgstr "최대 <깊�> 단계만� 내려갑니다"
 
-#: builtin/grep.c:670
+#: builtin/grep.c:672
 msgid "use extended POSIX regular expressions"
 msgstr "POSIX 확장 정규�� 사용합니다"
 
-#: builtin/grep.c:673
+#: builtin/grep.c:675
 msgid "use basic POSIX regular expressions (default)"
 msgstr "기본 POSIX 정규�� 사용합니다 (기본값)"
 
-#: builtin/grep.c:676
+#: builtin/grep.c:678
 msgid "interpret patterns as fixed strings"
 msgstr "패턴� 고정 문�열로 해�합니다"
 
-#: builtin/grep.c:679
+#: builtin/grep.c:681
 msgid "use Perl-compatible regular expressions"
 msgstr "펄과 호환�는 정규�� 사용합니다"
 
-#: builtin/grep.c:682
+#: builtin/grep.c:684
 msgid "show line numbers"
 msgstr "줄 번호를 표시합니다"
 
-#: builtin/grep.c:683
+#: builtin/grep.c:685
 msgid "don't show filenames"
 msgstr "파� �름� 표시하지 않습니다"
 
-#: builtin/grep.c:684
+#: builtin/grep.c:686
 msgid "show filenames"
 msgstr "파� �름� 표시합니다"
 
-#: builtin/grep.c:686
+#: builtin/grep.c:688
 msgid "show filenames relative to top directory"
 msgstr "파� �름� 최�위 디렉터리 �대 경로로 표시합니다"
 
-#: builtin/grep.c:688
+#: builtin/grep.c:690
 msgid "show only filenames instead of matching lines"
 msgstr "�치하는 줄� 표시하지 않고 파� �름만 표시합니다"
 
-#: builtin/grep.c:690
+#: builtin/grep.c:692
 msgid "synonym for --files-with-matches"
 msgstr "--files-with-matches 옵션과 ��"
 
-#: builtin/grep.c:693
+#: builtin/grep.c:695
 msgid "show only the names of files without match"
 msgstr "�치하지 않는 파�� �름만 표시합니다"
 
-#: builtin/grep.c:695
+#: builtin/grep.c:697
 msgid "print NUL after filenames"
 msgstr "파� �름 다�� NUL� 출력합니다"
 
-#: builtin/grep.c:697
+#: builtin/grep.c:699
 msgid "show the number of matches instead of matching lines"
 msgstr "�치하는 줄� 표시하지 않고 �치하는 수를 표시합니다"
 
-#: builtin/grep.c:698
+#: builtin/grep.c:700
 msgid "highlight matches"
 msgstr "�치하는 부분� 강조합니다"
 
-#: builtin/grep.c:700
+#: builtin/grep.c:702
 msgid "print empty line between matches from different files"
 msgstr "다른 파� 사�� �치하는 부분� 사�� 빈 줄� 출력합니다"
 
-#: builtin/grep.c:702
+#: builtin/grep.c:704
 msgid "show filename only once above matches from same file"
 msgstr "같� 파��서 여러 개가 �치하면 파� �름� 한 번만 표시합니다"
 
-#: builtin/grep.c:705
+#: builtin/grep.c:707
 msgid "show <n> context lines before and after matches"
 msgstr "�치하는 부분 앞뒤� 컨�스트를 <n>줄 표시합니다"
 
-#: builtin/grep.c:708
+#: builtin/grep.c:710
 msgid "show <n> context lines before matches"
 msgstr "�치하는 부분 앞� 컨�스트를 <n>줄 표시합니다"
 
-#: builtin/grep.c:710
+#: builtin/grep.c:712
 msgid "show <n> context lines after matches"
 msgstr "�치하는 부분 뒤� 컨�스트를 <n>줄 표시합니다"
 
-#: builtin/grep.c:712
+#: builtin/grep.c:714
 msgid "use <n> worker threads"
 msgstr "<n>개� 작업 스레드를 사용합니다"
 
-#: builtin/grep.c:713
+#: builtin/grep.c:715
 msgid "shortcut for -C NUM"
 msgstr "-C NUM 옵션� 줄임"
 
-#: builtin/grep.c:716
+#: builtin/grep.c:718
 msgid "show a line with the function name before matches"
 msgstr "�치 항목 앞� 함수 �름 줄� 표시합니다"
 
-#: builtin/grep.c:718
+#: builtin/grep.c:720
 msgid "show the surrounding function"
 msgstr "들어 있는 함수를 표시합니다"
 
-#: builtin/grep.c:721
+#: builtin/grep.c:723
 msgid "read patterns from file"
 msgstr "파��서 패턴� �습니다"
 
-#: builtin/grep.c:723
+#: builtin/grep.c:725
 msgid "match <pattern>"
 msgstr "<패턴>과 �치"
 
-#: builtin/grep.c:725
+#: builtin/grep.c:727
 msgid "combine patterns specified with -e"
 msgstr "-e 옵션으로 지정한 패턴� 결합합니다"
 
-#: builtin/grep.c:737
+#: builtin/grep.c:739
 msgid "indicate hit with exit status without output"
 msgstr "출력하지 않고 �치하는 항목� exit() �태 번호로 리턴합니다"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:741
 msgid "show only matches from files that match all patterns"
 msgstr "모든 패턴과 �치하는 파�� �치하는 부분만 표시합니다"
 
-#: builtin/grep.c:741
+#: builtin/grep.c:743
 msgid "show parse tree for grep expression"
 msgstr "grep 표현�� 대한 파싱 트리를 표시합니다"
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "pager"
 msgstr "페�저"
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "show matching files in the pager"
 msgstr "�치하는 파�� 페�저 프로그램�서 표시합니다"
 
-#: builtin/grep.c:748
+#: builtin/grep.c:750
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "grep(1) 실행� 허용합니다 (� 빌드�서는 무시)"
 
-#: builtin/grep.c:811
+#: builtin/grep.c:813
 msgid "no pattern given."
 msgstr "패턴� 지정하지 않았습니다."
 
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "잘못� 스레드 수를 지정했습니다 (%d)"
 
-#: builtin/grep.c:873
+#: builtin/grep.c:875
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager 옵션� 작업 ���서만 �작합니다"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:901
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr ""
 "--cached �는 --untracked 옵션� --no-index 옵션과 같� 쓸 수 없습니다."
 
-#: builtin/grep.c:904
+#: builtin/grep.c:906
 msgid "--no-index or --untracked cannot be used with revs."
 msgstr "--no-index �는 --untracked 옵션� 리비전과 같� 쓸 수 없습니다."
 
-#: builtin/grep.c:907
+#: builtin/grep.c:909
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard 옵션� 추��는 내용� 대해 쓸 수 없습니다."
 
-#: builtin/grep.c:915
+#: builtin/grep.c:917
 msgid "both --cached and trees are given."
 msgstr "--cached 옵션과 트리를 모� 지정했습니다."
 
@@ -6761,8 +7031,8 @@ msgstr "emacsclient '%d' 버전� 너무 과거 (< 22) 버전입니다."
 
 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
 #, c-format
-msgid "failed to exec '%s': %s"
-msgstr "실행 실패: '%s': %s"
+msgid "failed to exec '%s'"
+msgstr "실행 실패: '%s'"
 
 #: builtin/help.c:205
 #, c-format
@@ -7018,104 +7288,105 @@ msgstr "극심한 혼란"
 
 #: builtin/index-pack.c:1253
 #, c-format
-msgid "completed with %d local objects"
-msgstr "로컬 오브�트 %d개 마침"
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "로컬 오브�트 %d개 마침"
 
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1265
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "%s� 대해 예�치 못한 테� 체�섬 (디스� ��?)"
 
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "묶�� 알아내지 못한 �타 %d개가 있습니다"
 
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1293
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "추가한 오브�트를 deflate할 수 없습니다 (%d)"
 
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "%s 로컬 오브�트가 ���었습니다"
 
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
 msgid "error while closing pack file"
 msgstr "묶� 파�� 닫는� 오류"
 
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "'%s' 보존 파�� 쓸 수 없습니다"
 
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "쓴 '%s' 보존 파�� 닫지 못했습니다"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
 msgid "cannot store pack file"
 msgstr "묶� 파�� 저장할 수 없습니다"
 
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
 msgid "cannot store index file"
 msgstr "��스 파�� 저장할 수 없습니다"
 
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "잘못� pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "스레드 기능� 없습니다. %s 무시"
 
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "기존 '%s' 묶� 파�� 열 수 없습니다"
 
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "'%s'� 대한 기존 묶� idx 파�� 열 수 없습니다"
 
-#: builtin/index-pack.c:1587
+#: builtin/index-pack.c:1589
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "�타 아님: 오브�트 %d개"
 
-#: builtin/index-pack.c:1594
+#: builtin/index-pack.c:1596
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "체� 길� = %d: 오브�트 %lu개"
 
-#: builtin/index-pack.c:1624
+#: builtin/index-pack.c:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "'%s' 묶�파� �름� '.pack'으로 �나지 않습니다"
+
+#: builtin/index-pack.c:1638
 msgid "Cannot come back to cwd"
 msgstr "현재 디렉터리로 �아올 수 없습니다"
 
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
 #, c-format
 msgid "bad %s"
 msgstr "잘못� %s"
 
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin 옵션� --stdin 옵션과 같� 쓸 수 없습니다"
 
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "'%s' 묶�파� �름� '.pack'으로 �나지 않습니다"
-
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1731
 msgid "--verify with no packfile name given"
 msgstr "--verify 옵션� 묶�파� �름� 지정하지 않았습니다"
 
@@ -7154,27 +7425,27 @@ msgstr "'%s'�(를) '%s'� 복사할 수 없습니다"
 msgid "ignoring template %s"
 msgstr "%s 서�� 무시합니다"
 
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
 #, c-format
 msgid "templates not found %s"
 msgstr "%s� 서�� 없습니다"
 
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
 #, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr "'%2$s'�서 잘못� 형� 버전 %1$d� 서�� 복사하지 않습니다"
+msgid "not copying templates from '%s': %s"
+msgstr "'%s'�서 서�� 복사하지 않습니다: %s"
 
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
 #, c-format
 msgid "%s already exists"
 msgstr "%s 파�� �미 있습니다"
 
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "파� 종류 %d번� 처리할 수 없습니다"
 
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "%s�(를) %s(으)로 옮길 수 없습니다"
@@ -7182,24 +7453,24 @@ msgstr "%s�(를) %s(으)로 옮길 수 없습니다"
 #. TRANSLATORS: The first '%s' is either "Reinitialized
 #. existing" or "Initialized empty", the second " shared" or
 #. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
 #, c-format
 msgid "%s%s Git repository in %s%s\n"
 msgstr "%s%s 깃 저장소, 위치 %s%s\n"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Reinitialized existing"
 msgstr "다시 초기화: 기존"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Initialized empty"
 msgstr "초기화: 빈"
 
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
 msgid " shared"
 msgstr " 공유"
 
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -7207,25 +7478,25 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<서�-디렉터리>] [--shared[=<권"
 "한>]] [<디렉터리>]"
 
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
 msgid "permissions"
 msgstr "권한"
 
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "깃 저장소를 다른 사용�가 공유할 수 있게 지정"
 
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "%s� 대해 mkdir를 할 수 없습니다"
 
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "%s� 대해 chdir를 할 수 없습니다"
 
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7234,7 +7505,7 @@ msgstr ""
 "%s (�는 --work-tree=<디렉터리>) 허용�지 않�. %s (�는 --git-"
 "dir=<directory>) 지정� 없으면"
 
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "작업 �� '%s'� 접근할 수 없습니다"
@@ -7280,263 +7551,315 @@ msgstr "git show [<옵션>] <오브�트>..."
 msgid "invalid --decorate option: %s"
 msgstr "잘못� --decorate 옵션: %s"
 
-#: builtin/log.c:131
+#: builtin/log.c:137
 msgid "suppress diff output"
 msgstr "diff를 출력하지 않습니다"
 
-#: builtin/log.c:132
+#: builtin/log.c:138
 msgid "show source"
 msgstr "소스를 표시합니다"
 
-#: builtin/log.c:133
+#: builtin/log.c:139
 msgid "Use mail map file"
 msgstr "메� 맵 파�� 사용합니다"
 
-#: builtin/log.c:134
+#: builtin/log.c:140
 msgid "decorate options"
 msgstr "꾸미기 옵션"
 
-#: builtin/log.c:137
+#: builtin/log.c:143
 msgid "Process line range n,m in file, counting from 1"
 msgstr "파��서 n,m 범위� 줄� 처리합니다 (1부터 시작)"
 
-#: builtin/log.c:233
+#: builtin/log.c:239
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "최종 출력: %d %s\n"
 
-#: builtin/log.c:465
+#: builtin/log.c:471
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: 잘못� 파�"
 
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
 #, c-format
 msgid "Could not read object %s"
 msgstr "%s 오브�트를 �� 수 없습니다"
 
-#: builtin/log.c:596
+#: builtin/log.c:602
 #, c-format
 msgid "Unknown type: %d"
 msgstr "알 수 없는 종류: %d"
 
-#: builtin/log.c:715
+#: builtin/log.c:722
 msgid "format.headers without value"
 msgstr "format.headers 설정� 값� 없�"
 
-#: builtin/log.c:801
+#: builtin/log.c:812
 msgid "name of output directory is too long"
 msgstr "출력 디렉터리� �름� 너무 �니다"
 
-#: builtin/log.c:816
+#: builtin/log.c:827
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "%s 패치 파�� 열 수 없습니다"
 
-#: builtin/log.c:830
+#: builtin/log.c:841
 msgid "Need exactly one range."
 msgstr "정확히 하나� 범위가 필요합니다."
 
-#: builtin/log.c:840
+#: builtin/log.c:851
 msgid "Not a range."
 msgstr "범위가 아닙니다."
 
-#: builtin/log.c:946
+#: builtin/log.c:957
 msgid "Cover letter needs email format"
 msgstr "커버레터는 전�메� 형��어야 합니다"
 
-#: builtin/log.c:1025
+#: builtin/log.c:1036
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "정신나간 in-reply-to 헤�: %s"
 
-#: builtin/log.c:1053
+#: builtin/log.c:1064
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<옵션>] [<시작시�> | <리비전-범위>]"
 
-#: builtin/log.c:1098
+#: builtin/log.c:1109
 msgid "Two output directories?"
 msgstr "출력 디렉터리가 �개?"
 
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "알 수 없는 커밋 %s"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "'%s'�(를) 올바른 레�런스로 알아내는� 실패했습니다."
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr "정확한 병합 기준�� 찾� 수 없습니다."
+
+#: builtin/log.c:1235
+msgid ""
+"Failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually."
+msgstr ""
+"업스트림� 가져오는� 실패했습니다. 베�스 커밋� ��으로 기�하려면,\n"
+"'git branch --set-upstream-to' 명령으로 �격 브랜치를 추�하십시오.\n"
+"아니면 �접 '--base=<기준�-커밋-ID>' 옵션으로 기준� 커밋� 지정할\n"
+"수� 있습니다."
+
+#: builtin/log.c:1255
+msgid "Failed to find exact merge base"
+msgstr "정확한 병합 기준�� 찾는� 실패했습니다"
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr "기준� 커밋� 리비전 목�� �위 커밋�어야 합니다"
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr "기준� 커밋� 리비전 목�� 들어 있으면 안 �니다"
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr "패치 ID를 알아낼 수 없습니다"
+
+#: builtin/log.c:1377
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "하나� 패치� 대해서� [PATCh n/m]� 붙입니다"
 
-#: builtin/log.c:1217
+#: builtin/log.c:1380
 msgid "use [PATCH] even with multiple patches"
 msgstr "여러 개 패치� 대해서� [PATCH]를 붙입니다"
 
-#: builtin/log.c:1221
+#: builtin/log.c:1384
 msgid "print patches to standard out"
 msgstr "패치를 표준 출력으로 표시합니다"
 
-#: builtin/log.c:1223
+#: builtin/log.c:1386
 msgid "generate a cover letter"
 msgstr "커버레터를 만듭니다"
 
-#: builtin/log.c:1225
+#: builtin/log.c:1388
 msgid "use simple number sequence for output file names"
 msgstr "출력 파� �름� 간단한 �련 번호를 사용합니다"
 
-#: builtin/log.c:1226
+#: builtin/log.c:1389
 msgid "sfx"
 msgstr "확장�"
 
-#: builtin/log.c:1227
+#: builtin/log.c:1390
 msgid "use <sfx> instead of '.patch'"
 msgstr "'.patch' 대신 <확장�>를 사용합니다"
 
-#: builtin/log.c:1229
+#: builtin/log.c:1392
 msgid "start numbering patches at <n> instead of 1"
 msgstr "패치 번호를 1 대신 <n>�서 시작합니다"
 
-#: builtin/log.c:1231
+#: builtin/log.c:1394
 msgid "mark the series as Nth re-roll"
 msgstr "시리즈를 N번째 re-roll로 표시합니다"
 
-#: builtin/log.c:1233
+#: builtin/log.c:1396
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "[PATCH] 대신 [<접�어>]를 사용합니다"
 
-#: builtin/log.c:1236
+#: builtin/log.c:1399
 msgid "store resulting files in <dir>"
 msgstr "결과 파�� <디렉터리>� 저장합니다"
 
-#: builtin/log.c:1239
+#: builtin/log.c:1402
 msgid "don't strip/add [PATCH]"
 msgstr "[PATCH]를 �르거나 추가하지 않습니다"
 
-#: builtin/log.c:1242
+#: builtin/log.c:1405
 msgid "don't output binary diffs"
 msgstr "바�너리 diff를 만들지 않습니다"
 
-#: builtin/log.c:1244
+#: builtin/log.c:1407
 msgid "output all-zero hash in From header"
 msgstr "From 헤��서 모� 0� 해시를 출력합니다"
 
-#: builtin/log.c:1246
+#: builtin/log.c:1409
 msgid "don't include a patch matching a commit upstream"
 msgstr "업스트림� 있는 패치를 �함하지 않습니다"
 
-#: builtin/log.c:1248
+#: builtin/log.c:1411
 msgid "show patch format instead of default (patch + stat)"
 msgstr "기본값 (패치 + 통계) 대신 패치 형�� 표시합니다"
 
-#: builtin/log.c:1250
+#: builtin/log.c:1413
 msgid "Messaging"
 msgstr "메시징"
 
-#: builtin/log.c:1251
+#: builtin/log.c:1414
 msgid "header"
 msgstr "헤�"
 
-#: builtin/log.c:1252
+#: builtin/log.c:1415
 msgid "add email header"
 msgstr "전�메� 헤�"
 
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
 msgid "email"
 msgstr "전�메�"
 
-#: builtin/log.c:1253
+#: builtin/log.c:1416
 msgid "add To: header"
 msgstr "To: 헤�를 추가합니다"
 
-#: builtin/log.c:1255
+#: builtin/log.c:1418
 msgid "add Cc: header"
 msgstr "Cc: 헤�를 추가합니다"
 
-#: builtin/log.c:1257
+#: builtin/log.c:1420
 msgid "ident"
 msgstr "신�"
 
-#: builtin/log.c:1258
+#: builtin/log.c:1421
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "<신�>�서 From 주소를 설정합니다 (없으면 커미터 주소 신� 사용)"
 
-#: builtin/log.c:1260
+#: builtin/log.c:1423
 msgid "message-id"
 msgstr "메시지-ID"
 
-#: builtin/log.c:1261
+#: builtin/log.c:1424
 msgid "make first mail a reply to <message-id>"
 msgstr "첫 메�� <메시지-ID>� 대한 답장 메�로 만듭니다"
 
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
 msgid "boundary"
 msgstr "경계"
 
-#: builtin/log.c:1263
+#: builtin/log.c:1426
 msgid "attach the patch"
 msgstr "패치를 첨부합니다"
 
-#: builtin/log.c:1266
+#: builtin/log.c:1429
 msgid "inline the patch"
 msgstr "패치를 본문� �함합니다"
 
-#: builtin/log.c:1270
+#: builtin/log.c:1433
 msgid "enable message threading, styles: shallow, deep"
 msgstr "메시지� 스레드를 사용, 스타�: shallow, deep"
 
-#: builtin/log.c:1272
+#: builtin/log.c:1435
 msgid "signature"
 msgstr "서명"
 
-#: builtin/log.c:1273
+#: builtin/log.c:1436
 msgid "add a signature"
 msgstr "서명� 추가합니다"
 
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "베�스-커밋"
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr "전제조건 트리 정보를 패치 시리즈� 추가합니다"
+
+#: builtin/log.c:1440
 msgid "add a signature from a file"
 msgstr "파��서 서명� 추가합니다"
 
-#: builtin/log.c:1276
+#: builtin/log.c:1441
 msgid "don't print the patch filenames"
 msgstr "패치 파� �름� 표시하지 않습니다"
 
-#: builtin/log.c:1365
+#: builtin/log.c:1531
 msgid "-n and -k are mutually exclusive."
 msgstr "-n � -k 옵션� 하나만 �야 합니다."
 
-#: builtin/log.c:1367
+#: builtin/log.c:1533
 msgid "--subject-prefix and -k are mutually exclusive."
 msgstr "--subject-prefix � -k 옵션� 하나만 �야 합니다."
 
-#: builtin/log.c:1375
+#: builtin/log.c:1541
 msgid "--name-only does not make sense"
 msgstr "--name-only 옵션� 앞뒤가 맞지 않습니다"
 
-#: builtin/log.c:1377
+#: builtin/log.c:1543
 msgid "--name-status does not make sense"
 msgstr "--name-status 옵션� 앞뒤가 맞지 않습니다"
 
-#: builtin/log.c:1379
+#: builtin/log.c:1545
 msgid "--check does not make sense"
 msgstr "--check 옵션� 앞뒤가 맞지 않습니다"
 
-#: builtin/log.c:1407
+#: builtin/log.c:1573
 msgid "standard output, or directory, which one?"
 msgstr "표준 출력�나 디렉터리 중� 하나만 지정해야 합니다."
 
-#: builtin/log.c:1409
+#: builtin/log.c:1575
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "'%s' 디렉터리를 만들 수 없습니다"
 
-#: builtin/log.c:1506
+#: builtin/log.c:1672
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "'%s' 서명 파�� �� 수 없습니다"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1743
 msgid "Failed to create output files"
 msgstr "출력 파�� 만드는� 실패했습니다"
 
-#: builtin/log.c:1617
+#: builtin/log.c:1792
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<업스트림> [<헤드> [<한계값>]]]"
 
-#: builtin/log.c:1671
+#: builtin/log.c:1846
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7544,11 +7867,6 @@ msgstr ""
 "추��는 리모트 브랜치를 찾� 수 없습니다. <업스트림>� 수�으로 지정하십시"
 "오.\n"
 
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr "알 수 없는 커밋 %s"
-
 #: builtin/ls-files.c:378
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<옵션>] [<파�>...]"
@@ -7739,171 +8057,175 @@ msgstr "git merge [<옵션>] <메시지> HEAD <커밋>"
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:100
+#: builtin/merge.c:101
 msgid "switch `m' requires a value"
 msgstr "`m' 옵션�는 값� 필요합니다"
 
-#: builtin/merge.c:137
+#: builtin/merge.c:138
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "'%s' 병합 전략� 찾� 수 없습니다.\n"
 
-#: builtin/merge.c:138
+#: builtin/merge.c:139
 #, c-format
 msgid "Available strategies are:"
 msgstr "사용 가능한 전략�:"
 
-#: builtin/merge.c:143
+#: builtin/merge.c:144
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "사용 가능한 사용� 설정 전략�:"
 
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
 msgid "do not show a diffstat at the end of the merge"
 msgstr "병합� �날 때 diffstat� 표시하지 않습니다"
 
-#: builtin/merge.c:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
 msgid "show a diffstat at the end of the merge"
 msgstr "병합� �날 때 diffstat� 표시합니다"
 
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
 msgid "(synonym to --stat)"
 msgstr "(--stat 옵션과 ��)"
 
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "병합 커밋� 메시지� shortlog 항목� (최대 <n>개) 추가합니다"
 
-#: builtin/merge.c:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
 msgid "create a single commit instead of doing a merge"
 msgstr "병합하는 대신 하나� 커밋� 만듭니다"
 
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "병합� 성공하면 커밋� 합니다 (기본값)"
 
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
 msgid "edit message before committing"
 msgstr "커밋 전� 메시지를 편집합니다"
 
-#: builtin/merge.c:207
+#: builtin/merge.c:208
 msgid "allow fast-forward (default)"
 msgstr "정방향 진행� 허용합니다 (기본값)"
 
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
 msgid "abort if fast-forward is not possible"
 msgstr "정방향 진행� 불가능하면 중지합니다"
 
-#: builtin/merge.c:213
+#: builtin/merge.c:214
 msgid "Verify that the named commit has a valid GPG signature"
 msgstr "�름 붙� 커밋� 올바른 GPG 서명� 있는지 검�합니다"
 
-#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
 #: builtin/revert.c:89
 msgid "strategy"
 msgstr "ì „ëžµ"
 
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "merge strategy to use"
 msgstr "사용할 병합 전략"
 
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
 msgid "option=value"
 msgstr "옵션=값"
 
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
 msgid "option for selected merge strategy"
 msgstr "선�한 병합 전략� 대한 옵션"
 
-#: builtin/merge.c:219
+#: builtin/merge.c:220
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "병합 커밋 메시지 (정방향� 아닌 병합� 대해)"
 
-#: builtin/merge.c:223
+#: builtin/merge.c:224
 msgid "abort the current in-progress merge"
 msgstr "현재 진행 중� 병합� 중지합니다"
 
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "관계 없는 커밋 내역� 병합� 허용합니다"
+
+#: builtin/merge.c:254
 msgid "could not run stash."
 msgstr "stash를 실행할 수 없습니다."
 
-#: builtin/merge.c:256
+#: builtin/merge.c:259
 msgid "stash failed"
-msgstr "stash 실패"
+msgstr "스태시 실패"
 
-#: builtin/merge.c:261
+#: builtin/merge.c:264
 #, c-format
 msgid "not a valid object: %s"
 msgstr "올바른 오브�트가 아닙니다: %s"
 
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
 msgid "read-tree failed"
 msgstr "read-tree 실패"
 
-#: builtin/merge.c:327
+#: builtin/merge.c:330
 msgid " (nothing to squash)"
 msgstr " (합칠 내용� 없습니다)"
 
-#: builtin/merge.c:340
+#: builtin/merge.c:343
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "커밋 합치기 -- HEAD를 업��트하지 않습니다\n"
 
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
 #, c-format
 msgid "Could not write to '%s'"
 msgstr "'%s'� 쓸 수 없습니다"
 
-#: builtin/merge.c:372
+#: builtin/merge.c:375
 msgid "Writing SQUASH_MSG"
 msgstr "SQUASH_MSG를 쓰는 중"
 
-#: builtin/merge.c:374
+#: builtin/merge.c:377
 msgid "Finishing SQUASH_MSG"
 msgstr "SQUASH_MSG를 마치는 중"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:400
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "병합 메시지가 없습니다 -- HEAD를 업��트하지 않습니다\n"
 
-#: builtin/merge.c:448
+#: builtin/merge.c:451
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s'�(가) 커밋� 가리키지 않습니다"
 
-#: builtin/merge.c:538
+#: builtin/merge.c:541
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "잘못� branch.%s.mergeoptions 문�열: %s"
 
-#: builtin/merge.c:657
+#: builtin/merge.c:660
 msgid "Not handling anything other than two heads merge."
 msgstr "� 개� 헤드 병합 외�는 처리하지 않습니다."
 
-#: builtin/merge.c:671
+#: builtin/merge.c:674
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "merge-recursive� 대해 알 수 없는 옵션: -X%s"
 
-#: builtin/merge.c:684
+#: builtin/merge.c:687
 #, c-format
 msgid "unable to write %s"
 msgstr "%s� 쓸 수 없습니다"
 
-#: builtin/merge.c:773
+#: builtin/merge.c:776
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "'%s'�서 �� 수 없습니다"
 
-#: builtin/merge.c:782
+#: builtin/merge.c:785
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "병합� 커밋하지 않습니다. 병합� 마치려면 'git commit'� 사용하십시오.\n"
 
-#: builtin/merge.c:788
+#: builtin/merge.c:791
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -7919,52 +8241,52 @@ msgstr ""
 "'%c' 문�로 시작하는 줄� 무시�고, 메시지가 비어 있으면 커밋�\n"
 "중지합니다.\n"
 
-#: builtin/merge.c:812
+#: builtin/merge.c:815
 msgid "Empty commit message."
 msgstr "빈 커밋 메시지."
 
-#: builtin/merge.c:824
+#: builtin/merge.c:835
 #, c-format
 msgid "Wonderful.\n"
 msgstr "훌륭합니다.\n"
 
-#: builtin/merge.c:879
+#: builtin/merge.c:890
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "�� 병합� 실패했습니다. 충�� 바로잡고 결과물� 커밋하십시오.\n"
 
-#: builtin/merge.c:895
+#: builtin/merge.c:906
 #, c-format
 msgid "'%s' is not a commit"
 msgstr "'%s'�(는) 커밋� 아닙니다"
 
-#: builtin/merge.c:936
+#: builtin/merge.c:947
 msgid "No current branch."
 msgstr "현재 브랜치가 없습니다."
 
-#: builtin/merge.c:938
+#: builtin/merge.c:949
 msgid "No remote for the current branch."
 msgstr "현재 브랜치� 대한 리모트가 없습니다."
 
-#: builtin/merge.c:940
+#: builtin/merge.c:951
 msgid "No default upstream defined for the current branch."
 msgstr "현재 브랜치� 대해 기본 업스트림� 지정하지 않았습니다."
 
-#: builtin/merge.c:945
+#: builtin/merge.c:956
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "리모트 %2$s�서 %1$s� 대한 리모트 추� 브랜치가 없습니다"
 
-#: builtin/merge.c:1080
+#: builtin/merge.c:1091
 #, c-format
 msgid "could not close '%s'"
 msgstr "'%s'�(를) 닫� 수 없습니다"
 
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "중지할 병합 작업� 없습니다. (MERGE_HEAD가 없�)"
 
-#: builtin/merge.c:1223
+#: builtin/merge.c:1235
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -7972,7 +8294,7 @@ msgstr ""
 "병합� 마치지 않았습니다. (MERGE_HEAD 있�)\n"
 "병합하기 전� 변경 사항� 커밋하십시오."
 
-#: builtin/merge.c:1230
+#: builtin/merge.c:1242
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -7980,100 +8302,104 @@ msgstr ""
 "커밋 빼오기를 마치지 않았습니다. (COMMIT_PICK_HEAD 있�)\n"
 "병합하기 전� 변경 사항� 커밋하십시오."
 
-#: builtin/merge.c:1233
+#: builtin/merge.c:1245
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "커밋 빼오기를 마치지 않았습니다. (CHERRY_PICK_HEAD 있�)"
 
-#: builtin/merge.c:1242
+#: builtin/merge.c:1254
 msgid "You cannot combine --squash with --no-ff."
 msgstr "--squash 옵션� --no-ff 옵션과 같� 쓸 수 없습니다."
 
-#: builtin/merge.c:1250
+#: builtin/merge.c:1262
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "커밋� 지정하지 않았고  merge.defaultToUpstream를 설정하지 않았습니다."
 
-#: builtin/merge.c:1267
+#: builtin/merge.c:1279
 msgid "Squash commit into empty head not supported yet"
 msgstr "빈 헤드로 커밋� 합치기는 지�하지 않습니다"
 
-#: builtin/merge.c:1269
+#: builtin/merge.c:1281
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "정방향� 아닌 커밋� 빈 헤드�서는 앞뒤가 맞지 않습니다"
 
-#: builtin/merge.c:1275
+#: builtin/merge.c:1286
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - 병합할 수 있는 항목� 아닙니다"
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
 msgid "Can merge only exactly one commit into empty head"
 msgstr "빈 헤드�는 정확히 하나� 커밋만 병합할 수 있습니다"
 
-#: builtin/merge.c:1332
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "%s 커밋� 신뢰하지 않는 (서명�가 %s�고 하는) GPG 서명� 있습니다."
 
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "%s 커밋� 잘못� (서명�가 %s�고 하는) GPG 서명� 있습니다."
 
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "%s 커밋� GPG 서명� 없습니다."
 
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "%s 커밋� %s� 올바른 GPG 서명� 없습니다\n"
 
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr "관계 없는 커밋 내역� 병합� 거부합니다"
+
+#: builtin/merge.c:1439
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "업��트 중 %s..%s\n"
 
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "아주 간단한 ��스 내부 병합� 시�합니다...\n"
 
-#: builtin/merge.c:1468
+#: builtin/merge.c:1483
 #, c-format
 msgid "Nope.\n"
 msgstr "아님.\n"
 
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
 msgid "Not possible to fast-forward, aborting."
 msgstr "정방향� 불가능하므로, 중지합니다."
 
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "트리를 본래 위치로 ��립니다...\n"
 
-#: builtin/merge.c:1527
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "병합 전략 %s 시�...\n"
 
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "병합� 처리한 전략� 없습니다.\n"
 
-#: builtin/merge.c:1595
+#: builtin/merge.c:1610
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "전략 %s(으)로 병합� 실패했습니다.\n"
 
-#: builtin/merge.c:1604
+#: builtin/merge.c:1619
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "수� 해결� 준비를 위해 %s 전략� 사용합니다.\n"
 
-#: builtin/merge.c:1616
+#: builtin/merge.c:1631
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "�� 병합� 잘 진행�었습니다. 요청한대로 커밋 전� 중지합니다\n"
@@ -8183,9 +8509,9 @@ msgstr "git mv [<옵션>] <�본>... <대�>"
 msgid "Directory %s is in index and no submodule?"
 msgstr "%s 디렉터리가 ��스� 있고 하위 모듈� 없습니다?"
 
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
-msgstr "계�하려면 .gitmodules� 변경 사항� 스테�지� 넣거나 stash 하십시오"
+msgstr "계�하려면 .gitmodules� 변경 사항� 스테�지� 넣거나 스태시 하십시오"
 
 #: builtin/mv.c:90
 #, c-format
@@ -8261,48 +8587,48 @@ msgstr "%s, �본=%s, 대�=%s"
 msgid "Renaming %s to %s\n"
 msgstr "�름 바꾸기, '%s'�서 '%s'(으)로\n"
 
-#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "'%s'� �름 바꾸기가 실패했습니다"
 
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<옵션>] <커밋>..."
 
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<옵션>] --all"
 
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<옵션>] --stdin"
 
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
 msgid "print only names (no SHA-1)"
 msgstr "�름만 표시 (SHA-1 없�)"
 
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
 msgid "only use tags to name the commits"
 msgstr "커밋� 지정할 때 태그만 사용합니다"
 
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
 msgid "only use refs matching <pattern>"
 msgstr "<패턴>과 �치하는 레�런스만 사용합니다"
 
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
 msgid "list all commits reachable from all refs"
 msgstr "모든 레�런스�서 접근 가능한 모든 커밋 목�� 표시합니다"
 
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
 msgid "read from stdin"
 msgstr "표준입력�서 �습니다"
 
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
 msgid "allow to print `undefined` names (default)"
 msgstr "`정��지 않�' �름 표시를 허용합니다 (기본값)"
 
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
 msgid "dereference tags in the input (internal use)"
 msgstr "입력� 태그 레�런스를 따�갑니다 (내부 사용)"
 
@@ -8449,24 +8775,16 @@ msgstr "노트 오브�트를 쓸 수 없습니다"
 msgid "The note contents have been left in %s"
 msgstr "노트 내용� %s� 남습니다"
 
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
 #, c-format
 msgid "cannot read '%s'"
 msgstr "'%s'�(를) �� 수 없습니다"
 
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "'%s'�(를) 열거나 �� 수 없습니다"
 
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "'%s'�(를) 올바른 레�런스로 알아내는� 실패했습니다."
-
 #: builtin/notes.c:256
 #, c-format
 msgid "Failed to read object '%s'."
@@ -8479,7 +8797,7 @@ msgstr "블롭� 아닌 '%s' 오브�트� 대해 노트 ��터를 ��
 
 #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
 msgid "too many parameters"
 msgstr "파�미터가 너무 많습니다"
 
@@ -8526,7 +8844,7 @@ msgstr ""
 msgid "Overwriting existing notes for object %s\n"
 msgstr "%s 오브�트� 대한 기존 노트를 �어�니다\n"
 
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "%s 오브�트� 대한 노트를 제거합니다\n"
@@ -8566,15 +8884,15 @@ msgstr ""
 "-m/-F/-c/-C 옵션� 'edit' 하위 명령� 대해 사용� 권하지 않습니다.\n"
 "대신� 'git notes add -f -m/-F/-c/-C' 명령� 사용하십시오.\n"
 
-#: builtin/notes.c:767
+#: builtin/notes.c:768
 msgid "General options"
 msgstr "�반 옵션"
 
-#: builtin/notes.c:769
+#: builtin/notes.c:770
 msgid "Merge options"
 msgstr "병합 옵션"
 
-#: builtin/notes.c:771
+#: builtin/notes.c:772
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -8582,49 +8900,49 @@ msgstr ""
 "주어진 전략� 사용해 노트 충�� 해결합니다 (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "Committing unmerged notes"
 msgstr "병합하지 않� 노트 커밋"
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "병합하지 않� 노트를 커밋해 노트 병합� 마칩니다"
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid "Aborting notes merge resolution"
 msgstr "노트 병합 해결 중지"
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "abort notes merge"
 msgstr "노트 병합� 중지합니다"
 
-#: builtin/notes.c:856
+#: builtin/notes.c:857
 #, c-format
 msgid "A notes merge into %s is already in-progress at %s"
 msgstr "%s 위치로 노트 병합� �미 %s�서 진행중입니다"
 
-#: builtin/notes.c:883
+#: builtin/notes.c:884
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "%s 오브�트� 노트가 없습니다\n"
 
-#: builtin/notes.c:895
+#: builtin/notes.c:896
 msgid "attempt to remove non-existent note is not an error"
 msgstr "없는 노트를 제거하려는 시�를 오류가 아닌 것으로 취급합니다"
 
-#: builtin/notes.c:898
+#: builtin/notes.c:899
 msgid "read object names from the standard input"
 msgstr "표준 입력�서 오브�트 �름� �습니다"
 
-#: builtin/notes.c:979
+#: builtin/notes.c:980
 msgid "notes-ref"
 msgstr "노트-레�런스"
 
-#: builtin/notes.c:980
+#: builtin/notes.c:981
 msgid "use notes from <notes-ref>"
 msgstr "<노트-레�런스>�서 노트를 사용합니다"
 
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "알 수 없는 하위 명령: %s"
@@ -8647,166 +8965,170 @@ msgstr ""
 msgid "deflate error (%d)"
 msgstr "deflate 오류 (%d)"
 
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr "배트맵 쓰기를 하지 않습니다. 묶�� pack.packSizeLimit 값� 따� 쪼개집니다"
+
+#: builtin/pack-objects.c:776
 msgid "Writing objects"
 msgstr "오브�트 쓰는 중"
 
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "묶�� 들어있지 않� 오브�트가 있으므로, 비트맵 쓰기를 하지 않습니다"
 
-#: builtin/pack-objects.c:2172
+#: builtin/pack-objects.c:2177
 msgid "Compressing objects"
 msgstr "오브�트 압축하는 중"
 
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
 #, c-format
 msgid "unsupported index version %s"
 msgstr "지�하지 않는 ��스 버전 %s"
 
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2567
 #, c-format
 msgid "bad index version '%s'"
 msgstr "잘못� ��스 버전 '%s'"
 
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
 msgid "do not show progress meter"
 msgstr "진행률� 표시하지 않습니다"
 
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
 msgid "show progress meter"
 msgstr "진행률� 표시합니다"
 
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
 msgid "show progress meter during object writing phase"
 msgstr "오브�트 쓰기 단계�서 진행률� 표시합니다"
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2604
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "진행률� 표시� 때 --all-progress와 비슷합니다"
 
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2605
 msgid "version[,offset]"
 msgstr "버전[,오프셋]"
 
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
 msgid "write the pack index file in the specified idx format version"
 msgstr "지정한 버전� ��스 형�� 따� 묶� ��스 파�� �니다"
 
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2609
 msgid "maximum size of each output pack file"
 msgstr "출력 묶� 파�� 최대 �기"
 
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2611
 msgid "ignore borrowed objects from alternate object store"
 msgstr "보조 오브�트 저장소�서 빌려온 오브�트를 무시합니다"
 
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2613
 msgid "ignore packed objects"
 msgstr "묶� 오브�트를 무시합니다"
 
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
 msgid "limit pack window by objects"
 msgstr "묶� 윈�우를 오브�트 단위로 제한합니다"
 
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2617
 msgid "limit pack window by memory in addition to object limit"
 msgstr "묶� 윈�우를 오브�트 단위� 추가로 메모리 단위로 제한합니다"
 
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2619
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "결과물 묶��서 허용�는 최대 길�� �타 체�"
 
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2621
 msgid "reuse existing deltas"
 msgstr "기존 �타를 재사용합니다"
 
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
 msgid "reuse existing objects"
 msgstr "기존 오브�트를 재사용합니다"
 
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
 msgid "use OFS_DELTA objects"
 msgstr "OFS_DELTA 오브�트를 사용합니다"
 
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
 msgid "use threads when searching for best delta matches"
 msgstr "최�� �타 �치를 검색하는� 스레드를 사용합니다"
 
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2629
 msgid "do not create an empty pack output"
 msgstr "빈 묶� 출력� 만들지 않습니다"
 
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2631
 msgid "read revision arguments from standard input"
 msgstr "표준 입력�서 리비전 ��를 �습니다"
 
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
 msgid "limit the objects to those that are not yet packed"
 msgstr "묶지 않는 오브�트 수를 제한합니다"
 
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2636
 msgid "include objects reachable from any reference"
 msgstr "모든 레�런스�서 접근 가능한 오브�트를 �함합니다"
 
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2639
 msgid "include objects referred by reflog entries"
 msgstr "reflog 항목�서 레�런스할 수 있는 오브�트를 �함합니다"
 
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2642
 msgid "include objects referred to by the index"
 msgstr "��스�서< 레�런스하는 오브�트를 �함합니다"
 
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2645
 msgid "output pack to stdout"
 msgstr "묶�� 표준 출력으로 출력합니다"
 
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
 msgid "include tag objects that refer to objects to be packed"
 msgstr "묶�� 들어갈 오브�트를 레�런스하는 태그 오브�트를 �함합니다"
 
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2649
 msgid "keep unreachable objects"
 msgstr "접근 불가능 오브�트를 보존합니다"
 
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
 msgid "time"
 msgstr "시�"
 
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
 msgid "unpack unreachable objects newer than <time>"
 msgstr "<시�>보다 새로운 접근 불가능 오브�트� 묶�� 풉니다"
 
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2654
 msgid "create thin packs"
 msgstr "얇� 묶�� 만듭니다"
 
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
 msgid "create packs suitable for shallow fetches"
 msgstr "얕� 가져오기� �합한 묶�� 만듭니다"
 
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2658
 msgid "ignore packs that have companion .keep file"
 msgstr "해당하는 .keep 파�� 있는 묶�� 무시합니다"
 
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2660
 msgid "pack compression level"
 msgstr "묶� 압축 단계"
 
 # FIXME: graft?
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
 msgid "do not hide commits by grafts"
 msgstr "붙어 있는 커밋� 숨기지 않습니다"
 
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2664
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "가능하면 비트맵 ��스를 사용해 오브�트 세기 ��를 높입니다"
 
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2666
 msgid "write a bitmap index together with the pack index"
 msgstr "묶� ��스와 같� 비트맵 ��스를 �니다"
 
-#: builtin/pack-objects.c:2752
+#: builtin/pack-objects.c:2757
 msgid "Counting objects"
 msgstr "오브�트 개수 세는 중"
 
@@ -8834,15 +9156,15 @@ msgstr "중복� 오브�트 제거"
 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--expire <시�>] [--] [<헤드>...]"
 
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
 msgid "do not remove, show only"
 msgstr "제거하지 않고, 보여주기만 합니다"
 
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
 msgid "report pruned objects"
 msgstr "잘�낸 오브�트를 알립니다"
 
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
 msgid "expire objects older than <time>"
 msgstr "<시�>보다 오래 � 오브�트가 만료�니다"
 
@@ -8854,61 +9176,65 @@ msgstr "precious-objects 저장소�서 잘�낼 수 없습니다"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<옵션>] [<저장소> [<레�런스명세>...]]"
 
-#: builtin/pull.c:117
+#: builtin/pull.c:120
 msgid "Options related to merging"
 msgstr "병합 관련 옵션"
 
-#: builtin/pull.c:120
+#: builtin/pull.c:123
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "변경 사항� �용할 때 병합하는 대신 리베�스합니다"
 
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
 msgid "allow fast-forward"
 msgstr "정방향 진행� 허용합니다"
 
-#: builtin/pull.c:150
+#: builtin/pull.c:153
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "지정한 커밋� 올바른 GPG 서명� 있는지 검�합니다"
 
-#: builtin/pull.c:164
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "리베�스 전과 후� stash � stash pop� ��으로 합니다"
+
+#: builtin/pull.c:172
 msgid "Options related to fetching"
 msgstr "가져오기 관련 옵션"
 
-#: builtin/pull.c:186
+#: builtin/pull.c:194
 msgid "number of submodules pulled in parallel"
 msgstr "병렬�으로 풀� 실행할 하위모듈 개수"
 
-#: builtin/pull.c:275
+#: builtin/pull.c:283
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "pull.ff� 대해 잘못� 값: %s"
 
-#: builtin/pull.c:359
+#: builtin/pull.c:379
 msgid "Cannot pull with rebase: You have unstaged changes."
 msgstr ""
 "리베�스로 풀� 할 수 없습니다: 스테�징하지 않� 변경 사항� 있습니다."
 
-#: builtin/pull.c:365
+#: builtin/pull.c:385
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "추가로, ��스� 커밋하지 않� 변경 사항� 있습니다."
 
-#: builtin/pull.c:367
+#: builtin/pull.c:387
 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
 msgstr ""
 "리베�스로 풀� 할 수 없습니다: ��스� 커밋하지 않� 변경 사항� 있습니다."
 
-#: builtin/pull.c:443
+#: builtin/pull.c:463
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "가져온 레�런스 중� 리베�스할 대� 후보가 없습니다."
 
-#: builtin/pull.c:445
+#: builtin/pull.c:465
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "가져온 레�런스 중� 병합할 대� 후보가 없습니다."
 
-#: builtin/pull.c:446
+#: builtin/pull.c:466
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -8916,7 +9242,7 @@ msgstr ""
 "보통 �런 경우는 리모트 쪽�는 없는 와�드카드 레�런스명세가\n"
 "주어졌� 때 �어납니다."
 
-#: builtin/pull.c:449
+#: builtin/pull.c:469
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -8927,38 +9253,42 @@ msgstr ""
 "� 리모트는 현재 브랜치� 대해 기본으로 설정� 리모트가\n"
 "아니기 때문�, 명령행�서 브랜치를 지정해야 합니다."
 
-#: builtin/pull.c:454
+#: builtin/pull.c:474 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "현재 어떤 브랜치 위�� 있지 않습니다."
 
-#: builtin/pull.c:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "어떤 브랜치를 대�으로 리베�스할지 지정하십시오."
 
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "어떤 브랜치를 대�으로 병합할지 지정하십시오."
 
-#: builtin/pull.c:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
 msgid "See git-pull(1) for details."
 msgstr "�세한 정보는 git-pull(1) 페�지를 참고하십시오."
 
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<리모트>"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<브랜치>"
+
+#: builtin/pull.c:489 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "현재 브랜치� 추� 정보가 없습니다."
 
-#: builtin/pull.c:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
 msgid ""
-"If you wish to set tracking information for this branch you can do so with:\n"
-"\n"
-"    git branch --set-upstream-to=%s/<branch> %s\n"
-msgstr ""
-"� 브랜치� 대한 추� 정보를 설정하려면 다�과 같� 할 수 있습니다:\n"
-"\n"
-"    git branch --set-upstream-to=%s/<브랜치> %s\n"
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr "� 브랜치� 대한 추� 정보를 설정하려면 다�과 같� 할 수 있습니다:"
 
-#: builtin/pull.c:483
+#: builtin/pull.c:503
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -8967,11 +9297,15 @@ msgstr ""
 "설정�서 리모트� '%s' 레�런스와 병합하�� 지정했지만,\n"
 "그런 레�런스를 가져오지 않았습니다."
 
-#: builtin/pull.c:841
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "--[no-]autostash 옵션� --rebase 옵션과 같� �야 합니다."
+
+#: builtin/pull.c:872
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "만들어지지 않� 브랜치를 ��스� 추가� 변경 사항으로 업��트합니다."
 
-#: builtin/pull.c:870
+#: builtin/pull.c:900
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -8982,7 +9316,7 @@ msgstr ""
 "작업 ��를 %s 커밋�서 정방향\n"
 "진행합니다."
 
-#: builtin/pull.c:875
+#: builtin/pull.c:905
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -8999,11 +9333,11 @@ msgstr ""
 "$ git reset --hard\n"
 "복구�니다."
 
-#: builtin/pull.c:890
+#: builtin/pull.c:920
 msgid "Cannot merge multiple branches into empty head."
 msgstr "여러 브랜치를 빈 헤드로 병합할 수 없습니다."
 
-#: builtin/pull.c:894
+#: builtin/pull.c:924
 msgid "Cannot rebase onto multiple branches."
 msgstr "여러 브랜치로 리베�스할 수 없습니다."
 
@@ -9367,6 +9701,18 @@ msgstr "드문 체�아웃 필터 �용� 건너�니다"
 msgid "debug unpack-trees"
 msgstr "unpack-trees 디버깅"
 
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <git-dir>"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "출력 않기"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "디렉터리를 지정해야 합니다."
+
 #: builtin/reflog.c:423
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
@@ -9688,174 +10034,176 @@ msgstr "* 리모트 %s"
 msgid "  Fetch URL: %s"
 msgstr "  가져오기 URL: %s"
 
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
 msgid "(no URL)"
 msgstr "(URL 없�)"
 
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in "  Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  푸시  URL: %s"
 
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD 브랜치: %s"
 
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD 브랜치 (리모트 HEAD는 애매하고, 다� 중 하나� 수 있습니다):\n"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1181
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  리모트 브랜치:%s"
 
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
 msgid " (status not queried)"
 msgstr " (�태를 질�하지 않�)"
 
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  'git pull'� 사용할 로컬 브랜치를 설정:"
 
-#: builtin/remote.c:1199
+#: builtin/remote.c:1201
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  로컬 레�런스를 'git push'로 미러�할 예정"
 
-#: builtin/remote.c:1206
+#: builtin/remote.c:1208
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  로컬 레�런스를 'git push'로 미러�%s:"
 
-#: builtin/remote.c:1227
+#: builtin/remote.c:1229
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "레�런스/리모트/<�름>/HEAD 값� 리모트� 맞게 설정합니다"
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1231
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "레�런스/리모트/<�름>/HEAD 값� 삭제합니다"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
 msgid "Cannot determine remote HEAD"
 msgstr "리모트 HEAD를 결정할 수 없습니다"
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "리모트 HEAD 브랜치가 여러개입니다. 다� 중 하나를 명시�으로 지정하십시오:"
 
-#: builtin/remote.c:1256
+#: builtin/remote.c:1258
 #, c-format
 msgid "Could not delete %s"
 msgstr "%s�(를) 삭제할 수 없습니다"
 
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "올바른 레�런스가 아닙니다: %s"
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
 #, c-format
 msgid "Could not setup %s"
 msgstr "%s�(를) 설정할 수 없습니다"
 
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s� 연결� �어집니다!"
 
-#: builtin/remote.c:1285
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s� 연결� �어졌습니다!"
 
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
 #, c-format
 msgid "Pruning %s"
 msgstr "잘�냄: %s"
 
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [잘�낼 예정] %s"
 
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [잘�냄] %s"
 
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
 msgid "prune remotes after fetching"
 msgstr "가져온 후� 리모트를 잘�냅니다"
 
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
 #, c-format
 msgid "No such remote '%s'"
 msgstr "그런 리모트가 없습니다 ('%s')"
 
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
 msgid "add branch"
 msgstr "브랜치를 추가합니다"
 
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
 msgid "no remote specified"
 msgstr "리모트를 지정하지 않았습니다"
 
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
 msgid "query push URLs rather than fetch URLs"
 msgstr "가져오기 URL� 아니� 푸시 URL� 질�합니다"
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1467
 msgid "return all URLs"
 msgstr "모든 URL� 리턴합니다"
 
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "'%s' 리모트� 대한 URL� 설정하지 않았습니다"
 
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
 msgid "manipulate push URLs"
 msgstr "푸시 URL� 지정합니다"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
 msgid "add URL"
 msgstr "URL� 추가합니다"
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
 msgid "delete URLs"
 msgstr "URL� 삭제합니다"
 
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete 옵션� 둘다 쓰면 안 �니다"
 
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "잘못� 오래전 URL 패턴: %s"
 
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
 #, c-format
 msgid "No such URL found: %s"
 msgstr "그런 URL� 없습니다: %s"
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
 msgid "Will not delete all non-push URLs"
 msgstr "푸시용� 아닌 모든 URL� 삭제하지 않습니다"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 msgid "be verbose; must be placed before a subcommand"
 msgstr "�세히 표시합니다 (하위 명령 앞� 와야 합니다)"
 
@@ -10359,10 +10707,6 @@ msgstr "재귀� 제거를 허용합니다"
 msgid "exit with a zero status even if nothing matched"
 msgstr "아무 것� �치하지 않으면 �태 0번으로 �납니다"
 
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr "계�하려면 .gitmodules� 변경 사항� 스테�징하거나 stash하십시오"
-
 #: builtin/rm.c:335
 #, c-format
 msgid "not removing '%s' recursively without -r"
@@ -10565,82 +10909,178 @@ msgstr "주� 문�로 시작하는 모든 줄� 건너뛰고 제거합니다
 msgid "prepend comment character and space to each line"
 msgstr "� 줄� 앞� 주� 문�와 공백� 붙입니다"
 
-#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "그런 레�런스가 없습니다: %s"
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "전체 레�런스 �름� 필요하지만, 입력� %s"
+
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "'%s' URL 하나� 단계를 잘�낼 수 없습니다"
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
 msgid "alternative anchor for relative paths"
 msgstr "�대 경로� 사용할 �다른 기준"
 
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<경로>] [<경로>...]"
 
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr ".gitmodules�서 하위 모듈 경로 '%s'� 대한 URL� 없습니다"
+
+#: builtin/submodule--helper.c:366
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "하위 모듈 경로 '%s'� 대한 URL� 등�하는� 실패했습니다"
+
+#: builtin/submodule--helper.c:370
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "'%3$s' 경로� 대해 '%1$s' (%2$s) 하위 모듈 등�\n"
+
+#: builtin/submodule--helper.c:380
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "경고: '%s' 하위 모듈� 대해 커맨드 업��트 모드가 제안�었습니다\n"
+
+#: builtin/submodule--helper.c:387
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr "'%s' 하위 모듈� 대해 업��트 모드 등�� 실패했습니다"
+
+#: builtin/submodule--helper.c:406
+msgid "Suppress output for initializing a submodule"
+msgstr "하위 모듈 초기화� 출력� 하지 않습니다"
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<경로>]"
+
+#: builtin/submodule--helper.c:432
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <경로>"
 
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "경로 '%s'� 대해 .gitmodules� 있는 하위모듈 매핑� 없습니다"
 
-#: builtin/submodule--helper.c:164
+#: builtin/submodule--helper.c:489
 msgid "where the new submodule will be cloned to"
 msgstr "새 하위 모듈� 복제할 대� 위치"
 
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:492
 msgid "name of the new submodule"
 msgstr "새 하위 모듈 �름"
 
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
 msgid "url where to clone the submodule from"
 msgstr "하위 모듈� 복제해 올 URL"
 
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:501
 msgid "depth for shallow clones"
 msgstr "얕� 복제� 사용할 깊�"
 
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
-msgstr ""
-"git submodule--helper clone [--prefix=<경로>] [--quiet] [--reference <저장소"
-">] [--name <�름>] [--url <URL>][--depth <깊�>] [--] [<경로>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr "git submodule--helper clone [--prefix=<경로>] [--quiet] [--reference <저장소>] [--name <�름>] [--depth <깊�>] --url <url> --path <경로>"
 
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "'%s' 디렉터리를 만들 수 없습니다"
 
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "'%s'�서 하위 모듈 경로 '%s'� 복제하는� 실패했습니다"
 
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:550
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "'%s' 파�� 열 수 없습니다"
 
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
 #, c-format
 msgid "could not close file %s"
 msgstr "%s 파�� 닫� 수 없습니다"
 
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "'%s'� 대한 하위 모듈 디렉터리를 가져올 수 없습니다"
 
-#: builtin/submodule--helper.c:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
-msgstr ""
-"치명� ��: submodule--helper 하위 명령� 하위 명령으로 호출해야 합니다"
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "'%s' 하위 모듈 경로가 초기화�지 않았습니다"
 
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr "'update --init'� 하려고 한 것 아니었습니까?"
+
+#: builtin/submodule--helper.c:639
 #, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr "치명� ��: '%s'�(는) 올바른 submodule--helper 하위 명령� 아닙니다"
+msgid "Skipping unmerged submodule %s"
+msgstr "병합하지 하위 모듈 %s 건너뜀"
+
+#: builtin/submodule--helper.c:660
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "하위 모듈 '%s' 건너뜀"
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "작업 ��로 가는 경로"
+
+#: builtin/submodule--helper.c:771
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "작업 ��로 가는 경로, 내장� 하위 모듈� 경계 통과"
+
+#: builtin/submodule--helper.c:775
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout �는 none"
+
+#: builtin/submodule--helper.c:779
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "지정한 개수� 리비전�서 잘린 얕� 복제를 만듭니다"
+
+#: builtin/submodule--helper.c:782
+msgid "parallel jobs"
+msgstr "병렬 작업 개수"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "복제 과정� 표시하지 않습니다"
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<경로>] [<경로>...]"
+
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr "파�미터 업��트� 값� 잘못�었습니다"
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "submodule--helper 하위 명령� 하위 명령으로 호출해야 합니다"
+
+#: builtin/submodule--helper.c:862
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s'�(는) 올바른 submodule--helper 하위 명령� 아닙니다"
 
 #: builtin/symbolic-ref.c:7
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10694,27 +11134,22 @@ msgstr ""
 msgid "git tag -v <tagname>..."
 msgstr "git tag -v <태그�름>..."
 
-#: builtin/tag.c:80
+#: builtin/tag.c:81
 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr "태그 �름� 너무 �니다: %.*s..."
 
-#: builtin/tag.c:85
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr "'%s' 태그가 없습니다."
 
-#: builtin/tag.c:100
+#: builtin/tag.c:101
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "'%s' 태그 삭제함 (과거 %s)\n"
 
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "'%s' 태그를 검�할 수 없습니다"
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
 #, c-format
 msgid ""
 "\n"
@@ -10727,7 +11162,7 @@ msgstr ""
 "  %s\n"
 "'%c' 문�로 시작하는 줄� 무시�니다.\n"
 
-#: builtin/tag.c:126
+#: builtin/tag.c:121
 #, c-format
 msgid ""
 "\n"
@@ -10858,21 +11293,21 @@ msgstr "--merged � --no-merged 옵션� -l 옵션과 같� �야 합니다.
 msgid "only one -F or -m option is allowed."
 msgstr "하나� -F �는 -m 옵션만 쓸 수 있습니다."
 
-#: builtin/tag.c:453
+#: builtin/tag.c:452
 msgid "too many params"
 msgstr "파�미터가 너무 많습니다"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:458
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s'�9는) 올바른 태그 �름� 아닙니다."
 
-#: builtin/tag.c:464
+#: builtin/tag.c:463
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "태그 '%s'�(가) �미 있습니다"
 
-#: builtin/tag.c:489
+#: builtin/tag.c:491
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "태그 '%s' 업��트 (과거 %s)\n"
@@ -11121,7 +11556,7 @@ msgstr "git verify-commit [-v | --verbose] <커밋>..."
 msgid "print commit contents"
 msgstr "커밋 내용� 표시합니다"
 
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
 msgid "print raw gpg status output"
 msgstr "�본 GPG �태를 출력합니다"
 
@@ -11141,7 +11576,7 @@ msgstr "통계만 표시"
 msgid "git verify-tag [-v | --verbose] <tag>..."
 msgstr "git verify-tag [-v | --verbose] <태그>..."
 
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
 msgid "print tag contents"
 msgstr "태그 내용 표시"
 
@@ -11157,68 +11592,72 @@ msgstr "git worktree prune [<옵션>]"
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<옵션>]"
 
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "worktrees/%s 제거: 올바른 디렉터리가 아닙나다"
 
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "worktrees/%s 제거: gitdir 파�� 없습니다"
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "worktrees/%s 제거: gitdir 파�� �� 수 없습니다 (%s)"
 
-#: builtin/worktree.c:61
+#: builtin/worktree.c:62
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "worktrees/%s 제거: gitdir 파�� 올바르지 않습니다"
 
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "worktrees/%s 제거: gitdir 파�� 없는 위치를 가리킵니다"
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:113
 #, c-format
-msgid "failed to remove: %s"
-msgstr "제거� 실패했습니다: %s"
+msgid "failed to remove '%s'"
+msgstr "'%s' 제거� 실패했습니다"
 
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s'�(가) �미 있습니다"
 
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "'%s'� 디렉터리를 만들 수 없습니다"
 
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "%s 준비 중 (ID %s)"
 
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "다른 작업 ���서 체�아웃했��� <브랜치>를 체�아웃합니다"
 
-#: builtin/worktree.c:319
+#: builtin/worktree.c:324
 msgid "create a new branch"
 msgstr "새 브랜치를 만듭니다"
 
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
 msgid "create or reset a branch"
 msgstr "브랜치를 만들거나 리셋합니다"
 
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
 msgid "detach HEAD at named commit"
 msgstr "HEAD를 해당 커밋�서 분리합니다"
 
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "새 작업 ��를 만듭니다"
+
+#: builtin/worktree.c:336
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B, --detach 옵션 중 하나만 쓸 수 있습니다"
 
@@ -11238,7 +11677,7 @@ msgstr "하위 디렉터리 <ì ‘ë‘�ì–´>ì—� 대해 트리 오브ì �트를 ì”�니ë
 msgid "only useful for debugging"
 msgstr "디버깅 용�로만 사용"
 
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "디버깅 메시지를 표준오류로 출력합니다"
 
@@ -11252,7 +11691,7 @@ msgstr ""
 "목�� 볼 수 있습니다. 특정 하위 명령어나 개�� 대해 �어 보려면 'git help\n"
 "<명령>' �는 'git help <개�>' 명령� 실행하십시오."
 
-#: http.c:321
+#: http.c:322
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "공개 키 고정� cURL 7.44.0 앞 버전�서는 지�하지 않습니다"
 
@@ -11298,7 +11737,7 @@ msgstr "저장소를 복제해 새 디렉터리로 가져 옵니다"
 
 #: common-cmds.h:22
 msgid "Record changes to the repository"
-msgstr "바� 사항� 저장소� 기�합니다."
+msgstr "바� 사항� 저장소� 기�합니다"
 
 #: common-cmds.h:23
 msgid "Show changes between commits, commit and working tree, etc"
@@ -11380,7 +11819,7 @@ msgstr "� 간략히 표시합니다"
 msgid "use <n> digits to display SHA-1s"
 msgstr "SHA-1 표시� <n>개� 숫�를 사용합니다"
 
-#: rerere.h:38
+#: rerere.h:40
 msgid "update the index with reused conflict resolution if possible"
 msgstr "가능하면 ��스를 재사용한 충� 해결로 업��트합니다"
 
@@ -11592,16 +12031,16 @@ msgstr ""
 "�래 브랜치를 체�아웃하고 리베�스를 중지하려면, \"git rebase --abort\"를 실"
 "행하십시오."
 
-#: git-rebase.sh:165
+#: git-rebase.sh:168
 msgid "Applied autostash."
 msgstr "��스태시 �용."
 
-#: git-rebase.sh:168
+#: git-rebase.sh:171
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "\"$stash_sha1\"�(를) 저장할 수 없습니다"
 
-#: git-rebase.sh:169
+#: git-rebase.sh:172
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 "Your changes are safe in the stash.\n"
@@ -11611,31 +12050,27 @@ msgstr ""
 "변경 사항� 스태시 안� 안전하게 들어 있습니다.\n"
 "언제든지 \"git stash pop\" �는 \"git stash drop\"� 실행할 수 있습니다.\n"
 
-#: git-rebase.sh:208
+#: git-rebase.sh:211
 msgid "The pre-rebase hook refused to rebase."
 msgstr "리베�스 전 후��서 리베�스를 거부했습니다."
 
-#: git-rebase.sh:213
+#: git-rebase.sh:216
 msgid "It looks like git-am is in progress. Cannot rebase."
 msgstr "git-am� 진행 중� 것처럼 보입니다. 리베�스할 수 없습니다."
 
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "--exec 옵션� --interactive 옵션과 같� 사용해야 합니다"
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
 msgid "No rebase in progress?"
 msgstr "리베�스가 진행 중�지 않습니다"
 
-#: git-rebase.sh:370
+#: git-rebase.sh:368
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "--edit-todo �작� 대화형 리베�스�서만 사용할 수 있습니다."
 
-#: git-rebase.sh:377
+#: git-rebase.sh:375
 msgid "Cannot read HEAD"
 msgstr "HEAD를 �� 수 없습니다"
 
-#: git-rebase.sh:380
+#: git-rebase.sh:378
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -11643,12 +12078,12 @@ msgstr ""
 "모든 병합 충�� 편집하고 git add\n"
 "명령으로 해결�었다고 표시해야 합니다"
 
-#: git-rebase.sh:398
+#: git-rebase.sh:396
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "'$head_name' 위치로 �아갈 수 없습니다"
 
-#: git-rebase.sh:417
+#: git-rebase.sh:415
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -11669,64 +12104,64 @@ msgstr ""
 "� 명령� 다시 실행하십시오. 중요한 사항� 남아 있� 경우를\n"
 "대비해 여기서 멈춥니다."
 
-#: git-rebase.sh:468
+#: git-rebase.sh:466
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "잘못� 업스트림 $upstream_name"
 
-#: git-rebase.sh:492
+#: git-rebase.sh:490
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: 여러 개� 병합 베�스가 있습니다"
 
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: 병합 베�스가 없습니다"
 
-#: git-rebase.sh:504
+#: git-rebase.sh:502
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "올바른 커밋� 가리키지 않습니다: $onto_name"
 
-#: git-rebase.sh:527
+#: git-rebase.sh:525
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "치명� ��: 그런 브랜치가 없습니다: $branch_name"
 
-#: git-rebase.sh:560
+#: git-rebase.sh:558
 msgid "Cannot autostash"
 msgstr "�� 스태시를 할 수 없습니다"
 
-#: git-rebase.sh:565
+#: git-rebase.sh:563
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "�� 스태시를 만들었습니다: $stash_abbrev"
 
-#: git-rebase.sh:569
+#: git-rebase.sh:567
 msgid "Please commit or stash them."
 msgstr "커밋하거나 스태시� 넣으십시오."
 
-#: git-rebase.sh:589
+#: git-rebase.sh:587
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "현재 브랜치가 ($branch_name) 최신 �태입니다."
 
-#: git-rebase.sh:593
+#: git-rebase.sh:591
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "현재 브랜치가 ($branch_name) 최신 �태입니다. 강제 리베�스합니다."
 
-#: git-rebase.sh:604
+#: git-rebase.sh:602
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "변경 사항 '$mb'�서 '$onto'(으)로:"
 
-#: git-rebase.sh:613
+#: git-rebase.sh:611
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr "작업 사항� 다시 넣기 위해 먼저 헤드를 뒤로 �립니다..."
 
-#: git-rebase.sh:623
+#: git-rebase.sh:621
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "$branch_name 브랜치를 $onto_name 위치로 정방향 진행합니다."
@@ -11870,26 +12305,21 @@ msgstr "브랜치 �름� 지정하지 않았습니다"
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(복구하려면 \"git stash apply\"를 실행하십시오)"
 
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "'$remoteurl' URL�서 하나� 항목� 잘�낼 수 없습니다"
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr "�대 경로는 작업 ��� 최�위�서만 쓸 수 있습니다"
 
-#: git-submodule.sh:291
+#: git-submodule.sh:229
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "저장소 URL: '$repo' 값� 절대 경로거나 ./ �는 ../로 시작해야 합니다."
 
-#: git-submodule.sh:308
+#: git-submodule.sh:246
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path'�(는) �미 ��스� 있습니다"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:250
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
@@ -11900,111 +12330,93 @@ msgstr ""
 "$sm_path\n"
 "정�로 추가하려면 -f 옵션� 사용하십시오."
 
-#: git-submodule.sh:330
+#: git-submodule.sh:268
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "'$sm_path'� 기존 저장소를 ��스� 추가합니다"
 
-#: git-submodule.sh:332
+#: git-submodule.sh:270
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path'�(가) �미 있고 올바른 git 저장소가 아닙니다"
 
-#: git-submodule.sh:340
+#: git-submodule.sh:278
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr "'$sm_name'� 대한 깃 디렉터리가 로컬�서 리모트가 있는 채로 있습니다:"
 
-#: git-submodule.sh:342
+#: git-submodule.sh:280
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from"
 msgstr "다시 복제하지 않고 � 로컬 깃 디렉터리를 재활용하려면"
 
-#: git-submodule.sh:344
+#: git-submodule.sh:282
 #, sh-format
 msgid ""
 "use the '--force' option. If the local git directory is not the correct repo"
 msgstr ""
 "'--force' 옵션� 사용하십시오. 로컬 깃 디렉터리가 올바른 저장소가 아니거나"
 
-#: git-submodule.sh:345
+#: git-submodule.sh:283
 #, sh-format
 msgid ""
 "or you are unsure what this means choose another name with the '--name' "
 "option."
 msgstr "무슨 �미�지 잘 모르겠다면 '--name' 옵션으로 다른 �름� 쓰십시오."
 
-#: git-submodule.sh:347
+#: git-submodule.sh:285
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "로컬 깃 디렉터리를 '$sm_name' 하위모듈로 다시 활성화합니다."
 
-#: git-submodule.sh:359
+#: git-submodule.sh:297
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "'$sm_path' 하위 모듈� 체�아웃할 수 없습니다"
 
-#: git-submodule.sh:364
+#: git-submodule.sh:302
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "'$sm_path' 하위 모듈� 추가하는� 실패했습니다"
 
-#: git-submodule.sh:373
+#: git-submodule.sh:311
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "'$sm_path' 하위 모듈� 등�하는� 실패했습니다"
 
-#: git-submodule.sh:417
+#: git-submodule.sh:355
 #, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "'$prefix$displaypath' ìž…ë ¥"
+msgid "Entering '$displaypath'"
+msgstr "'$displaypath' 들어�"
 
-#: git-submodule.sh:437
+#: git-submodule.sh:375
 #, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
-msgstr ""
-"'$prefix$displaypath' 위치�서 멈춤. 스�립트�서 0� 아닌 �태를 리턴했습니"
-"다."
+msgid "Stopping at '$displaypath'; script returned non-zero status."
+msgstr "'$displaypath'�서 멈춤. 스�립트가 0� 아닌 �태를 리턴함."
 
-#: git-submodule.sh:483
+#: git-submodule.sh:448
 #, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr ".gitmodules�서 하위 모듈 경로 '$displaypath'� 대한 URL� 없습니다"
-
-#: git-submodule.sh:492
-#, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr "하위 모듈 경로 '$displaypath'� 대한 URL� 등�하는� 실패했습니다"
-
-#: git-submodule.sh:494
-#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr "'$displaypath' 경로� ($url) 대해 등�� '$name' 하위 모듈"
-
-#: git-submodule.sh:511
-#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr ""
-"하위 모듈 경로 '$displaypath'� 대해 업��트 모드를 등�하는� 실패했습니다"
+msgid "pathspec and --all are incompatible"
+msgstr "경로명세 � --all 옵션� 호환�지 않습니다"
 
-#: git-submodule.sh:549
+#: git-submodule.sh:453
 #, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr "정�로 모든 하위 모듈 초기화를 해제하려면 '.'� 사용하십시오"
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "정�로 모든 하위 모듈 초기화를 해제하려면 '--all'� 사용하십시오"
 
-#: git-submodule.sh:566
+#: git-submodule.sh:470
 #, sh-format
 msgid "Submodule work tree '$displaypath' contains a .git directory"
 msgstr "하위 모듈 작업 ��� ('$displaypath') .git 디렉터리가 들어 있습니다"
 
-#: git-submodule.sh:567
+#: git-submodule.sh:471
 #, sh-format
 msgid ""
 "(use 'rm -rf' if you really want to remove it including all of its history)"
 msgstr "(정�로 그 커밋 내역까지 �함해 제거하려면 'rm -rf'를 사용하십시오)"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:477
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12013,133 +12425,127 @@ msgstr ""
 "하위 모듈 작업 ��� ('$displaypath') 로컬 수정 사항� 있습니다. 버리려면 '-"
 "f'를 사용하십시오"
 
-#: git-submodule.sh:576
+#: git-submodule.sh:480
 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr "'$displaypath' 디렉터리를 지�니다"
 
-#: git-submodule.sh:577
+#: git-submodule.sh:481
 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr "하위 모듈 디렉터리를 ('$displaypath') 제거할 수 없습니다"
 
-#: git-submodule.sh:580
+#: git-submodule.sh:484
 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr "빈 하위 모듈 디렉터리를 ('$displaypath') 만들 수 없습니다"
 
-#: git-submodule.sh:589
+#: git-submodule.sh:493
 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr ""
 "'$name' 하위 모듈� ($url) '$displaypath' 경로� 대해 등��지 않았습니다"
 
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"하위 모듈 경로가 ('$displaypath') 초기화�지 않았습니다\n"
-"아마� 'update --init'� 필요합니다?"
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "하위 모듈 경로�서 ('$displaypath') 현재 리비전� 찾� 수 없습니다"
 
-#: git-submodule.sh:745
+#: git-submodule.sh:644
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "하위 모듈 경로 '$sm_path'�서 가져올 수 없습니다"
 
-#: git-submodule.sh:768
+#: git-submodule.sh:667
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "하위 모듈 경로 '$displaypath'�서 가져올 수 없습니다"
 
-#: git-submodule.sh:788
+#: git-submodule.sh:680
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "하위 모듈 경로 '$displaypath'�서 '$sha1'�(를) 체�아웃할 수 없습니다"
 
-#: git-submodule.sh:789
+#: git-submodule.sh:681
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "하위 모듈 경로 '$displaypath': '$sha1' 체�아웃"
 
-#: git-submodule.sh:793
+#: git-submodule.sh:685
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "하위 모듈 경로 '$displaypath'�서 '$sha1'�(를) 리베�스할 수 없습니다"
 
-#: git-submodule.sh:794
+#: git-submodule.sh:686
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "하위 모듈 경로 '$displaypath': '$sha1'(으)로 리베�스"
 
-#: git-submodule.sh:799
+#: git-submodule.sh:691
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "하위 모듈 경로 '$displaypath'�서 '$sha1' 병합할 수 없습니다"
 
-#: git-submodule.sh:800
+#: git-submodule.sh:692
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "하위 모듈 경로 '$displaypath': '$sha1'�서 병합"
 
-#: git-submodule.sh:805
+#: git-submodule.sh:697
 #, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
-msgstr ""
-"하위 모듈 경로 '$prefix$sm_path'�서 '$command $sha1' 실행� 실패했습니다"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr "'$command $sha1' 실행� 하위 모듈 경로 '$displaypath'�서 실패했습니다"
 
-#: git-submodule.sh:806
+#: git-submodule.sh:698
 #, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "하위 모듈 경로 '$prefix$sm_path': '$command $sha1'"
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "하위 모듈 경로 '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:836
+#: git-submodule.sh:729
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "재귀�으로 하위 모듈 경로 '$displaypath'� 들어가는� 실패했습니다"
 
-#: git-submodule.sh:944
+#: git-submodule.sh:837
 msgid "The --cached option cannot be used with the --files option"
 msgstr "--cached 옵션� --files 옵션과 같� 쓸 수 없습니다"
 
-#: git-submodule.sh:996
+#: git-submodule.sh:889
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "예�치 못한 모드 $mod_dst"
 
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  경고: '$display_name'� '$sha1_src' 커밋� 들어있지 않습니다"
 
-#: git-submodule.sh:1019
+#: git-submodule.sh:912
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  경고: '$display_name'� '$sha1_dst' 커밋� 들어있지 않습니다"
 
-#: git-submodule.sh:1022
+#: git-submodule.sh:915
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 "  경고: '$display_name'� '$sha1_src' � '$sha1_dst' 커밋� 들어있지 않습니다"
 
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
 msgid "blob"
 msgstr "블롭"
 
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "재귀�으로 하위 모듈 경로 '$sm_path'� 들어가는� 실패했습니다"
 
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "하위 모듈 URL� '$displaypath'� 대해 �기화"
+
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "�세한 정보는 git-${cmd}(1) 페�지를 참고하십시오."
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 321b553877..f2cc93fe2a 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,16 +1,17 @@
 # Portuguese translations for Git package.
 # Copyright (C) 2012 Marco Sousa <marcomsousa AT gmail.com>
+# Copyright (C) 2016 Vasco Almeida <vascomalmeida@sapo.pt>
 # This file is distributed under the same license as the Git package.
-# Contributers:
+# Contributors:
 # - Marco Sousa <marcomsousa AT gmail.com>
-# Vasco Almeida <vasco13almeida@gmail.com>, 2016.
+# Vasco Almeida <vascomalmeida@sapo.pt>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
-"PO-Revision-Date: 2016-03-22 16:00+0000\n"
-"Last-Translator: Vasco Almeida <vasco13almeida@gmail.com>\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"PO-Revision-Date: 2016-05-31 18:17+0000\n"
+"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
@@ -30,23 +31,23 @@ msgid ""
 "as appropriate to mark resolution and make a commit."
 msgstr ""
 "Corrija-os na árvore de trabalho e use 'git add/rm <ficheiro>'\n"
-"conforme apropriado para marcá-los como resolvidos e faça commit."
+"conforme apropriado para marcá-los como resolvidos e submeta."
 
-#: advice.c:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
-msgstr "Merge não concluído (MERGE_HEAD presente)."
+msgstr "Não concluído a integração (MERGE_HEAD presente)."
 
 #: advice.c:103
 msgid "Please, commit your changes before merging."
-msgstr "Faça commit das suas alterações antes de efetuar merge."
+msgstr "Submeta as suas alterações antes de integrar."
 
 #: advice.c:104
 msgid "Exiting because of unfinished merge."
-msgstr "A terminar por causa de merge incompleto."
+msgstr "A terminar devido a integração incompleta."
 
 #: archive.c:12
 msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<opções>] <árvore> [<caminho>...]"
+msgstr "git archive [<opções>] <árvore-etc> [<caminho>...]"
 
 #: archive.c:13
 msgid "git archive --list"
@@ -56,7 +57,7 @@ msgstr "git archive --list"
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
-"git archive --remote <repo> [--exec <cmd>] [<opções>] <tree-ish> "
+"git archive --remote <repo> [--exec <cmd>] [<opções>] <árvore-etc> "
 "[<caminho>...]"
 
 #: archive.c:15
@@ -76,7 +77,7 @@ msgstr "fmt"
 msgid "archive format"
 msgstr "formato do arquivo"
 
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
 msgid "prefix"
 msgstr "prefixo"
 
@@ -84,9 +85,9 @@ msgstr "prefixo"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo"
 
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547
-#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548
+#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
 #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
 #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
 msgid "file"
@@ -120,7 +121,8 @@ msgstr "compressão ótima"
 msgid "list supported archive formats"
 msgstr "listar formatos de arquivo suportados"
 
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
 msgid "repo"
 msgstr "repo"
 
@@ -153,8 +155,8 @@ msgid ""
 "\"git branch --set-upstream-to=%s%s%s\"."
 msgstr ""
 "\n"
-"Após resolver a causa do problema, pode tentar corrigir\n"
-"o ramo remoto que deve ser seguido invocando\n"
+"Após resolver a causa do erro, pode tentar corrigir\n"
+"o ramo remoto que deve ser seguido, invocando\n"
 "\"git branch --set-upstream-to=%s%s%s\"."
 
 #: branch.c:67
@@ -271,10 +273,15 @@ msgstr "Nome de objeto ambíguo: '%s'."
 msgid "Not a valid branch point: '%s'."
 msgstr "Ponto no ramo inválido: '%s'."
 
-#: branch.c:344
+#: branch.c:345
 #, c-format
 msgid "'%s' is already checked out at '%s'"
-msgstr "'%s' já extraído em '%s'"
+msgstr "'%s' foi já extraído em '%s'"
+
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "HEAD da árvore de trabalho %s não está atualizada"
 
 #: bundle.c:34
 #, c-format
@@ -286,19 +293,19 @@ msgstr "'%s' não parece ser um ficheiro bundle v2"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "cabeçalho não reconhecido: %s%s (%d)"
 
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
 #, c-format
 msgid "could not open '%s'"
-msgstr "não é possível abrir '%s'"
+msgstr "não foi possível abrir '%s'"
 
 #: bundle.c:139
 msgid "Repository lacks these prerequisite commits:"
 msgstr "O repositório não possuí estes commits pré-requisitados:"
 
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
 msgid "revision walk setup failed"
 msgstr "falha ao configurar percurso de revisões"
 
@@ -337,21 +344,21 @@ msgstr "rev-list terminou inesperadamente"
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "a referência '%s' é excluída pelas opções de rev-list"
 
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argumento não reconhecido: %s"
 
-#: bundle.c:449
+#: bundle.c:451
 msgid "Refusing to create empty bundle."
 msgstr "Criação de bundle vazio recusada."
 
-#: bundle.c:459
+#: bundle.c:463
 #, c-format
 msgid "cannot create '%s'"
 msgstr "não é possível criar '%s'"
 
-#: bundle.c:480
+#: bundle.c:491
 msgid "index-pack died"
 msgstr "index-pack terminou inesperadamente"
 
@@ -360,8 +367,8 @@ msgstr "index-pack terminou inesperadamente"
 msgid "invalid color value: %.*s"
 msgstr "valor de cor inválido: %.*s"
 
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
 #, c-format
 msgid "could not parse %s"
 msgstr "não foi possível analisar %s"
@@ -381,7 +388,7 @@ msgid "bad config line %d in %s %s"
 msgstr "linha %d de configuração incorreta em %s %s"
 
 #: config.c:593
-#, c-format
+#, c-format, fuzzy
 msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
 msgstr "valor numérico '%s' da configuração '%s' em %s %s incorreto: %s"
 
@@ -395,21 +402,21 @@ msgstr "valor numérico '%s' da configuração '%s' incorreto: %s"
 msgid "failed to expand user dir in: '%s'"
 msgstr "falha ao expandir diretório de utilizador em: '%s'"
 
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "nível de compressão zlib %d incorreto"
 
-#: config.c:891
+#: config.c:890
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "modo inválido para criação de objeto: %s"
 
-#: config.c:1220
+#: config.c:1228
 msgid "unable to parse command-line config"
 msgstr "não é possível analisar configuração de linha de comandos"
 
-#: config.c:1281
+#: config.c:1284
 msgid "unknown error occured while reading the configuration files"
 msgstr ""
 "ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração"
@@ -429,24 +436,27 @@ msgstr "variável de configuração '%s' incorreta no ficheiro '%s' na linha %d"
 msgid "%s has multiple values"
 msgstr "%s tem múltiplos valores"
 
+#: config.c:2224
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "não foi possível definir '%s' como '%s'"
+
 #: config.c:2226
 #, c-format
-msgid "Could not set '%s' to '%s'"
-msgstr "Não foi possível definir '%s' como '%s'"
+msgid "could not unset '%s'"
+msgstr "não foi possível reiniciar '%s'"
 
 #: connected.c:69
 msgid "Could not run 'git rev-list'"
 msgstr "Não foi possível executar 'git rev-list'"
 
 #: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "falha ao escrever para rev-list: %s"
+msgid "failed write to rev-list"
+msgstr "falha ao escrever para rev-list"
 
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "falha ao fechar stdin de rev-list: %s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
+msgstr "falha ao fechar entrada padrão de rev-list"
 
 #: date.c:95
 msgid "in the future"
@@ -521,26 +531,26 @@ msgstr[1] "há %lu anos atrás"
 msgid "failed to read orderfile '%s'"
 msgstr "falha ao ler o ficheiro de comando '%s'"
 
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
 msgid "Performing inexact rename detection"
 msgstr "Deteção de mudança de nome inexata em curso"
 
-#: diff.c:115
+#: diff.c:116
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  Falha ao analisar percentagem limite de dirstat '%s'\n"
 
-#: diff.c:120
+#: diff.c:121
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Parâmetro de dirstat desconhecido '%s'\n"
 
-#: diff.c:215
+#: diff.c:225
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "Valor desconhecido na variável de configuração 'diff.submodule': '%s'"
 
-#: diff.c:267
+#: diff.c:277
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -549,16 +559,16 @@ msgstr ""
 "Erros encontrados na variável de configuração 'diff.dirstat':\n"
 "%s"
 
-#: diff.c:2997
+#: diff.c:3007
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "o diff externo terminou inesperadamente, interrompido em %s"
 
-#: diff.c:3393
+#: diff.c:3405
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow requer exatamente um único especificador de caminho"
 
-#: diff.c:3556
+#: diff.c:3568
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -567,20 +577,20 @@ msgstr ""
 "Falha ao analisar parâmetro da opção --dirstat/-X:\n"
 "%s"
 
-#: diff.c:3570
+#: diff.c:3582
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"
 
-#: dir.c:2004
+#: dir.c:1823
 msgid "failed to get kernel name and information"
 msgstr "falha ao obter nome e informação do kernel"
 
-#: dir.c:2123
+#: dir.c:1942
 msgid "Untracked cache is disabled on this system or location."
 msgstr "A cache não controlada está desativada neste sistema ou localização."
 
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
 msgid "could not run gpg."
 msgstr "não foi possível executar gpg."
 
@@ -594,28 +604,28 @@ msgstr "gpg não assinou os dados"
 
 #: gpg-interface.c:222
 #, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "não foi possível criar ficheiro temporário '%s': %s"
+msgid "could not create temporary file '%s'"
+msgstr "não foi possível criar ficheiro temporário '%s'"
 
-#: gpg-interface.c:225
+#: gpg-interface.c:224
 #, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "falha ao escrever assinatura destacada em '%s': %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "falha ao escrever assinatura destacada em '%s'"
 
 #: grep.c:1718
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': não foi possível ler %s"
 
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
 #, c-format
-msgid "'%s': %s"
-msgstr "'%s': %s"
+msgid "failed to stat '%s'"
+msgstr "falha ao invocar stat de '%s'"
 
 #: grep.c:1746
 #, c-format
-msgid "'%s': short read %s"
-msgstr "'%s': leitura truncada %s"
+msgid "'%s': short read"
+msgstr "'%s': leitura truncada"
 
 #: help.c:205
 #, c-format
@@ -641,7 +651,7 @@ msgstr ""
 
 #: help.c:366
 msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Ai ai. Não há nenhum comando do Git disponível no sistema."
+msgstr "Oh não. Não há nenhum comando do Git disponível no sistema."
 
 #: help.c:388
 #, c-format
@@ -681,12 +691,36 @@ msgstr[1] ""
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
+#: lockfile.c:152
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"Não é possível criar '%s.lock': %s.\n"
+"\n"
+"Outro processo git parece estar a executar neste repositório, e.g.\n"
+"um editor aberto por 'git commit'. Certifique-se que todos os processos\n"
+"terminaram e tente de novo. Se ainda assim falhar, um processo git\n"
+"pode ter falhado anteriormente no repositório:\n"
+"remova o ficheiro manualmente para continuar."
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Não é foi possível criar '%s.lock': %s"
+
 #: merge.c:41
 msgid "failed to read the cache"
 msgstr "falha ao ler a cache"
 
-#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
 msgid "unable to write new index file"
 msgstr "não foi possível escrever novo ficheiro de índice"
 
@@ -721,7 +755,7 @@ msgstr ": talvez um conflito D/F?"
 #: merge-recursive.c:725
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
-msgstr "recusando-se a perder ficheiro não controlado em '%s'"
+msgstr "perda de ficheiro não controlado em '%s' recusada"
 
 #: merge-recursive.c:765
 #, c-format
@@ -733,7 +767,7 @@ msgstr "não é possível ler o objeto %s: '%s'"
 msgid "blob expected for %s '%s'"
 msgstr "blob para %s '%s' esperado"
 
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
 #, c-format
 msgid "failed to open '%s'"
 msgstr "falha ao abrir '%s'"
@@ -750,7 +784,7 @@ msgstr "não sei o que fazer com %06o %s '%s'"
 
 #: merge-recursive.c:939
 msgid "Failed to execute internal merge"
-msgstr "Falha ao executar merge interno"
+msgstr "Falha ao executar integração interna"
 
 #: merge-recursive.c:943
 #, c-format
@@ -868,16 +902,16 @@ msgstr "%s ignorado (integrado é igual ao existente)"
 #: merge-recursive.c:1646
 #, c-format
 msgid "Auto-merging %s"
-msgstr "Merge automático de %s"
+msgstr "A integrar automaticamente %s"
 
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
 msgid "submodule"
 msgstr "submódulo"
 
 #: merge-recursive.c:1651
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "CONFLITO (%s): conflito de merge em %s"
+msgstr "CONFLITO (%s): conflito de integração em %s"
 
 #: merge-recursive.c:1737
 #, c-format
@@ -898,58 +932,57 @@ msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "CONFLITO (%s): Há um diretório designado %s em %s. A adicionar %s como %s"
 
-#: merge-recursive.c:1783
+#: merge-recursive.c:1781
 #, c-format
 msgid "Adding %s"
 msgstr "A adicionar %s"
 
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
 msgid "Fatal merge failure, shouldn't happen."
-msgstr "Falha de merge fatal, não devia acontecer."
+msgstr "Falha de integração fatal, não devia acontecer."
 
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
 msgid "Already up-to-date!"
 msgstr "Já está atualizado!"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
 #, c-format
 msgid "merging of trees %s and %s failed"
-msgstr "falha ao realizar merge das árvores %s e %s"
+msgstr "falha ao integrar as árvores %s e %s"
 
-#: merge-recursive.c:1858
+#: merge-recursive.c:1856
 #, c-format
 msgid "Unprocessed path??? %s"
 msgstr "Caminho não processado??? %s"
 
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
 msgid "Merging:"
-msgstr "A realizar merge:"
+msgstr "A integrar:"
 
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "%u antecessor comum encontrado:"
 msgstr[1] "%u antecessores comuns encontrados:"
 
-#: merge-recursive.c:1956
+#: merge-recursive.c:1954
 msgid "merge returned no commit"
-msgstr "merge não retornou nenhum commit"
+msgstr "a integração não retornou nenhum commit"
 
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Não foi possível analisar o objeto '%s'"
 
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
 msgid "Unable to write index."
 msgstr "Não é possível escrever no índice."
 
 #: notes-utils.c:41
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr ""
-"Não é possível fazer commit de árvore de notas não inicializada ou não "
-"referenciada"
+"Não é possível submeter árvore de notas não inicializada ou não referenciada"
 
 #: notes-utils.c:100
 #, c-format
@@ -959,7 +992,7 @@ msgstr "Valor de notes.rewriteMode incorreto: '%s'"
 #: notes-utils.c:110
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "Recusando-se a reescrever notas em %s (fora de refs/notes/)"
+msgstr "Reescrita de notas em %s (fora de refs/notes/) recusada"
 
 #. TRANSLATORS: The first %s is the name of the
 #. environment variable, the second %s is its value
@@ -973,28 +1006,28 @@ msgstr "Valor incorreto de %s: '%s'"
 msgid "unable to parse object: %s"
 msgstr "não foi possível analisar o objeto: %s"
 
-#: parse-options.c:570
+#: parse-options.c:572
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:588
+#: parse-options.c:590
 #, c-format
 msgid "usage: %s"
 msgstr "utilização: %s"
 
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
 #, c-format
 msgid "   or: %s"
 msgstr "        ou: %s"
 
-#: parse-options.c:595
+#: parse-options.c:597
 #, c-format
 msgid "    %s"
 msgstr "         %s"
 
-#: parse-options.c:629
+#: parse-options.c:631
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -1003,7 +1036,7 @@ msgstr "-NUM"
 msgid "malformed object name '%s'"
 msgstr "nome do objeto malformado '%s'"
 
-#: path.c:752
+#: path.c:796
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Não foi possível dar permissão de escrita ao grupo a %s"
@@ -1075,7 +1108,7 @@ msgstr ""
 "Não há nada para excluir de acordo com o padrão :(excluir).\n"
 "Talvez se tenha esquecido de acrescentar ':/' ou '.' ?"
 
-#: pretty.c:969
+#: pretty.c:971
 msgid "unable to parse --pretty format"
 msgstr "não foi possível analisar o formato de --pretty"
 
@@ -1101,23 +1134,23 @@ msgstr ""
 "GIT_INDEX_VERSION definido, mas com valor inválido.\n"
 "A usar a versão %i"
 
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "Não foi possível abrir '%s' para escrita"
 
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "não foi possível eliminar a referência %s: %s"
 
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2246
 #, c-format
 msgid "could not delete references: %s"
 msgstr "não foi possível eliminar as referências: %s"
 
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
 #, c-format
 msgid "could not remove reference %s"
 msgstr "não foi possível eliminar a referência %s"
@@ -1256,97 +1289,98 @@ msgstr "formato: falta átomo %%(end)"
 msgid "malformed object name %s"
 msgstr "nome de objeto malformado %s"
 
-#: remote.c:745
+#: remote.c:746
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Não é possível obter %s e %s ao mesmo tempo para %s"
 
-#: remote.c:749
+#: remote.c:750
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s geralmente segue %s, não %s"
 
-#: remote.c:753
+#: remote.c:754
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s segue %s e %s em simultâneo"
 
-#: remote.c:761
+#: remote.c:762
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
 msgid "HEAD does not point to a branch"
 msgstr "HEAD não aponta para um ramo"
 
-#: remote.c:1686
+#: remote.c:1687
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "ramo inexistente: '%s'"
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "nenhum ramo a montante configurado para o ramo '%s'"
 
-#: remote.c:1695
+#: remote.c:1696
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "o ramo a montante '%s' não está guardado como um ramo remoto seguido"
+msgstr ""
+"o ramo a montante '%s' não está guardado como um ramo de monitorização remoto"
 
-#: remote.c:1710
+#: remote.c:1711
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "o destino de publicação '%s' no remoto '%s' não é seguido por nenhum ramo "
 "local"
 
-#: remote.c:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "o ramo '%s' não tem nenhum remoto para publicar"
 
-#: remote.c:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr ""
 "'%2$s' não faz parte dos especificadores de referência de '%1$s' para "
 "publicação"
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "publicação sem destino (push.default é 'nothing')"
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "não é possível resolver a publicação 'simple' num único destino"
 
-#: remote.c:2073
+#: remote.c:2074
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "A base do seu ramo é '%s', mas o ramo a montante desapareceu.\n"
 
-#: remote.c:2077
+#: remote.c:2078
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (use \"git branch --unset-upstream\" para corrigir)\n"
 
-#: remote.c:2080
+#: remote.c:2081
 #, c-format
 msgid "Your branch is up-to-date with '%s'.\n"
 msgstr "O seu ramo está atualizado com '%s'.\n"
 
-#: remote.c:2084
+#: remote.c:2085
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "O seu ramo está à frente de '%s' por %d commit.\n"
 msgstr[1] "O seu ramo está à frente de '%s' por %d commits.\n"
 
-#: remote.c:2090
+#: remote.c:2091
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (use \"git push\" para publicar os commits locais)\n"
 
-#: remote.c:2093
+#: remote.c:2094
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -1358,11 +1392,11 @@ msgstr[1] ""
 "O seu ramo está atrás de '%s' por %d commits, podendo ser atualizado com "
 "avanço rápido.\n"
 
-#: remote.c:2101
+#: remote.c:2102
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (use \"git pull\" para atualizar o seu ramo local)\n"
 
-#: remote.c:2104
+#: remote.c:2105
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -1377,20 +1411,20 @@ msgstr[1] ""
 "O seu ramo e '%s' divergiram,\n"
 "tendo cada um %d e %d commits diferentes, respetivamente.\n"
 
-#: remote.c:2114
+#: remote.c:2115
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr "  (use \"git pull\" para incorporar o ramo remoto no seu)\n"
+msgstr "  (use \"git pull\" para integrar o ramo remoto no seu ramo)\n"
 
-#: revision.c:2131
+#: revision.c:2142
 msgid "your current branch appears to be broken"
 msgstr "o ramo atual parece estar danificado"
 
-#: revision.c:2134
+#: revision.c:2145
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "o ramo atual '%s' ainda não contém nenhum commit"
 
-#: revision.c:2328
+#: revision.c:2339
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent é incompatível com --bisect"
 
@@ -1439,17 +1473,17 @@ msgid ""
 msgstr ""
 "depois de resolver os conflitos, marque os caminhos corrigidos\n"
 "com 'git add <caminhos>' ou 'git rm <caminhos>'\n"
-"e faça commit do resultado com 'git commit'"
+"e submeta o resultado com 'git commit'"
 
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
 #, c-format
 msgid "Could not write to %s"
 msgstr "Não foi possível escrever em %s"
 
 #: sequencer.c:193
-#, fuzzy, c-format
+#, c-format
 msgid "Error wrapping up %s"
-msgstr "Erro ao isolar %s"
+msgstr "Erro ao rematar %s."
 
 #: sequencer.c:208
 msgid "Your local changes would be overwritten by cherry-pick."
@@ -1461,7 +1495,7 @@ msgstr "As suas alterações locais serão substituídas por revert."
 
 #: sequencer.c:213
 msgid "Commit your changes or stash them to proceed."
-msgstr "Faça commit ou stash das suas alterações para continuar."
+msgstr "Submeta ou empilhe (stash) as suas alterações para continuar."
 
 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
 #: sequencer.c:300
@@ -1494,7 +1528,7 @@ msgstr "Ficheiro de índice não integrado."
 #: sequencer.c:479
 #, c-format
 msgid "Commit %s is a merge but no -m option was given."
-msgstr "O commit %s é um merge mas nenhuma opção -m fornecida."
+msgstr "O commit %s é uma integração mas não foi fornecida nenhuma opção -m."
 
 #: sequencer.c:487
 #, c-format
@@ -1504,7 +1538,8 @@ msgstr "O commit %s não tem o pai %d"
 #: sequencer.c:491
 #, c-format
 msgid "Mainline was specified but commit %s is not a merge."
-msgstr "Linha principal especificada mas o commit %s não é um merge."
+msgstr ""
+"A linha principal foi especificada mas o commit %s não é uma integração."
 
 #. TRANSLATORS: The first %s will be "revert" or
 #. "cherry-pick", the second %s a SHA1
@@ -1599,12 +1634,12 @@ msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
 msgid "Could not create sequencer directory %s"
 msgstr "Não foi possível criar o diretório do sequenciador %s"
 
-#: sequencer.c:835 sequencer.c:917
-#, fuzzy, c-format
+#: sequencer.c:835 sequencer.c:916
+#, c-format
 msgid "Error wrapping up %s."
-msgstr "Erro ao isolar %s."
+msgstr "Erro ao rematar %s."
 
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
 msgid "no cherry-pick or revert in progress"
 msgstr "nenhum cherry-pick ou revert em curso"
 
@@ -1616,63 +1651,72 @@ msgstr "não é possível resolver HEAD"
 msgid "cannot abort from a branch yet to be born"
 msgstr "não é possível abortar um ramo ainda não criado"
 
-#: sequencer.c:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
 #, c-format
-msgid "cannot open %s: %s"
-msgstr "não é possível abrir %s: %s"
+msgid "cannot open %s"
+msgstr "não é possível abrir %s"
 
-#: sequencer.c:881
+#: sequencer.c:880
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "não é possível ler %s: %s"
 
-#: sequencer.c:882
+#: sequencer.c:881
 msgid "unexpected end of file"
 msgstr "fim de ficheiro inesperado"
 
-#: sequencer.c:888
+#: sequencer.c:887
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "o ficheiro HEAD de pre-cherry-pick '%s' está corrompido"
 
-#: sequencer.c:910
+#: sequencer.c:909
 #, c-format
 msgid "Could not format %s."
 msgstr "Não foi possível formatar %s."
 
-#: sequencer.c:1055
+#: sequencer.c:1054
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: não é possível efetuar cherry-pick de %s"
 
-#: sequencer.c:1058
+#: sequencer.c:1057
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: revisão incorreta"
 
-#: sequencer.c:1092
+#: sequencer.c:1091
 msgid "Can't revert as initial commit"
 msgstr "Não é possível reverter como commit inicial"
 
-#: sequencer.c:1093
+#: sequencer.c:1092
 msgid "Can't cherry-pick into empty head"
 msgstr "Não é possível efetuar cherry-pick numa cabeça vazia"
 
-#: setup.c:246
+#: setup.c:248
 #, c-format
 msgid "failed to read %s"
 msgstr "falha ao ler %s"
 
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Esperava-se versão do repositório git <= %d, obteve-se %d"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "extensões de repositório desconhecidas encontradas:"
+
 #: sha1_file.c:1080
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)"
 
-#: sha1_file.c:2459
+#: sha1_file.c:2458
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "offset antes do início do índice do pacote %s (índice corrompido?)"
 
-#: sha1_file.c:2463
+#: sha1_file.c:2462
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "offset depois do fim do índice do pacote %s (índice truncado?)"
@@ -1702,31 +1746,40 @@ msgstr ""
 "Analise estas referências e elimine-as se desejar. Desative esta\n"
 "mensagem executando \"git config advice.objectNameWarning false\""
 
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
-"Não é possível alterar .gitmodules não integrado, resolva os conflitos do "
-"merge primeiro"
+"Não é possível alterar .gitmodules não integrado, resolva primeiro os "
+"conflitos de integração"
 
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "Secção de .gitmodules cujo path=%s não encontrada"
 
-#: submodule.c:74
+#: submodule.c:76
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Não foi possível atualizar o elemento %s de .gitmodules"
 
-#: submodule.c:107
+#: submodule.c:109
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "Não foi possível remover o elemento %s de .gitmodules"
 
-#: submodule.c:118
+#: submodule.c:120
 msgid "staging updated .gitmodules failed"
 msgstr "falha ao preparar .gitmodules atualizado"
 
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "não é permitido valores negativos em submodule.fetchJobs"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "Valor inválido de %s"
+
 #: trailer.c:237
 #, c-format
 msgid "running trailer command '%s' failed"
@@ -1746,7 +1799,7 @@ msgstr "mais do que um %s"
 #: trailer.c:582
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
-msgstr ""
+msgstr "token terminador vazio no terminador '%.*s'"
 
 #: trailer.c:702
 #, c-format
@@ -1786,7 +1839,241 @@ msgstr "não foi possível mudar o nome do ficheiro temporário para %s"
 msgid "Could not read ref %s"
 msgstr "Não foi possível ler a referência %s"
 
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you can switch branches."
+msgstr ""
+"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
+"extrair:\n"
+"%%sSubmeta as suas alterações ou empilhe-as (stash) antes de trocar de ramo."
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
+"extrair:\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you can merge."
+msgstr ""
+"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
+"integrar:\n"
+"%%sSubmeta as suas alterações ou empilhe-as (stash) antes de integrar."
+
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
+"integrar:\n"
+"%%s"
+
+#: unpack-trees.c:74
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you can %s."
+msgstr ""
+"As suas alterações locais nos seguintes ficheiros seriam substituídas por %s:"
+"\n"
+"%%sSubmeta as suas alterações ou empilhe-as (stash) antes de efetuar %s."
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"As suas alterações locais nos seguintes ficheiros seriam substituídas por %s:"
+"\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"Perder-se-iam ficheiros não controlados ao atualizar os seguintes diretórios:"
+"\n"
+"%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos ao extrair:\n"
+"%%sMova ou remova-os antes de trocar de ramos."
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos ao extrair:\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos ao integrar:\n"
+"%%sMova ou remova-os antes de integrar."
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos ao integrar:\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos por %s:\n"
+"%%sMova ou remova-os antes de efetuar %s."
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos por %s:\n"
+"%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos ao extrair:\n"
+"%%sMova ou remova-os antes de trocar de ramos."
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos ao extrair:\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos ao integrar:\n"
+"%%sMova ou remova-os antes de integrar."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos ao integrar:\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos por %s:\n"
+"%%sMova ou remova-os antes de efetuar %s."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos por %s:\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "A entrada '%s' sobrepõe-se com '%s'. Não é possível vincular."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"Não é possível extrair esparsamente: as seguintes entradas não estão "
+"atualizadas:\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Os seguintes ficheiros na árvore de trabalho seriam substituídos ao "
+"atualizar a extração esparsa:\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Os seguintes ficheiros na árvore de trabalho seriam removidos ao atualizar a "
+"extração esparsa:\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "A abortar\n"
+
+#: unpack-trees.c:237
 msgid "Checking out files"
 msgstr "A extrair ficheiros"
 
@@ -1824,202 +2111,195 @@ msgstr "segmento de caminho '..' inválido"
 msgid "could not open '%s' for reading and writing"
 msgstr "não foi possível abrir '%s' para leitura e escrita"
 
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "não foi possível abrir '%s' para escrita"
 
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "não foi possível abrir '%s' para leitura"
 
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "não é possível aceder a '%s': %s"
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
 #, c-format
 msgid "unable to access '%s'"
 msgstr "não é possível aceder a '%s'"
 
-#: wrapper.c:640
+#: wrapper.c:623
 msgid "unable to get current working directory"
 msgstr "não é possível de obter o diretório de trabalho atual"
 
-#: wrapper.c:667
+#: wrapper.c:650
 #, c-format
 msgid "could not open %s for writing"
 msgstr "não foi possível abrir %s para escrita"
 
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
 #, c-format
 msgid "could not write to %s"
 msgstr "não foi possível escrever para %s"
 
-#: wrapper.c:684
+#: wrapper.c:667
 #, c-format
 msgid "could not close %s"
 msgstr "não foi possível fechar %s"
 
-#: wt-status.c:149
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "Caminhos não integrados:"
 
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
-msgstr "  (use \"git reset %s <ficheiro>...\" para retirar do índice)"
+msgstr "  (use \"git reset %s <ficheiro>...\" para despreparar)"
 
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
-msgstr "  (use \"git rm --cached <ficheiro>...\" para retirar do índice)"
+msgstr "  (use \"git rm --cached <ficheiro>...\" para despreparar)"
 
-#: wt-status.c:182
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (use \"git add <ficheiro>...\" para marcar como resolvido)"
 
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (use \"git add/rm <ficheiro>...\" conforme apropriado para marcar como "
 "resolvido)"
 
-#: wt-status.c:186
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (use \"git rm <ficheiro>...\" para marcar como resolvido)"
 
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
 msgid "Changes to be committed:"
-msgstr "Alterações incluídas no próximo commit:"
+msgstr "Alterações para serem submetidas:"
 
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
 msgid "Changes not staged for commit:"
-msgstr "Alterações não preparadas para commit:"
+msgstr "Alterações não preparadas para submeter:"
 
-#: wt-status.c:219
+#: wt-status.c:220
 msgid "  (use \"git add <file>...\" to update what will be committed)"
-msgstr ""
-"  (use \"git add <ficheiro>...\" para atualizar o que será incluído no "
-"commit)"
+msgstr "  (use \"git add <ficheiro>...\" para atualizar o que será submetido)"
 
-#: wt-status.c:221
+#: wt-status.c:222
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
-"  (use \"git add/rm <ficheiro>...\" para atualizar o que será incluído no "
-"commit)"
+"  (use \"git add/rm <ficheiro>...\" para atualizar o que será submetido)"
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (use \"git checkout -- <ficheiro>...\" para descartar alterações no "
 "diretório de trabalho)"
 
-#: wt-status.c:224
+#: wt-status.c:225
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
-"  (faça commit ou descarte o conteúdo modificado ou não controlado nos "
+"  (submeta ou descarte o conteúdo modificado ou não controlado nos "
 "submódulos)"
 
-#: wt-status.c:236
+#: wt-status.c:237
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr "  (use \"git %s <ficheiro>...\" para incluir no próximo commit)"
+msgstr "  (use \"git %s <ficheiro>...\" para incluir no que será submetido)"
 
-#: wt-status.c:251
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "eliminado por ambos:"
 
-#: wt-status.c:253
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "adicionado por nós:"
 
-#: wt-status.c:255
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "eliminado por eles:"
 
-#: wt-status.c:257
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "adicionado por eles:"
 
-#: wt-status.c:259
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "eliminado por nós:"
 
-#: wt-status.c:261
+#: wt-status.c:262
 msgid "both added:"
 msgstr "adicionado por ambos:"
 
-#: wt-status.c:263
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "modificado por ambos:"
 
-#: wt-status.c:265
+#: wt-status.c:266
 #, c-format
 msgid "bug: unhandled unmerged status %x"
 msgstr ""
 
-#: wt-status.c:273
+#: wt-status.c:274
 msgid "new file:"
 msgstr "novo ficheiro:"
 
-#: wt-status.c:275
+#: wt-status.c:276
 msgid "copied:"
 msgstr "copiado:"
 
-#: wt-status.c:277
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "eliminado:"
 
-#: wt-status.c:279
+#: wt-status.c:280
 msgid "modified:"
 msgstr "modificado:"
 
-#: wt-status.c:281
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "nome mudado:"
 
-#: wt-status.c:283
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "tipo alterado:"
 
-#: wt-status.c:285
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "desconhecido:"
 
-#: wt-status.c:287
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "não integrado:"
 
-#: wt-status.c:369
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "novos commits, "
 
-#: wt-status.c:371
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "conteúdo modificado, "
 
-#: wt-status.c:373
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "conteúdo não controlado, "
 
-#: wt-status.c:390
+#: wt-status.c:391
 #, c-format
 msgid "bug: unhandled diff status %c"
 msgstr ""
 
-#: wt-status.c:754
+#: wt-status.c:755
 msgid "Submodules changed but not updated:"
 msgstr "Submódulos alterados mas não atualizados:"
 
-#: wt-status.c:756
+#: wt-status.c:757
 msgid "Submodule changes to be committed:"
-msgstr "Alterações em submódulos incluídas no próximo commit:"
+msgstr "Alterações em submódulos para serem submetidas:"
 
-#: wt-status.c:837
+#: wt-status.c:838
 msgid ""
 "Do not touch the line above.\n"
 "Everything below will be removed."
@@ -2027,39 +2307,39 @@ msgstr ""
 "Não altere a linha acima.\n"
 "Tudo o que estiver abaixo será removido."
 
-#: wt-status.c:948
+#: wt-status.c:949
 msgid "You have unmerged paths."
 msgstr "Há caminhos não integrados."
 
-#: wt-status.c:951
+#: wt-status.c:952
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (corrija os conflitos e execute \"git commit\")"
 
-#: wt-status.c:954
+#: wt-status.c:956
 msgid "All conflicts fixed but you are still merging."
-msgstr "Todos os conflitos foram corrigidos mas o merge continua em curso."
+msgstr "Todos os conflitos foram corrigidos mas ainda está a integrar."
 
-#: wt-status.c:957
+#: wt-status.c:959
 msgid "  (use \"git commit\" to conclude merge)"
-msgstr "  (use \"git commit\" para concluir o merge)"
+msgstr "  (use \"git commit\" para concluir a integração)"
 
-#: wt-status.c:967
+#: wt-status.c:969
 msgid "You are in the middle of an am session."
 msgstr "Sessão am em curso."
 
-#: wt-status.c:970
+#: wt-status.c:972
 msgid "The current patch is empty."
 msgstr "O patch atual está vazio."
 
-#: wt-status.c:974
+#: wt-status.c:976
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (corrija os conflitos e execute \"git am --continue\")"
 
-#: wt-status.c:976
+#: wt-status.c:978
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (use \"git am --skip\" para ignorar este patch)"
 
-#: wt-status.c:978
+#: wt-status.c:980
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (use \"git am --abort\" para restaurar o ramo original)"
 
@@ -2097,11 +2377,11 @@ msgstr "  (use \"git rebase --edit-todo\" para visualizar e editar)"
 #: wt-status.c:1148
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "A realizar rebase do ramo '%s' sobre '%s'."
+msgstr "Está a realizar rebase do ramo '%s' sobre '%s'."
 
 #: wt-status.c:1153
 msgid "You are currently rebasing."
-msgstr "Rebase em curso."
+msgstr "Está a rebasear neste momento."
 
 #: wt-status.c:1167
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
@@ -2125,11 +2405,12 @@ msgstr ""
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr ""
-"A dividir um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre '%s'."
+"Está a dividir um commit ao mesmo tempo que se efetua rebase do ramo '%s' "
+"sobre '%s'."
 
 #: wt-status.c:1186
 msgid "You are currently splitting a commit during a rebase."
-msgstr "A dividir um commit durante um rebase."
+msgstr "Está a dividir um commit durante um rebase."
 
 #: wt-status.c:1189
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
@@ -2141,11 +2422,12 @@ msgstr ""
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
-"A editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre '%s'."
+"Está a editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre "
+"'%s'."
 
 #: wt-status.c:1198
 msgid "You are currently editing a commit during a rebase."
-msgstr "A editar um commit durante um rebase."
+msgstr "Está a editar um commit durante um rebase."
 
 #: wt-status.c:1201
 msgid "  (use \"git commit --amend\" to amend the current commit)"
@@ -2161,7 +2443,7 @@ msgstr ""
 #: wt-status.c:1213
 #, c-format
 msgid "You are currently cherry-picking commit %s."
-msgstr "A realizar cherry-pick do commit %s."
+msgstr "Está a realizar cherry-pick do commit %s."
 
 #: wt-status.c:1218
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
@@ -2181,7 +2463,7 @@ msgstr ""
 #: wt-status.c:1232
 #, c-format
 msgid "You are currently reverting commit %s."
-msgstr "A reverter o commit %s."
+msgstr "Está a reverter o commit %s neste comento."
 
 #: wt-status.c:1237
 msgid "  (fix conflicts and run \"git revert --continue\")"
@@ -2199,53 +2481,53 @@ msgstr "  (use \"git rever --abort\" para cancelar a operação de reversão)"
 #: wt-status.c:1253
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Bissecção em curso, iniciada a partir do ramo '%s'."
+msgstr "Está a bissetar, iniciado a partir do ramo '%s'."
 
 #: wt-status.c:1257
 msgid "You are currently bisecting."
-msgstr "Bissecção em curso."
+msgstr "Está a bissetar neste momento."
 
 #: wt-status.c:1260
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (use \"git bisect reset\" para voltar ao ramo original)"
 
-#: wt-status.c:1438
+#: wt-status.c:1460
 msgid "On branch "
 msgstr "No ramo "
 
-#: wt-status.c:1444
+#: wt-status.c:1466
 msgid "interactive rebase in progress; onto "
 msgstr "rebase interativo em curso; sobre "
 
-#: wt-status.c:1446
+#: wt-status.c:1468
 msgid "rebase in progress; onto "
 msgstr "rebase em curso; sobre "
 
-#: wt-status.c:1451
+#: wt-status.c:1473
 msgid "HEAD detached at "
 msgstr "HEAD destacada em "
 
-#: wt-status.c:1453
+#: wt-status.c:1475
 msgid "HEAD detached from "
 msgstr "HEAD destacada de "
 
-#: wt-status.c:1456
+#: wt-status.c:1478
 msgid "Not currently on any branch."
 msgstr "Não se encontra em nenhum ramo neste momento."
 
-#: wt-status.c:1474
+#: wt-status.c:1496
 msgid "Initial commit"
 msgstr "Commit inicial"
 
-#: wt-status.c:1488
+#: wt-status.c:1510
 msgid "Untracked files"
 msgstr "Ficheiros não controlados"
 
-#: wt-status.c:1490
+#: wt-status.c:1512
 msgid "Ignored files"
 msgstr "Ficheiros ignorados"
 
-#: wt-status.c:1494
+#: wt-status.c:1516
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2257,91 +2539,92 @@ msgstr ""
 "cuidado de não se esquecer de adicionar novos ficheiros\n"
 "(consulte 'git help status')."
 
-#: wt-status.c:1500
+#: wt-status.c:1522
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Ficheiros não controlados não listados%s"
 
-#: wt-status.c:1502
+#: wt-status.c:1524
 msgid " (use -u option to show untracked files)"
 msgstr " (use a opção -u para mostrar os ficheiros não controlados)"
 
-#: wt-status.c:1508
+#: wt-status.c:1530
 msgid "No changes"
 msgstr "Sem alterações"
 
-#: wt-status.c:1513
+#: wt-status.c:1535
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
-"nenhuma alteração adicionada para commit (use \"git add\" e/ou \"git commit -"
-"a\")\n"
+"nenhuma alteração adicionada para submeter (use \"git add\" e/ou \"git "
+"commit -a\")\n"
 
-#: wt-status.c:1516
+#: wt-status.c:1538
 #, c-format
 msgid "no changes added to commit\n"
-msgstr "nenhuma alteração adicionada para commit\n"
+msgstr "nenhuma alteração adicionada para submeter\n"
 
-#: wt-status.c:1519
+#: wt-status.c:1541
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr ""
-"não foi adicionado nada para commit, mas existem ficheiros não controlados "
+"não foi adicionado nada para submeter, mas existem ficheiros não controlados "
 "(use \"git add\" para controlá-los)\n"
 
-#: wt-status.c:1522
+#: wt-status.c:1544
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
-"não foi adicionado nada para commit, mas existem ficheiros não controlados\n"
+"não foi adicionado nada para submeter, mas existem ficheiros não "
+"controlados\n"
 
-#: wt-status.c:1525
+#: wt-status.c:1547
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
-"não há nada para fazer commit (crie/copie ficheiros e use \"git add\" para "
+"não há nada para submeter (crie/copie ficheiros e use \"git add\" para "
 "controlá-los)\n"
 
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
 #, c-format
 msgid "nothing to commit\n"
-msgstr "não há nada para fazer commit\n"
+msgstr "não há nada para submeter\n"
 
-#: wt-status.c:1531
+#: wt-status.c:1553
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
-"não há nada para fazer commit (use -u para mostrar os ficheiros não "
-"controlados)\n"
+"não há nada para submeter (use -u para mostrar os ficheiros não controlados)"
+"\n"
 
-#: wt-status.c:1535
+#: wt-status.c:1557
 #, c-format
 msgid "nothing to commit, working directory clean\n"
-msgstr "não há nada para fazer commit, diretório de trabalho limpo\n"
+msgstr "não há nada para submeter, diretório de trabalho limpo\n"
 
-#: wt-status.c:1642
+#: wt-status.c:1664
 msgid "Initial commit on "
 msgstr "Commit inicial em "
 
-#: wt-status.c:1646
+#: wt-status.c:1668
 msgid "HEAD (no branch)"
 msgstr "HEAD (nenhum ramo)"
 
-#: wt-status.c:1675
+#: wt-status.c:1697
 msgid "gone"
 msgstr "desaparecido"
 
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
 msgid "behind "
 msgstr "atrás "
 
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
 msgid "ahead "
 msgstr "à frente "
 
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "falha ao invocar unlink de '%s'"
@@ -2355,7 +2638,7 @@ msgstr "git add [<opções>] [--] <caminho>..."
 msgid "unexpected diff status %c"
 msgstr "diff status inesperado %c"
 
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
 msgid "updating files failed"
 msgstr "falha ao atualizar os ficheiros"
 
@@ -2368,7 +2651,7 @@ msgstr "remover '%s'\n"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Alterações não preparadas depois de atualizar o índice:"
 
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
 msgid "Could not read the index"
 msgstr "Não foi possível ler o índice"
 
@@ -2404,14 +2687,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "Os seguintes caminhos estão ignorados por algum ficheiro .gitignore:\n"
 
 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
 msgid "dry run"
 msgstr "simular ação"
 
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
 msgid "be verbose"
 msgstr "ser verboso"
 
@@ -2419,7 +2702,7 @@ msgstr "ser verboso"
 msgid "interactive picking"
 msgstr "seleção interativa"
 
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
 msgid "select hunks interactively"
 msgstr "selecionar blocos interativamente"
 
@@ -2489,16 +2772,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Queria dizer 'git add .'?\n"
 
 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
 msgid "index file corrupt"
 msgstr "ficheiro de índice corrompido"
 
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "Não foi possível escrever novo ficheiro de índice"
 
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
 #, c-format
 msgid "could not read '%s'"
 msgstr "não foi possível ler '%s'"
@@ -2526,16 +2809,6 @@ msgstr "Falha ao copiar notas de '%s' para '%s'"
 msgid "fseek failed"
 msgstr "falha ao invocar fseek"
 
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "não foi possível abrir '%s' para leitura: %s"
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "não foi possível abrir '%s' para escrita: %s"
-
 #: builtin/am.c:788
 #, c-format
 msgid "could not parse patch '%s'"
@@ -2545,77 +2818,77 @@ msgstr "não foi possível analisar o patch '%s'"
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Só pode ser aplicada uma série de patches StGIT duma só vez"
 
-#: builtin/am.c:901
+#: builtin/am.c:900
 msgid "invalid timestamp"
 msgstr "carimbo de data/hora inválido"
 
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
 msgid "invalid Date line"
 msgstr "linha de Data inválida"
 
-#: builtin/am.c:909
+#: builtin/am.c:908
 msgid "invalid timezone offset"
 msgstr "mudança de fuso horário inválida"
 
-#: builtin/am.c:996
+#: builtin/am.c:995
 msgid "Patch format detection failed."
 msgstr "Falha ao detetar o formato do patch."
 
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "falha ao criar o diretório '%s'"
 
-#: builtin/am.c:1005
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Falha ao dividir patches."
 
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
 msgid "unable to write index file"
 msgstr "não é possível escrever o ficheiro de índice"
 
-#: builtin/am.c:1188
+#: builtin/am.c:1187
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Após resolver este problema, execute \"%s --continue\"."
 
-#: builtin/am.c:1189
+#: builtin/am.c:1188
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Se preferir ignorar este patch, execute \"%s --skip\"."
 
-#: builtin/am.c:1190
+#: builtin/am.c:1189
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Para restaurar o ramo original e interromper a aplicação dos patches, "
 "execute \"%s --abort\"."
 
-#: builtin/am.c:1328
+#: builtin/am.c:1327
 msgid "Patch is empty. Was it split wrong?"
 msgstr "O patch está vazio. Foi dividido incorretamente?"
 
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "linha de identidade inválida: %s"
 
-#: builtin/am.c:1429
+#: builtin/am.c:1428
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "não foi possível analisar o commit %s"
 
-#: builtin/am.c:1631
+#: builtin/am.c:1630
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
-"O repositório não tem os blobs necessários para recorrer a merge com 3 "
+"O repositório não tem os blobs necessários para recorrer a integração com 3 "
 "pontos."
 
-#: builtin/am.c:1633
+#: builtin/am.c:1632
 msgid "Using index info to reconstruct a base tree..."
 msgstr "A usar informação do índice para reconstruir uma árvore de base..."
 
-#: builtin/am.c:1652
+#: builtin/am.c:1651
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -2623,40 +2896,41 @@ msgstr ""
 "Editou o patch manualmente?\n"
 "Não é possível aplicá-lo aos blobs registados no índice."
 
-#: builtin/am.c:1658
+#: builtin/am.c:1657
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
-"A recorrer a uma de base para aplicação de patches e merge com 3 pontos..."
+"A recorrer a uma de base para aplicação de patches e integração com 3 "
+"pontos..."
 
-#: builtin/am.c:1673
+#: builtin/am.c:1672
 msgid "Failed to merge in the changes."
-msgstr "Falha ao efetuar merge das alterações."
+msgstr "Falha ao integrar as alterações."
 
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree falhou ao escrever uma árvore"
 
-#: builtin/am.c:1704
+#: builtin/am.c:1703
 msgid "applying to an empty history"
 msgstr "a aplicar a um histórico vazio"
 
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
 msgid "failed to write commit object"
 msgstr "falha ao escrever objeto de commit"
 
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "não é possível continuar: %s não existe."
 
-#: builtin/am.c:1769
+#: builtin/am.c:1768
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "não é possível entrar em modo interativo sem um entrada padrão conectada a "
 "um terminal."
 
-#: builtin/am.c:1774
+#: builtin/am.c:1773
 msgid "Commit Body is:"
 msgstr "Corpo do commit:"
 
@@ -2664,35 +2938,35 @@ msgstr "Corpo do commit:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1784
+#: builtin/am.c:1783
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Aplicar? [y]sim/[n]ão/[e]ditar/[v]er patch/[a]ceitar todos: "
 
-#: builtin/am.c:1834
+#: builtin/am.c:1833
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "�ndice modificado: não é possível aplicar patches (modificado: %s)"
 
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
 #, c-format
 msgid "Applying: %.*s"
 msgstr "A aplicar: %.*s"
 
-#: builtin/am.c:1885
+#: builtin/am.c:1884
 msgid "No changes -- Patch already applied."
 msgstr "Nenhuma alteração -- Já foi aplicado o patch."
 
-#: builtin/am.c:1893
+#: builtin/am.c:1892
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Falha ao aplicar o patch em %s %.*s"
 
-#: builtin/am.c:1899
+#: builtin/am.c:1898
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "A cópia do patch que falhou encontra-se em: %s"
 
-#: builtin/am.c:1944
+#: builtin/am.c:1943
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -2702,7 +2976,7 @@ msgstr ""
 "Se não há nada por preparar, provavelmente essas mesmas alterações\n"
 "já foram introduzidas; pode querer ignorar este patch."
 
-#: builtin/am.c:1951
+#: builtin/am.c:1950
 msgid ""
 "You still have unmerged paths in your index.\n"
 "Did you forget to use 'git add'?"
@@ -2710,17 +2984,17 @@ msgstr ""
 "Ainda há caminhos não integrados no índice.\n"
 "Esqueceu-se de usar 'git add'?"
 
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
 #: builtin/reset.c:316
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Não foi possível analisar o objeto '%s'."
 
-#: builtin/am.c:2111
+#: builtin/am.c:2110
 msgid "failed to clean index"
 msgstr "falha ao limpar o índice"
 
-#: builtin/am.c:2145
+#: builtin/am.c:2144
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -2728,153 +3002,155 @@ msgstr ""
 "Parece que a HEAD foi movida desde a última vez que o 'am' falhou.\n"
 "Não recuando a ORIG_HEAD"
 
-#: builtin/am.c:2206
+#: builtin/am.c:2205
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valor inválido de --patch-format: %s"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2238
 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
 msgstr "git am [<opções>] [(<mbox>|<Maildir>)...]"
 
-#: builtin/am.c:2240
+#: builtin/am.c:2239
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opções>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2246
+#: builtin/am.c:2245
 msgid "run interactively"
 msgstr "executar interativamente"
 
-#: builtin/am.c:2248
+#: builtin/am.c:2247
 msgid "historical option -- no-op"
 msgstr "opção histórica -- sem-ação"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2249
 msgid "allow fall back on 3way merging if needed"
-msgstr "permitir recorrer a merge com 3 pontos se necessário"
+msgstr "permitir recorrer a integração com 3 pontos se necessário"
 
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
 #: builtin/repack.c:171
 msgid "be quiet"
 msgstr "silencioso"
 
-#: builtin/am.c:2253
+#: builtin/am.c:2252
 msgid "add a Signed-off-by line to the commit message"
 msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2255
 msgid "recode into utf8 (default)"
 msgstr "recodificar em utf8 (predefinição)"
 
-#: builtin/am.c:2258
+#: builtin/am.c:2257
 msgid "pass -k flag to git-mailinfo"
 msgstr "passar a opção -k ao git-mailinfo"
 
-#: builtin/am.c:2260
+#: builtin/am.c:2259
 msgid "pass -b flag to git-mailinfo"
 msgstr "passar a opção -b ao git-mailinfo"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2261
 msgid "pass -m flag to git-mailinfo"
 msgstr "passar a opção -m ao git-mailinfo"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2263
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "passar a opção --keep-cr ao gitmailsplit para formato de mbox"
 
-#: builtin/am.c:2267
+#: builtin/am.c:2266
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "não passar a opção --keep-cr ao git-mailsplit independentemente de am.keepcr"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "strip everything before a scissors line"
 msgstr "retirar todo o conteúdo antes da linha de tesoura"
 
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
 msgid "action"
 msgstr "ação"
 
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
 msgid "pass it through git-apply"
 msgstr "transmitir ao git-apply"
 
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
 msgid "root"
 msgstr "raiz"
 
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
 msgid "path"
 msgstr "caminho"
 
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
-#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134
+#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182
 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
 #: parse-options.h:132 parse-options.h:134 parse-options.h:244
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
 msgid "num"
 msgstr "num"
 
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
 #: builtin/tag.c:372
 msgid "format"
 msgstr "formato"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "format the patch(es) are in"
 msgstr "formato de apresentação de patches"
 
-#: builtin/am.c:2302
+#: builtin/am.c:2301
 msgid "override error message when patch failure occurs"
 msgstr "substituir a mensagem de erro quando a aplicação do patch falha"
 
-#: builtin/am.c:2304
+#: builtin/am.c:2303
 msgid "continue applying patches after resolving a conflict"
 msgstr "continuar a aplicar os patches depois de resolver os conflitos"
 
-#: builtin/am.c:2307
+#: builtin/am.c:2306
 msgid "synonyms for --continue"
 msgstr "sinónimo de --continue"
 
-#: builtin/am.c:2310
+#: builtin/am.c:2309
 msgid "skip the current patch"
 msgstr "ignorar o patch atual"
 
-#: builtin/am.c:2313
+#: builtin/am.c:2312
 msgid "restore the original branch and abort the patching operation."
-msgstr "restaurar o ramo original e abortar a operação de patch"
+msgstr "restaurar o ramo original e abortar a operação de patch."
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 msgid "lie about committer date"
 msgstr "mentir sobre a data de commit"
 
-#: builtin/am.c:2319
+#: builtin/am.c:2318
 msgid "use current timestamp for author date"
 msgstr "usar a data e hora atual como data de autor"
 
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
 msgid "key-id"
 msgstr "id-chave"
 
-#: builtin/am.c:2322
+#: builtin/am.c:2321
 msgid "GPG-sign commits"
 msgstr "assinar os commits com GPG"
 
-#: builtin/am.c:2325
+#: builtin/am.c:2324
 msgid "(internal use for git-rebase)"
 msgstr "(uso interno de git-rebase)"
 
-#: builtin/am.c:2340
+#: builtin/am.c:2339
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -2882,17 +3158,17 @@ msgstr ""
 "A opção -b/--binary há muito que é ignorada e será\n"
 "futuramente removida. Por favor não a use."
 
-#: builtin/am.c:2347
+#: builtin/am.c:2346
 msgid "failed to read the index"
 msgstr "falha ao ler o índice"
 
-#: builtin/am.c:2362
+#: builtin/am.c:2361
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "o diretório de rebesa anterior %s ainda existe, mas foi fornecida uma mbox."
 
-#: builtin/am.c:2386
+#: builtin/am.c:2385
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -2901,7 +3177,7 @@ msgstr ""
 "Diretório abandonado %s encontrado.\n"
 "Use \"git am --abort\" para o remover."
 
-#: builtin/am.c:2392
+#: builtin/am.c:2391
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "A operação de resolução não está em curso, não retomando."
 
@@ -2934,43 +3210,43 @@ msgstr "regexec retornou %d para a entra: %s"
 msgid "unable to find filename in patch at line %d"
 msgstr "não foi possível encontrar o nome do ficheiro no patch na linha %d"
 
-#: builtin/apply.c:940
+#: builtin/apply.c:937
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: git-diff incorreto - esperava-se /dev/null, obteve-se %s na linha "
 "%d"
 
-#: builtin/apply.c:944
+#: builtin/apply.c:942
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply: git-diff incorreto - o nome do novo ficheiro na linha %d é "
 "inconsistente"
 
-#: builtin/apply.c:945
+#: builtin/apply.c:943
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply: git-diff incorreto - o nome do ficheiro antigo na linha %d é "
 "inconsistente"
 
-#: builtin/apply.c:952
+#: builtin/apply.c:949
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: git-diff incorreto - esperava-se /dev/null na linha %d"
 
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recontagem: linha inesperada: %.*s"
 
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "fragmento de patch sem cabeçalho na linha %d: %.*s"
 
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -2985,77 +3261,77 @@ msgstr[1] ""
 "o cabeçalho do git diff não revelou o nome do ficheiro depois de se remover "
 "%d componentes de caminho (linha %d)"
 
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
 msgid "new file depends on old contents"
 msgstr "o novo ficheiro depende de conteúdos antigos"
 
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
 msgid "deleted file still has contents"
 msgstr "o ficheiro eliminado ainda tem conteúdos"
 
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "patch corrompido na linha %d"
 
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "o novo ficheiro %s depende de conteúdos antigos"
 
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "o ficheiro eliminado %s ainda tem conteúdos"
 
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** aviso: o ficheiro %s ficará vazio, mas não será eliminado"
 
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "patch binário corrompido na linha %d: %.*s"
 
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "patch binário não reconhecido na linha %d"
 
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "patch incompreensível na linha %d"
 
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "não é possível ler a ligação simbólica %s"
 
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
 #, c-format
 msgid "unable to open or read %s"
 msgstr "não é possível abrir ou ler %s"
 
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "início de linha inválido: '%c'"
 
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
-msgstr[0] "Excerto nº%d bem sucedido na linha %d (%d linha deslocada)"
-msgstr[1] "Excerto nº%d bem sucedido na linha %d (%d linhas deslocadas)"
+msgstr[0] "Excerto nº%d bem sucedido na linha %d (%d linha deslocada)."
+msgstr[1] "Excerto nº%d bem sucedido na linha %d (%d linhas deslocadas)."
 
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Contexto reduzido para (%ld/%ld) para aplicar o fragmento em %d"
 
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -3064,324 +3340,335 @@ msgstr ""
 "ao procura por:\n"
 "%.*s"
 
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "falta de dados do patch binário '%s'"
 
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "o patch binário não foi aplicado corretamente a '%s'"
 
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "o patch binário aplicado a '%s' gera resultados incorretos (esperava-se %s, "
 "obteve-se %s)"
 
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "falha ao aplicar o patch: %s:%ld"
 
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
 #, c-format
 msgid "cannot checkout %s"
 msgstr "não é possível extrair %s"
 
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
 #, c-format
 msgid "read of %s failed"
 msgstr "falha ao ler %s"
 
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "a ler '%s' indicado por uma ligação simbólica"
 
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "o caminho %s foi eliminado ou mudou de nome"
 
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: não existe no índice"
 
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: não tem correspondência no índice"
 
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
 msgid "removal patch leaves file contents"
 msgstr "patch de remoção deixa conteúdos no ficheiro"
 
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipo errado"
 
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s é do tipo %o, esperado %o"
 
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
 #, c-format
 msgid "invalid path '%s'"
 msgstr "caminho inválido '%s'"
 
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: já existe no índice"
 
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: já existe no diretório de trabalho"
 
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o)"
 
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o) de %s"
 
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "o ficheiro afetado '%s' é indicado por uma ligação simbólica"
 
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: patch não se aplica com sucesso"
 
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
 #, c-format
 msgid "Checking patch %s..."
 msgstr "A verificar o patch %s..."
 
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "falha ao invocar make_cache_entry em '%s'"
 
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "não é possível remover %s do índice"
 
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "patch corrompido no submódulo %s"
 
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "não é possível obter estado do novo ficheiro criado '%s'"
 
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "não é possível criar armazenamento de segurança do ficheiro recém-criado %s"
 
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "não é possível adicionar %s à cache"
 
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
 #, c-format
 msgid "closing file '%s'"
 msgstr "a fechar o ficheiro '%s'"
 
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "não é possível escrever o ficheiro '%s' com o modo %o"
 
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s aplicado com sucesso."
 
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
 msgid "internal error"
 msgstr "erro interno"
 
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "A aplicar patch %%s com %d rejeição..."
 msgstr[1] "A aplicar patch %%s com %d rejeições..."
 
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
-msgstr "a truncar o nome do ficheiro .rej em %.*s.rej "
+msgstr "a truncar o nome do ficheiro .rej em %.*s.rej"
+
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "não é possível abrir %s: %s"
 
-#: builtin/apply.c:4300
+#: builtin/apply.c:4298
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Excerto nº%d aplicado com sucesso."
 
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Excerto nº%d rejeitado."
 
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Patch '%s' ignorado."
+
+#: builtin/apply.c:4395
 msgid "unrecognized input"
 msgstr "entrada não reconhecida"
 
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
 msgid "unable to read index file"
 msgstr "não foi possível ler o ficheiro de índice"
 
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
 msgid "don't apply changes matching the given path"
 msgstr "não aplicar alterações que correspondam ao caminho fornecido"
 
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
 msgid "apply changes matching the given path"
 msgstr "aplicar alterações que correspondam ao caminho fornecido"
 
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "remover <num> barras à esquerda dos caminhos de diff tradicional"
 
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
 msgid "ignore additions made by the patch"
 msgstr "ignorar adições feitas pelo patch"
 
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "em vez de aplicar o patch, mostrar o diffstat da entrada"
 
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "mostrar número de linhas adicionadas e removidas em notação decimal"
 
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "em vez de aplicar o patch, mostrar um resumo da entrada"
 
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado"
 
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
 msgid "make sure the patch is applicable to the current index"
 msgstr "garantir que o patch pode ser aplicado ao índice atual"
 
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
 msgid "apply a patch without touching the working tree"
 msgstr "aplicar um patch sem tocar na árvore de trabalho"
 
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
 msgid "accept a patch that touches outside the working area"
 msgstr "aceitar patches que alteram ficheiros fora da área de trabalho"
 
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "aplicar o patch também (use com --stat/--summary/--check)"
 
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
 msgid "attempt three-way merge if a patch does not apply"
-msgstr "tentar merge com três pontos se um patch não for aplicado corretamente"
+msgstr ""
+"tentar integração com três pontos se um patch não se se aplica com êxito"
 
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "construir um índice temporário baseado na informação incorporada do índice"
 
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
 msgid "paths are separated with NUL character"
 msgstr "os caminhos estão separados por caracteres NUL"
 
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
 msgid "ensure at least <n> lines of context match"
 msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
 
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "detetar linhas novas ou modificadas que tenham espaços em branco"
 
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignorar alterações de espaço em branco ao procurar contexto"
 
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
 msgid "apply the patch in reverse"
 msgstr "aplicar o patch em reverso"
 
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
 msgid "don't expect at least one line of context"
 msgstr "não esperar nenhuma linha de contexto"
 
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "deixar os excertos rejeitados nos respetivos ficheiros *.rej"
 
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
 msgid "allow overlapping hunks"
 msgstr "permitir a sobreposição de excertos"
 
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 "tolerar deteções incorretas de falta de nova linha no final do ficheiro"
 
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
 msgid "do not trust the line counts in the hunk headers"
 msgstr "não confiar na contagem de linhas no cabeçalho dos excertos"
 
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
 msgid "prepend <root> to all filenames"
 msgstr "preceder <root> a todos os nomes de ficheiro"
 
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
 msgid "--3way outside a repository"
 msgstr "--3way fora de um repositório"
 
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
 msgid "--index outside a repository"
 msgstr "--index fora de um repositório"
 
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
 msgid "--cached outside a repository"
 msgstr "--cached fora de um repositório"
 
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
 #, c-format
 msgid "can't open patch '%s'"
 msgstr "não é possível abrir o patch '%s'"
 
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "%d erro de espaço em branco reprimido"
-msgstr[1] "%d erros de espaço em branco repimidos"
+msgstr[1] "%d erros de espaço em branco reprimidos"
 
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
@@ -3447,102 +3734,101 @@ msgstr "<rev-opções> estão documentadas em git-rev-list(1)"
 msgid "Blaming lines"
 msgstr "Linhas de culpa"
 
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
 msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 "Mostrar entradas de culpa à medida que forem encontradas, incrementalmente"
 
-#: builtin/blame.c:2531
+#: builtin/blame.c:2532
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr ""
-"Mostar SHA-1 dos commits de limite em branco (Predefinição: desativado)"
+msgstr "Mostar SHA-1 dos commits limite em branco (Predefinição: desativado)"
 
-#: builtin/blame.c:2532
+#: builtin/blame.c:2533
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "Não tratar os commits raiz como limites (Predefinição: desativado)"
 
-#: builtin/blame.c:2533
+#: builtin/blame.c:2534
 msgid "Show work cost statistics"
 msgstr "Mostrar estatísticas de custo de atividade"
 
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
 msgid "Force progress reporting"
 msgstr "Forçar informação de progresso"
 
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
 msgid "Show output score for blame entries"
 msgstr "Mostrar a pontuação das entradas de culpa"
 
-#: builtin/blame.c:2536
+#: builtin/blame.c:2537
 msgid "Show original filename (Default: auto)"
 msgstr "Mostrar o nome do ficheiro original (Predefinição: auto)"
 
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
 msgid "Show original linenumber (Default: off)"
 msgstr "Mostrar números de linha originais (Predefinição: desativado)"
 
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
 msgid "Show in a format designed for machine consumption"
 msgstr "Mostrar em formato próprio para ser consumo por uma máquina"
 
-#: builtin/blame.c:2539
+#: builtin/blame.c:2540
 msgid "Show porcelain format with per-line commit information"
 msgstr "Mostrar em formato de porcelana com informações de commit por linha"
 
-#: builtin/blame.c:2540
+#: builtin/blame.c:2541
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "Usar o mesmo modo de saída que git-annotate (Predefinição: desativado)"
 
-#: builtin/blame.c:2541
+#: builtin/blame.c:2542
 msgid "Show raw timestamp (Default: off)"
 msgstr "Mostrar carimbo de data/hora em bruto (Predefinição: desativado)"
 
-#: builtin/blame.c:2542
+#: builtin/blame.c:2543
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Mostrar SHA1 longo de commit (Predefinição: desativado)"
 
-#: builtin/blame.c:2543
+#: builtin/blame.c:2544
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr ""
 "Suprimir nome de autor e carimbo de data/hora (Predefinição: desativado)"
 
-#: builtin/blame.c:2544
+#: builtin/blame.c:2545
 msgid "Show author email instead of name (Default: off)"
 msgstr "Mostrar o email do autor em vez do nome (Predefinição: desativado)"
 
-#: builtin/blame.c:2545
+#: builtin/blame.c:2546
 msgid "Ignore whitespace differences"
 msgstr "Ignorar as diferenças de espaço em branco"
 
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
 msgid "Spend extra cycles to find better match"
 msgstr "Despender ciclos extra para encontrar uma melhor correspondência"
 
-#: builtin/blame.c:2547
+#: builtin/blame.c:2548
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Usar revisões do <ficheiro> em vez de invocar git-rev-list"
 
-#: builtin/blame.c:2548
+#: builtin/blame.c:2549
 msgid "Use <file>'s contents as the final image"
 msgstr "Usar o conteúdo do <ficheiro> como imagem final"
 
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
 msgid "score"
 msgstr "pontuação"
 
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
 msgid "Find line copies within and across files"
 msgstr "Localizar linhas copiadas dentro e entre ficheiros"
 
-#: builtin/blame.c:2550
+#: builtin/blame.c:2551
 msgid "Find line movements within and across files"
 msgstr "Localizar linhas movidas dentro e entre ficheiros"
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "Process only line range n,m, counting from 1"
 msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
 
@@ -3552,356 +3838,377 @@ msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
 #. takes 22 places, is the longest among various forms of
 #. relative timestamps, but your language may need more or
 #. fewer display columns.
-#: builtin/blame.c:2640
+#: builtin/blame.c:2641
 msgid "4 years, 11 months ago"
 msgstr "há 4 anos e 11 meses atrás"
 
-#: builtin/branch.c:25
+#: builtin/branch.c:26
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr "git branch [<opções>] [-r | -a] [--merged | --no-merged]"
 
-#: builtin/branch.c:26
+#: builtin/branch.c:27
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr "git branch [<opções>] [-l] [-f] <nome-ramo> [<ponto-de-partida>]"
 
-#: builtin/branch.c:27
+#: builtin/branch.c:28
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<opções>] [-r] (-d | -D) <nome-do-ramo>..."
 
-#: builtin/branch.c:28
+#: builtin/branch.c:29
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<opções>] (-m | -M) [<ramo-antigo>] <novo-ramo>"
 
-#: builtin/branch.c:29
+#: builtin/branch.c:30
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<opções>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:142
+#: builtin/branch.c:143
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD."
 msgstr ""
-"a eliminar o ramo '%s' incorporado em\n"
-"         '%s', mas ainda não incorporado em HEAD."
+"a eliminar o ramo '%s' integrado em\n"
+"         '%s', mas ainda não integrado em HEAD."
 
-#: builtin/branch.c:146
+#: builtin/branch.c:147
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 "         '%s', even though it is merged to HEAD."
 msgstr ""
-"ramo '%s' não eliminado, visto que ainda não foi incorporado em\n"
-"         '%s', apesar de já ter sido incorporado em HEAD."
+"ramo '%s' não eliminado, visto que ainda não foi integrado em\n"
+"         '%s', apesar de já ter sido integrado em HEAD."
 
-#: builtin/branch.c:160
+#: builtin/branch.c:161
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Não foi possível pesquisar pelo objeto commit de '%s'"
 
-#: builtin/branch.c:164
+#: builtin/branch.c:165
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
 "If you are sure you want to delete it, run 'git branch -D %s'."
 msgstr ""
-"O ramo '%s' não foi totalmente incorporado.\n"
+"O ramo '%s' não foi totalmente integrado.\n"
 "Se tem a certeza que o quer eliminar, execute 'git branch -D %s'."
 
-#: builtin/branch.c:177
+#: builtin/branch.c:178
 msgid "Update of config-file failed"
 msgstr "Falha ao atualizar o ficheiro de configuração"
 
-#: builtin/branch.c:205
+#: builtin/branch.c:206
 msgid "cannot use -a with -d"
 msgstr "não é possível usar -a com -d"
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Não foi possível pesquisar pelo objeto commit de HEAD"
 
-#: builtin/branch.c:219
+#: builtin/branch.c:226
 #, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "Não é possível eliminar o ramo '%s' no qual se encontra neste momento."
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "Não é possível eliminar o ramo '%s' extraído em '%s'"
 
-#: builtin/branch.c:235
+#: builtin/branch.c:241
 #, c-format
 msgid "remote-tracking branch '%s' not found."
-msgstr "ramo remoto seguido '%s' não encontrado."
+msgstr "ramo de monitorização remoto '%s' não encontrado."
 
-#: builtin/branch.c:236
+#: builtin/branch.c:242
 #, c-format
 msgid "branch '%s' not found."
 msgstr "ramo '%s' não encontrado."
 
-#: builtin/branch.c:251
+#: builtin/branch.c:257
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Erro a eliminar o ramo remoto seguido '%s'"
+msgstr "Erro a eliminar o ramo de monitorização remoto '%s'"
 
-#: builtin/branch.c:252
+#: builtin/branch.c:258
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Erro a eliminar ramo '%s'"
 
-#: builtin/branch.c:259
+#: builtin/branch.c:265
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
-msgstr "Ramo remoto seguido %s eliminado (era %s).\n"
+msgstr "Ramo de monitorização remoto %s eliminado (era %s).\n"
 
-#: builtin/branch.c:260
+#: builtin/branch.c:266
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Ramo %s eliminado (era %s).\n"
 
-#: builtin/branch.c:303
+#: builtin/branch.c:309
 #, c-format
 msgid "[%s: gone]"
 msgstr "[%s: desaparecido]"
 
-#: builtin/branch.c:308
+#: builtin/branch.c:314
 #, c-format
 msgid "[%s]"
 msgstr "[%s]"
 
-#: builtin/branch.c:313
+#: builtin/branch.c:319
 #, c-format
 msgid "[%s: behind %d]"
 msgstr "[%s: atrás %d]"
 
-#: builtin/branch.c:315
+#: builtin/branch.c:321
 #, c-format
 msgid "[behind %d]"
 msgstr "[atrás %d]"
 
-#: builtin/branch.c:319
+#: builtin/branch.c:325
 #, c-format
 msgid "[%s: ahead %d]"
 msgstr "[%s: à frente %d]"
 
-#: builtin/branch.c:321
+#: builtin/branch.c:327
 #, c-format
 msgid "[ahead %d]"
 msgstr "[à frente %d]"
 
-#: builtin/branch.c:324
+#: builtin/branch.c:330
 #, c-format
 msgid "[%s: ahead %d, behind %d]"
 msgstr "[%s: à frente %d, atrás %d]"
 
-#: builtin/branch.c:327
+#: builtin/branch.c:333
 #, c-format
 msgid "[ahead %d, behind %d]"
 msgstr "[à frente %d, atrás %d]"
 
-#: builtin/branch.c:340
+#: builtin/branch.c:346
 msgid " **** invalid ref ****"
 msgstr " **** referências inválida ****"
 
-#: builtin/branch.c:366
+#: builtin/branch.c:372
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(nenhum ramo, a efetuar rebase de %s)"
 
-#: builtin/branch.c:369
+#: builtin/branch.c:375
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(nenhum ramo, bissecção iniciada em %s)"
 
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD destacada em %s)"
 
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD destacada de %s)"
 
-#: builtin/branch.c:382
+#: builtin/branch.c:390
 msgid "(no branch)"
 msgstr "(nenhum ramo)"
 
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "O ramo %s está a ser rebaseado em %s"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "O ramo %s está a ser bissetado em %s"
+
+#: builtin/branch.c:560
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 "não é possível mudar o nome do ramo atual vista que não se encontra num ramo."
 
-#: builtin/branch.c:534
+#: builtin/branch.c:570
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nome de ramo inválido: '%s'"
 
-#: builtin/branch.c:549
+#: builtin/branch.c:587
 msgid "Branch rename failed"
 msgstr "Falha ao mudar o nome do ramo"
 
-#: builtin/branch.c:553
+#: builtin/branch.c:591
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "O ramo incorretamente denominado '%s' mudou de nome"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:594
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "O nome do ramo mudou para %s, mas a HEAD não está atualizada!"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:601
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 "O ramo mudou de nome, mas a atualização do ficheiro de configuração falhou"
 
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "não foi possível escrever o modelo da descrição de ramo: %s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "não foi possível escrever o modelo da descrição do ramo"
 
-#: builtin/branch.c:615
+#: builtin/branch.c:651
 msgid "Generic options"
 msgstr "Opções genéricas"
 
-#: builtin/branch.c:617
+#: builtin/branch.c:653
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "apresentar hash e assunto, duplique para ramos a montante"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:654
 msgid "suppress informational messages"
 msgstr "suprimir mensagens informativas"
 
-#: builtin/branch.c:619
+#: builtin/branch.c:655
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "configurar modo de seguimento (consulte git-pull(1))"
 
-#: builtin/branch.c:621
+#: builtin/branch.c:657
 msgid "change upstream info"
 msgstr "alterar a informação do ramo a montante"
 
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "a montante"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "alterar a informação do ramo a montante"
+
+#: builtin/branch.c:661
 msgid "use colored output"
 msgstr "usar saída colorida"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:662
 msgid "act on remote-tracking branches"
-msgstr "atuar sobre ramos remotos seguidos"
+msgstr "atuar sobre ramos de monitorização remotos"
 
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
 msgid "print only branches that contain the commit"
 msgstr "imprimir apenas ramos que contenham o commit"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:668
 msgid "Specific git-branch actions:"
 msgstr "Ações específicas do git-branch:"
 
-#: builtin/branch.c:633
+#: builtin/branch.c:669
 msgid "list both remote-tracking and local branches"
-msgstr "listar ramos remotos seguidos e ramos locais"
+msgstr "listar ramos de monitorização remotos e ramos locais"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:671
 msgid "delete fully merged branch"
-msgstr "eliminar um ramo totalmente incorporado"
+msgstr "eliminar um ramo totalmente integrado"
 
-#: builtin/branch.c:636
+#: builtin/branch.c:672
 msgid "delete branch (even if not merged)"
-msgstr "eliminar um ramo (mesmo que não tenha sido incorporado)"
+msgstr "eliminar um ramo (mesmo que não tenha sido integrado)"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:673
 msgid "move/rename a branch and its reflog"
 msgstr "mover ou mudar o nome de um ramo e o seu reflog"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:674
 msgid "move/rename a branch, even if target exists"
 msgstr "mover ou mudar o nome de um ramo, mesmo que o destino já exista"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:675
 msgid "list branch names"
 msgstr "listar os nomes dos ramos"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:676
 msgid "create the branch's reflog"
 msgstr "criar reflog do ramo"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:678
 msgid "edit the description for the branch"
 msgstr "editar a descrição do ramo"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:679
 msgid "force creation, move/rename, deletion"
 msgstr "forçar criação, mover/mudar o nome ou exclusão"
 
-#: builtin/branch.c:644
+#: builtin/branch.c:680
 msgid "print only branches that are merged"
-msgstr "imprimir apenas os ramos que foram incorporados"
+msgstr "imprimir apenas os ramos que foram integrados"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:681
 msgid "print only branches that are not merged"
-msgstr "imprimir apenas os ramos que não foram incorporados"
+msgstr "imprimir apenas os ramos que não foram integrados"
 
-#: builtin/branch.c:646
+#: builtin/branch.c:682
 msgid "list branches in columns"
 msgstr "listar os ramos em colunas"
 
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
 msgid "key"
 msgstr "chave"
 
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
 msgid "field name to sort on"
 msgstr "nome do campo pelo qual ordernar"
 
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
 #: builtin/tag.c:369
 msgid "object"
 msgstr "objeto"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:687
 msgid "print only branches of the object"
 msgstr "imprimir apenas os ramos do objeto"
 
-#: builtin/branch.c:669
+#: builtin/branch.c:705
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Falha ao resolver HEAD numa referência válida."
 
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD não encontrada em refs/heads!"
 
-#: builtin/branch.c:693
+#: builtin/branch.c:729
 msgid "--column and --verbose are incompatible"
 msgstr "--column e --verbose são incompatíveis"
 
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
 msgid "branch name required"
 msgstr "nome do ramo é obrigatório"
 
-#: builtin/branch.c:722
+#: builtin/branch.c:758
 msgid "Cannot give description to detached HEAD"
 msgstr "Não é possível atribuir descrição a HEAD destacada"
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 msgid "cannot edit description of more than one branch"
 msgstr "não é possível editar a descrição de mais do que um ramo"
 
-#: builtin/branch.c:734
+#: builtin/branch.c:770
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Ainda não há commits no ramo '%s'."
 
-#: builtin/branch.c:737
+#: builtin/branch.c:773
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Não há nenhum ramo denominado '%s'."
 
-#: builtin/branch.c:752
+#: builtin/branch.c:788
 msgid "too many branches for a rename operation"
 msgstr "demasiados ramos para uma operação de mudança de nome"
 
-#: builtin/branch.c:757
+#: builtin/branch.c:793
 msgid "too many branches to set new upstream"
 msgstr "demasiados ramos para definir novo ramo a montante"
 
-#: builtin/branch.c:761
+#: builtin/branch.c:797
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -3909,41 +4216,40 @@ msgstr ""
 "não foi possível definir %s como ramo a montante de HEAD visto que esta não "
 "aponta para um ramo."
 
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
 #, c-format
 msgid "no such branch '%s'"
 msgstr "o ramo '%s' não existe"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:804
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "o ramo '%s' não existe"
 
-#: builtin/branch.c:780
+#: builtin/branch.c:816
 msgid "too many branches to unset upstream"
 msgstr "demasiados ramos para remover a definição de ramo a montante"
 
-#: builtin/branch.c:784
+#: builtin/branch.c:820
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "não foi possível remover a definição de ramo a montante de HEAD visto que "
 "esta não aponta para um ramo."
 
-#: builtin/branch.c:790
+#: builtin/branch.c:826
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "O ramo '%s' não tem informação sobre o ramo a montante"
 
-#: builtin/branch.c:804
+#: builtin/branch.c:840
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "não faz sentido criar 'HEAD' manualmente"
 
-#: builtin/branch.c:810
+#: builtin/branch.c:846
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr ""
-"as opções -a e -r de 'git branch' não fazem sentido com um nome de ramo"
+msgstr "as opções -a e -r de 'git branch' não fazem sentido com um nome de ramo"
 
-#: builtin/branch.c:813
+#: builtin/branch.c:849
 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3952,7 +4258,7 @@ msgstr ""
 "A opção --set-upstream é obsoleta e será removida. Considere o uso de --"
 "track ou --set-upstream-to\n"
 
-#: builtin/branch.c:830
+#: builtin/branch.c:866
 #, c-format
 msgid ""
 "\n"
@@ -3963,16 +4269,6 @@ msgstr ""
 "Se quer que '%s' siga '%s', faça:\n"
 "\n"
 
-#: builtin/branch.c:831
-#, c-format
-msgid "    git branch -d %s\n"
-msgstr "    git branch -d %s\n"
-
-#: builtin/branch.c:832
-#, c-format
-msgid "    git branch --set-upstream-to %s\n"
-msgstr "    git branch --set-upstream-to %s\n"
-
 #: builtin/bundle.c:51
 #, c-format
 msgid "%s is okay\n"
@@ -3991,8 +4287,8 @@ msgid ""
 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
 "<type>|--textconv) <object>"
 msgstr ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<tipo>|--textconv) <objeto>"
+"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-"
+"type]|-e|-p|<tipo>|--textconv) <objeto>"
 
 #: builtin/cat-file.c:429
 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
@@ -4072,7 +4368,7 @@ msgstr "ler os nomes dos ficheiros da entrada padrão"
 msgid "terminate input and output records by a NUL character"
 msgstr "terminar registos da entrada e da saída com um carácter NUL"
 
-#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
 msgid "suppress progress reporting"
 msgstr "suprimir informação de progresso"
 
@@ -4164,8 +4460,9 @@ msgid "write the content to temporary files"
 msgstr "escrever o conteúdo em ficheiros temporários"
 
 #: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
 msgid "string"
 msgstr "cadeia"
 
@@ -4213,82 +4510,82 @@ msgstr "caminho '%s': não é possível integrar"
 #: builtin/checkout.c:230
 #, c-format
 msgid "Unable to add merge result for '%s'"
-msgstr "Não é possível integrar os resultados do merge de '%s'"
+msgstr "Não é possível adicionar os resultados da integração de '%s'"
 
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' não pode ser usado com caminhos em atualização"
 
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' não pode ser usado com %s"
 
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Não é possível atualizar os caminhos e mudar para o ramo '%s' ao mesmo tempo."
 
-#: builtin/checkout.c:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
 msgid "corrupt index file"
 msgstr "ficheiro de índice corrompido"
 
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "o caminho '%s' não foi integrado"
 
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
 msgid "you need to resolve your current index first"
 msgstr "primeiro deve resolver o índice atual"
 
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Não é possível efetuar reflog de '%s': %s\n"
 
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
 msgid "HEAD is now at"
 msgstr "HEAD está agora em"
 
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
 msgid "unable to update HEAD"
 msgstr "não foi possível atualizar HEAD"
 
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Repor ramo '%s'\n"
 
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Já em '%s'\n"
 
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Mudou para e repôs o ramo '%s'\n"
 
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Mudou para o novo ramo '%s'\n"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Mudou para o ramo '%s'\n"
 
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... e mais %d.\n"
 
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -4309,7 +4606,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4336,166 +4633,166 @@ msgstr[1] ""
 " git branch <nome-do-novo-ramo> %s\n"
 "\n"
 
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
 msgid "internal error in revision walk"
 msgstr "erro interno durante o curso de revisões"
 
-#: builtin/checkout.c:797
+#: builtin/checkout.c:796
 msgid "Previous HEAD position was"
 msgstr "A posição anterior de HEAD era"
 
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
 msgid "You are on a branch yet to be born"
 msgstr "Está num ramo ainda não criado"
 
-#: builtin/checkout.c:969
+#: builtin/checkout.c:968
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "esperava-se apenas uma referência, %d fornecidas."
 
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referência inválida: %s"
 
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "a referência não é uma árvore: %s"
 
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1076
 msgid "paths cannot be used with switching branches"
 msgstr "não podem ser usados caminhos ao mudar de ramo"
 
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' não pode ser usado ao mudar de ramo"
 
-#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' não pode ser usado com '%s'"
 
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Não é possível mudar de ramo para '%s', visto que não é um commit"
 
-#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
 msgid "branch"
 msgstr "ramo"
 
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
 msgid "create and checkout a new branch"
 msgstr "criar e extrair um novo ramo"
 
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
 msgid "create/reset and checkout a branch"
 msgstr "criar/repor e extrair um ramo"
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
 msgid "create reflog for new branch"
 msgstr "criar reflog do novo ramo"
 
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
 msgid "detach the HEAD at named commit"
 msgstr "destacar HEAD no commit indicado"
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
 msgid "set upstream info for new branch"
 msgstr "definir a informação do ramo a montante do novo ramo"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new-branch"
 msgstr "novo-ramo"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new unparented branch"
 msgstr "novo ramo sem pai"
 
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
 msgid "checkout our version for unmerged files"
 msgstr "extrair a nossa versão dos ficheiros não integrados"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
 msgid "checkout their version for unmerged files"
 msgstr "extrair a versão deles dos ficheiros não integrados"
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
 msgid "force checkout (throw away local modifications)"
 msgstr "forçar extração (descartar modificações locais)"
 
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1150
 msgid "perform a 3-way merge with the new branch"
-msgstr "realizar um merge com 3 pontos com o novo ramo"
+msgstr "realizar uma integração com 3 pontos com o novo ramo"
 
-#: builtin/checkout.c:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
 msgid "update ignored files (default)"
 msgstr "atualizar ficheiros ignorados (predefinição)"
 
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
 msgid "style"
 msgstr "estilo"
 
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
 msgid "conflict style (merge or diff3)"
 msgstr "estilo de conflito (merge ou diff3)"
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "não restringir especificadores de caminho a entradas esparsas"
 
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 "não verificar se outra árvore de trabalho contém a referência fornecida"
 
-#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
 #: builtin/send-pack.c:168
 msgid "force progress reporting"
 msgstr "forçar informação de progresso"
 
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B e --orphan são mutuamente exclusivos"
 
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1209
 msgid "--track needs a branch name"
 msgstr "--track requer um nome dum ramo"
 
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
 msgid "Missing branch name; try -b"
 msgstr "Falta um nome dum ramo; tente -b"
 
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
 msgid "invalid path specification"
 msgstr "especificação de caminho inválida"
 
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
 #, c-format
 msgid ""
 "Cannot update paths and switch to branch '%s' at the same time.\n"
 "Did you intend to checkout '%s' which can not be resolved as commit?"
 msgstr ""
-"Não é possível atualizar os caminho e mudar para o ramo '%s' ao mesmo "
-"tempo.\n"
-"Pretendia extrair '%s' podendo ser resolvido num commit?"
+"Não é possível atualizar os caminho e mudar para o ramo '%s' ao mesmo tempo."
+"\n"
+"Pretendia extrair '%s' o qual não pode ser resolvido como commit?"
 
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach não aceita um caminho como argumento '%s'"
 
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1266
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -4579,7 +4876,7 @@ msgstr "Introduza padrões a ignorar>> "
 #: builtin/clean.c:690
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
-msgstr "AVISO: não foram encontrados itens correspondentes a %s"
+msgstr "AVISO: não foram encontrados itens correspondentes a: %s"
 
 #: builtin/clean.c:711
 msgid "Select items to delete"
@@ -4647,8 +4944,8 @@ msgstr "limpeza interativa"
 msgid "remove whole directories"
 msgstr "remover diretórios inteiros"
 
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
 msgid "pattern"
 msgstr "padrão"
 
@@ -4674,7 +4971,7 @@ msgid ""
 "clean"
 msgstr ""
 "clean.requireForce definido como true e nenhum -i, -n, ou -f fornecido; "
-"recusando-se a limpar"
+"limpeza recusada"
 
 #: builtin/clean.c:904
 msgid ""
@@ -4682,110 +4979,119 @@ msgid ""
 "refusing to clean"
 msgstr ""
 "clean.requireForce predefinido como true e nenhum -i, -n, ou -f fornecido; "
-"recusando-se a limpar"
+"limpeza recusada"
 
 #: builtin/clone.c:37
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opções>] [--] <repo> [<dir>]"
 
-#: builtin/clone.c:60
+#: builtin/clone.c:62
 msgid "don't create a checkout"
-msgstr "não realizar extração"
+msgstr "não criar uma extração"
 
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
 msgid "create a bare repository"
 msgstr "criar um repositório nu"
 
-#: builtin/clone.c:65
+#: builtin/clone.c:67
 msgid "create a mirror repository (implies bare)"
 msgstr "criar um repositório espelhado (implica repositório nu)"
 
-#: builtin/clone.c:67
+#: builtin/clone.c:69
 msgid "to clone from a local repository"
 msgstr "para clonar de um repositório local"
 
-#: builtin/clone.c:69
+#: builtin/clone.c:71
 msgid "don't use local hardlinks, always copy"
 msgstr "não usar ligações fixas, copiar sempre"
 
-#: builtin/clone.c:71
+#: builtin/clone.c:73
 msgid "setup as shared repository"
 msgstr "configurar como repositório partilhado"
 
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
 msgid "initialize submodules in the clone"
 msgstr "inicializar submódulos no clone"
 
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "número de submódulos clonados em paralelo"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
 msgid "template-directory"
 msgstr "diretório-modelo"
 
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
 msgid "directory from which templates will be used"
 msgstr "diretório que contém os modelos usados"
 
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
 msgid "reference repository"
 msgstr "repositório de referência"
 
-#: builtin/clone.c:81
+#: builtin/clone.c:85
 msgid "use --reference only while cloning"
 msgstr "usar --reference apenas para clonar"
 
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
 msgid "name"
 msgstr "nome"
 
-#: builtin/clone.c:83
+#: builtin/clone.c:87
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "usar <nome> em vez de 'origin' para seguir o ramo a montante"
 
-#: builtin/clone.c:85
+#: builtin/clone.c:89
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "extrair <ramo> em vez da HEAD do remoto"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:91
 msgid "path to git-upload-pack on the remote"
 msgstr "caminho para git-upload-pack no remoto"
 
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
-#: builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667
+#: builtin/pull.c:201
 msgid "depth"
 msgstr "profundidade"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:93
 msgid "create a shallow clone of that depth"
 msgstr "criar um clone raso com essa profundidade"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:95
 msgid "clone only one branch, HEAD or --branch"
 msgstr "clonar apenas um ramo, HEAD ou --branch"
 
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "qualquer submódulo clonado será raso"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
 msgid "separate git dir from working tree"
 msgstr "separar o repositório git da árvore de trabalho"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:100
 msgid "key=value"
 msgstr "chave=valor"
 
-#: builtin/clone.c:95
+#: builtin/clone.c:101
 msgid "set config inside the new repository"
 msgstr "definir configuração dentro do novo repositório"
 
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
 msgid "use IPv4 addresses only"
 msgstr "usar apenas endereços IPv4"
 
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
 msgid "use IPv6 addresses only"
 msgstr "usar apenas endereços IPv6"
 
-#: builtin/clone.c:239
+#: builtin/clone.c:241
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -4793,59 +5099,54 @@ msgstr ""
 "Não foi possível adivinhar o nome do diretório.\n"
 "Especifique um diretório na linha de comandos"
 
-#: builtin/clone.c:305
+#: builtin/clone.c:307
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "ainda não é suportada a funcionalidade que permite ter o repositório de "
-"referência '%s' como uma extração ligada"
+"referência '%s' como uma extração ligada."
 
-#: builtin/clone.c:307
+#: builtin/clone.c:309
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "o repositório de referência '%s' não é um repositório local."
 
-#: builtin/clone.c:312
+#: builtin/clone.c:314
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "o repositório de referência '%s' é raso"
 
-#: builtin/clone.c:315
+#: builtin/clone.c:317
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "o repositório de referência '%s' está enxertado"
 
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "falha ao invocar stat de '%s'"
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existe e não é um diretório"
 
-#: builtin/clone.c:396
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "falha ao invocar stat de %s\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "falha ao criar a ligação '%s'"
 
-#: builtin/clone.c:422
+#: builtin/clone.c:424
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "falha ao copiar o ficheiro para '%s'"
 
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
 #, c-format
 msgid "done.\n"
 msgstr "concluído.\n"
 
-#: builtin/clone.c:459
+#: builtin/clone.c:461
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -4855,128 +5156,128 @@ msgstr ""
 "Pode inspecionar o que foi extraído com 'git status'\n"
 "e repetir a extração com 'git checkout -f HEAD'\n"
 
-#: builtin/clone.c:536
+#: builtin/clone.c:538
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Ramo remoto %s não encontrado para clonar."
 
-#: builtin/clone.c:626
+#: builtin/clone.c:628
 #, c-format
 msgid "Checking connectivity... "
 msgstr "A verificar a conectividade... "
 
-#: builtin/clone.c:629
+#: builtin/clone.c:631
 msgid "remote did not send all necessary objects"
 msgstr "o remoto não enviou todos os objetos necessários"
 
-#: builtin/clone.c:647
+#: builtin/clone.c:649
 #, c-format
 msgid "unable to update %s"
 msgstr "não foi possível atualizar %s"
 
-#: builtin/clone.c:696
+#: builtin/clone.c:698
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
-"a HEAD remota referencia uma referência inexistente, não é possível "
-"extrair.\n"
+"a HEAD remota referencia uma referência inexistente, não é possível extrair."
+"\n"
 
-#: builtin/clone.c:727
+#: builtin/clone.c:729
 msgid "unable to checkout working tree"
 msgstr "não foi possível extrair a árvore de trabalho"
 
-#: builtin/clone.c:753
+#: builtin/clone.c:767
 msgid "unable to write parameters to config file"
 msgstr "não foi possível escrever os parâmetros no ficheiro de configuração"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:830
 msgid "cannot repack to clean up"
 msgstr "não é possível reempacotar para limpar"
 
-#: builtin/clone.c:818
+#: builtin/clone.c:832
 msgid "cannot unlink temporary alternates file"
-msgstr "não é possível invocar unlink sobre o ficheiro alternates temporário"
+msgstr "não é possível invocar unlink sobre o ficheiro sobressalente temporário"
 
-#: builtin/clone.c:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
 msgid "Too many arguments."
 msgstr "Demasiados argumentos."
 
-#: builtin/clone.c:854
+#: builtin/clone.c:868
 msgid "You must specify a repository to clone."
 msgstr "Deve especificar um repositório para clonar."
 
-#: builtin/clone.c:865
+#: builtin/clone.c:879
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "as opções --bare e --origin %s são incompatíveis."
 
-#: builtin/clone.c:868
+#: builtin/clone.c:882
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare e --separate-git-dir são incompatíveis."
 
-#: builtin/clone.c:881
+#: builtin/clone.c:895
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "o repositório '%s' não existe"
 
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "profundidade %s não é um número positivo"
 
-#: builtin/clone.c:897
+#: builtin/clone.c:911
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "o caminho de destino '%s' já existe e não é um diretório vazio."
 
-#: builtin/clone.c:907
+#: builtin/clone.c:921
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "a árvore de trabalho '%s' já existe."
 
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "não foi possível criar os diretórios superiores de '%s'"
 
-#: builtin/clone.c:925
+#: builtin/clone.c:939
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "não foi possível criar o diretório de árvore de trabalho '%s'"
 
-#: builtin/clone.c:943
+#: builtin/clone.c:957
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "A clonar no repositório nu '%s'...\n"
 
-#: builtin/clone.c:945
+#: builtin/clone.c:959
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "A clonar em '%s'...\n"
 
-#: builtin/clone.c:984
+#: builtin/clone.c:998
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth é ignorado em clones locais; use file:// ."
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1001
 msgid "source repository is shallow, ignoring --local"
 msgstr "o repositório de origem é raso, --local ignorado"
 
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
 msgid "--local is ignored"
 msgstr "--local ignorado"
 
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "Não sei como clonar %s"
 
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "O ramo remoto %s não foi encontrado no repositório a montante %s"
 
-#: builtin/clone.c:1056
+#: builtin/clone.c:1070
 msgid "You appear to have cloned an empty repository."
 msgstr "Parece foi clonado um repositório vazio."
 
@@ -5076,7 +5377,7 @@ msgid ""
 "it empty. You can repeat your command with --allow-empty, or you can\n"
 "remove the commit entirely with \"git reset HEAD^\".\n"
 msgstr ""
-"Pediu para emendar o commit mais recente, mas fazê-lo torná-lo-ia\n"
+"Pediu para emendar o commit mais recente, mas ao fazê-lo torná-lo-ia\n"
 "vazio. Pode repetir o comando com --allow-empty, ou pode remover o\n"
 "commit completamente com \"git reset HEAD^\".\n"
 
@@ -5090,7 +5391,7 @@ msgid ""
 msgstr ""
 "O cherry-pick anterior está vazio, possivelmente devido a resolução de "
 "conflitos.\n"
-"Se deseja fazer commit de qualquer forma, use:\n"
+"Se deseja submeter de qualquer forma, use:\n"
 "\n"
 "    git commit --allow-empty\n"
 "\n"
@@ -5115,66 +5416,66 @@ msgstr ""
 "Depois \"git cherry-pick --continue\" irá retomar o cherry-pick\n"
 "dos restantes commits.\n"
 
-#: builtin/commit.c:305
+#: builtin/commit.c:307
 msgid "failed to unpack HEAD tree object"
 msgstr "falha ao descompactar o objeto árvore HEAD"
 
-#: builtin/commit.c:346
+#: builtin/commit.c:348
 msgid "unable to create temporary index"
 msgstr "não foi possível criar índice temporário"
 
-#: builtin/commit.c:352
+#: builtin/commit.c:354
 msgid "interactive add failed"
 msgstr "falha ao adicionar interativamente"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:367
 msgid "unable to update temporary index"
 msgstr "não é possível atualizar o índice temporário"
 
-#: builtin/commit.c:367
+#: builtin/commit.c:369
 msgid "Failed to update main cache tree"
 msgstr "Falha ao atualizar a árvore de cache principal"
 
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
 msgid "unable to write new_index file"
 msgstr "não é possível escrever o ficheiro new_index"
 
-#: builtin/commit.c:445
+#: builtin/commit.c:447
 msgid "cannot do a partial commit during a merge."
-msgstr "não é possível fazer um commit parcial durante um merge."
+msgstr "não é possível fazer um commit parcial durante uma integração."
 
-#: builtin/commit.c:447
+#: builtin/commit.c:449
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "não é possível fazer um commit parcial durante um cherry-pick."
 
-#: builtin/commit.c:456
+#: builtin/commit.c:458
 msgid "cannot read the index"
 msgstr "não é possível ler o índice"
 
-#: builtin/commit.c:475
+#: builtin/commit.c:477
 msgid "unable to write temporary index file"
 msgstr "não é possível escrever ficheiro de índice temporário"
 
-#: builtin/commit.c:580
+#: builtin/commit.c:582
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "o commit '%s' não tem cabeçalho de autor"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:584
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "o commit '%s' tem a linha de autor malformada"
 
-#: builtin/commit.c:601
+#: builtin/commit.c:603
 msgid "malformed --author parameter"
 msgstr "parâmetro --author malformado"
 
-#: builtin/commit.c:609
+#: builtin/commit.c:611
 #, c-format
 msgid "invalid date format: %s"
 msgstr "formato de data inválido: %s"
 
-#: builtin/commit.c:653
+#: builtin/commit.c:655
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -5182,38 +5483,38 @@ msgstr ""
 "não foi possível selecionar um carácter de comentário que\n"
 "não estivesse já a ser usado na mensagem de commit atual"
 
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "não foi possível consultar o commit %s"
 
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(a ler mensagem de log da entrada padrão)\n"
 
-#: builtin/commit.c:704
+#: builtin/commit.c:706
 msgid "could not read log from standard input"
 msgstr "não foi possível ler o log da entrada padrão"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:710
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "não é possível ler o ficheiro de log '%s'"
 
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "não foi possível ler MERGE_MSG"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
 msgid "could not read SQUASH_MSG"
 msgstr "não foi possível ler SQUASH_MSG"
 
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "não foi possível ler MERGE_MSG"
+
+#: builtin/commit.c:796
 msgid "could not write commit template"
 msgstr "não foi possível escrever o modelo de commit"
 
-#: builtin/commit.c:803
+#: builtin/commit.c:814
 #, c-format
 msgid ""
 "\n"
@@ -5223,12 +5524,12 @@ msgid ""
 "and try again.\n"
 msgstr ""
 "\n"
-"Parece que está a fazer commit de um merge.\n"
+"Parece que está a submeter uma integração.\n"
 "Se não for o caso, remova o ficheiro\n"
 "\t%s\n"
 "e tente de novo.\n"
 
-#: builtin/commit.c:808
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -5238,12 +5539,12 @@ msgid ""
 "and try again.\n"
 msgstr ""
 "\n"
-"Parece que está a fazer commit de um cherry-pick.\n"
+"Parece que está a submeter um cherry-pick.\n"
 "Se não é o caso, remova o ficheiro\n"
-"        %s\n"
+"\t%s\n"
 "e tente outra vez.\n"
 
-#: builtin/commit.c:821
+#: builtin/commit.c:832
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5253,7 +5554,7 @@ msgstr ""
 "Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n"
 "aborta o commit.\n"
 
-#: builtin/commit.c:828
+#: builtin/commit.c:839
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5264,149 +5565,149 @@ msgstr ""
 "Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n"
 "Uma mensagem vazia aborta o commit.\n"
 
-#: builtin/commit.c:848
+#: builtin/commit.c:859
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:    %.*s <%.*s>"
 
-#: builtin/commit.c:856
+#: builtin/commit.c:867
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sData:      %s"
 
-#: builtin/commit.c:863
+#: builtin/commit.c:874
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommitter: %.*s <%.*s>"
 
-#: builtin/commit.c:881
+#: builtin/commit.c:892
 msgid "Cannot read index"
 msgstr "Não é possível ler o índice"
 
-#: builtin/commit.c:938
+#: builtin/commit.c:949
 msgid "Error building trees"
 msgstr "Erro ao construir árvores"
 
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Indique a mensagem usando as opções -m ou -F.\n"
 
-#: builtin/commit.c:1055
+#: builtin/commit.c:1066
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' não é do tipo 'Nome <email>' e não corresponde a um autor "
 "existente"
 
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Modo inválido de ficheiros não controlados '%s'"
 
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
 msgid "--long and -z are incompatible"
 msgstr "--long e -z são incompatíveis"
 
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Não faz sentido usar --reset-author e --author ao mesmo tempo"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1157
 msgid "You have nothing to amend."
 msgstr "Não há nada para emendar."
 
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
 msgid "You are in the middle of a merge -- cannot amend."
-msgstr "Merge em curso -- não é possível emendar."
+msgstr "Integração em curso -- não é possível emendar."
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1162
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Cherry-pick em curso -- não é possível emendar."
 
-#: builtin/commit.c:1154
+#: builtin/commit.c:1165
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "As opções --squash e --fixup não podem ser usadas juntas"
 
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Apenas um entre -c/-C/-F/--fixup pode ser usado."
 
-#: builtin/commit.c:1166
+#: builtin/commit.c:1177
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "A opção -m não pode ser combinada com -c/C/-F/--fixup."
 
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author só pode ser usado com -C, -c ou --amend."
 
-#: builtin/commit.c:1191
+#: builtin/commit.c:1202
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Apenas um entre --include/--only/--all/--interactive/--patch pode ser usado."
 
-#: builtin/commit.c:1193
+#: builtin/commit.c:1204
 msgid "No paths with --include/--only does not make sense."
 msgstr "As opções --include/--only não fazem sentido sem indicar caminhos."
 
-#: builtin/commit.c:1195
+#: builtin/commit.c:1206
 msgid "Clever... amending the last one with dirty index."
 msgstr "Inteligente... a emendar o último commit com o índice sujo."
 
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
 msgstr "Caminhos explícitos especificados sem -i ou -o; assumindo --only..."
 
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Modo de limpeza inválido %s"
 
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
 msgid "Paths with -a does not make sense."
-msgstr "A especificação de caminhos com -a não faz sentido."
+msgstr "Indicar caminhos com -a não faz sentido."
 
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
 msgid "show status concisely"
 msgstr "mostrar status de forma concisa"
 
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
 msgid "show branch information"
 msgstr "mostrar informação do ramo"
 
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
 msgid "machine-readable output"
 msgstr "saída inteligível por máquina"
 
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
 msgid "show status in long format (default)"
 msgstr "apresentar status em formato longo (predefinição)"
 
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
 msgid "terminate entries with NUL"
 msgstr "terminar entradas com NUL"
 
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
 #: builtin/fast-export.c:984 builtin/tag.c:353
 msgid "mode"
 msgstr "modo"
 
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "mostrar ficheiros não controlados, modo é opcional: all, normal, no. "
 "(Predefinição: all)"
 
-#: builtin/commit.c:1340
+#: builtin/commit.c:1351
 msgid "show ignored files"
 msgstr "mostrar ficheiros ignorados"
 
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
 msgid "when"
 msgstr "quando"
 
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -5414,200 +5715,199 @@ msgstr ""
 "ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. "
 "(Predefinição: all)"
 
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
 msgid "list untracked files in columns"
 msgstr "listar ficheiros não controlados em colunas"
 
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
 msgid "couldn't look up newly created commit"
 msgstr "não foi possível consultar o commit recém-criado"
 
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
 msgid "could not parse newly created commit"
 msgstr "não foi possível analisar o commit recém-criado"
 
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
 msgid "detached HEAD"
 msgstr "HEAD destacada"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
 msgid " (root-commit)"
 msgstr " (commit-raiz)"
 
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
 msgid "suppress summary after successful commit"
-msgstr "suprimir o resumo depois de fazer commit com sucesso"
+msgstr "suprimir o resumo depois de submeter com sucesso"
 
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
 msgid "show diff in commit message template"
 msgstr "mostrar diff no modelo da mensagem de commit"
 
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
 msgid "Commit message options"
 msgstr "Opções de mensagem de commit"
 
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
 msgid "read message from file"
 msgstr "ler mensagem de um ficheiro"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "author"
 msgstr "autor"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "override author for commit"
 msgstr "substituir autor do commit"
 
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
 msgid "date"
 msgstr "data"
 
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
 msgid "override date for commit"
 msgstr "substituir data do commit"
 
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
 #: builtin/notes.c:558 builtin/tag.c:349
 msgid "message"
 msgstr "mensagem"
 
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
 msgid "commit message"
 msgstr "mensagem de commit"
 
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
 msgid "commit"
 msgstr "commit"
 
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
 msgid "reuse and edit message from specified commit"
 msgstr "reutilizar e editar a mensagem de um commit especificado"
 
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
 msgid "reuse message from specified commit"
 msgstr "reutilizar a mensagem de um commit especificado"
 
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "usar mensagem com formato autosquash para corrigir o commit especificado"
 
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
 msgid "use autosquash formatted message to squash specified commit"
-msgstr ""
-"usar mensagem com formato autosquash para esmagar o commit especificado"
+msgstr "usar mensagem com formato autosquash para esmagar o commit especificado"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1603
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "agora sou eu o autor do commit (usado com C/-c/--amend)"
 
-#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
 msgid "add Signed-off-by:"
 msgstr "adicionar Signed-off-by:"
 
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
 msgid "use specified template file"
 msgstr "usar ficheiro de modelo especificado"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
 msgid "force edit of commit"
 msgstr "forçar edição do commit"
 
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
 msgid "default"
 msgstr "predefinição"
 
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
 msgid "how to strip spaces and #comments from message"
 msgstr "como retirar espaços e #comentários da mensagem"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
 msgid "include status in commit message template"
 msgstr "incluir status no modelo da mensagem de commit"
 
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
 #: builtin/revert.c:93
 msgid "GPG sign commit"
 msgstr "assinar o commit com GPG"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
 msgid "Commit contents options"
 msgstr "Opções de conteúdo do commit"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
 msgid "commit all changed files"
-msgstr "fazer commit de todos os ficheiros alterados"
+msgstr "submeter todos os ficheiros alterados"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
 msgid "add specified files to index for commit"
-msgstr "adicionar ficheiros especificados ao índice para incluir no commit"
+msgstr "adicionar ficheiros especificados ao índice para submeter"
 
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
 msgid "interactively add files"
 msgstr "adicionar ficheiros interativamente"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
 msgid "interactively add changes"
 msgstr "adicionar alterações interativamente"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
 msgid "commit only specified files"
-msgstr "fazer commit somente dos ficheiros especificados"
+msgstr "submeter somente os ficheiros especificados"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
 msgid "bypass pre-commit hook"
 msgstr "ignorar pre-commit hook"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
 msgid "show what would be committed"
-msgstr "mostrar o que será incluído no commit"
+msgstr "mostrar o que seria submetido"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
 msgid "amend previous commit"
 msgstr "emendar o commit anterior"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
 msgid "bypass post-rewrite hook"
 msgstr "ignorar post-rewrite hook"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
 msgid "ok to record an empty change"
 msgstr "aceitar o registo duma alteração vazia"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
 msgid "ok to record a change with an empty message"
 msgstr "aceitar o registo duma alteração com uma mensagem vazia"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
 msgid "could not parse HEAD commit"
 msgstr "não foi possível analisar o commit HEAD"
 
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Ficheiro MERGE_HEAD corrompido (%s)"
 
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
 msgid "could not read MERGE_MODE"
 msgstr "não foi possível ler MERGE_MODE"
 
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "não foi possível ler a mensagem de commit: %s"
 
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "A abortar o commit; não editou a mensagem.\n"
 
-#: builtin/commit.c:1740
+#: builtin/commit.c:1760
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n"
 
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -5716,7 +6016,7 @@ msgstr "Tipo"
 
 #: builtin/config.c:78
 msgid "value is \"true\" or \"false\""
-msgstr "o valor é \"true\" (verdadeiro) ou \"falso\" (falso)"
+msgstr "o valor é \"true\" (verdadeiro) ou \"false\" (falso)"
 
 #: builtin/config.c:79
 msgid "value is decimal number"
@@ -5756,7 +6056,7 @@ msgstr ""
 msgid "unable to parse default color value"
 msgstr "não é possível analisar o valor de cor por omissão"
 
-#: builtin/config.c:469
+#: builtin/config.c:472
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -5771,7 +6071,7 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:614
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "não é possível criar o ficheiro de configuração %s"
@@ -5786,7 +6086,7 @@ msgstr "imprimir dimensões em formato inteligível por humanos"
 
 #: builtin/describe.c:17
 msgid "git describe [<options>] [<commit-ish>...]"
-msgstr "git describe [<opções>] [<commit-ish>...]"
+msgstr "git describe [<opções>] [<commit-etc>...]"
 
 #: builtin/describe.c:18
 msgid "git describe [<options>] --dirty"
@@ -5807,7 +6107,7 @@ msgstr "a tag anotada %s não tem nenhum nome incorporado"
 msgid "tag '%s' is really '%s' here"
 msgstr "a tag '%s' está de facto em '%s'"
 
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s não é um nome de objeto válido"
@@ -5900,7 +6200,7 @@ msgstr "considerar as <n> tags mais recentes (predefinição: 10)"
 msgid "only consider tags matching <pattern>"
 msgstr "apenas considerar tags que correspondam ao <padrão>"
 
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
 msgid "show abbreviated commit object as fallback"
 msgstr "mostrar objetos de commit abreviados em recurso"
 
@@ -5936,21 +6236,21 @@ msgstr "'%s': não é um ficheiro regular nem uma ligação simbólica"
 msgid "invalid option: %s"
 msgstr "opção inválida: %s"
 
-#: builtin/diff.c:358
+#: builtin/diff.c:360
 msgid "Not a git repository"
 msgstr "Não é um repositório git"
 
-#: builtin/diff.c:401
+#: builtin/diff.c:403
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objeto inválido '%s' fornecido."
 
-#: builtin/diff.c:410
+#: builtin/diff.c:412
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "mais do que dois blobs fornecidos: '%s'"
 
-#: builtin/diff.c:417
+#: builtin/diff.c:419
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "objeto sem tratamento '%s' fornecido."
@@ -6009,8 +6309,7 @@ msgstr "anonimizar saída"
 
 #: builtin/fetch.c:20
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr ""
-"git fetch [<opções>] [<repositório> [<especificador-de-referência>...]]"
+msgstr "git fetch [<opções>] [<repositório> [<especificador-de-referência>...]]"
 
 #: builtin/fetch.c:21
 msgid "git fetch [<options>] <group>"
@@ -6024,19 +6323,19 @@ msgstr "git fetch --multiple [<opções>] [(<repositório> | <grupo>)...]"
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opções>]"
 
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
 msgid "fetch from all remotes"
 msgstr "obter de todos os remotos"
 
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "acrescentar a .git/FETCH_HEAD em vez de substituir"
 
-#: builtin/fetch.c:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
 msgid "path to upload pack on remote end"
 msgstr "caminho para o comando upload pack no remoto"
 
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
 msgid "force overwrite of local branch"
 msgstr "forçar a substituição do ramo local"
 
@@ -6044,7 +6343,7 @@ msgstr "forçar a substituição do ramo local"
 msgid "fetch from multiple remotes"
 msgstr "obter de múltiplos remotos"
 
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
 msgid "fetch all tags and associated objects"
 msgstr "obter todas as tags e objetos associados"
 
@@ -6056,19 +6355,19 @@ msgstr "não obter todas as tags (--no-tags)"
 msgid "number of submodules fetched in parallel"
 msgstr "número de submódulos obtidos em paralelo"
 
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
 msgid "prune remote-tracking branches no longer on remote"
-msgstr "eliminar os ramos cujo respetivo ramo remoto já não existe"
+msgstr "eliminar os ramos de monitorização remotos que já não existem no remoto"
 
-#: builtin/fetch.c:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
 msgid "control recursive fetching of submodules"
 msgstr "controlar a obtenção recursiva de submódulos"
 
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
 msgid "keep downloaded pack"
 msgstr "manter o pacote transferido"
 
@@ -6076,15 +6375,15 @@ msgstr "manter o pacote transferido"
 msgid "allow updating of HEAD ref"
 msgstr "permitir a atualização da referência HEAD"
 
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
 msgid "deepen history of shallow clone"
 msgstr "aprofundar o histórico de um clone raso"
 
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
 msgid "convert to a complete repository"
 msgstr "converter num repositório completo"
 
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
 msgid "dir"
 msgstr "dir"
 
@@ -6096,15 +6395,15 @@ msgstr "preceder isto ao caminho do submódulo"
 msgid "default mode for recursion"
 msgstr "modo recursivo por omissão"
 
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
 msgid "accept refs that update .git/shallow"
 msgstr "aceitar referência que atualizem .git/shallow"
 
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
 msgid "refmap"
 msgstr "mapa de referências"
 
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
 msgid "specify fetch refmap"
 msgstr "especificar mapa de referências"
 
@@ -6162,11 +6461,6 @@ msgstr "atualização forçada"
 msgid "(non-fast-forward)"
 msgstr "(sem avanço rápido)"
 
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "não é possível abrir %s: %s\n"
-
 #: builtin/fetch.c:619
 #, c-format
 msgid "%s did not send all necessary objects\n"
@@ -6212,7 +6506,7 @@ msgstr "(nenhum)"
 #: builtin/fetch.c:841
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "Não é possível obter objetos no ramo atual %s de um repositório não nu"
+msgstr "Obtenção de objetos no ramo atual %s de um repositório não nu recusada"
 
 #: builtin/fetch.c:860
 #, c-format
@@ -6352,11 +6646,11 @@ msgstr "imprimir apenas referências que apontem para o objeto fornecido"
 
 #: builtin/for-each-ref.c:43
 msgid "print only refs that are merged"
-msgstr "imprimir apenas referenciadas incorporadas"
+msgstr "imprimir apenas referenciadas integradas"
 
 #: builtin/for-each-ref.c:44
 msgid "print only refs that are not merged"
-msgstr "imprimir apenas referências não incorporadas"
+msgstr "imprimir apenas referências não integrada"
 
 #: builtin/for-each-ref.c:45
 msgid "print only refs which contain the commit"
@@ -6370,55 +6664,55 @@ msgstr "A verificar conectividade"
 msgid "Checking object directories"
 msgstr "A verificar diretórios de objetos"
 
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opções>] [<objeto>...]"
 
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
 msgid "show unreachable objects"
 msgstr "mostrar objetos inalcançáveis"
 
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
 msgid "show dangling objects"
 msgstr "mostrar objetos suspensos"
 
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
 msgid "report tags"
 msgstr "mostrar tags"
 
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
 msgid "report root nodes"
 msgstr "mostrar nós raiz"
 
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
 msgid "make index objects head nodes"
 msgstr "considerar objetos do índice como nós cabeça"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
 msgid "make reflogs head nodes (default)"
 msgstr "considerar os reflogs como nós cabeça (predefinição)"
 
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
 msgid "also consider packs and alternate objects"
-msgstr "considerar também pacotes e objetos alternate"
+msgstr "considerar também pacotes e objetos sobressalente"
 
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
 msgid "check only connectivity"
 msgstr "verificar só a conetividade"
 
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
 msgid "enable more strict checking"
 msgstr "ativar verificação mais rigorosa"
 
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
 msgid "write dangling objects in .git/lost-found"
 msgstr "escrever objetos suspensos em .git/lost-found"
 
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
 msgid "show progress"
 msgstr "mostrar progresso"
 
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
 msgid "Checking objects"
 msgstr "A verificar objetos"
 
@@ -6446,7 +6740,7 @@ msgid ""
 "%s"
 msgstr ""
 "A última execução do gc reportou o seguinte.\n"
-"Corrija a raiz do problema e remova %s.\n"
+"Corrija a origem do problema e remova %s.\n"
 "A limpeza automática não será realizada enquanto o ficheiro existir.\n"
 "\n"
 "%s"
@@ -6523,229 +6817,229 @@ msgstr "não foi possível ler a árvore (%s)"
 msgid "unable to grep from object of type %s"
 msgstr "não foi possível efetuar grep de objetos do tipo %s"
 
-#: builtin/grep.c:558
+#: builtin/grep.c:560
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "a opção '%c' espera um valor numérico"
 
-#: builtin/grep.c:575
+#: builtin/grep.c:577
 #, c-format
 msgid "cannot open '%s'"
 msgstr "não é possível abrir '%s'"
 
-#: builtin/grep.c:644
+#: builtin/grep.c:646
 msgid "search in index instead of in the work tree"
 msgstr "procurar no índice em vez de procurar na árvore de trabalho"
 
-#: builtin/grep.c:646
+#: builtin/grep.c:648
 msgid "find in contents not managed by git"
 msgstr "procurar em conteúdos não geridos pelo git"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:650
 msgid "search in both tracked and untracked files"
 msgstr "procurar em ficheiros controlados e não controlados"
 
-#: builtin/grep.c:650
+#: builtin/grep.c:652
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorar ficheiros especificados via '.gitignore'"
 
-#: builtin/grep.c:653
+#: builtin/grep.c:655
 msgid "show non-matching lines"
 msgstr "mostrar linhas não correspondidas"
 
-#: builtin/grep.c:655
+#: builtin/grep.c:657
 msgid "case insensitive matching"
 msgstr "não diferenciar maiúsculas de minúsculas"
 
-#: builtin/grep.c:657
+#: builtin/grep.c:659
 msgid "match patterns only at word boundaries"
 msgstr "corresponder padrões apenas a palavras"
 
-#: builtin/grep.c:659
+#: builtin/grep.c:661
 msgid "process binary files as text"
 msgstr "processar ficheiros binários como texto"
 
-#: builtin/grep.c:661
+#: builtin/grep.c:663
 msgid "don't match patterns in binary files"
 msgstr "ignorar ficheiros binários"
 
-#: builtin/grep.c:664
+#: builtin/grep.c:666
 msgid "process binary files with textconv filters"
 msgstr "processar ficheiros binários com filtros textconv"
 
-#: builtin/grep.c:666
+#: builtin/grep.c:668
 msgid "descend at most <depth> levels"
 msgstr "descer no máximo até <profundidade>"
 
-#: builtin/grep.c:670
+#: builtin/grep.c:672
 msgid "use extended POSIX regular expressions"
 msgstr "usar expressões regulares estendidas do POSIX"
 
-#: builtin/grep.c:673
+#: builtin/grep.c:675
 msgid "use basic POSIX regular expressions (default)"
 msgstr "usar expressões regulares básicas do POSIX (predefinição)"
 
-#: builtin/grep.c:676
+#: builtin/grep.c:678
 msgid "interpret patterns as fixed strings"
 msgstr "interpretar padrões como cadeias de caracteres fixas"
 
-#: builtin/grep.c:679
+#: builtin/grep.c:681
 msgid "use Perl-compatible regular expressions"
 msgstr "usar expressões regulares compatíveis com Perl"
 
-#: builtin/grep.c:682
+#: builtin/grep.c:684
 msgid "show line numbers"
 msgstr "mostrar números de linha"
 
-#: builtin/grep.c:683
+#: builtin/grep.c:685
 msgid "don't show filenames"
 msgstr "não mostrar nomes de ficheiro"
 
-#: builtin/grep.c:684
+#: builtin/grep.c:686
 msgid "show filenames"
 msgstr "mostrar nomes de ficheiro"
 
-#: builtin/grep.c:686
+#: builtin/grep.c:688
 msgid "show filenames relative to top directory"
 msgstr "mostrar nomes de ficheiro relativamente ao diretório superior"
 
-#: builtin/grep.c:688
+#: builtin/grep.c:690
 msgid "show only filenames instead of matching lines"
 msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"
 
-#: builtin/grep.c:690
+#: builtin/grep.c:692
 msgid "synonym for --files-with-matches"
 msgstr "sinónimo de --files-with-matches"
 
-#: builtin/grep.c:693
+#: builtin/grep.c:695
 msgid "show only the names of files without match"
 msgstr "mostrar apenas nomes de ficheiro sem correspondência"
 
-#: builtin/grep.c:695
+#: builtin/grep.c:697
 msgid "print NUL after filenames"
 msgstr "imprimir NUL depois dos nomes de ficheiro"
 
-#: builtin/grep.c:697
+#: builtin/grep.c:699
 msgid "show the number of matches instead of matching lines"
 msgstr "mostrar o número de correspondências em vez das linha correspondidas"
 
-#: builtin/grep.c:698
+#: builtin/grep.c:700
 msgid "highlight matches"
 msgstr "realçar correspondências"
 
-#: builtin/grep.c:700
+#: builtin/grep.c:702
 msgid "print empty line between matches from different files"
 msgstr ""
 "imprimir uma linha em branco entre correspondências de diferentes ficheiros"
 
-#: builtin/grep.c:702
+#: builtin/grep.c:704
 msgid "show filename only once above matches from same file"
 msgstr ""
 "mostrar só uma vez o nome do ficheiro acima das correspondências dentro do "
 "mesmo ficheiro"
 
-#: builtin/grep.c:705
+#: builtin/grep.c:707
 msgid "show <n> context lines before and after matches"
 msgstr "mostrar <n> linhas de contexto antes e depois das correspondências"
 
-#: builtin/grep.c:708
+#: builtin/grep.c:710
 msgid "show <n> context lines before matches"
 msgstr "mostrar <n> linhas de contexto antes das correspondências"
 
-#: builtin/grep.c:710
+#: builtin/grep.c:712
 msgid "show <n> context lines after matches"
 msgstr "mostrar <n> linhas de contexto depois das correspondências"
 
-#: builtin/grep.c:712
+#: builtin/grep.c:714
 msgid "use <n> worker threads"
 msgstr "usar <n> threads de trabalho"
 
-#: builtin/grep.c:713
+#: builtin/grep.c:715
 msgid "shortcut for -C NUM"
 msgstr "atalho para -C NUM"
 
-#: builtin/grep.c:716
+#: builtin/grep.c:718
 msgid "show a line with the function name before matches"
 msgstr "mostrar uma linha com o nome da função antes das correspondências"
 
-#: builtin/grep.c:718
+#: builtin/grep.c:720
 msgid "show the surrounding function"
 msgstr "mostrar a função circundante"
 
-#: builtin/grep.c:721
+#: builtin/grep.c:723
 msgid "read patterns from file"
 msgstr "ler padrões do ficheiro"
 
-#: builtin/grep.c:723
+#: builtin/grep.c:725
 msgid "match <pattern>"
 msgstr "procurar <padrão>"
 
-#: builtin/grep.c:725
+#: builtin/grep.c:727
 msgid "combine patterns specified with -e"
 msgstr "combinar padrões especificados com -e"
 
-#: builtin/grep.c:737
+#: builtin/grep.c:739
 msgid "indicate hit with exit status without output"
 msgstr "indicar padrão encontrado no valor de saída, mas não imprimir"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:741
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "mostrar apenas correspondências de ficheiro que tenham todos os padrões"
 
-#: builtin/grep.c:741
+#: builtin/grep.c:743
 msgid "show parse tree for grep expression"
 msgstr "mostrar árvore de analise da expressões grep"
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "pager"
 msgstr "paginador"
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "show matching files in the pager"
 msgstr "mostrar ficheiros com correspondências no paginador"
 
-#: builtin/grep.c:748
+#: builtin/grep.c:750
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permitir invocar grep(1) (ignorado nesta compilação)"
 
-#: builtin/grep.c:811
+#: builtin/grep.c:813
 msgid "no pattern given."
 msgstr "nenhum padrão fornecido."
 
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "número de threads especificado inválido (%d)"
 
-#: builtin/grep.c:873
+#: builtin/grep.c:875
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager só funciona na árvore de trabalho"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:901
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached ou --untracked não podem ser usados com --no-index."
 
-#: builtin/grep.c:904
+#: builtin/grep.c:906
 msgid "--no-index or --untracked cannot be used with revs."
 msgstr "--no-index ou --untracked não podem ser usados em revisões."
 
-#: builtin/grep.c:907
+#: builtin/grep.c:909
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr ""
 "--[no-]exclude-standard não podem ser usados em conteúdos não controlados."
 
-#: builtin/grep.c:915
+#: builtin/grep.c:917
 msgid "both --cached and trees are given."
-msgstr "--cached e árvores fornecidos simultaneamente."
+msgstr "--cached e árvores foram fornecidos simultaneamente."
 
 #: builtin/hash-object.c:81
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
 msgstr ""
-"git hash-object [-t <tipo>] [-w] [--path=<ficheiro> | --no-filters] [--"
-"stdin] [--] <ficheiro>..."
+"git hash-object [-t <tipo>] [-w] [--path=<ficheiro> | --no-filters] [--stdin]"
+" [--] <ficheiro>..."
 
 #: builtin/hash-object.c:82
 msgid "git hash-object  --stdin-paths"
@@ -6826,8 +7120,8 @@ msgstr "a versão do emacsclient '%d' é demasiado antiga (< 22)."
 
 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
 #, c-format
-msgid "failed to exec '%s': %s"
-msgstr "falha ao executar '%s': %s"
+msgid "failed to exec '%s'"
+msgstr "falha ao executar '%s'"
 
 #: builtin/help.c:205
 #, c-format
@@ -6836,7 +7130,7 @@ msgid ""
 "Please consider using 'man.<tool>.cmd' instead."
 msgstr ""
 "'%s': caminho para visualizador de manual não suportado.\n"
-"Considere usar 'man.<tool>.cmd'."
+"Considere usar 'man.<ferramenta>.cmd'."
 
 #: builtin/help.c:217
 #, c-format
@@ -6845,12 +7139,12 @@ msgid ""
 "Please consider using 'man.<tool>.path' instead."
 msgstr ""
 "'%s': comando de visualizador de manual suportado.\n"
-"Considere usar 'man.<tool>.path'."
+"Considere usar 'man.<ferramenta>.path'."
 
 #: builtin/help.c:334
 #, c-format
 msgid "'%s': unknown man viewer."
-msgstr "'%s' visualizador de manual desconhecido."
+msgstr "'%s': visualizador de manual desconhecido."
 
 #: builtin/help.c:351
 msgid "no man viewer handled the request"
@@ -6910,7 +7204,7 @@ msgstr "'git %s' é um alias de '%s'"
 #: builtin/index-pack.c:152
 #, c-format
 msgid "unable to open %s"
-msgstr "não foi possível ler %s"
+msgstr "não foi possível abrir %s"
 
 #: builtin/index-pack.c:202
 #, c-format
@@ -6984,9 +7278,8 @@ msgid "offset value overflow for delta base object"
 msgstr "delta de objeto base com capacidade excedida no valor de offset"
 
 #: builtin/index-pack.c:530
-#, fuzzy
 msgid "delta base offset is out of bound"
-msgstr "um offset de base delta ultrapassou o limite"
+msgstr "offset da base delta está fora do limite"
 
 #: builtin/index-pack.c:538
 #, c-format
@@ -7087,107 +7380,109 @@ msgstr "extrema confusão"
 
 #: builtin/index-pack.c:1253
 #, c-format
-msgid "completed with %d local objects"
-msgstr "concluído com %d objetos locais"
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "concluído com %d objeto local"
+msgstr[1] "concluído com %d objetos locais"
 
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1265
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Soma de verificação inesperada no final de %s (corrupção no disco?)"
 
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "pacote com %d delta não resolvido"
 msgstr[1] "pacote com %d deltas não resolvidos"
 
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1293
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "não é possível compactar objeto acrescentado (%d)"
 
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "objeto local %s corrompido"
 
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
 msgid "error while closing pack file"
 msgstr "erro ao fechar ficheiro de pacote"
 
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "não é possível escrever o ficheiro de conservação '%s'"
 
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "não é possível fechar o ficheiro de conservação '%s' escrito"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
 msgid "cannot store pack file"
 msgstr "não é possível guardar ficheiro de pacote"
 
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
 msgid "cannot store index file"
 msgstr "não é possível guardar o ficheiro índice"
 
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "pack.indexversion=%<PRIu32> incorreto"
 
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "sem suporte de threads, %s ignorado"
 
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Não é possível abrir o ficheiro de pacote '%s' existente"
 
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Não é possível abrir o ficheiro de índice do pacote existente de '%s'"
 
-#: builtin/index-pack.c:1587
+#: builtin/index-pack.c:1589
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "%d objeto não delta"
 msgstr[1] "%d objetos não delta"
 
-#: builtin/index-pack.c:1594
+#: builtin/index-pack.c:1596
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "comprimento de cadeia = %d: %lu objeto"
 msgstr[1] "comprimento de cadeia = %d: %lu objetos"
 
-#: builtin/index-pack.c:1624
+#: builtin/index-pack.c:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "o nome do ficheiro de pacote '%s' não termina em '.pack'"
+
+#: builtin/index-pack.c:1638
 msgid "Cannot come back to cwd"
 msgstr "Não é possível voltar ao diretório de trabalho atual"
 
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
 #, c-format
 msgid "bad %s"
 msgstr "%s incorreto"
 
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin não pode ser usado sem --stdin"
 
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "o nome do ficheiro de pacote '%s' não termina em '.pack'"
-
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1731
 msgid "--verify with no packfile name given"
 msgstr "--verify sem nome do ficheiro de pacote indicado"
 
@@ -7226,28 +7521,27 @@ msgstr "não é possível copiar '%s' para '%s'"
 msgid "ignoring template %s"
 msgstr "modelo %s ignorado"
 
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
 #, c-format
 msgid "templates not found %s"
 msgstr "modelos não encontrados em %s"
 
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
 #, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr ""
-"os modelos com versão de formato %d incorreta não foram copiados de '%s'"
+msgid "not copying templates from '%s': %s"
+msgstr "modelos não copiados de '%s': %s"
 
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
 #, c-format
 msgid "%s already exists"
 msgstr "%s já existe"
 
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "não foi possível processar o tipo de ficheiro %d"
 
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "não foi possível mover %s para %s"
@@ -7255,51 +7549,51 @@ msgstr "não foi possível mover %s para %s"
 #. TRANSLATORS: The first '%s' is either "Reinitialized
 #. existing" or "Initialized empty", the second " shared" or
 #. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
 #, c-format
 msgid "%s%s Git repository in %s%s\n"
 msgstr "Repositório Git %s%s em %s%s\n"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Reinitialized existing"
 msgstr "existente reinicializado"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Initialized empty"
 msgstr "vazio inicializado"
 
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
 msgid " shared"
 msgstr " partilhado"
 
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
 msgstr ""
-"git init [-q | --quiet] [--bare] [--template=<diretório-modelo>] [--"
-"shared[=<permissões>]] [<diretório>]"
+"git init [-q | --quiet] [--bare] [--template=<diretório-modelo>] "
+"[--shared[=<permissões>]] [<diretório>]"
 
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
 msgid "permissions"
 msgstr "permissões"
 
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 "especificar que o repositório git será partilhado por vários utilizadores"
 
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "não é possível criar o diretório %s"
 
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "não é possível mudar para o diretório %s"
 
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7308,7 +7602,7 @@ msgstr ""
 "%s (ou --work-tree=<diretório>) não é permitido sem especificar %s (ou --git-"
 "dir=<diretório>)"
 
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Não é possível aceder à árvore de trabalho '%s'"
@@ -7354,267 +7648,319 @@ msgstr "git show [<opções>] <objeto>..."
 msgid "invalid --decorate option: %s"
 msgstr "opção --decorate inválida: %s"
 
-#: builtin/log.c:131
+#: builtin/log.c:137
 msgid "suppress diff output"
 msgstr "suprimir saída do diff"
 
-#: builtin/log.c:132
+#: builtin/log.c:138
 msgid "show source"
 msgstr "mostrar origem"
 
-#: builtin/log.c:133
+#: builtin/log.c:139
 msgid "Use mail map file"
 msgstr "usar ficheiro de mapeamento de correio"
 
-#: builtin/log.c:134
+#: builtin/log.c:140
 msgid "decorate options"
 msgstr "opções de decoração"
 
-#: builtin/log.c:137
+#: builtin/log.c:143
 msgid "Process line range n,m in file, counting from 1"
 msgstr "processar intervalo de linhas n,m, a cantar a partir de 1"
 
-#: builtin/log.c:233
+#: builtin/log.c:239
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Resultado final: %d %s\n"
 
-#: builtin/log.c:465
+#: builtin/log.c:471
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ficheiro incorreto"
 
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
 #, c-format
 msgid "Could not read object %s"
 msgstr "Não foi possível ler o objeto %s"
 
-#: builtin/log.c:596
+#: builtin/log.c:602
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Tipo desconhecido: %d"
 
-#: builtin/log.c:715
+#: builtin/log.c:722
 msgid "format.headers without value"
 msgstr "format.headers sem valor"
 
-#: builtin/log.c:801
+#: builtin/log.c:812
 msgid "name of output directory is too long"
 msgstr "o nome do diretório de saída é demasiado longo"
 
-#: builtin/log.c:816
+#: builtin/log.c:827
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Não é possível abrir o ficheiro de patch %s"
 
-#: builtin/log.c:830
+#: builtin/log.c:841
 msgid "Need exactly one range."
 msgstr "É necessário exatamente um intervalo."
 
-#: builtin/log.c:840
+#: builtin/log.c:851
 msgid "Not a range."
 msgstr "Não é um intervalo."
 
-#: builtin/log.c:946
+#: builtin/log.c:957
 msgid "Cover letter needs email format"
 msgstr "A carta de apresentação precisa de um formato de e-mail"
 
-#: builtin/log.c:1025
+#: builtin/log.c:1036
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to incorreto: %s"
 
-#: builtin/log.c:1053
+#: builtin/log.c:1064
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opções>] [<desde> | <intervalo-de-revisões>]"
 
-#: builtin/log.c:1098
+#: builtin/log.c:1109
 msgid "Two output directories?"
 msgstr "Dois diretórios de saída?"
 
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "Commit desconhecido %s"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Falha ao resolver '%s' numa referência válida."
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr "Não foi possível encontrar a base exata de integração."
+
+#: builtin/log.c:1235
+msgid ""
+"Failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually."
+msgstr ""
+"Falha ao obter ramo a montante, se quer gravar o commit base automaticamente,"
+"\n"
+"use branch --set-upstream-to para seguir um ramo remoto.\n"
+"Ou pode especificar o commit base com --base=<base-commit-id> manualmente."
+
+#: builtin/log.c:1255
+msgid "Failed to find exact merge base"
+msgstr "Falha ao procurar base exata de integração"
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr "o commit base deve ser o antecessor da lista de revisões"
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr "o commit base não deve fazer parte da lista de revisões"
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr "não é possível obter o id do patch"
+
+#: builtin/log.c:1377
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "usar [PATCH n/m] mesmo com um único patch"
 
-#: builtin/log.c:1217
+#: builtin/log.c:1380
 msgid "use [PATCH] even with multiple patches"
 msgstr "usar [PATCH] mesmo com múltiplos patches"
 
-#: builtin/log.c:1221
+#: builtin/log.c:1384
 msgid "print patches to standard out"
 msgstr "imprimir patches para a saída padrão"
 
-#: builtin/log.c:1223
+#: builtin/log.c:1386
 msgid "generate a cover letter"
 msgstr "gerar uma carta de apresentação"
 
-#: builtin/log.c:1225
+#: builtin/log.c:1388
 msgid "use simple number sequence for output file names"
 msgstr ""
 "usar uma sequência de números simples para denominar os ficheiros gerados"
 
-#: builtin/log.c:1226
+#: builtin/log.c:1389
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1227
+#: builtin/log.c:1390
 msgid "use <sfx> instead of '.patch'"
 msgstr "usar <sfx> em vez de '.patch'"
 
-#: builtin/log.c:1229
+#: builtin/log.c:1392
 msgid "start numbering patches at <n> instead of 1"
 msgstr "começar a numerar os patches em <n> em vez de 1"
 
-#: builtin/log.c:1231
+#: builtin/log.c:1394
 msgid "mark the series as Nth re-roll"
 msgstr "marcar a série como a n-ésima reiteração"
 
-#: builtin/log.c:1233
+#: builtin/log.c:1396
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "usar [<prefixo>] em vez de [PATCH]"
 
-#: builtin/log.c:1236
+#: builtin/log.c:1399
 msgid "store resulting files in <dir>"
 msgstr "guardar os ficheiros resultantes em <dir>"
 
-#: builtin/log.c:1239
+#: builtin/log.c:1402
 msgid "don't strip/add [PATCH]"
 msgstr "não tirar/inserir [PATCH]"
 
-#: builtin/log.c:1242
+#: builtin/log.c:1405
 msgid "don't output binary diffs"
 msgstr "não gerar diffs binários"
 
-#: builtin/log.c:1244
+#: builtin/log.c:1407
 msgid "output all-zero hash in From header"
 msgstr "preencher o cabeçalho From com hash de zeros"
 
-#: builtin/log.c:1246
+#: builtin/log.c:1409
 msgid "don't include a patch matching a commit upstream"
 msgstr "não incluir um patch que coincida com um commit a montante"
 
-#: builtin/log.c:1248
+#: builtin/log.c:1411
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 "mostrar no formato de patch em vez de no formato por omissão (patch + stat)"
 
-#: builtin/log.c:1250
+#: builtin/log.c:1413
 msgid "Messaging"
 msgstr "Mensagem"
 
-#: builtin/log.c:1251
+#: builtin/log.c:1414
 msgid "header"
 msgstr "cabeçalho"
 
-#: builtin/log.c:1252
+#: builtin/log.c:1415
 msgid "add email header"
 msgstr "adicionar cabeçalho de e-mail"
 
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
 msgid "email"
 msgstr "e-mail"
 
-#: builtin/log.c:1253
+#: builtin/log.c:1416
 msgid "add To: header"
 msgstr "adicionar cabeçalho To:"
 
-#: builtin/log.c:1255
+#: builtin/log.c:1418
 msgid "add Cc: header"
 msgstr "adicionar cabeçalho Cc:"
 
-#: builtin/log.c:1257
+#: builtin/log.c:1420
 msgid "ident"
 msgstr "identidade"
 
-#: builtin/log.c:1258
+#: builtin/log.c:1421
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "definir o endereço From como <identidade> (ou como identidade do committer "
 "se não indicado)"
 
-#: builtin/log.c:1260
+#: builtin/log.c:1423
 msgid "message-id"
 msgstr "id-mensagem"
 
-#: builtin/log.c:1261
+#: builtin/log.c:1424
 msgid "make first mail a reply to <message-id>"
 msgstr "usar o primeiro email para responder a <id-mensagem>"
 
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
 msgid "boundary"
 msgstr "limite"
 
-#: builtin/log.c:1263
+#: builtin/log.c:1426
 msgid "attach the patch"
 msgstr "anexar o patch"
 
-#: builtin/log.c:1266
+#: builtin/log.c:1429
 msgid "inline the patch"
 msgstr "incorporar o patch"
 
-#: builtin/log.c:1270
+#: builtin/log.c:1433
 msgid "enable message threading, styles: shallow, deep"
 msgstr "ativar mensagens por tópicos, estilos: shallow (raso), deep (profundo)"
 
-#: builtin/log.c:1272
+#: builtin/log.c:1435
 msgid "signature"
 msgstr "assinatura"
 
-#: builtin/log.c:1273
+#: builtin/log.c:1436
 msgid "add a signature"
 msgstr "adicionar uma assinatura"
 
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "commit-base"
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr "adicionar informação pré-requisito da árvore à série de patches"
+
+#: builtin/log.c:1440
 msgid "add a signature from a file"
 msgstr "adicionar uma assinatura de um ficheiro"
 
-#: builtin/log.c:1276
+#: builtin/log.c:1441
 msgid "don't print the patch filenames"
 msgstr "não imprimir os nomes dos ficheiros de patch"
 
-#: builtin/log.c:1365
+#: builtin/log.c:1531
 msgid "-n and -k are mutually exclusive."
 msgstr "-n e -k são mutuamente exclusivos."
 
-#: builtin/log.c:1367
+#: builtin/log.c:1533
 msgid "--subject-prefix and -k are mutually exclusive."
 msgstr "--subject-prefix e -k são mutuamente exclusivos."
 
-#: builtin/log.c:1375
+#: builtin/log.c:1541
 msgid "--name-only does not make sense"
 msgstr "--name-only não faz sentido"
 
-#: builtin/log.c:1377
+#: builtin/log.c:1543
 msgid "--name-status does not make sense"
 msgstr "--name-status não faz sentido"
 
-#: builtin/log.c:1379
+#: builtin/log.c:1545
 msgid "--check does not make sense"
 msgstr "--check não faz sentido"
 
-#: builtin/log.c:1407
+#: builtin/log.c:1573
 msgid "standard output, or directory, which one?"
 msgstr "saída padrão, ou diretório, qual deles?"
 
-#: builtin/log.c:1409
+#: builtin/log.c:1575
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Não foi possível criar o diretório '%s'"
 
-#: builtin/log.c:1506
+#: builtin/log.c:1672
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "não é possível ler o ficheiro de assinatura '%s'"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1743
 msgid "Failed to create output files"
 msgstr "Falha ao criar os ficheiros de saída"
 
-#: builtin/log.c:1617
+#: builtin/log.c:1792
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<ramo-a-montante> [<head> [<limite>]]]"
 
-#: builtin/log.c:1671
+#: builtin/log.c:1846
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7622,11 +7968,6 @@ msgstr ""
 "O ramo remoto seguido não foi encontrado, especifique <ramo-a-montante> "
 "manualmente.\n"
 
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr "Commit desconhecido %s"
-
 #: builtin/ls-files.c:378
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opções>] [<ficheiro>...]"
@@ -7643,7 +7984,7 @@ msgstr ""
 
 #: builtin/ls-files.c:431
 msgid "show cached files in the output (default)"
-msgstr "mostrar ficheiros em cache na saída"
+msgstr "mostrar ficheiros em cache na saída (predefinição)"
 
 #: builtin/ls-files.c:433
 msgid "show deleted files in the output"
@@ -7684,11 +8025,11 @@ msgstr "não mostrar diretórios vazios"
 
 #: builtin/ls-files.c:453
 msgid "show unmerged files in the output"
-msgstr "mostrar ficheiros com versões não conciliadas, na saída"
+msgstr "mostrar ficheiros não integrados na saída"
 
 #: builtin/ls-files.c:455
 msgid "show resolve-undo information"
-msgstr "mostrar informação de resolver-anular"
+msgstr "mostrar informação de resolver-desfazer"
 
 #: builtin/ls-files.c:457
 msgid "skip files matching pattern"
@@ -7716,11 +8057,12 @@ msgstr "se um <ficheiro> não estiver no índice, tratar como erro"
 
 #: builtin/ls-files.c:472
 msgid "tree-ish"
-msgstr "árvore"
+msgstr "árvore-etc"
 
 #: builtin/ls-files.c:473
 msgid "pretend that paths removed since <tree-ish> are still present"
-msgstr "fingir que os caminhos removidos desde <árvore> ainda estão presentes"
+msgstr ""
+"fingir que os caminhos removidos desde <árvore-etc> ainda estão presentes"
 
 #: builtin/ls-files.c:475
 msgid "show debugging data"
@@ -7774,7 +8116,7 @@ msgstr "mostrar a referência subjacente em adição ao objeto por ela apontado"
 
 #: builtin/ls-tree.c:28
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr "git ls-tree [<opções>] <árvore> [<caminho>...]"
+msgstr "git ls-tree [<opções>] <árvore-etc> [<caminho>...]"
 
 #: builtin/ls-tree.c:128
 msgid "only show trees"
@@ -7821,172 +8163,178 @@ msgstr "git merge [<opções>] <msg> HEAD <commit>"
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:100
+#: builtin/merge.c:101
 msgid "switch `m' requires a value"
 msgstr "a opção 'm' requer um valor"
 
-#: builtin/merge.c:137
+#: builtin/merge.c:138
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
-msgstr "Estratégia de merge '%s' não encontrada.\n"
+msgstr "Estratégia de integração '%s' não encontrada.\n"
 
-#: builtin/merge.c:138
+#: builtin/merge.c:139
 #, c-format
 msgid "Available strategies are:"
 msgstr "Estratégias disponíveis:"
 
-#: builtin/merge.c:143
+#: builtin/merge.c:144
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Estratégias personalizadas disponíveis:"
 
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
 msgid "do not show a diffstat at the end of the merge"
-msgstr "não apresentar um diffstat no final do merge"
+msgstr "não apresentar um diffstat ao fim da integração"
 
-#: builtin/merge.c:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
 msgid "show a diffstat at the end of the merge"
-msgstr "mostrar um diffstat no final do merge"
+msgstr "mostrar um diffstat ao fim da integração"
 
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
 msgid "(synonym to --stat)"
 msgstr "(sinónimo de --stat)"
 
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
-"adicionar (no máximo <n>) entradas do shortlog à mensagem de commit do merge"
+"adicionar (no máximo <n>) entradas do shortlog à mensagem de commit da "
+"integração"
 
-#: builtin/merge.c:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
 msgid "create a single commit instead of doing a merge"
-msgstr "criar um único commit em vez de realizar um merge"
+msgstr "criar um único commit em vez de realizar uma integração"
 
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
 msgid "perform a commit if the merge succeeds (default)"
-msgstr "realizar um commit se o merge for bem sucedido (predefinição)"
+msgstr "realizar um commit se a integração for bem sucedida (predefinição)"
 
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
 msgid "edit message before committing"
-msgstr "editar a mensagem antes de realizar commit"
+msgstr "editar a mensagem antes de submeter"
 
-#: builtin/merge.c:207
+#: builtin/merge.c:208
 msgid "allow fast-forward (default)"
 msgstr "permitir avanço rápido (predefinição)"
 
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
 msgid "abort if fast-forward is not possible"
 msgstr "abortar se não é possível efetuar avanço rápido"
 
-#: builtin/merge.c:213
+#: builtin/merge.c:214
 msgid "Verify that the named commit has a valid GPG signature"
 msgstr "verificar se o commit tem uma assinatura GPG válida"
 
-#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
 #: builtin/revert.c:89
 msgid "strategy"
 msgstr "estratégia"
 
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "merge strategy to use"
-msgstr "estratégia de merge a usar"
+msgstr "estratégia de integração a usar"
 
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
 msgid "option=value"
 msgstr "opção=valor"
 
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
 msgid "option for selected merge strategy"
-msgstr "opções para a estratégia de merge selecionada"
+msgstr "opções da estratégia de integração selecionada"
 
-#: builtin/merge.c:219
+#: builtin/merge.c:220
 msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "mensagem de commit (de merge não suscetível a avanço rápido)"
+msgstr "mensagem de commit (de integração não suscetível a avanço rápido)"
 
-#: builtin/merge.c:223
+#: builtin/merge.c:224
 msgid "abort the current in-progress merge"
-msgstr "abortar merge em curso"
+msgstr "abortar integração em curso"
 
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "permitir integração de históricos não relacionados"
+
+#: builtin/merge.c:254
 msgid "could not run stash."
 msgstr "não foi possível executar o comando stash."
 
-#: builtin/merge.c:256
+#: builtin/merge.c:259
 msgid "stash failed"
 msgstr "falha ao executar o comando stash"
 
-#: builtin/merge.c:261
+#: builtin/merge.c:264
 #, c-format
 msgid "not a valid object: %s"
 msgstr "nome de objeto inválido: %s"
 
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
 msgid "read-tree failed"
 msgstr "falha ao executar o comando read-tree"
 
-#: builtin/merge.c:327
+#: builtin/merge.c:330
 msgid " (nothing to squash)"
 msgstr " (não há nada para esmagar)"
 
-#: builtin/merge.c:340
+#: builtin/merge.c:343
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Commit esmagado -- HEAD não atualizada\n"
 
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
 #, c-format
 msgid "Could not write to '%s'"
 msgstr "Não foi possível escrever em '%s'"
 
-#: builtin/merge.c:372
+#: builtin/merge.c:375
 msgid "Writing SQUASH_MSG"
 msgstr "A escrever SQUASH_MSG"
 
-#: builtin/merge.c:374
+#: builtin/merge.c:377
 msgid "Finishing SQUASH_MSG"
 msgstr "A concluir SQUASH_MSG"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:400
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
-msgstr "Sem mensagem de merge -- HEAD não atualizada\n"
+msgstr "Nenhuma mensagem de integração -- HEAD não atualizada\n"
 
-#: builtin/merge.c:448
+#: builtin/merge.c:451
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' não aponta para um commit"
 
-#: builtin/merge.c:538
+#: builtin/merge.c:541
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Valor de branch.%s.mergeoptions incorreto: %s"
 
-#: builtin/merge.c:657
+#: builtin/merge.c:660
 msgid "Not handling anything other than two heads merge."
-msgstr "A processar exclusivamente merge de duas cabeças."
+msgstr "Não se processa outra coisa senão incorporação de duas cabeças."
 
-#: builtin/merge.c:671
+#: builtin/merge.c:674
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Opção desconhecida de merge-recursive: -X%s"
 
-#: builtin/merge.c:684
+#: builtin/merge.c:687
 #, c-format
 msgid "unable to write %s"
 msgstr "não foi possível escrever %s"
 
-#: builtin/merge.c:773
+#: builtin/merge.c:776
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Não foi possível ler '%s'"
 
-#: builtin/merge.c:782
+#: builtin/merge.c:785
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
-"Commit do merge não realizado; use 'git commit' para concluir o merge.\n"
+"Commit de integração não realizado; use 'git commit' para concluir a "
+"integração.\n"
 
-#: builtin/merge.c:788
+#: builtin/merge.c:791
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -7995,180 +8343,184 @@ msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
 "the commit.\n"
 msgstr ""
-"Introduza uma mensagem de commit, explicando por que este merge é "
+"Introduza uma mensagem de commit, explicando por que esta integração é "
 "necessário,\n"
-"sobretudo se incorpora um ramo a montante atualizado, com um ramo tópico.\n"
+"sobretudo se incorpora um ramo a montante atualizado, num ramo tópico.\n"
 "\n"
-"Linhas começadas com '%c' são ignoradas, e uma mensagem vazia\n"
+"Linhas começadas com '%c' são ignoradas e uma mensagem vazia\n"
 "aborta o commit.\n"
 
-#: builtin/merge.c:812
+#: builtin/merge.c:815
 msgid "Empty commit message."
 msgstr "Mensagem de commit vazia."
 
-#: builtin/merge.c:824
+#: builtin/merge.c:835
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Maravilhoso.\n"
 
-#: builtin/merge.c:879
+#: builtin/merge.c:890
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
-"Falha ao realizar merge automático; corrija os conflitos e faça commit do "
+"Falha ao realizar integração automática; corrija os conflitos e submeta o "
 "resultado.\n"
 
-#: builtin/merge.c:895
+#: builtin/merge.c:906
 #, c-format
 msgid "'%s' is not a commit"
 msgstr "'%s' não é um commit"
 
-#: builtin/merge.c:936
+#: builtin/merge.c:947
 msgid "No current branch."
 msgstr "Nenhum ramo atual."
 
-#: builtin/merge.c:938
+#: builtin/merge.c:949
 msgid "No remote for the current branch."
 msgstr "Não há um remoto para o ramo atual."
 
-#: builtin/merge.c:940
+#: builtin/merge.c:951
 msgid "No default upstream defined for the current branch."
 msgstr "Não está definido nenhum ramo a montante para o ramo atual."
 
-#: builtin/merge.c:945
+#: builtin/merge.c:956
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
-msgstr "Nenhum ramo remoto seguido por %s de %s"
+msgstr "Nenhum ramo de monitorização remoto seguido por %s de %s"
 
-#: builtin/merge.c:1080
+#: builtin/merge.c:1091
 #, c-format
 msgid "could not close '%s'"
 msgstr "não foi possível fechar '%s'"
 
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
 msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "Não há nenhum merge para abortar (MERGE_HEAD não presente)."
+msgstr "Não há nenhuma integração para se abortar (MERGE_HEAD não presente)."
 
-#: builtin/merge.c:1223
+#: builtin/merge.c:1235
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
-"Merge não concluído (MERGE_HEAD presente).\n"
-"Faça commit das suas alterações antes de realizar merge."
+"Não concluiu a integração (MERGE_HEAD presente).\n"
+"Submeta as suas alterações antes de integrar."
 
-#: builtin/merge.c:1230
+#: builtin/merge.c:1242
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 "Cherry-pick não concluído (CHERRY_PICK_HEAD presente).\n"
-"Faça commit das suas alterações antes de realizar merge."
+"Submeta as suas alterações antes de integrar."
 
-#: builtin/merge.c:1233
+#: builtin/merge.c:1245
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Cherry-pick não concluído (CHERRY_PICK_HEAD presente)."
 
-#: builtin/merge.c:1242
+#: builtin/merge.c:1254
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Não é possível combinar --squash e --no-ff."
 
-#: builtin/merge.c:1250
+#: builtin/merge.c:1262
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Nenhum commit especificado e merge.defaultToUpstream não definido."
 
-#: builtin/merge.c:1267
+#: builtin/merge.c:1279
 msgid "Squash commit into empty head not supported yet"
 msgstr "Esmagar um commit numa cabeça vazia ainda não é suportado"
 
-#: builtin/merge.c:1269
+#: builtin/merge.c:1281
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
-"Não faz sentido efetuar commit não suscetível a avanço rápido, numa cabeça "
+"Não faz sentido submeter de modo não suscetível a avanço rápido, numa cabeça "
 "vazia"
 
-#: builtin/merge.c:1275
+#: builtin/merge.c:1286
 #, c-format
 msgid "%s - not something we can merge"
-msgstr "%s - não é algo suscetível a merge"
+msgstr "%s - não é algo se possa integrar"
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
 msgid "Can merge only exactly one commit into empty head"
-msgstr "Só é possível realizar merge de exatamente um commit numa cabeça vazia"
+msgstr "Só se pode integrar exatamente um commit numa cabeça vazia"
 
-#: builtin/merge.c:1332
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "A assinatura GPG do commit %s, alegadamente assinada por %s, não é de "
 "confiança."
 
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 "A assinatura GPG do commit %s, alegadamente assinada por %s, está incorreta."
 
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "O commit %s não tem uma assinatura GPG."
 
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "A assinatura GPG do commit %s por %s está correta\n"
 
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr "integração de históricos não relacionados recusada"
+
+#: builtin/merge.c:1439
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "A atualizar %s..%s\n"
 
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
-msgstr "A tentar merge mesmo trivial no interior do índice...\n"
+msgstr "A tentar integração mesmo trivial no interior do índice...\n"
 
-#: builtin/merge.c:1468
+#: builtin/merge.c:1483
 #, c-format
 msgid "Nope.\n"
 msgstr "Não.\n"
 
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
 msgid "Not possible to fast-forward, aborting."
 msgstr "Não é possível avançar rapidamente, a abortar."
 
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "A recuar a árvore ao seu estado original...\n"
 
-#: builtin/merge.c:1527
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying merge strategy %s...\n"
-msgstr "A tentar a estratégia de merge %s...\n"
+msgstr "A tentar a estratégia de integração %s...\n"
 
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
 #, c-format
 msgid "No merge strategy handled the merge.\n"
-msgstr "Nenhuma estratégia de merge conseguiu processar o merge.\n"
+msgstr "Nenhuma estratégia de integração conseguiu processar a integração.\n"
 
-#: builtin/merge.c:1595
+#: builtin/merge.c:1610
 #, c-format
 msgid "Merge with strategy %s failed.\n"
-msgstr "Falha ao realizar merge com a estratégia %s.\n"
+msgstr "Falha ao integrar com a estratégia %s.\n"
 
-#: builtin/merge.c:1604
+#: builtin/merge.c:1619
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "A usar %s para preparar resolução manual.\n"
 
-#: builtin/merge.c:1616
+#: builtin/merge.c:1631
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
-"O merge automático foi bem sucedido; interrompido antes de realizar commit "
-"como pretendido\n"
+"A integração automática foi bem sucedida; interrompida antes de submeter "
+"como solicitado\n"
 
 #: builtin/merge-base.c:29
 msgid "git merge-base [-a | --all] <commit> <commit>..."
@@ -8196,7 +8548,7 @@ msgstr "mostrar todos os antecessores"
 
 #: builtin/merge-base.c:216
 msgid "find ancestors for a single n-way merge"
-msgstr "encontrar antecessores de um único merge com n pontos"
+msgstr "encontrar antecessores de uma única integração com n pontos"
 
 #: builtin/merge-base.c:218
 msgid "list revs not reachable from others"
@@ -8209,7 +8561,7 @@ msgstr "o primeiro é antecessor do segundo?"
 #: builtin/merge-base.c:222
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr ""
-"descobrir aonde foi que o <commit> divergiu usando o reflog da <referência>"
+"descobrir onde foi que o <commit> divergiu usando o reflog da <referência>"
 
 #: builtin/merge-file.c:8
 msgid ""
@@ -8225,7 +8577,7 @@ msgstr "enviar resultados para a saída padrão"
 
 #: builtin/merge-file.c:34
 msgid "use a diff3 based merge"
-msgstr "usar merge baseado em diff3"
+msgstr "usar integração baseada em diff3"
 
 #: builtin/merge-file.c:35
 msgid "for conflicts, use our version"
@@ -8274,12 +8626,12 @@ msgstr "git mv [<opções>] <origem>... <destino>"
 #: builtin/mv.c:70
 #, fuzzy, c-format
 msgid "Directory %s is in index and no submodule?"
-msgstr "O diretório %s está no índice mas não no submódulo?"
+msgstr "O diretório %s está no índice mas não em nenhum submódulo?"
 
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
-"Prepare as suas alterações em .gitmodules ou esconda-as (stash) para "
+"Prepare as suas alterações em .gitmodules ou empilhe-as (stash) para "
 "prosseguir"
 
 #: builtin/mv.c:90
@@ -8356,48 +8708,48 @@ msgstr "%s, origem=%s, destino=%s"
 msgid "Renaming %s to %s\n"
 msgstr "A mudar de nome de %s para %s\n"
 
-#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "falha ao mudar o nome de '%s'"
 
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<opções>] <commit>..."
 
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<opções>] --all"
 
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<opções>] --stdin"
 
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
 msgid "print only names (no SHA-1)"
 msgstr "imprimir apenas nomes (sem SHA-1)"
 
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
 msgid "only use tags to name the commits"
 msgstr "usar apenas tags para designar commits"
 
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
 msgid "only use refs matching <pattern>"
 msgstr "usar apenas referência que correspondam ao <padrão>"
 
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
 msgid "list all commits reachable from all refs"
 msgstr "listar todos os commits alcançáveis a partir de todas as referências"
 
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
 msgid "read from stdin"
 msgstr "ler da entrada padrão"
 
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
 msgid "allow to print `undefined` names (default)"
 msgstr "permitir imprimir nomes 'indefinidos' (predefinição)"
 
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
 msgid "dereference tags in the input (internal use)"
 msgstr "desreferenciar tags na entrada (uso interno)"
 
@@ -8505,7 +8857,7 @@ msgstr "git notes remove [<objeto>]"
 
 #: builtin/notes.c:84
 msgid "git notes prune [<options>]"
-msgstr "git notes prune [<optções>]"
+msgstr "git notes prune [<opções>]"
 
 #: builtin/notes.c:89
 msgid "git notes get-ref"
@@ -8543,24 +8895,16 @@ msgstr "não é possível escrever o objeto de nota"
 msgid "The note contents have been left in %s"
 msgstr "O conteúdo da nota foi guardado em %s"
 
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
 #, c-format
 msgid "cannot read '%s'"
 msgstr "não é possível ler '%s'"
 
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "não foi possível abrir ou ler '%s'"
 
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Falha ao resolver '%s' numa referência válida."
-
 #: builtin/notes.c:256
 #, c-format
 msgid "Failed to read object '%s'."
@@ -8573,7 +8917,7 @@ msgstr "Não é possível ler os dados da nota de um objeto não-blob '%s'."
 
 #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
 msgid "too many parameters"
 msgstr "demasiados parâmetros"
 
@@ -8620,7 +8964,7 @@ msgstr ""
 msgid "Overwriting existing notes for object %s\n"
 msgstr "A substituir as notas existentes do objeto %s\n"
 
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "A remover a nota do objeto %s\n"
@@ -8660,65 +9004,65 @@ msgstr ""
 "As opções -m/-F/-c/-C são obsoletas no subcomando 'edit'.\n"
 "Use 'git notes add -f -m/-F/-c/-C' em seu lugar.\n"
 
-#: builtin/notes.c:767
+#: builtin/notes.c:768
 msgid "General options"
 msgstr "Opções gerais"
 
-#: builtin/notes.c:769
+#: builtin/notes.c:770
 msgid "Merge options"
-msgstr "Opções de merge"
+msgstr "Opções de integração"
 
-#: builtin/notes.c:771
+#: builtin/notes.c:772
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgstr ""
-"resolver conflitos nas notas usando a estratégia indicada (manual/ours/"
-"theirs/union/cat_sort_uniq)"
+"resolver conflitos nas notas usando a estratégia indicada "
+"(manual/ours/theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "Committing unmerged notes"
-msgstr "Efetuar commit de notas não integradas"
+msgstr "A submeter notas não integradas"
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "finalize notes merge by committing unmerged notes"
-msgstr "concluir merge de notas, fazendo commit de notas não integradas"
+msgstr "concluir integração de notas, submetendo notas não integradas"
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid "Aborting notes merge resolution"
-msgstr "Abortar resoluções de merge das notas"
+msgstr "A abortar resolução de integração das notas"
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "abort notes merge"
-msgstr "abortar merge das notas"
+msgstr "abortar integração das notas"
 
-#: builtin/notes.c:856
+#: builtin/notes.c:857
 #, c-format
 msgid "A notes merge into %s is already in-progress at %s"
-msgstr "Merge das notas em %s já está em curso em %s"
+msgstr "Uma integração das notas em %s já está em curso em %s"
 
-#: builtin/notes.c:883
+#: builtin/notes.c:884
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "O objeto %s não tem nenhuma nota\n"
 
-#: builtin/notes.c:895
+#: builtin/notes.c:896
 msgid "attempt to remove non-existent note is not an error"
 msgstr "não considerar como erro a remoção de uma nota não existente"
 
-#: builtin/notes.c:898
+#: builtin/notes.c:899
 msgid "read object names from the standard input"
 msgstr "ler nome dos objetos da entrada padrão"
 
-#: builtin/notes.c:979
+#: builtin/notes.c:980
 msgid "notes-ref"
 msgstr "notes-ref"
 
-#: builtin/notes.c:980
+#: builtin/notes.c:981
 msgid "use notes from <notes-ref>"
 msgstr "usar notas de <notes-ref>"
 
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Subcomando desconhecido: %s"
@@ -8742,171 +9086,177 @@ msgstr ""
 msgid "deflate error (%d)"
 msgstr "erro ao compactar (%d)"
 
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+"a desativar escrita de mapa de bits, os pacotes são divididos devido a "
+"pack.packSizeLimit"
+
+#: builtin/pack-objects.c:776
 msgid "Writing objects"
 msgstr "A escrever objetos"
 
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "a desativar escrita de mapa de bits, visto que alguns objetos não estão a "
 "ser compactados"
 
-#: builtin/pack-objects.c:2172
+#: builtin/pack-objects.c:2177
 msgid "Compressing objects"
 msgstr "A comprimir objetos"
 
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
 #, c-format
 msgid "unsupported index version %s"
 msgstr "versão de índice %s não suportada"
 
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2567
 #, c-format
 msgid "bad index version '%s'"
 msgstr "versão de índice '%s' incorreta"
 
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
 msgid "do not show progress meter"
 msgstr "não mostrar medidor de progresso"
 
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
 msgid "show progress meter"
 msgstr "mostrar medidor de progresso"
 
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
 msgid "show progress meter during object writing phase"
 msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2604
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "semelhante a --all-progress quando o medidor de progresso é mostrado"
 
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2605
 msgid "version[,offset]"
 msgstr "versão[,offset]"
 
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "escrever o ficheiro de índice do pacote na versão de formato especificada"
 
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2609
 msgid "maximum size of each output pack file"
 msgstr "tamanho máximo de cada ficheiro de pacote gerado"
 
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2611
 msgid "ignore borrowed objects from alternate object store"
-msgstr "ignorar objetos emprestados do arquivo de objetos alternate"
+msgstr "ignorar objetos emprestados do arquivo de objetos sobressalentes"
 
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2613
 msgid "ignore packed objects"
 msgstr "ignorar objetos compactados"
 
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
 msgid "limit pack window by objects"
 msgstr "limitar a janela de compactação por objetos"
 
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2617
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "limitar a janela de compactação por memória em adição ao limite por objetos"
 
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2619
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "tamanho máximo de cadeias delta permitidas no pacote resultante"
 
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2621
 msgid "reuse existing deltas"
 msgstr "reutilizar deltas existentes"
 
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
 msgid "reuse existing objects"
 msgstr "reutilizar objetos existentes"
 
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
 msgid "use OFS_DELTA objects"
 msgstr "usar objetos OFS_DELTA"
 
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
 msgid "use threads when searching for best delta matches"
 msgstr "usar threads ao procurar pela melhor correspondência delta"
 
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2629
 msgid "do not create an empty pack output"
 msgstr "não criar um pacote vazio"
 
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2631
 msgid "read revision arguments from standard input"
 msgstr "ler argumentos de revisão da entrada padrão"
 
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
 msgid "limit the objects to those that are not yet packed"
 msgstr "restringir-se aos objetos que ainda não foram compactados"
 
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2636
 msgid "include objects reachable from any reference"
 msgstr "incluir objetos alcançáveis a partir de qualquer referência"
 
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2639
 msgid "include objects referred by reflog entries"
 msgstr "incluir objetos referenciados por entradas do reflog"
 
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2642
 msgid "include objects referred to by the index"
 msgstr "incluir objetos referenciados pelo índice"
 
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2645
 msgid "output pack to stdout"
 msgstr "gerar pacote para a saída padrão"
 
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
 msgid "include tag objects that refer to objects to be packed"
 msgstr "incluir objetos tag que refiram objetos a compactar"
 
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2649
 msgid "keep unreachable objects"
 msgstr "manter objetos inalcançáveis"
 
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
 msgid "time"
 msgstr "hora"
 
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
 msgid "unpack unreachable objects newer than <time>"
 msgstr "descompactar objetos inalcançáveis mais recentes que <hora>"
 
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2654
 msgid "create thin packs"
 msgstr "criar pacotes finos"
 
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
 msgid "create packs suitable for shallow fetches"
 msgstr "criar pacotes adequados para obter em repositórios pouco profundos"
 
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2658
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorar pacotes que tenham um ficheiro .keep"
 
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2660
 msgid "pack compression level"
 msgstr "nível de compactação do pacote"
 
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
 msgid "do not hide commits by grafts"
 msgstr "não esconder commits introduzidos por enxertos"
 
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2664
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "usar um índice de mapa de bits se disponível, para acelerar a contagem de "
 "objetos"
 
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2666
 msgid "write a bitmap index together with the pack index"
 msgstr "escrever um índice de mapa de bits juntamente com o índice do pacote"
 
-#: builtin/pack-objects.c:2752
+#: builtin/pack-objects.c:2757
 msgid "Counting objects"
 msgstr "A contar objetos"
 
@@ -8934,15 +9284,15 @@ msgstr "A remover objetos duplicados"
 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--expire <hora>] [--] [<head>...]"
 
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
 msgid "do not remove, show only"
 msgstr "não remover, mostrar apenas"
 
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
 msgid "report pruned objects"
 msgstr "apresentar objetos eliminados"
 
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
 msgid "expire objects older than <time>"
 msgstr "expirar objetos mais antigos que <hora>"
 
@@ -8954,50 +9304,53 @@ msgstr "não é possível limpar num repositório de objetos-preciosos"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<opções>] [<repositório> [<especificador-de-referência>...]]"
 
-#: builtin/pull.c:117
+#: builtin/pull.c:120
 msgid "Options related to merging"
-msgstr "Opções relacionadas com merge"
+msgstr "Opções relativas a integração"
 
-#: builtin/pull.c:120
+#: builtin/pull.c:123
 msgid "incorporate changes by rebasing rather than merging"
-msgstr "incorporar alterações por rebase em vez de merge"
+msgstr "incorporar alterações por rebase em vez de integrar"
 
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
 msgid "allow fast-forward"
 msgstr "permitir avanço rápido"
 
-#: builtin/pull.c:150
+#: builtin/pull.c:153
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "verificar se o commit tem uma assinatura GPG válida"
 
-#: builtin/pull.c:164
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "empilhar/desempilhar automaticamente antes de depois de rebase"
+
+#: builtin/pull.c:172
 msgid "Options related to fetching"
 msgstr "Opções relacionadas com obtenção de objetos"
 
-#: builtin/pull.c:186
+#: builtin/pull.c:194
 msgid "number of submodules pulled in parallel"
-msgstr "número de submódulos obtidos em paralelo"
+msgstr "número de submódulos puxados em paralelo"
 
-#: builtin/pull.c:275
+#: builtin/pull.c:283
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valor inválido de pull.ff: %s"
 
-#: builtin/pull.c:359
+#: builtin/pull.c:379
 msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "Não é possível efetuar pull com rebase: tem alterações não preparadas."
+msgstr "Não é possível puxar com rebase: tem alterações não preparadas."
 
-#: builtin/pull.c:365
+#: builtin/pull.c:385
 msgid "Additionally, your index contains uncommitted changes."
-msgstr "Além disso, o índice contém alterações pendentes para commit."
+msgstr "Além disso, o índice contém alterações não submetidas."
 
-#: builtin/pull.c:367
+#: builtin/pull.c:387
 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
 msgstr ""
-"Não é possível efetuar pull com rebase: o índice contém alterações pendentes "
-"para commit."
+"Não é possível puxar com rebase: o índice contém alterações não submetidas."
 
-#: builtin/pull.c:443
+#: builtin/pull.c:463
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -9005,14 +9358,14 @@ msgstr ""
 "Não há nenhum candidato com o qual realizar rebase de entre as referências "
 "que se acabaram de obter."
 
-#: builtin/pull.c:445
+#: builtin/pull.c:465
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
-"Não há nenhum candidato com o qual realizar merge de entre as referências "
-"que se acabaram obter."
+"Não há nenhum candidato com o qual integrar de entre as referências que se "
+"acabaram obter."
 
-#: builtin/pull.c:446
+#: builtin/pull.c:466
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -9020,64 +9373,74 @@ msgstr ""
 "Geralmente, significa que forneceu um especificador de referência\n"
 "com um carácter universal (wildcard) que não corresponde a nenhum remoto."
 
-#: builtin/pull.c:449
+#: builtin/pull.c:469
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
 "a branch. Because this is not the default configured remote\n"
 "for your current branch, you must specify a branch on the command line."
 msgstr ""
-"Solicitou pull do remoto '%s', mas não especificou um ramo.\n"
-"Uma vez que este não é o remoto configurado por omissão,\n"
-"deve especificar um ramo na linha de comandos."
+"Solicitou puxar o remoto '%s', mas não especificou um ramo.\n"
+"Uma vez que este não é o remoto configurado por predefinição\n"
+"do ramo atual, deve especificar um ramo na linha de comandos."
 
-#: builtin/pull.c:454
+#: builtin/pull.c:474 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Não se encontra em nenhum ramo de momento."
 
-#: builtin/pull.c:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Especifique o ramo sobre o qual pretende realizar rebase."
 
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
-msgstr "Especifique o ramo com o qual pretende realizar merge."
+msgstr "Especifique o ramo com o qual pretende integrar."
 
-#: builtin/pull.c:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
 msgid "See git-pull(1) for details."
 msgstr "Consulte git-pull(1) para obter mais detalhes."
 
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<remoto>"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<ramo>"
+
+#: builtin/pull.c:489 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "O ramo atual não segue nenhum ramo."
 
-#: builtin/pull.c:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
 msgid ""
-"If you wish to set tracking information for this branch you can do so with:\n"
-"\n"
-"    git branch --set-upstream-to=%s/<branch> %s\n"
+"If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
-"Se deseja definir um ramo para este ramo seguir, pode fazê-lo com:\n"
-"\n"
-"    git branch --set-upstream-to=%s/<ramo> %s\n"
+"Se deseja definir o ramo que deve ser seguido por este ramo, pode fazê-lo "
+"com:"
 
-#: builtin/pull.c:483
+#: builtin/pull.c:503
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 "from the remote, but no such ref was fetched."
 msgstr ""
-"A configuração indica para efetuar merge com a referência '%s'\n"
-"do remoto, mas esta ainda não foi obtida."
+"A configuração indica para integrar com a referência '%s'\n"
+"do remoto, mas aquela referência não foi obtida."
+
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "a opção --[no-]autostash só é válida com --rebase."
 
-#: builtin/pull.c:841
+#: builtin/pull.c:872
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 "A atualizar um ramo que ainda não foi criado e com alterações adicionadas ao "
 "índice."
 
-#: builtin/pull.c:870
+#: builtin/pull.c:900
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -9088,7 +9451,7 @@ msgstr ""
 "a avançar a árvore de trabalho a partir do\n"
 "commit %s."
 
-#: builtin/pull.c:875
+#: builtin/pull.c:905
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -9105,11 +9468,11 @@ msgstr ""
 "$ git reset --hard\n"
 "para recuperar."
 
-#: builtin/pull.c:890
+#: builtin/pull.c:920
 msgid "Cannot merge multiple branches into empty head."
-msgstr "Não é possível efetuar merge de múltiplos ramos numa cabeça vazia."
+msgstr "Não é possível integrar múltiplos ramos numa cabeça vazia."
 
-#: builtin/pull.c:894
+#: builtin/pull.c:924
 msgid "Cannot rebase onto multiple branches."
 msgstr "Não é possível efetuar rebase sobre múltiplos ramos."
 
@@ -9189,8 +9552,7 @@ msgstr ""
 #: builtin/push.c:183
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
-msgstr ""
-"O ramo atual %s tem múltiplos ramos a montante, recusando-se a publicar."
+msgstr "O ramo atual %s tem múltiplos ramos a montante, publicação recusada."
 
 #: builtin/push.c:186
 #, c-format
@@ -9403,10 +9765,10 @@ msgid ""
 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
-"prefix=<prefixo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-"
-"sparse-checkout] [--index-output=<ficheiro>] (--empty | <árvore1> [<árvore2> "
-"[<árvore3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefixo>)"
+" [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] "
+"[--index-output=<ficheiro>] (--empty | <árvore-etc1> [<árvore-etc2> [<árvore-"
+"etc3>]])"
 
 #: builtin/read-tree.c:110
 msgid "write resulting index to <file>"
@@ -9418,21 +9780,21 @@ msgstr "apenas esvaziar o índice"
 
 #: builtin/read-tree.c:115
 msgid "Merging"
-msgstr "A realizar merge"
+msgstr "A integrar"
 
 #: builtin/read-tree.c:117
 msgid "perform a merge in addition to a read"
-msgstr "realizar um merge em adição a uma leitura"
+msgstr "realizar uma integração em adição a uma leitura"
 
 #: builtin/read-tree.c:119
 msgid "3-way merge if no file level merging required"
 msgstr ""
-"realizar merge com 3 pontos se o merge ao nível dos ficheiros não for "
-"necessário"
+"integrar com 3 pontos se a integração ao nível de ficheiros não for "
+"necessária"
 
 #: builtin/read-tree.c:121
 msgid "3-way merge in presence of adds and removes"
-msgstr "realizar merge com 3 ponto na presença de adições e remoções"
+msgstr "integrar com 3 ponto na presença de adições e remoções"
 
 #: builtin/read-tree.c:123
 msgid "same as -m, but discard unmerged entries"
@@ -9448,7 +9810,7 @@ msgstr "ler a árvore em <subdiretório>/ para o índice"
 
 #: builtin/read-tree.c:128
 msgid "update working tree with merge result"
-msgstr "atualizar a árvore de trabalho com os resultados do merge"
+msgstr "atualizar a árvore de trabalho com os resultados da integração"
 
 #: builtin/read-tree.c:130
 msgid "gitignore"
@@ -9460,7 +9822,7 @@ msgstr "permitir que os ficheiros explicitamente ignorados sejam substituídos"
 
 #: builtin/read-tree.c:134
 msgid "don't check the working tree after merging"
-msgstr "não verificar a árvore de trabalho depois de efetuar merge"
+msgstr "não verificar a árvore de trabalho depois de integrar"
 
 #: builtin/read-tree.c:135
 msgid "don't update the index or the work tree"
@@ -9474,6 +9836,18 @@ msgstr "ignorar a aplicação do filtro de extração esparsa"
 msgid "debug unpack-trees"
 msgstr "depurar unpack-trees"
 
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <git-dir>"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "silencioso"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "Deve especificar um diretório."
+
 #: builtin/reflog.c:423
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
@@ -9493,8 +9867,8 @@ msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
 msgstr ""
-"git remote add [-t <ramo>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <nome> <url>"
+"git remote add [-t <ramo>] [-m <mestre>] [-f] [--tags | --no-tags] "
+"[--mirror=<fetch|push>] <nome> <url>"
 
 #: builtin/remote.c:14 builtin/remote.c:34
 msgid "git remote rename <old> <new>"
@@ -9733,7 +10107,7 @@ msgstr "realiza rebase interativo sobre %s do remoto"
 #: builtin/remote.c:971
 #, c-format
 msgid " merges with remote %s"
-msgstr " realiza merge com %s do remoto"
+msgstr " integra com %s do remoto"
 
 #: builtin/remote.c:972
 msgid "    and with remote"
@@ -9742,7 +10116,7 @@ msgstr "    e com o remoto"
 #: builtin/remote.c:974
 #, c-format
 msgid "merges with remote %s"
-msgstr "realiza merge com %s do remoto"
+msgstr "integra com %s do remoto"
 
 #: builtin/remote.c:975
 msgid "   and with remote"
@@ -9802,176 +10176,178 @@ msgstr "* remoto %s"
 msgid "  Fetch URL: %s"
 msgstr "  Obter    do URL: %s"
 
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
 msgid "(no URL)"
 msgstr "(nenhum URL)"
 
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in "  Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  Publicar no URL: %s"
 
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Ramo HEAD: %s"
 
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  Ramo HEAD (o remoto HEAD é ambíguo, pode ser um dos seguintes):\n"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1181
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Ramo remoto:%s"
 msgstr[1] "  Ramos remotos:%s"
 
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
 msgid " (status not queried)"
 msgstr " (estado não consultado)"
 
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Ramo local configurado para 'git pull':"
 msgstr[1] "  Ramos locais configurados para 'git pull':"
 
-#: builtin/remote.c:1199
+#: builtin/remote.c:1201
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Referências locais serão refletidas (mirror) por 'git push'"
 
-#: builtin/remote.c:1206
+#: builtin/remote.c:1208
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Referência local configurada para 'git push'%s:"
 msgstr[1] "  Referências locais configuradas para 'git push'%s:"
 
-#: builtin/remote.c:1227
+#: builtin/remote.c:1229
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "definir refs/remotes/<nome>/HEAD de acordo com o remoto"
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1231
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "eliminar refs/remotes/<nome>/HEAD"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
 msgid "Cannot determine remote HEAD"
 msgstr "Não é possível determinar o remoto HEAD"
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Múltiplos ramos HEAD remotos. Escolha um explicitamente com:"
 
-#: builtin/remote.c:1256
+#: builtin/remote.c:1258
 #, c-format
 msgid "Could not delete %s"
 msgstr "Não foi possível eliminar %s"
 
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Referência inválida: %s"
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
 #, c-format
 msgid "Could not setup %s"
 msgstr "Não foi possível configurar %s"
 
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s ficará suspenso!"
 
-#: builtin/remote.c:1285
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s ficou suspenso!"
 
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
 #, c-format
 msgid "Pruning %s"
 msgstr "A eliminar %s"
 
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [eliminaria] %s"
 
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [eliminado] %s"
 
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
 msgid "prune remotes after fetching"
 msgstr "eliminar remotos depois de obter"
 
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Remoto inexistente '%s'"
 
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
 msgid "add branch"
 msgstr "adicionar ramo"
 
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
 msgid "no remote specified"
 msgstr "nenhum remoto especificado"
 
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
 msgid "query push URLs rather than fetch URLs"
 msgstr "consultar URLs de publicação em vez de URLs utilizados para obter"
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1467
 msgid "return all URLs"
 msgstr "retornar todos os URLs"
 
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "o remoto '%s' não tem nenhum URL configurado"
 
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
 msgid "manipulate push URLs"
 msgstr "manipular URLs de publicação"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
 msgid "add URL"
 msgstr "adicionar URL"
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
 msgid "delete URLs"
 msgstr "eliminar URLs"
 
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete não faz sentido"
 
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Padrão de URL antigo inválido: %s"
 
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
 #, c-format
 msgid "No such URL found: %s"
 msgstr "URL não encontrado: %s"
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
 msgid "Will not delete all non-push URLs"
 msgstr "Não é possível remover todos os URLs de não publicação"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 msgid "be verbose; must be placed before a subcommand"
 msgstr "ser verboso; deve ser colocado antes de um subcomando"
 
@@ -10087,7 +10463,7 @@ msgstr "mergetag incorreta no commit '%s'"
 #: builtin/replace.c:357
 #, c-format
 msgid "malformed mergetag in commit '%s'"
-msgstr "mergetag malformada no commit '%s' "
+msgstr "mergetag malformada no commit '%s'"
 
 #: builtin/replace.c:368
 #, c-format
@@ -10105,12 +10481,12 @@ msgstr "o commit original '%s' tem uma assinatura gpg."
 
 #: builtin/replace.c:402
 msgid "the signature will be removed in the replacement commit!"
-msgstr "a assinatura será removida do commit substituto!"
+msgstr "a assinatura será removida do commit suplente!"
 
 #: builtin/replace.c:408
 #, c-format
 msgid "could not write replacement commit for: '%s'"
-msgstr "não foi possível escrever o commit substituto de: '%s'"
+msgstr "não foi possível escrever o commit suplente de: '%s'"
 
 #: builtin/replace.c:432
 msgid "list replace refs"
@@ -10157,11 +10533,11 @@ msgstr ""
 
 #: builtin/reset.c:27
 msgid "git reset [-q] <tree-ish> [--] <paths>..."
-msgstr "git reset [-q] <árvore> [--] <caminhos>..."
+msgstr "git reset [-q] <árvore-etc> [--] <caminhos>..."
 
 #: builtin/reset.c:28
 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<árvore>] [--] [<caminhos>...]"
+msgstr "git reset --patch [<árvore-etc>] [--] [<caminhos>...]"
 
 #: builtin/reset.c:34
 msgid "mixed"
@@ -10204,7 +10580,7 @@ msgstr "HEAD está agora em %s"
 #: builtin/reset.c:183
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
-msgstr "Não é possível repor de modo %s durante um merge."
+msgstr "Não é possível repor de modo %s durante uma integração."
 
 #: builtin/reset.c:276
 msgid "be quiet, only report errors"
@@ -10286,7 +10662,7 @@ msgstr "git rev-parse --parseopt [<opções>] -- [<argumentos>...]"
 
 #: builtin/rev-parse.c:363
 msgid "keep the `--` passed as an arg"
-msgstr "Conservar '--' passado como argumento"
+msgstr "conservar '--' passado como argumento"
 
 #: builtin/rev-parse.c:365
 msgid "stop parsing after the first non-option argument"
@@ -10313,7 +10689,7 @@ msgstr ""
 
 #: builtin/revert.c:22
 msgid "git revert [<options>] <commit-ish>..."
-msgstr "git revert [<opções>] <commit-ish>..."
+msgstr "git revert [<opções>] <commit-etc>..."
 
 #: builtin/revert.c:23
 msgid "git revert <subcommand>"
@@ -10321,7 +10697,7 @@ msgstr "git revert <subcommando>"
 
 #: builtin/revert.c:28
 msgid "git cherry-pick [<options>] <commit-ish>..."
-msgstr "git cherry-pick [<opções>] <commit-ish>..."
+msgstr "git cherry-pick [<opções>] <commit-etc>..."
 
 #: builtin/revert.c:29
 msgid "git cherry-pick <subcommand>"
@@ -10346,7 +10722,7 @@ msgstr "cancelar reversão ou cherry-pick"
 
 #: builtin/revert.c:83
 msgid "don't automatically commit"
-msgstr "não efetuar commit automaticamente"
+msgstr "não submeter automaticamente"
 
 #: builtin/revert.c:84
 msgid "edit the commit message"
@@ -10358,7 +10734,7 @@ msgstr "número de pai"
 
 #: builtin/revert.c:89
 msgid "merge strategy"
-msgstr "estratégia de merge"
+msgstr "estratégia de integração"
 
 #: builtin/revert.c:90
 msgid "option"
@@ -10366,7 +10742,7 @@ msgstr "opção"
 
 #: builtin/revert.c:91
 msgid "option for merge strategy"
-msgstr "opção de estratégia de merge"
+msgstr "opção de estratégia de integração"
 
 #: builtin/revert.c:104
 msgid "append commit name"
@@ -10420,7 +10796,7 @@ msgid ""
 "(use 'rm -rf' if you really want to remove it including all of its history)"
 msgstr ""
 "\n"
-"(use 'rm -rf' se quer mesmo removê-lo, incluindo todo o seu histórico)"
+"(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)"
 
 #: builtin/rm.c:230
 msgid ""
@@ -10484,12 +10860,6 @@ msgstr "permitir remoção recursiva"
 msgid "exit with a zero status even if nothing matched"
 msgstr "sair com valor zero mesmo quando não há correspondência"
 
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-"Prepare as suas alterações em .gitmodules ou esconda-as (stash) para "
-"prosseguir"
-
 #: builtin/rm.c:335
 #, c-format
 msgid "not removing '%s' recursively without -r"
@@ -10531,8 +10901,7 @@ msgstr "imprimir estado do programa auxiliar remoto"
 
 #: builtin/shortlog.c:13
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
-msgstr ""
-"git shortlog [<opções>] [<intervalo-de-revisões>] [[--] [<caminho>...]]"
+msgstr "git shortlog [<opções>] [<intervalo-de-revisões>] [[--] [<caminho>...]]"
 
 #: builtin/shortlog.c:242
 msgid "sort output according to the number of commits per author"
@@ -10572,11 +10941,11 @@ msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referência>]"
 
 #: builtin/show-branch.c:640
 msgid "show remote-tracking and local branches"
-msgstr "mostrar os ramos remotos seguidos e os ramos locais"
+msgstr "mostrar os ramos de monitorização remotos e os ramos locais"
 
 #: builtin/show-branch.c:642
 msgid "show remote-tracking branches"
-msgstr "mostrar os ramos remotos seguidos"
+msgstr "mostrar os ramos de monitorização remotos"
 
 #: builtin/show-branch.c:644
 msgid "color '*!+-' corresponding to the branch"
@@ -10604,7 +10973,7 @@ msgstr "designar commits pelos seus nomes de objeto"
 
 #: builtin/show-branch.c:655
 msgid "show possible merge bases"
-msgstr "mostrar possíveis bases de merge"
+msgstr "mostrar possíveis bases de integração"
 
 #: builtin/show-branch.c:657
 msgid "show refs unreachable from any other ref"
@@ -10620,7 +10989,7 @@ msgstr "mostrar apenas commits não presentes no primeiro ramo"
 
 #: builtin/show-branch.c:664
 msgid "show merges reachable from only one tip"
-msgstr "mostrar merges alcançáveis a partir duma única ponta"
+msgstr "mostrar integrações alcançáveis a partir duma única ponta"
 
 #: builtin/show-branch.c:666
 msgid "topologically sort, maintaining date order where possible"
@@ -10640,8 +11009,8 @@ msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
 msgstr ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<padrão>...]"
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | "
+"--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<padrão>...]"
 
 #: builtin/show-ref.c:11
 msgid "git show-ref --exclude-existing[=<pattern>]"
@@ -10698,84 +11067,183 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr "preceder cada linha com um carácter de comentário e um espaço"
 
-#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "Referência inexistente: %s"
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Esperava-se um nome completo de uma referência, obteve-se %s"
+
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "não é possível tirar um componente do URL '%s'"
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
 msgid "alternative anchor for relative paths"
 msgstr "âncora alternativa para caminhos relativos"
 
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]"
 
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "Nenhum URL encontrado para o caminho de submódulo '%s' em .gitmodules"
+
+#: builtin/submodule--helper.c:366
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "Falha ao registar o URL do caminho de submódulo '%s'"
+
+#: builtin/submodule--helper.c:370
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "Submódulo '%s' (%s) registado com caminho '%s'\n"
+
+#: builtin/submodule--helper.c:380
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "aviso: modo de atualização do comando sugerido para o submódulo '%s'\n"
+
+#: builtin/submodule--helper.c:387
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'"
+
+#: builtin/submodule--helper.c:406
+msgid "Suppress output for initializing a submodule"
+msgstr "Suprimir a saída ao inicializar um submódulo"
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<caminho>]"
+
+#: builtin/submodule--helper.c:432
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <caminho>"
 
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 "nenhum mapeamento de submódulo do caminho '%s' encontrado em .gitmodules"
 
-#: builtin/submodule--helper.c:164
+#: builtin/submodule--helper.c:489
 msgid "where the new submodule will be cloned to"
 msgstr "sítio para aonde o novo submódulo será clonado"
 
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:492
 msgid "name of the new submodule"
 msgstr "nome do novo submódulo"
 
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
 msgid "url where to clone the submodule from"
 msgstr "url donde clonar o submódulos"
 
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:501
 msgid "depth for shallow clones"
 msgstr "profundidade de clones rasos"
 
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=<caminho>] [--quiet] [--reference "
-"<repositório>] [--name <nome>] [--url <url>][--depth <profundidade>] [--] "
-"[<caminho>...]"
+"<repositório>] [--name <nome>] [--depth <depth>] --url <url> --path <caminho>"
 
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "não foi possível criar o diretório '%s'"
 
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "falha ao clonar '%s' no caminho do submódulo '%s'"
+msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"
 
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:550
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "não é possível abrir o ficheiro '%s'"
 
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
 #, c-format
 msgid "could not close file %s"
 msgstr "não é possível fechar o ficheiro %s"
 
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
 #, c-format
 msgid "could not get submodule directory for '%s'"
-msgstr "não foi possível obter o o diretório do submódulo de '%s'"
+msgstr "não foi possível obter o diretório do submódulo de '%s'"
+
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Caminho de submódulo '%s' não inicializado"
+
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Pretendia usar 'update --init'?"
 
-#: builtin/submodule--helper.c:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+#: builtin/submodule--helper.c:639
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "A ignorar submódulo %s não integrado"
+
+#: builtin/submodule--helper.c:660
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "A ignorar submódulo '%s'"
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "caminho para a árvore de trabalho"
+
+#: builtin/submodule--helper.c:771
+msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
-"fatal: o subcomando submodule--helper deve ser invocado com um subcomando"
+"caminho para a árvore de trabalho, atravessando limites de submódulos "
+"aninhados"
+
+#: builtin/submodule--helper.c:775
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout ou none"
+
+#: builtin/submodule--helper.c:779
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "criar um clone raso, truncado ao número especificado de revisões"
+
+#: builtin/submodule--helper.c:782
+msgid "parallel jobs"
+msgstr "trabalhos em paralelo"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "não imprimir progresso da clonagem"
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
 
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr "valor incorreto no parâmetro update"
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "o subcomando submodule--helper deve ser invocado com um subcomando"
+
+#: builtin/submodule--helper.c:862
 #, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr "fatal: '%s' não é um subcomando de submodule--helper válido"
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s' não é um subcomando válido de submodule--helper"
 
 #: builtin/symbolic-ref.c:7
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10830,27 +11298,22 @@ msgstr ""
 msgid "git tag -v <tagname>..."
 msgstr "git tag -v <nome-da-tag>..."
 
-#: builtin/tag.c:80
+#: builtin/tag.c:81
 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr "o nome da tag é demasiado longo: %.*s..."
 
-#: builtin/tag.c:85
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr "tag '%s' não encontrada."
 
-#: builtin/tag.c:100
+#: builtin/tag.c:101
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Tag '%s' eliminada (era %s)\n"
 
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "não foi possível validar a tag '%s'"
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
 #, c-format
 msgid ""
 "\n"
@@ -10863,7 +11326,7 @@ msgstr ""
 "  %s\n"
 "Linha começadas com '%c' serão ignoradas.\n"
 
-#: builtin/tag.c:126
+#: builtin/tag.c:121
 #, c-format
 msgid ""
 "\n"
@@ -10960,11 +11423,11 @@ msgstr "imprimir apenas tags que contenham o commit"
 
 #: builtin/tag.c:364
 msgid "print only tags that are merged"
-msgstr "imprimir apenas as tags que foram incorporadas"
+msgstr "imprimir apenas as tags que foram integradas"
 
 #: builtin/tag.c:365
 msgid "print only tags that are not merged"
-msgstr "imprimir apenas as tags que não foram incorporadas"
+msgstr "imprimir apenas as tags que não foram integradas"
 
 #: builtin/tag.c:370
 msgid "print only tags of the object"
@@ -10994,21 +11457,21 @@ msgstr "as opções --merged e --no-merged só são permitidas com -l"
 msgid "only one -F or -m option is allowed."
 msgstr "só é permitido um opção -F ou -m."
 
-#: builtin/tag.c:453
+#: builtin/tag.c:452
 msgid "too many params"
 msgstr "demasiado parâmetros"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:458
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' não é um nome de tag válido."
 
-#: builtin/tag.c:464
+#: builtin/tag.c:463
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "a tag '%s' já existe"
 
-#: builtin/tag.c:489
+#: builtin/tag.c:491
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Tag '%s' atualizada (era %s)\n"
@@ -11025,7 +11488,7 @@ msgstr "falha ao criar o diretório %s"
 #: builtin/update-index.c:85
 #, c-format
 msgid "failed to stat %s"
-msgstr "falha ao efetuar stat de %s"
+msgstr "falha ao invocar stat de %s"
 
 #: builtin/update-index.c:95
 #, c-format
@@ -11040,7 +11503,7 @@ msgstr "falha ao eliminar o ficheiro %s"
 #: builtin/update-index.c:110 builtin/update-index.c:212
 #, c-format
 msgid "failed to delete directory %s"
-msgstr "falha ao criar o diretório %s"
+msgstr "falha ao eliminar o diretório %s"
 
 #: builtin/update-index.c:133
 #, c-format
@@ -11109,7 +11572,7 @@ msgstr "avisar sobre ficheiros que faltem na árvore de trabalho"
 
 #: builtin/update-index.c:942
 msgid "refresh even if index contains unmerged entries"
-msgstr "refrescar mesmo que o índice contenha entradas não incorporadas"
+msgstr "refrescar mesmo que o índice contenha entradas não integradas"
 
 #: builtin/update-index.c:945
 msgid "refresh stat information"
@@ -11272,7 +11735,7 @@ msgstr "git verify-commit [-v | --verbose] <commit>..."
 msgid "print commit contents"
 msgstr "imprimir conteúdo do commit"
 
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
 msgid "print raw gpg status output"
 msgstr "imprimir informação do gpg em bruto"
 
@@ -11292,7 +11755,7 @@ msgstr "mostrar apenas estatísticas"
 msgid "git verify-tag [-v | --verbose] <tag>..."
 msgstr "git verify-tag [-v | --verbose] <tag>..."
 
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
 msgid "print tag contents"
 msgstr "imprimir conteúdo da tag"
 
@@ -11308,71 +11771,75 @@ msgstr "git worktree prune [<opções>]"
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<opções>]"
 
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "A remover worktrees/%s: diretório inválido"
 
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "A remover worktrees/%s: o ficheiro gitdir não existe"
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "A remover worktrees/%s: não é possível ler o ficheiro gitdir (%s)"
 
-#: builtin/worktree.c:61
+#: builtin/worktree.c:62
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "A remover worktrees/%s: ficheiro gitdir inválido"
 
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 "A remover worktrees/%s: o ficheiro gitdir aponta para uma localização "
 "inexistente"
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:113
 #, c-format
-msgid "failed to remove: %s"
-msgstr "falha ao remover: %s"
+msgid "failed to remove '%s'"
+msgstr "falha ao remover '%s'"
 
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' já existe"
 
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "não foi possível criar o diretório de '%s'"
 
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "A preparar %s (identificador %s)"
 
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "extrair o <ramo> mesmo se já tenha sido extraído noutra árvore de trabalho"
 
-#: builtin/worktree.c:319
+#: builtin/worktree.c:324
 msgid "create a new branch"
 msgstr "criar um novo ramo"
 
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
 msgid "create or reset a branch"
 msgstr "criar ou repor um ramo"
 
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
 msgid "detach HEAD at named commit"
 msgstr "destacar HEAD no commit indicado"
 
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "povoar a nova árvore de trabalho"
+
+#: builtin/worktree.c:336
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B e --detach são mutuamente exclusivos"
 
@@ -11392,7 +11859,7 @@ msgstr "escrever objeto árvore do subdiretório <prefixo>"
 msgid "only useful for debugging"
 msgstr "apenas útil para depuração"
 
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "imprimir mensagens de depuração no stderr"
 
@@ -11406,9 +11873,9 @@ msgstr ""
 "guias de conceitos. Consulte 'git help <comando>' ou 'git help <conceito>'\n"
 "para ler sobre um subcomando ou conceito específico."
 
-#: http.c:321
+#: http.c:322
 msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr ""
+msgstr "Não é suportado afixar chaves públicas com cURL < 7.44.0"
 
 #: common-cmds.h:9
 msgid "start a working area (see also: git help tutorial)"
@@ -11473,7 +11940,7 @@ msgstr "Criar um repositório Git vazio ou reinicializar um já existente"
 
 #: common-cmds.h:27
 msgid "Show commit logs"
-msgstr "Mostrado logs de commits"
+msgstr "Mostrar histórico de commits"
 
 #: common-cmds.h:28
 msgid "Join two or more development histories together"
@@ -11535,7 +12002,7 @@ msgstr "ser mais silencioso"
 msgid "use <n> digits to display SHA-1s"
 msgstr "usar <n> dígitos para mostrar SHA-1s"
 
-#: rerere.h:38
+#: rerere.h:40
 msgid "update the index with reused conflict resolution if possible"
 msgstr ""
 "atualizar o índice com resoluções de conflitos reutilizadas se possível"
@@ -11569,12 +12036,11 @@ msgstr "HEAD incorreta - é necessário uma HEAD"
 #, sh-format
 msgid ""
 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr ""
-"Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-válido>'."
+msgstr "Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-válido>'."
 
 #: git-bisect.sh:178
 msgid "won't bisect on cg-seek'ed tree"
-msgstr "não é possível bisseccionar numa árvore \"cg-seek'ed\""
+msgstr "não é possível bissetar numa árvore \"cg-seek'ed\""
 
 #: git-bisect.sh:182
 msgid "Bad HEAD - strange symbolic ref"
@@ -11607,7 +12073,7 @@ msgstr "'git bisect $TERM_BAD' só leva um argumento."
 #: git-bisect.sh:322
 #, sh-format
 msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr "Aviso: a bisseccionar só com um commit $TERM_BAD."
+msgstr "Aviso: a bissetar só com um commit $TERM_BAD."
 
 #. TRANSLATORS: Make sure to include [Y] and [n] in your
 #. translation. The program will only accept English input
@@ -11638,7 +12104,7 @@ msgstr ""
 
 #: git-bisect.sh:414 git-bisect.sh:546
 msgid "We are not bisecting."
-msgstr "Não estamos a bisseccionar."
+msgstr "Não se está a bissetar."
 
 #: git-bisect.sh:421
 #, sh-format
@@ -11678,12 +12144,12 @@ msgid ""
 "bisect run failed:\n"
 "exit code $res from '$command' is < 0 or >= 128"
 msgstr ""
-"falha bisseccionar:\n"
+"falha ao bissetar:\n"
 "código de saída $res de '$command' é < 0 ou >= 128"
 
 #: git-bisect.sh:525
 msgid "bisect run cannot continue any more"
-msgstr "não é possível continuar a bisseccionar"
+msgstr "não é possível continuar a bissetar"
 
 #: git-bisect.sh:531
 #, sh-format
@@ -11691,7 +12157,7 @@ msgid ""
 "bisect run failed:\n"
 "'bisect_state $state' exited with error code $res"
 msgstr ""
-"falha ao bisseccionar:\n"
+"falha ao bissetar:\n"
 "'bisect_state $state' retornou com o código de erro $res"
 
 #: git-bisect.sh:538
@@ -11721,7 +12187,7 @@ msgstr "não é possível alterar o significado do termo '$term'"
 #, sh-format
 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
 msgstr ""
-"Comando inválido: bissecção em curso usando os termo $TERM_BAD/$TERM_GOOD."
+"Comando inválido: está-se a bissetar usando os termos $TERM_BAD/$TERM_GOOD."
 
 #: git-bisect.sh:636
 msgid "no terms defined"
@@ -11748,63 +12214,59 @@ msgstr ""
 "Para extrair o ramo original e interromper o rebase, execute \"git rebase --"
 "abort\"."
 
-#: git-rebase.sh:165
+#: git-rebase.sh:168
 msgid "Applied autostash."
-msgstr "Autostash aplicado."
+msgstr "Pilha automática (autostash) aplicada."
 
-#: git-rebase.sh:168
+#: git-rebase.sh:171
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "Não é possível guardar $stash_sha1"
 
-#: git-rebase.sh:169
+#: git-rebase.sh:172
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 "Your changes are safe in the stash.\n"
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
-"Surgiram conflitos ao aplicar autostash.\n"
-"As suas alterações estão guardadas no stash.\n"
+"Surgiram conflitos ao aplicar a pilha automática (autostash).\n"
+"As suas alterações estão guardadas na pilha.\n"
 "Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n"
 
-#: git-rebase.sh:208
+#: git-rebase.sh:211
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Rebase recusado pelo hook pre-rebase."
 
-#: git-rebase.sh:213
+#: git-rebase.sh:216
 msgid "It looks like git-am is in progress. Cannot rebase."
 msgstr "Parece que o git-am está em curso. Não é possível efetuar rebase."
 
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "A opção --exec deve ser usada com a opção --interactive"
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
 msgid "No rebase in progress?"
 msgstr "Rebase não está em curso?"
 
-#: git-rebase.sh:370
+#: git-rebase.sh:368
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "A ação --edit-todo só pode ser usada durante um rebase interativo."
 
-#: git-rebase.sh:377
+#: git-rebase.sh:375
 msgid "Cannot read HEAD"
 msgstr "Não é possível ler HEAD"
 
-#: git-rebase.sh:380
+#: git-rebase.sh:378
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
 msgstr ""
-"Deve editar todos os conflitos do merge e\n"
-"marcá-los como resolvidos usando git add"
+"Deve editar todos os conflitos da integração\n"
+"e marcá-los como resolvidos usando git add"
 
-#: git-rebase.sh:398
+#: git-rebase.sh:396
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "Não foi possível voltar para $head_name"
 
-#: git-rebase.sh:417
+#: git-rebase.sh:415
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -11825,65 +12287,65 @@ msgstr ""
 "e execute o comando de novo. A execução foi interrompida no caso de\n"
 "ainda ter algo importante nesse sítio."
 
-#: git-rebase.sh:468
+#: git-rebase.sh:466
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "$upstream_name a montante inválido"
 
-#: git-rebase.sh:492
+#: git-rebase.sh:490
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
-msgstr "$onto_name: há mais do que uma base de merge"
+msgstr "$onto_name: há mais do que uma base de integração"
 
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
 #, sh-format
 msgid "$onto_name: there is no merge base"
-msgstr "$onto_name: não há nenhuma base de merge"
+msgstr "$onto_name: não há nenhuma base de integração"
 
-#: git-rebase.sh:504
+#: git-rebase.sh:502
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "Não aponta para um commit válido: $onto_name"
 
-#: git-rebase.sh:527
+#: git-rebase.sh:525
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "fatal: ramo inexistente: $branch_name"
 
-#: git-rebase.sh:560
+#: git-rebase.sh:558
 msgid "Cannot autostash"
-msgstr "Não é possível efetuar autostash"
+msgstr "Não é possível empilhar automaticamente (autostash)"
 
-#: git-rebase.sh:565
+#: git-rebase.sh:563
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
-msgstr "Autostash criado: $stash_abbrev"
+msgstr "Pilha automática (autostash) criada: $stash_abbrev"
 
-#: git-rebase.sh:569
+#: git-rebase.sh:567
 msgid "Please commit or stash them."
-msgstr "Faça commit ou stash delas."
+msgstr "Submeta ou empilhe-as (stash)."
 
-#: git-rebase.sh:589
+#: git-rebase.sh:587
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "O ramo atual $branch_name está atualizado."
 
-#: git-rebase.sh:593
+#: git-rebase.sh:591
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "O ramo atual $branch_name está atualizado, rebase forçado."
 
-#: git-rebase.sh:604
+#: git-rebase.sh:602
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Alterações de $mb para $onto:"
 
-#: git-rebase.sh:613
+#: git-rebase.sh:611
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 "Primeiro, a recuar a cabeça para replicar as suas alterações no topo desta..."
 
-#: git-rebase.sh:623
+#: git-rebase.sh:621
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "$branch_name avançado rapidamente para $onto_name."
@@ -11946,7 +12408,7 @@ msgstr "Não há alterações locais para guardar"
 
 #: git-stash.sh:264
 msgid "Cannot initialize stash"
-msgstr "Não é possível inicializar o stash"
+msgstr "Não é possível inicializar a pilha"
 
 #: git-stash.sh:268
 msgid "Cannot save the current status"
@@ -11963,7 +12425,7 @@ msgstr "opção desconhecido: $opt"
 
 #: git-stash.sh:415
 msgid "No stash found."
-msgstr "Nenhum stash encontrado."
+msgstr "Nenhuma pilha encontrada."
 
 #: git-stash.sh:422
 #, sh-format
@@ -11978,12 +12440,12 @@ msgstr "$reference não é uma referência válida"
 #: git-stash.sh:456
 #, sh-format
 msgid "'$args' is not a stash-like commit"
-msgstr "'$args' não é um commit do tipo stash"
+msgstr "'$args' não é um commit semelhante a pilha"
 
 #: git-stash.sh:467
 #, sh-format
 msgid "'$args' is not a stash reference"
-msgstr "'$args' não é uma referência de stash"
+msgstr "'$args' não é uma referência de pilha"
 
 #: git-stash.sh:475
 msgid "unable to refresh index"
@@ -11991,7 +12453,7 @@ msgstr "não foi possível refrescar o índice"
 
 #: git-stash.sh:479
 msgid "Cannot apply a stash in the middle of a merge"
-msgstr "Não é possível aplicar um stash durante um merge"
+msgstr "Não é possível aplicar uma pilha durante uma integração"
 
 #: git-stash.sh:487
 msgid "Conflicts in index. Try without --index."
@@ -12003,7 +12465,7 @@ msgstr "Não foi possível guardar árvore do índice"
 
 #: git-stash.sh:523
 msgid "Cannot unstage modified files"
-msgstr "Não é possível retirar os ficheiros modificado do índice"
+msgstr "Não é possível despreparar os ficheiros modificado"
 
 #: git-stash.sh:538
 msgid "Index was not unstashed."
@@ -12017,7 +12479,7 @@ msgstr "A descartar ${REV} ($s)"
 #: git-stash.sh:562
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: Não foi possível descartar elemento do stash"
+msgstr "${REV}: Não foi possível descartar elemento da pilha"
 
 #: git-stash.sh:570
 msgid "No branch name specified"
@@ -12027,28 +12489,23 @@ msgstr "Nenhum nome de ramo especificado"
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Para os restaurar execute \"git stash apply\")"
 
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "não é possível tirar um componente do URL '$remoteurl'"
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "Os caminhos relativos só podem ser usados a partir do topo da árvore de "
 "trabalho"
 
-#: git-submodule.sh:291
+#: git-submodule.sh:229
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "URL do repositório: '$repo' deve ser absoluto ou começar com ./|../"
 
-#: git-submodule.sh:308
+#: git-submodule.sh:246
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path' já existe no índice"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:250
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
@@ -12059,255 +12516,280 @@ msgstr ""
 "$sm_path\n"
 "Use -f se pretende mesmo adicioná-lo."
 
-#: git-submodule.sh:330
+#: git-submodule.sh:268
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "A adicionar repositório existente em '$sm_path' ao índice"
 
-#: git-submodule.sh:332
+#: git-submodule.sh:270
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' já existe e não é uma repositório git válido"
 
-#: git-submodule.sh:340
+#: git-submodule.sh:278
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 "Um diretório git de '$sm_name' foi encontrado localmente com os remotos:"
 
-#: git-submodule.sh:342
+#: git-submodule.sh:280
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from"
 msgstr ""
 "Se deseja reutilizar este diretório git local em vez de clonar de novo de"
 
-#: git-submodule.sh:344
+#: git-submodule.sh:282
 #, sh-format
 msgid ""
 "use the '--force' option. If the local git directory is not the correct repo"
 msgstr ""
 "use a opção '--force'. Se o diretório git local não é o repositório correto"
 
-#: git-submodule.sh:345
+#: git-submodule.sh:283
 #, sh-format
 msgid ""
 "or you are unsure what this means choose another name with the '--name' "
 "option."
 msgstr ""
-"ou não tem a certeza do que isto significa, escolha outro nome com a opção "
-"'--name'."
+"ou se não tem a certeza do que isto significa, escolha outro nome com a "
+"opção '--name'."
 
-#: git-submodule.sh:347
+#: git-submodule.sh:285
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "A reativar o diretório git local do submódulo '$sm_name'."
 
-#: git-submodule.sh:359
+#: git-submodule.sh:297
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "Não foi possível extrair o submódulo '$sm_path'"
 
-#: git-submodule.sh:364
+#: git-submodule.sh:302
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Falha ao adicionar o submódulo '$sm_path'"
 
-#: git-submodule.sh:373
+#: git-submodule.sh:311
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Falha ao registar o submódulo '$sm_path'"
 
-#: git-submodule.sh:417
+#: git-submodule.sh:355
 #, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "A entrar em '$prefix$displaypath'"
+msgid "Entering '$displaypath'"
+msgstr "A entrar em '$displaypath'"
 
-#: git-submodule.sh:437
+#: git-submodule.sh:375
 #, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
+msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr ""
-"Interrompido em '$prefix$displaypath'; o script retornou um valor diferente "
-"de zero."
-
-#: git-submodule.sh:483
-#, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr "Nenhum URL encontrado no submódulo '$displaypath' em .gitmodules"
-
-#: git-submodule.sh:492
-#, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr "Falha ao registar o URL do submódulo '$displaypath'"
-
-#: git-submodule.sh:494
-#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr "Submódulo '$name' ($url) registado em '$displaypath'"
+"Interrompido em '$displaypath'; o script retornou um valor diferente de zero."
 
-#: git-submodule.sh:511
+#: git-submodule.sh:448
 #, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr "Falha ao registar o modo de atualização do submódulo em '$displaypath'"
+msgid "pathspec and --all are incompatible"
+msgstr "especificador de caminho e --all são incompatíveis"
 
-#: git-submodule.sh:549
+#: git-submodule.sh:453
 #, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr "Use '.' se pretende mesmo anular a inicialização todos os submódulos"
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr ""
+"Use '--all' se pretende mesmo anular a inicialização todos os submódulos"
 
-#: git-submodule.sh:566
+#: git-submodule.sh:470
 #, sh-format
 msgid "Submodule work tree '$displaypath' contains a .git directory"
 msgstr ""
-"A árvore de trabalho do submódulo em '$displaypath' contém um diretório .git"
+"A árvore de trabalho do submódulo '$displaypath' contém um diretório .git"
 
-#: git-submodule.sh:567
+#: git-submodule.sh:471
 #, sh-format
 msgid ""
 "(use 'rm -rf' if you really want to remove it including all of its history)"
 msgstr ""
 "(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:477
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
 "discard them"
 msgstr ""
-"A árvore de trabalho do submódulo em '$displaypath' contém alterações "
-"locais; use '-f' para as descartar"
+"A árvore de trabalho do submódulo '$displaypath' contém alterações locais; "
+"use '-f' para as descartar"
 
-#: git-submodule.sh:576
+#: git-submodule.sh:480
 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr "Diretório '$displaypath' limpo"
 
-#: git-submodule.sh:577
+#: git-submodule.sh:481
 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr ""
-"Não foi possível remover a árvore de trabalho do submódulo em '$displaypath'"
+"Não foi possível remover a árvore de trabalho do submódulo '$displaypath'"
 
-#: git-submodule.sh:580
+#: git-submodule.sh:484
 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr "Não foi possível criar o diretório vazio do submódulo '$displaypath'"
 
-#: git-submodule.sh:589
+#: git-submodule.sh:493
 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr ""
 "O registo do submódulo '$name' ($url) foi removido do caminho '$displaypath'"
 
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"Submódulo em '$displaypath' não inicializado\n"
-"Talvez queira usar 'update --init'?"
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
-"Não foi possível encontrar a revisão atual no submódulo em '$displaypath'"
+"Não foi possível encontrar a revisão atual no caminho de submódulo "
+"'$displaypath'"
 
-#: git-submodule.sh:745
+#: git-submodule.sh:644
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr "Não foi possível obter no submódulo '$sm_path'"
+msgstr "Não foi possível obter no caminho de submódulo '$sm_path'"
 
-#: git-submodule.sh:768
+#: git-submodule.sh:667
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
-msgstr "Não é possível obter no submódulo '$displaypath'"
+msgstr "Não é possível obter no caminho de submódulo '$displaypath'"
 
-#: git-submodule.sh:788
+#: git-submodule.sh:680
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "Não foi possível extrair '$sha1' no submódulo em '$displaypath'"
+msgstr "Não é possível extrair '$sha1' no caminho de submódulo '$displaypath'"
 
-#: git-submodule.sh:789
+#: git-submodule.sh:681
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Submódulo em '$displaypath': '$sha1' extraído"
+msgstr "Caminho de submódulo '$displaypath': '$sha1' extraído"
 
-#: git-submodule.sh:793
+#: git-submodule.sh:685
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
-"Não foi possível efetuar rebase de '$sha1' no submódulo em '$displaypath'"
+"Não foi possível efetuar rebase de '$sha1' no caminho de submódulo "
+"'$displaypath'"
 
-#: git-submodule.sh:794
+#: git-submodule.sh:686
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Submódulo em '$displaypath': rebase concluído em '$sha1'"
+msgstr "Caminho de submódulo '$displaypath': rebase concluído em '$sha1'"
 
-#: git-submodule.sh:799
+#: git-submodule.sh:691
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "Não é possível efetuar merge de '$sha1' no submódulo em '$displaypath'"
+msgstr "Não é possível integrar '$sha1' no caminho de submódulo '$displaypath'"
 
-#: git-submodule.sh:800
+#: git-submodule.sh:692
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Submódulo em '$displaypath': merge em '$sha1' concluído"
+msgstr "Caminho de submódulo '$displaypath': integrado em '$sha1'"
 
-#: git-submodule.sh:805
+#: git-submodule.sh:697
 #, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
-msgstr "Falha ao executar '$command $sha1' no submódulo em '$prefix$sm_path'"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr ""
+"Falha ao executar '$command $sha1' no caminho de submódulo '$displaypath'"
 
-#: git-submodule.sh:806
+#: git-submodule.sh:698
 #, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "Submódulo em '$prefix$sm_path': '$command $sha1'"
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Caminho de submódulo '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:836
+#: git-submodule.sh:729
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "Falha ao percorrer o submódulo em '$displaypath'"
+msgstr "Falha ao percorrer o caminho de submódulo '$displaypath'"
 
-#: git-submodule.sh:944
+#: git-submodule.sh:837
 msgid "The --cached option cannot be used with the --files option"
 msgstr "A opção --cached não pode ser usada com a opção --files"
 
-#: git-submodule.sh:996
+#: git-submodule.sh:889
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "modo inesperado $mod_dst"
 
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Aviso: $display_name não contém o commit $sha1_src"
 
-#: git-submodule.sh:1019
+#: git-submodule.sh:912
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Warn: $display_name não contém o commit $sha1_dst"
 
-#: git-submodule.sh:1022
+#: git-submodule.sh:915
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr "  Warn: $display_name contém os commits $sha1_src e $sha1_dst"
 
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
 msgid "blob"
 msgstr "blob"
 
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr "Falha ao percorrer recursivamente o submódulo em '$sm_path'"
+msgstr "Falha ao percorrer recursivamente o caminho de submódulo '$sm_path'"
 
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "A sincronizar o URL do submódulo em '$displaypath'"
+msgstr "A sincronizar o URL do submódulo '$displaypath'"
+
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "Consulte git-${cmd}(1) para obter mais detalhes."
+
+#~ msgid "'%s': %s"
+#~ msgstr "'%s': %s"
+
+#~ msgid "unable to access '%s': %s"
+#~ msgstr "não é possível aceder a '%s': %s"
+
+#~ msgid "could not open '%s' for reading: %s"
+#~ msgstr "não foi possível abrir '%s' para leitura: %s"
+
+#~ msgid "could not open '%s' for writing: %s"
+#~ msgstr "não foi possível abrir '%s' para escrita: %s"
+
+#~ msgid "    git branch -d %s\n"
+#~ msgstr "    git branch -d %s\n"
+
+#~ msgid "    git branch --set-upstream-to %s\n"
+#~ msgstr "    git branch --set-upstream-to %s\n"
+
+#~ msgid "cannot open %s: %s\n"
+#~ msgstr "não é possível abrir %s: %s\n"
+
+#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+#~ msgstr ""
+#~ "Prepare as suas alterações em .gitmodules ou esconda-as (stash) para "
+#~ "prosseguir"
+
+#~ msgid "could not verify the tag '%s'"
+#~ msgstr "não foi possível validar a tag '%s'"
+
+#~ msgid "failed to remove: %s"
+#~ msgstr "falha ao remover: %s"
+
+#~ msgid "The --exec option must be used with the --interactive option"
+#~ msgstr "A opção --exec deve ser usada com a opção --interactive"
+
+#~ msgid ""
+#~ "Submodule path '$displaypath' not initialized\n"
+#~ "Maybe you want to use 'update --init'?"
+#~ msgstr ""
+#~ "Submódulo em '$displaypath' não inicializado\n"
+#~ "Talvez queira usar 'update --init'?"
 
 #~ msgid "unable to parse format"
 #~ msgstr "não foi possível analisar o formato"
@@ -12354,8 +12836,8 @@ msgstr "A sincronizar o URL do submódulo em '$displaypath'"
 #~ "Quando push.default está definido como 'matching', o Git publica\n"
 #~ "os ramos locais nos ramos remotos que já existam com o mesmo nome.\n"
 #~ "\n"
-#~ "Desde a versão 2.0, o Git assume o comportamento mais conservativo "
-#~ "'simple',\n"
+#~ "Desde a versão 2.0, o Git assume o comportamento mais conservativo 'simple',"
+#~ "\n"
 #~ "publicando só o ramo atual no ramo remoto correspondente, que é usado\n"
 #~ "para atualizar o ramo atual com 'git pull'.\n"
 #~ "Consulte 'git help config' e procure por 'push.default' para mais "
@@ -12369,9 +12851,6 @@ msgstr "A sincronizar o URL do submódulo em '$displaypath'"
 #~ msgid "Could not append '%s'"
 #~ msgstr "Não foi possível acrescentar '%s'"
 
-#~ msgid "Could not set '%s'"
-#~ msgstr "Não foi possível definir '%s'"
-
 #~ msgid "Missing author: %s"
 #~ msgstr "Autor em falta: %s"
 
diff --git a/po/ru.po b/po/ru.po
index c0a838b33b..617e5f54f0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2016
-# insolor <insolor@gmail.com>, 2014
-# insolor <insolor@gmail.com>, 2014
+# insolor, 2014
+# insolor, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Git Russian Localization Project\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
-"PO-Revision-Date: 2016-03-15 18:54+0000\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"PO-Revision-Date: 2016-06-11 09:37+0000\n"
 "Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgid ""
 "as appropriate to mark resolution and make a commit."
 msgstr "И�правьте их в рабочем каталоге, затем запу�тите «git add/rm <файл>»,\nчтобы пометить и�правление и �делайте коммит."
 
-#: advice.c:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Вы не завершили �ли�ние (при�ут�твует файл MERGE_HEAD)."
 
@@ -74,7 +74,7 @@ msgstr "формат"
 msgid "archive format"
 msgstr "формат архива"
 
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
 msgid "prefix"
 msgstr "префик�"
 
@@ -82,9 +82,9 @@ msgstr "префик�"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "добавл�ть префик� перед каждым путем файла в архиве"
 
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547
-#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548
+#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
 #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
 #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
 msgid "file"
@@ -118,7 +118,8 @@ msgstr "�жимать лучше"
 msgid "list supported archive formats"
 msgstr "перечи�лить поддерживаемые форматы архивов"
 
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
 msgid "repo"
 msgstr "репозиторий"
 
@@ -255,11 +256,16 @@ msgstr "�еоднозначное им� объекта: «%s»."
 msgid "Not a valid branch point: '%s'."
 msgstr "�едопу�тима� точка ветки: «%s»."
 
-#: branch.c:344
+#: branch.c:345
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "«%s» уже находит�� на «%s»"
 
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "HEAD рабочего каталога %s не обновлён"
+
 #: bundle.c:34
 #, c-format
 msgid "'%s' does not look like a v2 bundle file"
@@ -270,7 +276,7 @@ msgstr "«%s» не похож на файл пакета вер�ии 2"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "неопознанный заголовок: %s%s (%d)"
 
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
 #, c-format
 msgid "could not open '%s'"
 msgstr "не удало�ь открыть «%s»"
@@ -279,10 +285,10 @@ msgstr "не удало�ь открыть «%s»"
 msgid "Repository lacks these prerequisite commits:"
 msgstr "В репозитории от�ут�твуют необходимые коммиты:"
 
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
 msgid "revision walk setup failed"
 msgstr "�бой инициализации прохода по редакци�м"
 
@@ -325,21 +331,21 @@ msgstr "критиче�ка� ошибка rev-list"
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "��ылка «%s» и�ключена в �оответ�твии � опци�ми rev-list"
 
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "неопознанный аргумент: %s"
 
-#: bundle.c:449
+#: bundle.c:451
 msgid "Refusing to create empty bundle."
 msgstr "Отклонение �оздани� пу�того пакета."
 
-#: bundle.c:459
+#: bundle.c:463
 #, c-format
 msgid "cannot create '%s'"
 msgstr "не удало�ь �оздать «%s»"
 
-#: bundle.c:480
+#: bundle.c:491
 msgid "index-pack died"
 msgstr "критиче�ка� ошибка index-pack"
 
@@ -348,8 +354,8 @@ msgstr "критиче�ка� ошибка index-pack"
 msgid "invalid color value: %.*s"
 msgstr "недопу�тимое значение цвета: %.*s"
 
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
 #, c-format
 msgid "could not parse %s"
 msgstr "не удало�ь разобрать %s"
@@ -383,21 +389,21 @@ msgstr "неправильное чи�ловое значение «%s» дл�
 msgid "failed to expand user dir in: '%s'"
 msgstr "�бой разворачивани� пути каталога пользовател�: «%s»"
 
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "неправильный уровень �жати� zlib %d"
 
-#: config.c:891
+#: config.c:890
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "недопу�тимый режим �оздани� объекта: %s"
 
-#: config.c:1220
+#: config.c:1228
 msgid "unable to parse command-line config"
 msgstr "не удало�ь разобрать конфигурацию из командной �троки"
 
-#: config.c:1281
+#: config.c:1284
 msgid "unknown error occured while reading the configuration files"
 msgstr "произошла неизве�тна� ошибка при чтении файлов конфигурации"
 
@@ -416,24 +422,27 @@ msgstr "неправильнаÑ� переменнаÑ� конфигурации Â
 msgid "%s has multiple values"
 msgstr "%s имеет не�колько значений"
 
+#: config.c:2224
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "не удало�ь у�тановить «%s» в «%s»"
+
 #: config.c:2226
 #, c-format
-msgid "Could not set '%s' to '%s'"
-msgstr "�е удало�ь у�тановить «%s» в «%s»"
+msgid "could not unset '%s'"
+msgstr "не удало�ь �бро�ить значение дл� «%s»"
 
 #: connected.c:69
 msgid "Could not run 'git rev-list'"
 msgstr "�е удало�ь запу�тить «git rev-list»"
 
 #: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "�бой запи�и в rev-list: %s"
+msgid "failed write to rev-list"
+msgstr "�бой запи�и в rev-list"
 
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "�бой закрыти� �тандартного ввода у rev-list: %s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
+msgstr "�бой закрыти� �тандартного ввода у rev-list"
 
 #: date.c:95
 msgid "in the future"
@@ -526,62 +535,62 @@ msgstr[3] "%lu лет назад"
 msgid "failed to read orderfile '%s'"
 msgstr "�бой чтени� orderfile «%s»"
 
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
 msgid "Performing inexact rename detection"
 msgstr "Выполн�ет�� неточное определение переименовани�"
 
-#: diff.c:115
+#: diff.c:116
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  Сбой разбора величины �реза (cut-off) у dirstat «%s»\n"
 
-#: diff.c:120
+#: diff.c:121
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "�еизве�тный параметр dirstat: «%s»\n"
 
-#: diff.c:215
+#: diff.c:225
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "�еизве�тное значени� дл� переменной «diff.submodule»: «%s»"
 
-#: diff.c:267
+#: diff.c:277
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
 "%s"
 msgstr "�айдены ошибки в переменной «diff.dirstat»:\n%s"
 
-#: diff.c:2997
+#: diff.c:3007
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "критиче�ка� ошибка при внешнем �равнении, о�танов на %s"
 
-#: diff.c:3393
+#: diff.c:3405
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow требует ровно одной �пецификации пути"
 
-#: diff.c:3556
+#: diff.c:3568
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
 "%s"
 msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s"
 
-#: diff.c:3570
+#: diff.c:3582
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Сбой разбора параметра опции --submodule: «%s»"
 
-#: dir.c:2004
+#: dir.c:1823
 msgid "failed to get kernel name and information"
 msgstr "не удало�ь получить им� �дра и информацию"
 
-#: dir.c:2123
+#: dir.c:1942
 msgid "Untracked cache is disabled on this system or location."
 msgstr "К�ш неот�леживаемых файлов отключен на �той �и�теме или в �том ме�те."
 
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
 msgid "could not run gpg."
 msgstr "не удало�ь запу�тить gpg."
 
@@ -595,28 +604,28 @@ msgstr "gpg не удало�ь подпи�ать данные"
 
 #: gpg-interface.c:222
 #, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "не удало�ь �оздать временный файл «%s»: %s"
+msgid "could not create temporary file '%s'"
+msgstr "не удало�ь �оздать временный файл «%s»"
 
-#: gpg-interface.c:225
+#: gpg-interface.c:224
 #, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "�бой запи�и от�оединенной подпи�и в «%s»: %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "�бой запи�и от�оединенной подпи�и в «%s»"
 
 #: grep.c:1718
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "«%s»: не удало�ь проче�ть %s"
 
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
 #, c-format
-msgid "'%s': %s"
-msgstr "«%s»: %s"
+msgid "failed to stat '%s'"
+msgstr "не удало�ь выполнить stat «%s»"
 
 #: grep.c:1746
 #, c-format
-msgid "'%s': short read %s"
-msgstr "«%s»: �лишком мало данных прочитано %s"
+msgid "'%s': short read"
+msgstr "«%s»: �лишком мало данных прочитано"
 
 #: help.c:205
 #, c-format
@@ -676,12 +685,29 @@ msgstr[3] "\nВозможно, вы имели в виду что-то из �т
 msgid "%s: %s - %s"
 msgstr "%s: %s — %s"
 
+#: lockfile.c:152
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr "�е удало�ь �оздать «%s.lock»: %s.\n\nПохоже, что другой проце�� git запущен в �том репозитории,\nнапример редактор открыт из «git commit». Пожалуй�та, убедите�ь,\nчто в�е проце��ы были завершены и потом попробуйте �нова.\nЕ�ли �то не поможет, то возможно проце�� git был ранее завершен\n� ошибкой в �том репозитории: \nудалите файл вручную дл� продолжени�."
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "�е удало�ь �оздать «%s.lock»: %s"
+
 #: merge.c:41
 msgid "failed to read the cache"
 msgstr "�бой чтени� к�ша"
 
-#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
 msgid "unable to write new index file"
 msgstr "не удало�ь запи�ать новый файл индек�а"
 
@@ -728,7 +754,7 @@ msgstr "невозможно прочитать объект %s «%s»"
 msgid "blob expected for %s '%s'"
 msgstr "ожидает�� двоичный объект дл� %s «%s»"
 
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
 #, c-format
 msgid "failed to open '%s'"
 msgstr "не удало�ь открыть «%s»"
@@ -855,7 +881,7 @@ msgstr "Пропу�к %s (�литы одинаковые изменени� к
 msgid "Auto-merging %s"
 msgstr "�вто�ли�ние %s"
 
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
 msgid "submodule"
 msgstr "подмодуль"
 
@@ -883,34 +909,34 @@ msgid ""
 "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr "КО�ФЛИКТ (%s): Уже �уще�твует каталог � именем «%s» в «%s». Добавление «%s» как «%s»"
 
-#: merge-recursive.c:1783
+#: merge-recursive.c:1781
 #, c-format
 msgid "Adding %s"
 msgstr "Добавление %s"
 
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
 msgid "Fatal merge failure, shouldn't happen."
 msgstr "Критиче�ка� ошибка �ли�ни�, такого не должно �лучать��."
 
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
 msgid "Already up-to-date!"
 msgstr "Уже обновлено!"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "�бой �ли�ни� деревьев «%s» и «%s»"
 
-#: merge-recursive.c:1858
+#: merge-recursive.c:1856
 #, c-format
 msgid "Unprocessed path??? %s"
 msgstr "�еобработанный путь??? %s"
 
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
 msgid "Merging:"
 msgstr "Сли�ние:"
 
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
@@ -919,16 +945,16 @@ msgstr[1] "найдено %u общих предка:"
 msgstr[2] "найдено %u общих предков:"
 msgstr[3] "найдено %u общих предков:"
 
-#: merge-recursive.c:1956
+#: merge-recursive.c:1954
 msgid "merge returned no commit"
 msgstr "�ли�ние не вернуло коммит"
 
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "�е удало�ь разобрать объект «%s»"
 
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
 msgid "Unable to write index."
 msgstr "�е удает�� запи�ать индек�."
 
@@ -958,28 +984,28 @@ msgstr "Ð�еправильное значение переменной %s: «%sÂ
 msgid "unable to parse object: %s"
 msgstr "не удало�ь разобрать объект: %s"
 
-#: parse-options.c:570
+#: parse-options.c:572
 msgid "..."
 msgstr "…"
 
-#: parse-options.c:588
+#: parse-options.c:590
 #, c-format
 msgid "usage: %s"
 msgstr "и�пользование: %s"
 
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
 #, c-format
 msgid "   or: %s"
 msgstr "          или: %s"
 
-#: parse-options.c:595
+#: parse-options.c:597
 #, c-format
 msgid "    %s"
 msgstr "            %s"
 
-#: parse-options.c:629
+#: parse-options.c:631
 msgid "-NUM"
 msgstr "-КОЛИЧЕСТВО"
 
@@ -988,7 +1014,7 @@ msgstr "-КОЛИЧЕСТВО"
 msgid "malformed object name '%s'"
 msgstr "�еправильное им� объекта «%s»"
 
-#: path.c:752
+#: path.c:796
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "�е удало�ь предо�тавить до�туп к %s на запи�ь"
@@ -1053,7 +1079,7 @@ msgid ""
 "Perhaps you forgot to add either ':/' or '.' ?"
 msgstr "�е указан шаблон дл� и�ключени� � помощью :(exclude).\nВозможно, вы забыли «:/» или «.» ?"
 
-#: pretty.c:969
+#: pretty.c:971
 msgid "unable to parse --pretty format"
 msgstr "не удало�ь разобрать формат дл� --pretty"
 
@@ -1075,23 +1101,23 @@ msgid ""
 "Using version %i"
 msgstr "GIT_INDEX_VERSION указан, но значение недей�твительное.\nИ�пользую вер�ию %i"
 
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "�е удало�ь открыть «%s» дл� запи�и"
 
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "не удало�ь удалить ��ылку %s: %s"
 
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2246
 #, c-format
 msgid "could not delete references: %s"
 msgstr "не удало�ь удалить ��ылки: %s"
 
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
 #, c-format
 msgid "could not remove reference %s"
 msgstr "не удало�ь удалить ��ылки %s"
@@ -1230,82 +1256,82 @@ msgstr "format: пропущена ча�тица %%(end)"
 msgid "malformed object name %s"
 msgstr "неправильное им� объекта %s"
 
-#: remote.c:745
+#: remote.c:746
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "�ельз� извлечь одновременно %s и %s в %s"
 
-#: remote.c:749
+#: remote.c:750
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s обычно от�леживает %s, а не %s"
 
-#: remote.c:753
+#: remote.c:754
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s от�леживает и %s и %s"
 
-#: remote.c:761
+#: remote.c:762
 msgid "Internal error"
 msgstr "Внутренн�� ошибка"
 
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
 msgid "HEAD does not point to a branch"
 msgstr "HEAD не указывает на ветку"
 
-#: remote.c:1686
+#: remote.c:1687
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "нет такой ветки: «%s»"
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "выше�то�ща� ветка не на�троена дл� ветки «%s»"
 
-#: remote.c:1695
+#: remote.c:1696
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "выше�то�ща� ветка «%s» не �охранена как от�леживаема� ветка"
 
-#: remote.c:1710
+#: remote.c:1711
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "назначение дл� отправки «%s» на внешнем �ервере «%s» не имеет локальной от�леживаемой ветки"
 
-#: remote.c:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "ветка «%s» не имеет внешнего �ервера дл� отправки"
 
-#: remote.c:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "�пецификации пути дл� отправки «%s» не включают в �еб� «%s»"
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "отправка не имеет точки назначени� (push.default вы�тавлен в «nothing»)"
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "не удало�ь выполнить «simple» отправку в един�твенную точку назначени�"
 
-#: remote.c:2073
+#: remote.c:2074
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Ваша ветка базирует�� на «%s», но выше�то�щий репозиторий и�чез.\n"
 
-#: remote.c:2077
+#: remote.c:2078
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "(дл� и�правлени� запу�тите «git branch --unset-upstream»)\n"
 
-#: remote.c:2080
+#: remote.c:2081
 #, c-format
 msgid "Your branch is up-to-date with '%s'.\n"
 msgstr "Ваша ветка обновлена в �оответ�твии � «%s».\n"
 
-#: remote.c:2084
+#: remote.c:2085
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
@@ -1314,11 +1340,11 @@ msgstr[1] "Ваша ветка опережает «%s» на %d коммита.
 msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n"
 msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n"
 
-#: remote.c:2090
+#: remote.c:2091
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (и�пользуйте «git push», чтобы опубликовать ваши локальные коммиты)\n"
 
-#: remote.c:2093
+#: remote.c:2094
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -1328,11 +1354,11 @@ msgstr[1] "Ваша ветка от�тает от «%s» на %d коммита
 msgstr[2] "Ваша ветка от�тает от «%s» на %d коммитов и может быть перемотана вперед.\n"
 msgstr[3] "Ваша ветка от�тает от «%s» на %d коммитов и может быть перемотана вперед.\n"
 
-#: remote.c:2101
+#: remote.c:2102
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (и�пользуйте «git pull», чтобы обновить вашу локальную ветку)\n"
 
-#: remote.c:2104
+#: remote.c:2105
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -1345,20 +1371,20 @@ msgstr[1] "Ваша ветка и «%s» разделили�ь\nи теперь
 msgstr[2] "Ваша ветка и «%s» разделили�ь\nи теперь имеют %d и %d разных коммитов в каждой �оответ�твенно.\n"
 msgstr[3] "Ваша ветка и «%s» разделили�ь\nи теперь имеют %d и %d разных коммитов в каждой �оответ�твенно.\n"
 
-#: remote.c:2114
+#: remote.c:2115
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (и�пользуйте «git pull», чтобы �лить внешнюю ветку в вашу)\n"
 
-#: revision.c:2131
+#: revision.c:2142
 msgid "your current branch appears to be broken"
 msgstr "похоже, ваша текуща� ветка повреждена"
 
-#: revision.c:2134
+#: revision.c:2145
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "ваша текуща� ветка «%s» еще не �одержит ни одного коммита"
 
-#: revision.c:2328
+#: revision.c:2339
 msgid "--first-parent is incompatible with --bisect"
 msgstr "опцию --first-parent нельз� и�пользовать одновременно � --bisect"
 
@@ -1402,7 +1428,7 @@ msgid ""
 "and commit the result with 'git commit'"
 msgstr "по�ле разрешени� конфликтов, пометьте и�правленные пути\n� помощью «git add <пути>» или «git rm <пути>»\nи �делайте коммит � помощью «git commit»"
 
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
 #, c-format
 msgid "Could not write to %s"
 msgstr "�е удало�ь запи�ать в %s"
@@ -1560,12 +1586,12 @@ msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»
 msgid "Could not create sequencer directory %s"
 msgstr "�е удало�ь �оздать каталог дл� указател� �ледовани� коммитов %s"
 
-#: sequencer.c:835 sequencer.c:917
+#: sequencer.c:835 sequencer.c:916
 #, c-format
 msgid "Error wrapping up %s."
 msgstr "Ошибка оборачивани� %s."
 
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
 msgid "no cherry-pick or revert in progress"
 msgstr "отбор лучшего или возврат коммита не выполн�ет��"
 
@@ -1577,63 +1603,72 @@ msgstr "не удало�ь определить HEAD"
 msgid "cannot abort from a branch yet to be born"
 msgstr "нельз� отменить изменени� � ветки, котора� еще не �оздана"
 
-#: sequencer.c:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
 #, c-format
-msgid "cannot open %s: %s"
-msgstr "не удало�ь открыть %s: %s"
+msgid "cannot open %s"
+msgstr "не удало�ь открыть %s"
 
-#: sequencer.c:881
+#: sequencer.c:880
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "не удало�ь прочитать %s: %s"
 
-#: sequencer.c:882
+#: sequencer.c:881
 msgid "unexpected end of file"
 msgstr "неожиданный конец файла"
 
-#: sequencer.c:888
+#: sequencer.c:887
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "�охраненный файл � HEAD перед отбором лучшего «%s» поврежден"
 
-#: sequencer.c:910
+#: sequencer.c:909
 #, c-format
 msgid "Could not format %s."
 msgstr "�е удало�ь отформатировать %s."
 
-#: sequencer.c:1055
+#: sequencer.c:1054
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: не удало�ь отобрать %s"
 
-#: sequencer.c:1058
+#: sequencer.c:1057
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: плоха� редакци�"
 
-#: sequencer.c:1092
+#: sequencer.c:1091
 msgid "Can't revert as initial commit"
 msgstr "�ельз� возвратить изначальный коммит"
 
-#: sequencer.c:1093
+#: sequencer.c:1092
 msgid "Can't cherry-pick into empty head"
 msgstr "�ельз� отобрать лучшее в пу�тую ветку"
 
-#: setup.c:246
+#: setup.c:248
 #, c-format
 msgid "failed to read %s"
 msgstr "не удало�ь прочитать %s"
 
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Ожидаема� вер�и� git репозитори� <= %d, а обнаружена %d"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "обнаружены неизве�тные ра�ширени� репозитори�:"
+
 #: sha1_file.c:1080
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "�двиг до конца файла пакета (возможно, повреждён файл .idx?)"
 
-#: sha1_file.c:2459
+#: sha1_file.c:2458
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "�двиг до начала индек�а пакета дл� %s (повреждён индек�?)"
 
-#: sha1_file.c:2463
+#: sha1_file.c:2462
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "�двиг за пределами индек�а пакета дл� %s (обрезан индек�?)"
@@ -1651,29 +1686,38 @@ msgid ""
 "running \"git config advice.objectNameWarning false\""
 msgstr "Обычно Git не �оздает ��ылки, оканчивающие�� на 40 ше�тнадцатеричных\n�имволов, потому, что они будут игнорировать��, когда вы про�то\nукажете �то 40-�имвольное ше�тнадцатеричное чи�ло. Такие ��ылки\nмогли быть �озданы по ошибке. �апример, � помощью:\n\n  git checkout -b $br $(git rev-parse …)\n\n, е�ли «$br» оказал�� пу�тым, то ��ылка � 40-�имвольным\nше�тнадцатеричным чи�лом будет �оздана. Пожалуй�та, про�мотрите �ти\n��ылки и, возможно, удалите их. Вы можете отключить �то �ообщение\nзапу�тив «git config advice.objectNameWarning false»"
 
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr "�е удало�ь изменить не �литый .gitmodules, �начала разрешите конфликты"
 
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "�е удало�ь найти раздел в .gitmodules, где путь равен %s"
 
-#: submodule.c:74
+#: submodule.c:76
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr " �е удало�ь обновить .gitmodules запи�ь %s"
 
-#: submodule.c:107
+#: submodule.c:109
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "�е удало�ь удалить запи�ь в .gitmodules дл� %s"
 
-#: submodule.c:118
+#: submodule.c:120
 msgid "staging updated .gitmodules failed"
 msgstr "�бой индек�ировани� обновленного .gitmodules"
 
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "нельз� и�пользовать отприцательные значени� дл� submodule.fetchJobs"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "неправильное значение %s"
+
 #: trailer.c:237
 #, c-format
 msgid "running trailer command '%s' failed"
@@ -1733,7 +1777,171 @@ msgstr "не удало�ь переименовать временный фай
 msgid "Could not read ref %s"
 msgstr "�е удало�ь прочитать ��ылку %s"
 
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you can switch branches."
+msgstr "Ваши локальные изменени� в указанных файлах будут перезапи�аны при переключении на �о�то�ние:\n%%sСделайте коммит или �пр�чьте ваши изменени� перед переключением веток."
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr "Ваши локальные изменени� в указанных файлах будут перезапи�аны при переключении на �о�то�ние:\n%%s"
+
+#: unpack-trees.c:69
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you can merge."
+msgstr "Ваши локальные изменени� в указанных файлах будут перезапи�аны при �ли�нии:\n%%sСделайте коммит или �пр�чьте ваши изменени� перед �ли�нием веток."
+
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr "Ваши локальные изменени� в указанных файлах будут перезапи�аны при �ли�нии:\n%%s"
+
+#: unpack-trees.c:74
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you can %s."
+msgstr "Ваши локальные изменени� в указанных файлах будут перезапи�аны при %s:\n%%sСделайте коммит или �пр�чьте ваши изменени� перед %s."
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr "Ваши локальные изменени� в указанных файлах будут перезапи�аны при %s:\n%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr "Обновление указанных каталогов приведет к потере неот�леживаемых файлов в них:\n%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут удалены при переключении на �о�то�ние:\n%%sПереме�тите �ти файлы или удалите их перед переключением веток."
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут удалены при переключении на �о�то�ние:\n%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут удалены при �ли�нии:\n%%sПереме�тите �ти файлы или удалите их перед переключением веток."
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут удалены при �ли�нии:\n%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут удалены при %s:\n%%sПереме�тите �ти файлы или удалите их перед %s."
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут удалены при %s:\n%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут перезапи�аны при переключении на �о�то�ние:\n%%sПереме�тите �ти файлы или удалите их перед переключением веток."
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by checkout:\n"
+"%%s"
+msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут перезапи�аны при переключении на �о�то�ние:\n%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут перезапи�аны при �ли�нии:\n%%sПереме�тите �ти файлы или удалите их перед переключением веток."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут перезапи�аны при �ли�нии:\n%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут перезапи�аны при %s:\n%%sПереме�тите �ти файлы или удалите их перед %s."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут перезапи�аны при %s:\n%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "Запи�ь «%s» ча�тично �овпадает � «%s».  �е удало�ь назначить �оответ�твие."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr "�е удало�ь обновить ча�тичное �о�то�ние: �ледующие �лементы не по�ледней вер�ии:\n%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout update:\n"
+"%s"
+msgstr "Указанные файлы из рабочего каталога будут перезапи�аны при обновлении ча�тичного �о�то�ни�:\n%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout update:\n"
+"%s"
+msgstr "Указанные файлы из рабочего каталога будут удалены при обновлении ча�тичного �о�то�ни�:\n%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "Прерываю\n"
+
+#: unpack-trees.c:237
 msgid "Checking out files"
 msgstr "Ра�паковка файлов"
 
@@ -1771,231 +1979,227 @@ msgstr "неправильна� ча�ть пути «..»"
 msgid "could not open '%s' for reading and writing"
 msgstr "не удало�ь открыть «%s» дл� чтени� и запи�и"
 
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "не удало�ь открыть «%s» дл� запи�и"
 
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "не удало�ь открыть «%s» дл� чтени�"
 
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "«%s» недо�тупно: %s"
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
 #, c-format
 msgid "unable to access '%s'"
 msgstr "«%s» недо�тупно"
 
-#: wrapper.c:640
+#: wrapper.c:623
 msgid "unable to get current working directory"
 msgstr "не удало�ь получить текущий рабочий каталог"
 
-#: wrapper.c:667
+#: wrapper.c:650
 #, c-format
 msgid "could not open %s for writing"
 msgstr "не удало�ь открыть «%s» дл� запи�и"
 
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
 #, c-format
 msgid "could not write to %s"
 msgstr "не удало�ь запи�ать в %s"
 
-#: wrapper.c:684
+#: wrapper.c:667
 #, c-format
 msgid "could not close %s"
 msgstr "не удало�ь закрыть %s"
 
-#: wt-status.c:149
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "�е �литые пути:"
 
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (и�пользуйте «git reset %s <файл>…», чтобы убрать из индек�а)"
 
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (и�пользуйте «git rm --cached <файл>…», чтобы убрать из индек�а)"
 
-#: wt-status.c:182
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (и�пользуйте «git add <файл>…», чтобы пометить разрешение конфликта)"
 
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr "  (и�пользуйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)"
 
-#: wt-status.c:186
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (и�пользуйте «git rm <файл>…», чтобы пометить разрешение конфликта)"
 
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
 msgid "Changes to be committed:"
 msgstr "Изменени�, которые будут включены в коммит:"
 
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
 msgid "Changes not staged for commit:"
 msgstr "Изменени�, которые не в индек�е дл� коммита:"
 
-#: wt-status.c:219
+#: wt-status.c:220
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  (и�пользуйте «git add <файл>…», чтобы добавить файл в индек�)"
 
-#: wt-status.c:221
+#: wt-status.c:222
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  (и�пользуйте «git add/rm <файл>…», чтобы добавить или удалить файл из индек�а)"
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working "
 "directory)"
 msgstr "  (и�пользуйте «git checkout -- <файл>…», чтобы отменить изменени�\n   в рабочем каталоге)"
 
-#: wt-status.c:224
+#: wt-status.c:225
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr "  (�делайте коммит или отмените изменени� в неот�леживаемом или измененном �одержимом в подмодул�х)"
 
-#: wt-status.c:236
+#: wt-status.c:237
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr "  (и�пользуйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)"
 
-#: wt-status.c:251
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "оба удалены:"
 
-#: wt-status.c:253
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "добавлено нами:"
 
-#: wt-status.c:255
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "удалено ими:"
 
-#: wt-status.c:257
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "добавлено ими:"
 
-#: wt-status.c:259
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "удалено нами:"
 
-#: wt-status.c:261
+#: wt-status.c:262
 msgid "both added:"
 msgstr "оба добавлены:"
 
-#: wt-status.c:263
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "оба измены:"
 
-#: wt-status.c:265
+#: wt-status.c:266
 #, c-format
 msgid "bug: unhandled unmerged status %x"
 msgstr "ошибка: необработанный �тату� не �литых изменений %x"
 
-#: wt-status.c:273
+#: wt-status.c:274
 msgid "new file:"
 msgstr "новый файл:"
 
-#: wt-status.c:275
+#: wt-status.c:276
 msgid "copied:"
 msgstr "�копировано:"
 
-#: wt-status.c:277
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "удалено:"
 
-#: wt-status.c:279
+#: wt-status.c:280
 msgid "modified:"
 msgstr "изменено:"
 
-#: wt-status.c:281
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "переименовано:"
 
-#: wt-status.c:283
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "изменен тип:"
 
-#: wt-status.c:285
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "неизве�тно:"
 
-#: wt-status.c:287
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "не �литые:"
 
-#: wt-status.c:369
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "новые коммиты, "
 
-#: wt-status.c:371
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "изменено �одержимое, "
 
-#: wt-status.c:373
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "неот�леживаемое �одержимое, "
 
-#: wt-status.c:390
+#: wt-status.c:391
 #, c-format
 msgid "bug: unhandled diff status %c"
 msgstr "ошибка: необработанный �тату� изменений %c"
 
-#: wt-status.c:754
+#: wt-status.c:755
 msgid "Submodules changed but not updated:"
 msgstr "Измененные, но не обновленные подмодули:"
 
-#: wt-status.c:756
+#: wt-status.c:757
 msgid "Submodule changes to be committed:"
 msgstr "Изменени� в подмодул�х, которые будут закоммичены:"
 
-#: wt-status.c:837
+#: wt-status.c:838
 msgid ""
 "Do not touch the line above.\n"
 "Everything below will be removed."
 msgstr "�е трогайте �троку выше �той.\nВ�ё, что ниже — будет удалено."
 
-#: wt-status.c:948
+#: wt-status.c:949
 msgid "You have unmerged paths."
 msgstr "У ва� е�ть не �литые пути."
 
-#: wt-status.c:951
+#: wt-status.c:952
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (разрешите конфликты, затем запу�тите «git commit»)"
 
-#: wt-status.c:954
+#: wt-status.c:956
 msgid "All conflicts fixed but you are still merging."
 msgstr "В�е конфликты и�правлены, но вы в�е еще в проце��е �ли�ни�."
 
-#: wt-status.c:957
+#: wt-status.c:959
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (и�пользуйте «git commit», чтобы завершить �ли�ние)"
 
-#: wt-status.c:967
+#: wt-status.c:969
 msgid "You are in the middle of an am session."
 msgstr "Вы в проце��е �е��ии am."
 
-#: wt-status.c:970
+#: wt-status.c:972
 msgid "The current patch is empty."
 msgstr "Текущий патч пу�той."
 
-#: wt-status.c:974
+#: wt-status.c:976
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (разрешите конфликты, затем запу�тите «git am --continue»)"
 
-#: wt-status.c:976
+#: wt-status.c:978
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (и�пользуйте «git am --skip», чтобы пропу�тить �тот патч)"
 
-#: wt-status.c:978
+#: wt-status.c:980
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (и�пользуйте «git am --abort», чтобы во��тановить оригинальную ветку)"
 
@@ -2137,43 +2341,43 @@ msgstr "Вы �ейча� в проце��е двоичного пои�ка."
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (и�пользуйте «git bisect reset», чтобы вернуть�� на и�ходную ветку)"
 
-#: wt-status.c:1438
+#: wt-status.c:1460
 msgid "On branch "
 msgstr "�а ветке "
 
-#: wt-status.c:1444
+#: wt-status.c:1466
 msgid "interactive rebase in progress; onto "
 msgstr "интерактивное перемещение в проце��е; над "
 
-#: wt-status.c:1446
+#: wt-status.c:1468
 msgid "rebase in progress; onto "
 msgstr "перемещение в проце��е; над "
 
-#: wt-status.c:1451
+#: wt-status.c:1473
 msgid "HEAD detached at "
 msgstr "HEAD отделён на "
 
-#: wt-status.c:1453
+#: wt-status.c:1475
 msgid "HEAD detached from "
 msgstr "HEAD отделён начина� � "
 
-#: wt-status.c:1456
+#: wt-status.c:1478
 msgid "Not currently on any branch."
 msgstr "Сейча� ни на одной из веток"
 
-#: wt-status.c:1474
+#: wt-status.c:1496
 msgid "Initial commit"
 msgstr "�ачальный коммит"
 
-#: wt-status.c:1488
+#: wt-status.c:1510
 msgid "Untracked files"
 msgstr "�еот�леживаемые файлы"
 
-#: wt-status.c:1490
+#: wt-status.c:1512
 msgid "Ignored files"
 msgstr "Игнорируемые файлы"
 
-#: wt-status.c:1494
+#: wt-status.c:1516
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2181,82 +2385,82 @@ msgid ""
 "new files yourself (see 'git help status')."
 msgstr "%.2f �екунды зан�л вывод �пи�ка неот�леживаемых файлов. «status -uno» возможно может у�корить �то, но будьте внимательны, и не забудьте добавить новые файлы вручную (�мотрите «git help status» дл� подробно�тей)."
 
-#: wt-status.c:1500
+#: wt-status.c:1522
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "�еот�леживаемые файлы не показаны%s"
 
-#: wt-status.c:1502
+#: wt-status.c:1524
 msgid " (use -u option to show untracked files)"
 msgstr "(и�пользуйте опцию «-u», чтобы показать неот�леживаемые файлы)"
 
-#: wt-status.c:1508
+#: wt-status.c:1530
 msgid "No changes"
 msgstr "�ет изменений"
 
-#: wt-status.c:1513
+#: wt-status.c:1535
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr "нет изменений добавленных дл� коммита\n(и�пользуйте «git add» и/или «git commit -a»)\n"
 
-#: wt-status.c:1516
+#: wt-status.c:1538
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "нет изменений добавленных дл� коммита\n"
 
-#: wt-status.c:1519
+#: wt-status.c:1541
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr "ничего не добавлено в коммит, но е�ть неот�леживаемые файлы (и�пользуйте «git add», чтобы от�леживать их)\n"
 
-#: wt-status.c:1522
+#: wt-status.c:1544
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "ничего не добавлено в коммит, но е�ть неот�леживаемые файлы\n"
 
-#: wt-status.c:1525
+#: wt-status.c:1547
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "нечего коммитить (�оздайте/�копируйте файлы, затем запу�тите «git add», чтобы от�леживать их)\n"
 
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
 #, c-format
 msgid "nothing to commit\n"
 msgstr "нечего коммитить\n"
 
-#: wt-status.c:1531
+#: wt-status.c:1553
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "нечего коммитить (и�пользуйте опцию «-u», чтобы показать неот�леживаемые файлы)\n"
 
-#: wt-status.c:1535
+#: wt-status.c:1557
 #, c-format
 msgid "nothing to commit, working directory clean\n"
 msgstr "нечего коммитить, нет изменений в рабочем каталоге\n"
 
-#: wt-status.c:1642
+#: wt-status.c:1664
 msgid "Initial commit on "
 msgstr "�ачальный коммит на "
 
-#: wt-status.c:1646
+#: wt-status.c:1668
 msgid "HEAD (no branch)"
 msgstr "HEAD (нет ветки)"
 
-#: wt-status.c:1675
+#: wt-status.c:1697
 msgid "gone"
 msgstr "и�чез"
 
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
 msgid "behind "
 msgstr "позади"
 
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
 msgid "ahead "
 msgstr "впереди "
 
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "�бой от�оединени� «%s»"
@@ -2270,7 +2474,7 @@ msgstr "git add [<опции>] [--] <�пецификаци�-пути>…"
 msgid "unexpected diff status %c"
 msgstr "неожиданный �тату� различий %c"
 
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
 msgid "updating files failed"
 msgstr "�бой при обновлении файлов"
 
@@ -2283,7 +2487,7 @@ msgstr "удалить «%s»\n"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "�епроиндек�ированные изменени� по�ле обновлени� индек�а:"
 
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
 msgid "Could not read the index"
 msgstr "�е удало�ь прочитать индек�"
 
@@ -2319,14 +2523,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "Следующие пути игнорируют�� одним из ваших файлов .gitignore:\n"
 
 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
 msgid "dry run"
 msgstr "пробный запу�к"
 
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
 msgid "be verbose"
 msgstr "быть много�ловнее"
 
@@ -2334,7 +2538,7 @@ msgstr "быть много�ловнее"
 msgid "interactive picking"
 msgstr "интерактивный выбор"
 
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
 msgid "select hunks interactively"
 msgstr "интерактивный выбор блоков"
 
@@ -2402,16 +2606,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Возможно, вы имели в виду «git add .»?\n"
 
 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
 msgid "index file corrupt"
 msgstr "файл индек�а поврежден"
 
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "�е удало�ь запи�ать новый файл индек�а"
 
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
 #, c-format
 msgid "could not read '%s'"
 msgstr "не удало�ь прочитать «%s»"
@@ -2439,16 +2643,6 @@ msgstr "�е удало�ь �копировать заметку из «%s» в
 msgid "fseek failed"
 msgstr "�бой при выполнении fseek"
 
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "не удало�ь открыть «%s» дл� чтени�: %s"
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "не удало�ь открыть «%s» дл� запи�и: %s"
-
 #: builtin/am.c:788
 #, c-format
 msgid "could not parse patch '%s'"
@@ -2458,340 +2652,342 @@ msgstr "не удало�ь разобрать патч «%s»"
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Только �ери� патчей StGIT может быть применена за раз"
 
-#: builtin/am.c:901
+#: builtin/am.c:900
 msgid "invalid timestamp"
 msgstr "недопу�тима� метка даты/времени"
 
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
 msgid "invalid Date line"
 msgstr "недопу�тима� �трока даты"
 
-#: builtin/am.c:909
+#: builtin/am.c:908
 msgid "invalid timezone offset"
 msgstr "недопу�тимое �мещение ча�ового по��а"
 
-#: builtin/am.c:996
+#: builtin/am.c:995
 msgid "Patch format detection failed."
 msgstr "Сбой определени� формата патча."
 
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "не удало�ь �оздать каталог «%s»"
 
-#: builtin/am.c:1005
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "�е удало�ь разделить патчи на ча�ти."
 
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
 msgid "unable to write index file"
 msgstr "не удало�ь запи�ать индек�"
 
-#: builtin/am.c:1188
+#: builtin/am.c:1187
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Когда вы у�траните �ту проблему, запу�тите «%s --continue»."
 
-#: builtin/am.c:1189
+#: builtin/am.c:1188
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Е�ли вы хотите пропу�тить �тот патч, то запу�тите «%s --skip»."
 
-#: builtin/am.c:1190
+#: builtin/am.c:1189
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "Чтобы вернуть�� на предыдущую ветку и о�тановить применение изменений, запу�тите «%s --abort»."
 
-#: builtin/am.c:1328
+#: builtin/am.c:1327
 msgid "Patch is empty. Was it split wrong?"
 msgstr "Патч пу�т. Возможно, он был неправильно разделён?"
 
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "неправильна� �трока идентификации: %s"
 
-#: builtin/am.c:1429
+#: builtin/am.c:1428
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "не удало�ь разобрать коммит %s"
 
-#: builtin/am.c:1631
+#: builtin/am.c:1630
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "В репозитории от�ут�твуют двоичные объекты, необходимые дл� отката к трехходовому �ли�нию."
 
-#: builtin/am.c:1633
+#: builtin/am.c:1632
 msgid "Using index info to reconstruct a base tree..."
 msgstr "И�пользую индек� дл� рекон�трукции базового дерева…"
 
-#: builtin/am.c:1652
+#: builtin/am.c:1651
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr "Вы вручную измен�ли патч?\nОн не накладывает�� без ошибок на двоичные объекты, запи�анные в его заголовке."
 
-#: builtin/am.c:1658
+#: builtin/am.c:1657
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Откат к применению изменений к базовому коммиту � помощью трехходового �ли�ни�…"
 
-#: builtin/am.c:1673
+#: builtin/am.c:1672
 msgid "Failed to merge in the changes."
 msgstr "�е удало�ь �лить изменени�."
 
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree не удало�ь запи�ать дерево"
 
-#: builtin/am.c:1704
+#: builtin/am.c:1703
 msgid "applying to an empty history"
 msgstr "применение к пу�той и�тории"
 
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
 msgid "failed to write commit object"
 msgstr "�бой запи�и объекта коммита"
 
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "нельз� продолжнить: %s не �уще�твует "
 
-#: builtin/am.c:1769
+#: builtin/am.c:1768
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr "не удало�ь и�пользовать интерактивное поведение, без stdin подключенного к терминалу."
 
-#: builtin/am.c:1774
+#: builtin/am.c:1773
 msgid "Commit Body is:"
 msgstr "Тело коммита:"
 
 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
 #. in your translation. The program will only accept English
 #. input at this point.
-#: builtin/am.c:1784
+#: builtin/am.c:1783
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - про�мотреть патч/[a] - применить в�ё: "
 
-#: builtin/am.c:1834
+#: builtin/am.c:1833
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Индек� не пу�той: нельз� примен�ть патчи (в индек�е: %s)"
 
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Применение: %.*s"
 
-#: builtin/am.c:1885
+#: builtin/am.c:1884
 msgid "No changes -- Patch already applied."
 msgstr "�ет изменений — Патч уже применен."
 
-#: builtin/am.c:1893
+#: builtin/am.c:1892
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Ошибка применени� изменений на %s %.*s"
 
-#: builtin/am.c:1899
+#: builtin/am.c:1898
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "Копию изменений, которые не удало�ь применить, вы можете найти в: %s"
 
-#: builtin/am.c:1944
+#: builtin/am.c:1943
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
 "already introduced the same changes; you might want to skip this patch."
 msgstr "�ет изменений — возможно, вы забыли вызвать «git add»?\nЕ�ли ничего не о�тало�ь дл� индек�ации, то, �корее в�его, что-то другое уже �делало те же изменени�; возможно, вам �ледует пропу�тить �тот патч."
 
-#: builtin/am.c:1951
+#: builtin/am.c:1950
 msgid ""
 "You still have unmerged paths in your index.\n"
 "Did you forget to use 'git add'?"
 msgstr "У ва� в�е еще имеют�� не �литые пути в индек�е.\nВозможно, вы забыли вызвать «git add»?"
 
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
 #: builtin/reset.c:316
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "�е удало�ь разобрать объект «%s»."
 
-#: builtin/am.c:2111
+#: builtin/am.c:2110
 msgid "failed to clean index"
 msgstr "не удало�ь очи�тить индек�"
 
-#: builtin/am.c:2145
+#: builtin/am.c:2144
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr "Похоже, что вы переме�тили HEAD � момента по�ледней ошибки выполнени� «am».\nПеремотка на ORIG_HEAD не выполн�ет��"
 
-#: builtin/am.c:2206
+#: builtin/am.c:2205
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "�еправильное значение дл� --patch-format: %s"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2238
 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
 msgstr "git am [<опции>] [(<mbox>|<Maildir>)…]"
 
-#: builtin/am.c:2240
+#: builtin/am.c:2239
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<опции>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2246
+#: builtin/am.c:2245
 msgid "run interactively"
 msgstr "запу�тить в интерактивном режиме"
 
-#: builtin/am.c:2248
+#: builtin/am.c:2247
 msgid "historical option -- no-op"
 msgstr "и�ториче�ка� опци� — ничего не делает"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2249
 msgid "allow fall back on 3way merging if needed"
 msgstr "разрешить откатить�� к трехходовому �ли�нию, е�ли нужно"
 
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
 #: builtin/repack.c:171
 msgid "be quiet"
 msgstr "тихий режим"
 
-#: builtin/am.c:2253
+#: builtin/am.c:2252
 msgid "add a Signed-off-by line to the commit message"
 msgstr "добавить �троку Signed-off-by к �ообщению коммита"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2255
 msgid "recode into utf8 (default)"
 msgstr "перекодировать в utf8 (по умолчанию)"
 
-#: builtin/am.c:2258
+#: builtin/am.c:2257
 msgid "pass -k flag to git-mailinfo"
 msgstr "передать флаг -k в git-mailinfo"
 
-#: builtin/am.c:2260
+#: builtin/am.c:2259
 msgid "pass -b flag to git-mailinfo"
 msgstr "передать флаг -b в git-mailinfo"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2261
 msgid "pass -m flag to git-mailinfo"
 msgstr "передать флаг -m в git-mailinfo"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2263
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "передать флаг --keep-cr в git-mailsplit дл� формата mbox"
 
-#: builtin/am.c:2267
+#: builtin/am.c:2266
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "не передавать --keep-cr флаг в git-mailsplit вне зави�имо�ти от am.keepcr"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "strip everything before a scissors line"
 msgstr "обрезать в�е до �троки обрезки"
 
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
 msgid "action"
 msgstr "дей�твие"
 
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
 msgid "pass it through git-apply"
 msgstr "передать его в git-apply"
 
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
 msgid "root"
 msgstr "корень"
 
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
 msgid "path"
 msgstr "путь"
 
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
-#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134
+#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182
 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
 #: parse-options.h:132 parse-options.h:134 parse-options.h:244
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
 msgid "num"
 msgstr "количе�тво"
 
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
 #: builtin/tag.c:372
 msgid "format"
 msgstr "формат"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "format the patch(es) are in"
 msgstr "формат, в котором наход�т�� патчи"
 
-#: builtin/am.c:2302
+#: builtin/am.c:2301
 msgid "override error message when patch failure occurs"
 msgstr "переопределить �ообщение об ошибке, е�ли не удало�ь наложить изменени�"
 
-#: builtin/am.c:2304
+#: builtin/am.c:2303
 msgid "continue applying patches after resolving a conflict"
 msgstr "продолжить применение изменений по�ле разрешени� конфиликта"
 
-#: builtin/am.c:2307
+#: builtin/am.c:2306
 msgid "synonyms for --continue"
 msgstr "�иноним дл� --continue"
 
-#: builtin/am.c:2310
+#: builtin/am.c:2309
 msgid "skip the current patch"
 msgstr "пропу�тить текущий патч"
 
-#: builtin/am.c:2313
+#: builtin/am.c:2312
 msgid "restore the original branch and abort the patching operation."
 msgstr "во��тановить оригинальную ветку и отменить операцию применени� изменений."
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 msgid "lie about committer date"
 msgstr "�оврать о дате коммитера"
 
-#: builtin/am.c:2319
+#: builtin/am.c:2318
 msgid "use current timestamp for author date"
 msgstr "и�пользовать текущее врем� как врем� автор�тва"
 
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2322
+#: builtin/am.c:2321
 msgid "GPG-sign commits"
 msgstr "подпи�ать коммиты � помощью GPG"
 
-#: builtin/am.c:2325
+#: builtin/am.c:2324
 msgid "(internal use for git-rebase)"
 msgstr "(внутреннее и�пользование дл� git-rebase)"
 
-#: builtin/am.c:2340
+#: builtin/am.c:2339
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
 msgstr "Опци� -b/--binary уже долгое врем� ничего не делает и будет удалена � �ледующих вер�и�х Git. Пожалуй�та, не и�пользуйте ее."
 
-#: builtin/am.c:2347
+#: builtin/am.c:2346
 msgid "failed to read the index"
 msgstr "�бой чтени� индек�а"
 
-#: builtin/am.c:2362
+#: builtin/am.c:2361
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "предыдущий каталог перемещени� %s еще �уще�твует, но передан mbox."
 
-#: builtin/am.c:2386
+#: builtin/am.c:2385
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr "�айден забытый каталог %s.\nИ�пользуйте «git am --abort», чтобы удалить его."
 
-#: builtin/am.c:2392
+#: builtin/am.c:2391
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Операци� разрешени� конфликтов не в проце��е выполнени�, не продолжаем."
 
@@ -2824,37 +3020,37 @@ msgstr "regexec возвратил %d дл� ввода: %s"
 msgid "unable to find filename in patch at line %d"
 msgstr "не удало�ь найти им� файла в �троке патча %d"
 
-#: builtin/apply.c:940
+#: builtin/apply.c:937
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr "git apply: плохой git-diff — ожидало�ь /dev/null, получено %s на �троке %d"
 
-#: builtin/apply.c:944
+#: builtin/apply.c:942
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply: плохой git-diff — не �огла�ующее�� новое им� файла на �троке %d"
 
-#: builtin/apply.c:945
+#: builtin/apply.c:943
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply: плохой git-diff — не �огла�ующее�� �тарое им� файла на �троке %d"
 
-#: builtin/apply.c:952
+#: builtin/apply.c:949
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: плохой git-diff  — ожидало�ь /dev/null на �троке %d"
 
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: не ожидаема� �трока: %.*s"
 
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "фрагмент изменений без заголовка на �троке %d: %.*s"
 
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname"
@@ -2867,65 +3063,65 @@ msgstr[1] "заголовок git diff не нашел информацию об
 msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (�трока %d)"
 msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (�трока %d)"
 
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
 msgid "new file depends on old contents"
 msgstr "новый файл зави�ит от �тарого �одержимого"
 
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
 msgid "deleted file still has contents"
 msgstr "удаленный файл в�е еще имеет �одержимое"
 
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "патч поврежден на �троке %d"
 
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "новый файл %s зави�ит от �тарого �одержимого"
 
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "удаленный файл %s в�е еще имеет �одержимое"
 
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** предупреждение: файл %s �тановит�� пу�тым, но не удал�ет��"
 
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "поврежденный двоичный патч на �троке %d: %.*s"
 
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "неопознанный двоичный патч на �троке %d"
 
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "патч � му�ором на �троке %d"
 
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "не удало�ь прочитать �имвольную ��ылку %s"
 
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
 #, c-format
 msgid "unable to open or read %s"
 msgstr "не удало�ь открыть или проче�ть %s"
 
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "неправильное начало �троки: «%c»"
 
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -2934,177 +3130,177 @@ msgstr[1] "Ча�ть #%d у�пешно применена на %d (�о �дв
 msgstr[2] "Ча�ть #%d у�пешно применена на %d (�о �двигом в %d �трок)."
 msgstr[3] "Ча�ть #%d у�пешно применена на %d (�о �двигом в %d �трок)."
 
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Контек�т �ужен до (%ld/%ld), чтобы применить фрагмент на %d �троке"
 
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
 #, c-format
 msgid ""
 "while searching for:\n"
 "%.*s"
 msgstr "при пои�ке:\n%.*s"
 
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "пропущены данные двоичного патча дл� «%s»"
 
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "не удало�ь применить двоичный патч к «%s»"
 
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "по�ле применени� двоичного патча дл� «%s» был получен неправильный результат (ожидало�ь %s, получено %s)"
 
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "ошибка применени� изменений: %s:%ld"
 
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
 #, c-format
 msgid "cannot checkout %s"
-msgstr "не удало�ь перейти на %s"
+msgstr "не удало�ь переключить �о�то�ние на %s"
 
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
 #, c-format
 msgid "read of %s failed"
 msgstr "ошибка чтени� %s"
 
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "чтение из «%s» за �имволиче�кой ��ылкой"
 
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "путь %s был переименован/удален"
 
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: нет в индек�е"
 
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: не �овпадает � индек�ом"
 
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
 msgid "removal patch leaves file contents"
 msgstr "патч удалени� не удалил �одержимое файла"
 
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: неправильный тип"
 
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s имеет тип %o, а ожидал�� %o"
 
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
 #, c-format
 msgid "invalid path '%s'"
 msgstr "неправильный путь «%s»"
 
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: уже �одержит�� в индек�е"
 
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: уже �одержит�� в рабочем каталоге"
 
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "новый режим до�тупа (%o) дл� %s не �оответ�твует �тарому режиму до�тупа (%o)"
 
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "новый режим до�тупа (%o) дл� %s не �оответ�твует �тарому режиму до�тупа (%o) дл� %s"
 
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "затронутый файл «%s» находит�� за �имволиче�кой ��ылкой"
 
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: не удало�ь применить патч"
 
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Проверка патча %s…"
 
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "�бой make_cache_entry дл� пути «%s»"
 
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "не удало�ь удалить %s из индек�а"
 
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "поврежденный патч дл� подмодул� %s"
 
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "не удало�ь выполнить stat дл� �озданного файла «%s»"
 
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "не удало�ь �оздать в�помогательный файл дл� �озданного файла %s"
 
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "не удало�ь �оздать запи�ь в к�ше дл� %s"
 
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
 #, c-format
 msgid "closing file '%s'"
 msgstr "закрытие файла «%s»"
 
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "не удало�ь запи�ать файл «%s» � режимом до�тупа %o"
 
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Патч %s применен без ошибок."
 
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
 msgid "internal error"
 msgstr "внутренн�� ошибка"
 
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
@@ -3113,147 +3309,157 @@ msgstr[1] "Применение патча %%s � %d отказами…"
 msgstr[2] "Применение патча %%s � %d отказами…"
 msgstr[3] "Применение патча %%s � %d отказами…"
 
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "у�ечение имени .rej файла до %.*s.rej"
 
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "не удало�ь открыть %s: %s"
+
+#: builtin/apply.c:4298
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Блок №%d применен без ошибок."
 
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Блок №%d отклонен."
 
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Патч «%s» пропущен."
+
+#: builtin/apply.c:4395
 msgid "unrecognized input"
 msgstr "не ра�познанный ввод"
 
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
 msgid "unable to read index file"
 msgstr "не удало�ь прочитать файл индек�а"
 
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
 msgid "don't apply changes matching the given path"
 msgstr "не примен�ть изменени� по указанному пути"
 
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
 msgid "apply changes matching the given path"
 msgstr "примен�ть изменени� по указанному пути"
 
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "удалить <количе�тво> ведущих ко�ых черт из традиционных путей �пи�ка изменений"
 
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
 msgid "ignore additions made by the patch"
 msgstr "игнорировать добавлени�, �деланные �тим патчем"
 
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "вме�то применени� патча выве�ти �тати�тику добавлений и удалений дл� ввода"
 
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "показать количе�тво добавленных и удаленных �трок в де��тичном пред�тавлении"
 
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "вме�то применени� патча выве�ти �тати�тику изменений дл� ввода"
 
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "вме�то применени� патча проверить подходит ли он"
 
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
 msgid "make sure the patch is applicable to the current index"
 msgstr "проверить, что патч примен�ет�� к текущему индек�у"
 
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
 msgid "apply a patch without touching the working tree"
 msgstr "применить патч, не измен�� рабочий каталог"
 
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
 msgid "accept a patch that touches outside the working area"
 msgstr "прин�ть патч, который затрагивает файлы за рабочим каталогом"
 
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "а также применить патч (и�пользуйте � --stat/--summary/--check)"
 
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "попытать�� �делать трехходовое �ли�ние, е�ли патч не примен�ет��"
 
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
 msgid "build a temporary index based on embedded index information"
 msgstr "по�троить временный индек�, о�нованный на в�троенной информации об индек�е"
 
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
 msgid "paths are separated with NUL character"
 msgstr "пути, отделённые �УЛЕВЫМ �имволом"
 
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
 msgid "ensure at least <n> lines of context match"
 msgstr "удо�товерить��, что по крайней мере <n> �трок контек�та �овпадают"
 
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "определ�ть новые или модифицированные �троки, у которых е�ть ошибки в пробельных �имволах"
 
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
 msgid "ignore changes in whitespace when finding context"
 msgstr "игнорировать изменени� в пробельных �имволах при пои�ке контек�та"
 
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
 msgid "apply the patch in reverse"
 msgstr "применить патч � обращением изменений"
 
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
 msgid "don't expect at least one line of context"
 msgstr "не ожидать как минимум одной �троки контек�та"
 
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "о�тавить отклоненные блоки изменений в �оответ�твующих *.rej файлах"
 
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
 msgid "allow overlapping hunks"
 msgstr "разрешить перекрывающие�� блоки изменений"
 
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "разрешить некорректно определенные пропущенные пу�тые �троки в конце файла"
 
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
 msgid "do not trust the line counts in the hunk headers"
 msgstr "не довер�ть количе�тву �трок из заголовка блока изменений"
 
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
 msgid "prepend <root> to all filenames"
 msgstr "добавить <корень> �переди ко в�ем именам файлов"
 
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
 msgid "--3way outside a repository"
 msgstr "--3way вне репозитори�"
 
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
 msgid "--index outside a repository"
 msgstr "--index вне репозитори�"
 
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
 msgid "--cached outside a repository"
 msgstr "--cached вне репозитори�"
 
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
 #, c-format
 msgid "can't open patch '%s'"
 msgstr "не удало�ь открыть патч «%s»"
 
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
@@ -3262,7 +3468,7 @@ msgstr[1] "пропущено %d ошибки в пробельных �имво
 msgstr[2] "пропущено %d ошибок в пробельных �имволах"
 msgstr[3] "пропущено %d ошибок в пробельных �имволах"
 
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
@@ -3330,99 +3536,99 @@ msgstr "<опции-rev-list> документированы в git-rev-list(1)"
 msgid "Blaming lines"
 msgstr "Про�мотр авторов �трок"
 
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
 msgid "Show blame entries as we find them, incrementally"
 msgstr "Показать запи�и автор�тва по�тепенно, в проце��е нахождени�"
 
-#: builtin/blame.c:2531
+#: builtin/blame.c:2532
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "�е показывать SHA-1 дл� коммитов, не вход�щих в границы запро�а (По умолчанию: отключено)"
 
-#: builtin/blame.c:2532
+#: builtin/blame.c:2533
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "�е во�принимать корневые коммиты как граничные (По умолчанию: отключено)"
 
-#: builtin/blame.c:2533
+#: builtin/blame.c:2534
 msgid "Show work cost statistics"
 msgstr "Показать �тати�тику ра�ходов на выполнение запро�а"
 
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
 msgid "Force progress reporting"
 msgstr "Принудительно выводить прогре�� выполнени�"
 
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
 msgid "Show output score for blame entries"
 msgstr "Показать оценку дл� запи�ей автор�тва"
 
-#: builtin/blame.c:2536
+#: builtin/blame.c:2537
 msgid "Show original filename (Default: auto)"
 msgstr "Показать оригинальное им� файла (По умолчанию: автоматиче�ки)"
 
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
 msgid "Show original linenumber (Default: off)"
 msgstr "Показать оригинальные номера �трок (По умолчанию: отключено)"
 
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
 msgid "Show in a format designed for machine consumption"
 msgstr "Показать в формате дл� программного разбора"
 
-#: builtin/blame.c:2539
+#: builtin/blame.c:2540
 msgid "Show porcelain format with per-line commit information"
 msgstr "Показать в машиночитаемом формате, � по�трочной информацией о коммите"
 
-#: builtin/blame.c:2540
+#: builtin/blame.c:2541
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "И�пользовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)"
 
-#: builtin/blame.c:2541
+#: builtin/blame.c:2542
 msgid "Show raw timestamp (Default: off)"
 msgstr "Показать необработанные временные метки (По умолчанию: отключено)"
 
-#: builtin/blame.c:2542
+#: builtin/blame.c:2543
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)"
 
-#: builtin/blame.c:2543
+#: builtin/blame.c:2544
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "�е показывать им� автора и временные метки (По умолчанию: отключено)"
 
-#: builtin/blame.c:2544
+#: builtin/blame.c:2545
 msgid "Show author email instead of name (Default: off)"
 msgstr "Показать почту автора вме�то имени (По умолчанию: отключено)"
 
-#: builtin/blame.c:2545
+#: builtin/blame.c:2546
 msgid "Ignore whitespace differences"
 msgstr "Игнорировать различи� в пробелах"
 
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
 msgid "Spend extra cycles to find better match"
 msgstr "Потратить больше времени, дл� нахождени� лучших �овпадений"
 
-#: builtin/blame.c:2547
+#: builtin/blame.c:2548
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "И�пользовать редакции из <файла> вме�то вызова git-rev-list"
 
-#: builtin/blame.c:2548
+#: builtin/blame.c:2549
 msgid "Use <file>'s contents as the final image"
 msgstr "И�пользовать �одержимое <файла> как финальный �нимок"
 
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
 msgid "score"
 msgstr "мин-длина"
 
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
 msgid "Find line copies within and across files"
 msgstr "�айти копирование �трок в пределах и между файлами"
 
-#: builtin/blame.c:2550
+#: builtin/blame.c:2551
 msgid "Find line movements within and across files"
 msgstr "�айти перемещени� �трок в пределах и между файлами"
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "n,m"
 msgstr "начало,конец"
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "Process only line range n,m, counting from 1"
 msgstr "Обработать только �троки в диапазоне начало,конец, начина� � 1"
 
@@ -3432,392 +3638,413 @@ msgstr "Обработать только Ñ�троки в диапазоне нÐ
 #. takes 22 places, is the longest among various forms of
 #. relative timestamps, but your language may need more or
 #. fewer display columns.
-#: builtin/blame.c:2640
+#: builtin/blame.c:2641
 msgid "4 years, 11 months ago"
 msgstr "4 года и 11 ме��цев назад"
 
-#: builtin/branch.c:25
+#: builtin/branch.c:26
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr "git branch [<опции>] [-r | -a] [--merged | --no-merged]"
 
-#: builtin/branch.c:26
+#: builtin/branch.c:27
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr "git branch [<опции>] [-l] [-f] <им�-ветки> [<точка-начала>]"
 
-#: builtin/branch.c:27
+#: builtin/branch.c:28
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<опции>] [-r] (-d | -D) <им�-ветки>…"
 
-#: builtin/branch.c:28
+#: builtin/branch.c:29
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<опции>] (-m | -M) [<�тара�-ветка>] <нова�-ветка>"
 
-#: builtin/branch.c:29
+#: builtin/branch.c:30
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<опции>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:142
+#: builtin/branch.c:143
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD."
 msgstr "удаление ветки «%s», котора� была �лита �\n         «%s», но не �лита � HEAD."
 
-#: builtin/branch.c:146
+#: builtin/branch.c:147
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 "         '%s', even though it is merged to HEAD."
 msgstr "не удаление ветки «%s», котора� еще не �лита �\n         «%s», хот� уже �лита � HEAD."
 
-#: builtin/branch.c:160
+#: builtin/branch.c:161
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "�е удало�ь найти объект коммита дл� «%s»"
 
-#: builtin/branch.c:164
+#: builtin/branch.c:165
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
 "If you are sure you want to delete it, run 'git branch -D %s'."
 msgstr "Ветка «%s» не �лита полно�тью.\nЕ�ли вы уверены, что хотите ее удалить, запу�тите «git branch -D %s»."
 
-#: builtin/branch.c:177
+#: builtin/branch.c:178
 msgid "Update of config-file failed"
 msgstr "�е удало�ь обновить файл конфигурации"
 
-#: builtin/branch.c:205
+#: builtin/branch.c:206
 msgid "cannot use -a with -d"
 msgstr "нельз� и�пользовать одновременно ключи -a и -d"
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "Couldn't look up commit object for HEAD"
 msgstr "�е удало�ь найти объект коммита дл� HEAD"
 
-#: builtin/branch.c:219
+#: builtin/branch.c:226
 #, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "�ельз� удалить ветку «%s», так как вы �ейча� на ней находите�ь."
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "�ельз� удалить ветку «%s» т.к. она активна на «%s»"
 
-#: builtin/branch.c:235
+#: builtin/branch.c:241
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "внешн�� от�леживаема� ветка «%s» не найдена."
 
-#: builtin/branch.c:236
+#: builtin/branch.c:242
 #, c-format
 msgid "branch '%s' not found."
 msgstr "ветка «%s» не найдена."
 
-#: builtin/branch.c:251
+#: builtin/branch.c:257
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Ошибка удалени� внешней от�леживаемой ветки «%s»"
 
-#: builtin/branch.c:252
+#: builtin/branch.c:258
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Ошибка удалени� ветки «%s»"
 
-#: builtin/branch.c:259
+#: builtin/branch.c:265
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Внешн�� от�леживаема� ветка %s удалена (была %s).\n"
 
-#: builtin/branch.c:260
+#: builtin/branch.c:266
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Ветка %s удалена (была %s).\n"
 
-#: builtin/branch.c:303
+#: builtin/branch.c:309
 #, c-format
 msgid "[%s: gone]"
 msgstr "[%s: пропал]"
 
-#: builtin/branch.c:308
+#: builtin/branch.c:314
 #, c-format
 msgid "[%s]"
 msgstr "[%s]"
 
-#: builtin/branch.c:313
+#: builtin/branch.c:319
 #, c-format
 msgid "[%s: behind %d]"
 msgstr "[%s: позади %d]"
 
-#: builtin/branch.c:315
+#: builtin/branch.c:321
 #, c-format
 msgid "[behind %d]"
 msgstr "[позади %d]"
 
-#: builtin/branch.c:319
+#: builtin/branch.c:325
 #, c-format
 msgid "[%s: ahead %d]"
 msgstr "[%s: впереди %d]"
 
-#: builtin/branch.c:321
+#: builtin/branch.c:327
 #, c-format
 msgid "[ahead %d]"
 msgstr "[впереди %d]"
 
-#: builtin/branch.c:324
+#: builtin/branch.c:330
 #, c-format
 msgid "[%s: ahead %d, behind %d]"
 msgstr "[%s: впереди %d, позади %d]"
 
-#: builtin/branch.c:327
+#: builtin/branch.c:333
 #, c-format
 msgid "[ahead %d, behind %d]"
 msgstr "[впереди %d, позади %d]"
 
-#: builtin/branch.c:340
+#: builtin/branch.c:346
 msgid " **** invalid ref ****"
 msgstr " **** недей�твительна� ��ылка ****"
 
-#: builtin/branch.c:366
+#: builtin/branch.c:372
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(нет ветки, перемещение %s)"
 
-#: builtin/branch.c:369
+#: builtin/branch.c:375
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(нет ветки, двоичный пои�к начат на %s)"
 
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD отделён на %s)"
 
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD отделён начина� � %s)"
 
-#: builtin/branch.c:382
+#: builtin/branch.c:390
 msgid "(no branch)"
 msgstr "(нет ветки)"
 
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "Производит�� перемещение ветки %s на %s"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "Производит�� двоичный пои�к в ветке %s на %s"
+
+#: builtin/branch.c:560
 msgid "cannot rename the current branch while not on any."
 msgstr "невозможно переименовать текущую ветку, е�ли вы не находите�ь ни на одной из них."
 
-#: builtin/branch.c:534
+#: builtin/branch.c:570
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "�едей�твительное им� ветки: «%s»"
 
-#: builtin/branch.c:549
+#: builtin/branch.c:587
 msgid "Branch rename failed"
 msgstr "Сбой переименовани� ветки"
 
-#: builtin/branch.c:553
+#: builtin/branch.c:591
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Переименована неправильно названна� ветка «%s»"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:594
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Ветка переименована в %s, но HEAD не обновлен!"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:601
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Ветка переименована, но произошел �бой обновлени� файла конфигурации"
 
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "не удало�ь запи�ать шаблон опи�ани� ветки: %s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "не удало�ь запи�ать шаблон опи�ани� ветки"
 
-#: builtin/branch.c:615
+#: builtin/branch.c:651
 msgid "Generic options"
 msgstr "Общие параметры"
 
-#: builtin/branch.c:617
+#: builtin/branch.c:653
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "показывать х�ш-�умму и тему, укажите дважды дл� выше�то�щей ветки"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:654
 msgid "suppress informational messages"
 msgstr "не выводить информационные �ообщени�"
 
-#: builtin/branch.c:619
+#: builtin/branch.c:655
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "у�тановить режим от�леживани� выше�то�щей ветки (�м. git-pull(1))"
 
-#: builtin/branch.c:621
+#: builtin/branch.c:657
 msgid "change upstream info"
 msgstr "изменить информацию о выше�то�щей ветке"
 
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "выше�то�ща�"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "изменить информацию о выше�то�щей ветке"
+
+#: builtin/branch.c:661
 msgid "use colored output"
 msgstr "и�пользовать цветной вывод"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:662
 msgid "act on remote-tracking branches"
 msgstr "выполнить дей�тви� на от�леживаемых внешних ветках"
 
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
 msgid "print only branches that contain the commit"
 msgstr "вывод только веток, которые �одержат коммит"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:668
 msgid "Specific git-branch actions:"
 msgstr "Специфичные дл� git-branch дей�тви�:"
 
-#: builtin/branch.c:633
+#: builtin/branch.c:669
 msgid "list both remote-tracking and local branches"
 msgstr "показать �пи�ок и от�леживаемых и локальных веток"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:671
 msgid "delete fully merged branch"
 msgstr "удалить полно�тью �литую ветку"
 
-#: builtin/branch.c:636
+#: builtin/branch.c:672
 msgid "delete branch (even if not merged)"
 msgstr "удалить ветку (даже никуда не �литую)"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:673
 msgid "move/rename a branch and its reflog"
 msgstr "переме�тить/переименовать ветки и ее журнал ��ылок"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:674
 msgid "move/rename a branch, even if target exists"
 msgstr "переме�тить/переименовать ветку, даже е�ли целевое им� уже �уще�твует"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:675
 msgid "list branch names"
 msgstr "показать �пи�ок имен веток"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:676
 msgid "create the branch's reflog"
 msgstr "�оздать журнал ��ылок ветки"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:678
 msgid "edit the description for the branch"
 msgstr "изменить опи�ание ветки"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:679
 msgid "force creation, move/rename, deletion"
 msgstr "принудительное �оздание, перемещение или удаление ветки"
 
-#: builtin/branch.c:644
+#: builtin/branch.c:680
 msgid "print only branches that are merged"
 msgstr "вывод только �литых веток"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:681
 msgid "print only branches that are not merged"
 msgstr "вывод только не �литых веток"
 
-#: builtin/branch.c:646
+#: builtin/branch.c:682
 msgid "list branches in columns"
 msgstr "показать �пи�ок веток по �толбцам"
 
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
 msgid "key"
 msgstr "ключ"
 
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
 msgid "field name to sort on"
 msgstr "им� пол�, по которому выполнить �ортировку"
 
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
 #: builtin/tag.c:369
 msgid "object"
 msgstr "объект"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:687
 msgid "print only branches of the object"
 msgstr "вывод только веток, определенного объекта"
 
-#: builtin/branch.c:669
+#: builtin/branch.c:705
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "�е удало�ь определить HEAD как дей�твительную ��ылку."
 
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD не найден в refs/heads!"
 
-#: builtin/branch.c:693
+#: builtin/branch.c:729
 msgid "--column and --verbose are incompatible"
 msgstr "--column и --verbose нельз� и�пользовать одновременно"
 
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
 msgid "branch name required"
 msgstr "требует�� им� ветки"
 
-#: builtin/branch.c:722
+#: builtin/branch.c:758
 msgid "Cannot give description to detached HEAD"
 msgstr "�ельз� дать опи�ание отделённому HEAD"
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 msgid "cannot edit description of more than one branch"
 msgstr "нельз� изменить опи�ание более одной ветки за раз"
 
-#: builtin/branch.c:734
+#: builtin/branch.c:770
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Еще нет коммита на ветке «%s»."
 
-#: builtin/branch.c:737
+#: builtin/branch.c:773
 #, c-format
 msgid "No branch named '%s'."
 msgstr "�ет ветки � именем «%s»."
 
-#: builtin/branch.c:752
+#: builtin/branch.c:788
 msgid "too many branches for a rename operation"
 msgstr "�лишком много веток дл� операции переименовани�"
 
-#: builtin/branch.c:757
+#: builtin/branch.c:793
 msgid "too many branches to set new upstream"
 msgstr "�лишком много веток дл� указани� новых выше�то�щих"
 
-#: builtin/branch.c:761
+#: builtin/branch.c:797
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr "невозможно у�тановить выше�то�щий репозиторий дл� HEAD на %s, так как он не указывает ни на одну ветку."
 
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
 #, c-format
 msgid "no such branch '%s'"
 msgstr "нет такой ветки «%s»"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:804
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "ветка «%s» не �уще�твует"
 
-#: builtin/branch.c:780
+#: builtin/branch.c:816
 msgid "too many branches to unset upstream"
 msgstr "�лишком много веток дл� убирани� выше�то�щих"
 
-#: builtin/branch.c:784
+#: builtin/branch.c:820
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr "невозможно убрать выше�то�щий репозиторий дл� HEAD, так как он не указывает ни на одну ветку."
 
-#: builtin/branch.c:790
+#: builtin/branch.c:826
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Ветка «%s» не имеет информации о выше�то�щей ветке"
 
-#: builtin/branch.c:804
+#: builtin/branch.c:840
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "не имеет �мы�ла �оздавать «HEAD» вручную"
 
-#: builtin/branch.c:810
+#: builtin/branch.c:846
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr "параметры -a и -r дл� «git branch» не имеют �мы�ла � указанием имени ветки"
 
-#: builtin/branch.c:813
+#: builtin/branch.c:849
 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using "
 "--track or --set-upstream-to\n"
 msgstr "Флаг --set-upstream у�тарел и будет удален в будущем. Вме�то него и�пользуйте --track или --set-upstream-to\n"
 
-#: builtin/branch.c:830
+#: builtin/branch.c:866
 #, c-format
 msgid ""
 "\n"
@@ -3825,16 +4052,6 @@ msgid ""
 "\n"
 msgstr "\nЕ�ли вы хотите, чтобы «%s» от�леживала «%s», �делайте �ледующее:\n\n"
 
-#: builtin/branch.c:831
-#, c-format
-msgid "    git branch -d %s\n"
-msgstr "git branch -d %s\n"
-
-#: builtin/branch.c:832
-#, c-format
-msgid "    git branch --set-upstream-to %s\n"
-msgstr "    git branch --set-upstream-to %s\n"
-
 #: builtin/bundle.c:51
 #, c-format
 msgid "%s is okay\n"
@@ -3930,7 +4147,7 @@ msgstr "прочитать имена файлов из �тандартного
 msgid "terminate input and output records by a NUL character"
 msgstr "окончание ввода и вывода запи�ей по �УЛЕВОМУ �имволу"
 
-#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
 msgid "suppress progress reporting"
 msgstr "не выводить прогре�� выполнени�"
 
@@ -3993,7 +4210,7 @@ msgstr "индек� должен быть между 1 и 3 или all"
 
 #: builtin/checkout-index.c:160
 msgid "check out all files in the index"
-msgstr "перейти на �о�то�ние в�ех файлов из индек�а"
+msgstr "переключить�� на �о�то�ние в�ех файлов из индек�а"
 
 #: builtin/checkout-index.c:161
 msgid "force overwrite of existing files"
@@ -4020,8 +4237,9 @@ msgid "write the content to temporary files"
 msgstr "запи�ать �одержимое во временные файлы"
 
 #: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
 msgid "string"
 msgstr "�трока"
 
@@ -4071,79 +4289,79 @@ msgstr "путь «%s»: не удало�ь �лить"
 msgid "Unable to add merge result for '%s'"
 msgstr "�е удало�ь добавить результат �ли�ни� «%s»"
 
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "«%s» нельз� и�пользовать при обновлении путей"
 
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "«%s» нельз� и�пользовать одновременно � %s"
 
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "�ельз� обновл�ть пути и переключать�� на ветку «%s» одновременно."
 
-#: builtin/checkout.c:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
 msgid "corrupt index file"
 msgstr "файл индек�а поврежден"
 
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "путь «%s» не �лит"
 
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
 msgid "you need to resolve your current index first"
 msgstr "�начала нужно разрешить конфликты в вашем текущем индек�е"
 
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "�е удало�ь �оздать журнал ��ылок дл� «%s»: %s\n"
 
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
 msgid "HEAD is now at"
 msgstr "HEAD �ейча� на"
 
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
 msgid "unable to update HEAD"
 msgstr "не удало�ь обновить HEAD"
 
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Сбро� ветки «%s»\n"
 
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Уже на «%s»\n"
 
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Переключение и �бро� ветки «%s»\n"
 
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Переключено на новую ветку «%s»\n"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Переключено на ветку «%s»\n"
 
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " … и еще %d.\n"
 
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -4160,7 +4378,7 @@ msgstr[1] "Предупреждение: вы о�тавл�ете позади
 msgstr[2] "Предупреждение: вы о�тавл�ете позади %d коммитов не �оединенные ни � одной из ваших веток:\n\n%s\n"
 msgstr[3] "Предупреждение: вы о�тавл�ете позади %d коммитов не �оединенные ни � одной из ваших веток:\n\n%s\n"
 
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4179,162 +4397,162 @@ msgstr[1] "Е�ли вы хотите �охранить их � помощью
 msgstr[2] "Е�ли вы хотите �охранить их � помощью �оздани� новой ветки, то �ейча� �амое врем�\n�делать �то � помощью:\n\n git branch <им�-новой-ветки> %s\n"
 msgstr[3] "Е�ли вы хотите �охранить их � помощью �оздани� новой ветки, то �ейча� �амое врем�\n�делать �то � помощью:\n\n git branch <им�-новой-ветки> %s\n"
 
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
 msgid "internal error in revision walk"
 msgstr "внутренн�� ошибка при хождении по редакци�м"
 
-#: builtin/checkout.c:797
+#: builtin/checkout.c:796
 msgid "Previous HEAD position was"
 msgstr "Предыдуща� позици� HEAD была"
 
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
 msgid "You are on a branch yet to be born"
 msgstr "Вы находите�ь на еще не �озданной ветке"
 
-#: builtin/checkout.c:969
+#: builtin/checkout.c:968
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "ожидает�� только одна ��ылка, а передано %d."
 
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
 #, c-format
 msgid "invalid reference: %s"
 msgstr "неправильна� ��ылка: %s"
 
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "в дереве нет такой ��ылки: %s"
 
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1076
 msgid "paths cannot be used with switching branches"
 msgstr "нельз� и�пользовать пути при переключении веток"
 
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "нельз� и�пользовать «%s» при переключении веток"
 
-#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "«%s» нельз� и�пользовать одновременно � «%s»"
 
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "�ельз� переключить ветку на не коммит «%s»"
 
-#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
 msgid "branch"
 msgstr "ветка"
 
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
 msgid "create and checkout a new branch"
-msgstr "�оздать и перейти на новую ветку"
+msgstr "�оздать и переключить�� на новую ветку"
 
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
 msgid "create/reset and checkout a branch"
-msgstr "�оздать/�бро�ить и перейти на новую ветку"
+msgstr "�оздать/�бро�ить и перключить�� на новую ветку"
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
 msgid "create reflog for new branch"
 msgstr "�оздать журнал ��ылок дл� новой ветки"
 
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
 msgid "detach the HEAD at named commit"
 msgstr "от�оединить HEAD на указанном коммите"
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
 msgid "set upstream info for new branch"
 msgstr "у�тановить информацию о выше�то�щей ветке дл� новой ветки"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new-branch"
 msgstr "нова�-ветка"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new unparented branch"
 msgstr "нова� ветка без родителей"
 
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
 msgid "checkout our version for unmerged files"
-msgstr "перейти на нашу вер�ию дл� не �литых файлов"
+msgstr "переключить�� на нашу вер�ию дл� не �литых файлов"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
 msgid "checkout their version for unmerged files"
-msgstr "перейти на их вер�ию дл� не �литых файлов"
+msgstr "переключить�� на их вер�ию дл� не �литых файлов"
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
 msgid "force checkout (throw away local modifications)"
-msgstr "принудительный переход (отбра�ывает в�е локальные изменени�)"
+msgstr "принудительное переключение на �о�то�ние (отбра�ывает в�е локальные изменени�)"
 
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1150
 msgid "perform a 3-way merge with the new branch"
 msgstr "выполнить трехходовое �ли�ние � новой веткой"
 
-#: builtin/checkout.c:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
 msgid "update ignored files (default)"
 msgstr "обновить игнорируемые файлы (по умолчанию)"
 
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
 msgid "style"
 msgstr "�тиль"
 
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
 msgid "conflict style (merge or diff3)"
 msgstr "�тиль конфликтов �ли�ни� (merge или diff3)"
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "не ограничивать �пецификаторы пути только ча�тичными запи��ми"
 
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
 msgid "second guess 'git checkout <no-such-branch>'"
-msgstr "пере�мотр «git checkout <no-such-branch>»"
+msgstr "пере�мотр «git checkout <нет-такой-ветки>»"
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
 msgid "do not check if another worktree is holding the given ref"
 msgstr "не провер�ть, что другое дерево уже �одержит указанную ��ылку"
 
-#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
 #: builtin/send-pack.c:168
 msgid "force progress reporting"
 msgstr "принудительно выводить прогре��"
 
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B и --orphan нельз� и�пользовать одновременно"
 
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1209
 msgid "--track needs a branch name"
 msgstr "--track требует им� ветки"
 
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
 msgid "Missing branch name; try -b"
 msgstr "Пропущено им� ветки; попробуйте -b"
 
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
 msgid "invalid path specification"
 msgstr "неправильна� �пецификаци� пути"
 
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
 #, c-format
 msgid ""
 "Cannot update paths and switch to branch '%s' at the same time.\n"
 "Did you intend to checkout '%s' which can not be resolved as commit?"
-msgstr "�ельз� обновить пути и одновременно переключить на ветку «%s».\nВы хотели переключить�� на «%s», что не может быть определено как коммит?"
+msgstr "�ельз� обновить пути и одновременно переключить�� на ветку «%s».\nВы хотели переключить�� на «%s», что не может быть определено как коммит?"
 
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach не принимает путь «%s» как аргумент"
 
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1266
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -4466,8 +4684,8 @@ msgstr "интерактивна� очи�тка"
 msgid "remove whole directories"
 msgstr "удалить каталоги полно�тью"
 
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
 msgid "pattern"
 msgstr "шаблон"
 
@@ -4503,286 +4721,290 @@ msgstr "clean.requireForce у�тановлен по умолчанию как t
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]"
 
-#: builtin/clone.c:60
+#: builtin/clone.c:62
 msgid "don't create a checkout"
 msgstr "не переключать рабочую копию на HEAD"
 
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
 msgid "create a bare repository"
 msgstr "�оздать голый репозиторий"
 
-#: builtin/clone.c:65
+#: builtin/clone.c:67
 msgid "create a mirror repository (implies bare)"
 msgstr "�оздать зеркало репозитори� (включает в �еб� и параметр bare)"
 
-#: builtin/clone.c:67
+#: builtin/clone.c:69
 msgid "to clone from a local repository"
 msgstr "дл� клонировани� из локального репозитори�"
 
-#: builtin/clone.c:69
+#: builtin/clone.c:71
 msgid "don't use local hardlinks, always copy"
 msgstr "не и�пользовать же�ткие ��ылки, в�егда копировать файлы"
 
-#: builtin/clone.c:71
+#: builtin/clone.c:73
 msgid "setup as shared repository"
 msgstr "на�троить как общедо�тупный репозиторий"
 
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
 msgid "initialize submodules in the clone"
 msgstr "инициализировать подмодули в клоне"
 
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "количе�тво подмодулей, которые будут клонированы парралельно"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
 msgid "template-directory"
 msgstr "каталог-шаблонов"
 
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
 msgid "directory from which templates will be used"
 msgstr "каталог, шаблоны из которого будут и�пользованы"
 
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
 msgid "reference repository"
 msgstr "��ылаемый репозиторий"
 
-#: builtin/clone.c:81
+#: builtin/clone.c:85
 msgid "use --reference only while cloning"
 msgstr "и�пользуйте --reference только при клонировании"
 
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
 msgid "name"
 msgstr "им�"
 
-#: builtin/clone.c:83
+#: builtin/clone.c:87
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "и�пользовать <им�> вме�то «origin» дл� от�леживани� выше�то�щего репозитори�"
 
-#: builtin/clone.c:85
+#: builtin/clone.c:89
 msgid "checkout <branch> instead of the remote's HEAD"
-msgstr "перейти на <ветку>, вме�то HEAD внешнего репозитори�"
+msgstr "переключить�� на <ветку>, вме�то HEAD внешнего репозитори�"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:91
 msgid "path to git-upload-pack on the remote"
 msgstr "путь к git-upload-pack на внешнем репозитории"
 
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
-#: builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667
+#: builtin/pull.c:201
 msgid "depth"
 msgstr "глубина"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:93
 msgid "create a shallow clone of that depth"
 msgstr "�делать ча�тичный клон указанной глубины"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:95
 msgid "clone only one branch, HEAD or --branch"
 msgstr "клонировать только одну ветку, HEAD или --branch"
 
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "в�е �клонированные подмодули будут ча�тичными клонами"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
 msgid "gitdir"
 msgstr "каталог-git"
 
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
 msgid "separate git dir from working tree"
 msgstr "разме�тить каталог git отдельно от рабочей копии"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:100
 msgid "key=value"
 msgstr "ключ=значение"
 
-#: builtin/clone.c:95
+#: builtin/clone.c:101
 msgid "set config inside the new repository"
 msgstr "у�тановить параметры внутри нового репозитори�"
 
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
 msgid "use IPv4 addresses only"
 msgstr "и�пользовать только IPv4 адре�а"
 
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
 msgid "use IPv6 addresses only"
 msgstr "и�пользовать только IPv6 адре�а"
 
-#: builtin/clone.c:239
+#: builtin/clone.c:241
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
 msgstr "Им� каталога не может быть угадано.\nУкажите им� каталога � помощью параметра командной �троки"
 
-#: builtin/clone.c:305
+#: builtin/clone.c:307
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "��ылаемый репозиторий «%s» как �в�занное �о�то�ние, пока не поддерживает��."
 
-#: builtin/clone.c:307
+#: builtin/clone.c:309
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "��ылаемый репозиторий «%s» не �вл�ет�� локальным."
 
-#: builtin/clone.c:312
+#: builtin/clone.c:314
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "��ылаемый репозиторий «%s» �вл�ет�� ча�тичным"
 
-#: builtin/clone.c:315
+#: builtin/clone.c:317
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "��ылаемый репозиторий «%s» �вл�ет�� �ращенным"
 
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "не удало�ь выполнить stat «%s»"
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s уже �уще�твует и не �вл�ет�� каталогом"
 
-#: builtin/clone.c:396
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "не удало�ь выполнить stat %s\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "не удало�ь �оздать ��ылку «%s»"
 
-#: builtin/clone.c:422
+#: builtin/clone.c:424
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "не удало�ь копировать файл в «%s»"
 
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
 #, c-format
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: builtin/clone.c:459
+#: builtin/clone.c:461
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
 "and retry the checkout with 'git checkout -f HEAD'\n"
-msgstr "Клонирование прошло у�пешно, но во врем� перехода на вер�ию произошла ошибка.\nС помощь команды «git status» вы можете про�мотреть, какие файлы были обновлены, а повторить попытку перехода на вер�ию � помощью «git checkout -f HEAD»\n"
+msgstr "Клонирование прошло у�пешно, но во врем� переключени� �о�то�ни� произошла ошибка.\nС помощь команды «git status» вы можете про�мотреть, какие файлы были обновлены, а повторить попытку переключени� на ветку � помощью «git checkout -f HEAD»\n"
 
-#: builtin/clone.c:536
+#: builtin/clone.c:538
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "�е удало�ь найти внешнюю ветку %s дл� клонировани�."
 
-#: builtin/clone.c:626
+#: builtin/clone.c:628
 #, c-format
 msgid "Checking connectivity... "
 msgstr "Проверка �оединени�… "
 
-#: builtin/clone.c:629
+#: builtin/clone.c:631
 msgid "remote did not send all necessary objects"
 msgstr "внешний репозиторий при�лал не в�е необходимые объекты"
 
-#: builtin/clone.c:647
+#: builtin/clone.c:649
 #, c-format
 msgid "unable to update %s"
 msgstr "не удало�ь обновить %s"
 
-#: builtin/clone.c:696
+#: builtin/clone.c:698
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr "внешний HEAD ��ылает�� на не�уще�твующую ��ылку, нельз� перейти на такую вер�ию.\n"
+msgstr "внешний HEAD ��ылает�� на не�уще�твующую ��ылку, нельз� переключить�� на такую вер�ию.\n"
 
-#: builtin/clone.c:727
+#: builtin/clone.c:729
 msgid "unable to checkout working tree"
-msgstr "не удало�ь перейти на вер�ию в рабочем каталоге"
+msgstr "не удало�ь переключить�� на вер�ию в рабочем каталоге"
 
-#: builtin/clone.c:753
+#: builtin/clone.c:767
 msgid "unable to write parameters to config file"
 msgstr "не удало�ь запи�ать параметры в файл конфигурации"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:830
 msgid "cannot repack to clean up"
 msgstr "не удало�ь выполнить перепаковку дл� очи�тки"
 
-#: builtin/clone.c:818
+#: builtin/clone.c:832
 msgid "cannot unlink temporary alternates file"
 msgstr "не удало�ь от�оединить временные альтернативные файлы"
 
-#: builtin/clone.c:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
 msgid "Too many arguments."
 msgstr "Слишком много аргументов."
 
-#: builtin/clone.c:854
+#: builtin/clone.c:868
 msgid "You must specify a repository to clone."
 msgstr "Вы должны указать репозиторий дл� клонировани�."
 
-#: builtin/clone.c:865
+#: builtin/clone.c:879
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "--bare и --origin %s нельз� и�пользовать одновременно."
 
-#: builtin/clone.c:868
+#: builtin/clone.c:882
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare и --separate-git-dir нельз� и�пользовать одновременно."
 
-#: builtin/clone.c:881
+#: builtin/clone.c:895
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "репозиторий «%s» не �уще�твует"
 
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "глубина %s не �вл�ет�� положительным чи�лом"
 
-#: builtin/clone.c:897
+#: builtin/clone.c:911
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "целевой путь «%s» уже �уще�твует и не �вл�ет�� пу�тым каталогом."
 
-#: builtin/clone.c:907
+#: builtin/clone.c:921
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "рабочий каталог «%s» уже �уще�твует."
 
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "не удало�ь �оздать родитель�кие каталоги дл� «%s»"
 
-#: builtin/clone.c:925
+#: builtin/clone.c:939
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "не удало�ь �оздать рабочий каталог «%s»"
 
-#: builtin/clone.c:943
+#: builtin/clone.c:957
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Клонирование в голый репозиторий «%s»…\n"
 
-#: builtin/clone.c:945
+#: builtin/clone.c:959
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Клонирование в «%s»…\n"
 
-#: builtin/clone.c:984
+#: builtin/clone.c:998
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth игнорирует�� на локальных клонах; вме�то �того и�пользуйте file://."
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1001
 msgid "source repository is shallow, ignoring --local"
 msgstr "и�ходный репозиторий �вл�ет�� ча�тичным, --local игнорирует��"
 
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
 msgid "--local is ignored"
 msgstr "--local игнорирует��"
 
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "�е знаю как клонировать %s"
 
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Внешн�� ветка %s не найдена в выше�то�щем репозитории %s"
 
-#: builtin/clone.c:1056
+#: builtin/clone.c:1070
 msgid "You appear to have cloned an empty repository."
 msgstr "Похоже, что вы клонировали пу�той репозиторий."
 
@@ -4885,103 +5107,103 @@ msgid ""
 "the remaining commits.\n"
 msgstr "Е�ли вы хотите пропу�тит �тот коммит, и�пользуйте команду:\n\n    git reset\n\nПо�ле �того «git cherry-pick --continue» продолжит отбор лучшего\nв о�тавших�� коммитах.\n"
 
-#: builtin/commit.c:305
+#: builtin/commit.c:307
 msgid "failed to unpack HEAD tree object"
 msgstr "�бой ра�паковки объекта дерева HEAD"
 
-#: builtin/commit.c:346
+#: builtin/commit.c:348
 msgid "unable to create temporary index"
 msgstr "не удало�ь �оздать временный индек�"
 
-#: builtin/commit.c:352
+#: builtin/commit.c:354
 msgid "interactive add failed"
 msgstr "�бой интерактивного добавлени�"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:367
 msgid "unable to update temporary index"
 msgstr "не удало�ь обновить временный индек�"
 
-#: builtin/commit.c:367
+#: builtin/commit.c:369
 msgid "Failed to update main cache tree"
 msgstr "Сбой при обновлении о�новного к�ша дерева"
 
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
 msgid "unable to write new_index file"
 msgstr "не удало�ь запи�ать файл new_index"
 
-#: builtin/commit.c:445
+#: builtin/commit.c:447
 msgid "cannot do a partial commit during a merge."
 msgstr "нельз� �оздать ча�тичный коммит во врем� �ли�ни�."
 
-#: builtin/commit.c:447
+#: builtin/commit.c:449
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "нельз� �оздать ча�тичный коммит во врем� отбора лучшего коммита."
 
-#: builtin/commit.c:456
+#: builtin/commit.c:458
 msgid "cannot read the index"
 msgstr "не удало�ь прочитать индек�"
 
-#: builtin/commit.c:475
+#: builtin/commit.c:477
 msgid "unable to write temporary index file"
 msgstr "не удало�ь запи�ать временный файл индек�а"
 
-#: builtin/commit.c:580
+#: builtin/commit.c:582
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "у коммита «%s» от�ут�твует автор в заголовке"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:584
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "у коммита «%s» �трока автора в неправильном формате"
 
-#: builtin/commit.c:601
+#: builtin/commit.c:603
 msgid "malformed --author parameter"
 msgstr "параметр --author в неправильном формате"
 
-#: builtin/commit.c:609
+#: builtin/commit.c:611
 #, c-format
 msgid "invalid date format: %s"
 msgstr "неправильный формат даты: %s"
 
-#: builtin/commit.c:653
+#: builtin/commit.c:655
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr "нельз� выбрать �имвол комментари�, который\nне и�пользует�� в текущем �ообщении коммита"
 
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "не удало�ь запро�ить коммит %s"
 
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(чтение файла журнала из �тандартного ввода)\n"
 
-#: builtin/commit.c:704
+#: builtin/commit.c:706
 msgid "could not read log from standard input"
 msgstr "не удало�ь прочитать файл журнала из �тандартного ввода"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:710
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "не удало�ь прочитать файл журнала «%s»"
 
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "не удало�ь прочитать MERGE_MSG"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
 msgid "could not read SQUASH_MSG"
 msgstr "не удало�ь прочитать SQUASH_MSG"
 
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "не удало�ь прочитать MERGE_MSG"
+
+#: builtin/commit.c:796
 msgid "could not write commit template"
 msgstr "не удало�ь запи�ать шаблон опи�ани� коммита"
 
-#: builtin/commit.c:803
+#: builtin/commit.c:814
 #, c-format
 msgid ""
 "\n"
@@ -4991,7 +5213,7 @@ msgid ""
 "and try again.\n"
 msgstr "\nПохоже, что вы пытаете�ь закоммитить �ли�ние.\nЕ�ли �то ошибка, пожалуй�та удалите файл\n\t%s\nи попробуйте �нова.\n"
 
-#: builtin/commit.c:808
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -5001,14 +5223,14 @@ msgid ""
 "and try again.\n"
 msgstr "\nПохоже, что вы пытаете�ь закоммитить отбор лучшего.\nЕ�ли �то ошибка, пожалуй�та удалите файл\n\t%s\nи попробуйте �нова.\n"
 
-#: builtin/commit.c:821
+#: builtin/commit.c:832
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
 "with '%c' will be ignored, and an empty message aborts the commit.\n"
 msgstr "Пожалуй�та, введите �ообщение коммита дл� ваших изменений. Строки,\nначинающие�� � «%c» будут проигнорированы, а пу�тое �ообщение\nотмен�ет проце�� коммита.\n"
 
-#: builtin/commit.c:828
+#: builtin/commit.c:839
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5016,341 +5238,341 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr "Пожалуй�та, введите �ообщение коммита дл� ваших изменений. Строки,\nначинающие�� � «%c» будут о�тавлены; вы можете удалить их вручную,\nе�ли хотите. Пу�тое �ообщение отмен�ет проце�� коммита.\n"
 
-#: builtin/commit.c:848
+#: builtin/commit.c:859
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s�втор:     %.*s <%.*s>"
 
-#: builtin/commit.c:856
+#: builtin/commit.c:867
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sДата:      %s"
 
-#: builtin/commit.c:863
+#: builtin/commit.c:874
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sКоммитер:  %.*s <%.*s>"
 
-#: builtin/commit.c:881
+#: builtin/commit.c:892
 msgid "Cannot read index"
 msgstr "�е удало�ь прочитать индек�"
 
-#: builtin/commit.c:938
+#: builtin/commit.c:949
 msgid "Error building trees"
 msgstr "Ошибка при по�троении деревьев"
 
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Пожалуй�та, укажите �ообщение, при указании опций -m или -F.\n"
 
-#: builtin/commit.c:1055
+#: builtin/commit.c:1066
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr "--author «%s» не в формате «Им� <почта>» и не �овпадает � �уще�твующим автором"
 
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "�еправильный режим неот�леживаемых файлов «%s»"
 
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
 msgid "--long and -z are incompatible"
 msgstr "--long и -z нельз� и�пользовать одновременно"
 
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Указание одновременно опций --reset-author и --author не имеет �мы�ла"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1157
 msgid "You have nothing to amend."
 msgstr "�ечего и�правл�ть."
 
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Вы в проце��е �ли�ни� —  �ейча� нельз� и�правл�ть."
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1162
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Вы в проце��е отбора лучшего —  �ейча� нельз� и�правл�ть."
 
-#: builtin/commit.c:1154
+#: builtin/commit.c:1165
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Опции --squash и --fixup не могут и�пользовать�� одновременно"
 
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Может и�пользовать�� только одна из опций -c/-C/-F/--fixup."
 
-#: builtin/commit.c:1166
+#: builtin/commit.c:1177
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "Опци� -m не может и�пользовать�� � -c/-C/-F/--fixup."
 
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author может и�пользовать�� только одновременно � опци�ми -C, -c или --amend."
 
-#: builtin/commit.c:1191
+#: builtin/commit.c:1202
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "Может и�пользовать�� только одна из опций --include/--only/--all/--interactive/--patch."
 
-#: builtin/commit.c:1193
+#: builtin/commit.c:1204
 msgid "No paths with --include/--only does not make sense."
 msgstr "Указание путей каталогов � опци�ми --include/--only не имеет �мы�ла."
 
-#: builtin/commit.c:1195
+#: builtin/commit.c:1206
 msgid "Clever... amending the last one with dirty index."
 msgstr "Умно… отмена по�леднего � измененным индек�ом."
 
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
 msgstr "Пути �вно указаны пути без опций -i или -o; предполагаю опцию --only…"
 
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "�еправильное значение режима очи�тки %s"
 
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
 msgid "Paths with -a does not make sense."
 msgstr "С опцией -a указание пути не имеет �мы�ла."
 
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
 msgid "show status concisely"
 msgstr "кратко показать �тату�"
 
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
 msgid "show branch information"
 msgstr "показать информацию о вер�ии"
 
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
 msgid "machine-readable output"
 msgstr "машиночитаемый вывод"
 
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
 msgid "show status in long format (default)"
 msgstr "показать �тату� в длинном формате (по умолчанию)"
 
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
 msgid "terminate entries with NUL"
 msgstr "завершать запи�и �УЛЕВЫМ байтом"
 
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
 #: builtin/fast-export.c:984 builtin/tag.c:353
 msgid "mode"
 msgstr "режим"
 
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "показать неот�леживаемые файлы, опциональные режимы: all (в�е), normal (как обычно), no (нет). (По умолчанию: all)"
 
-#: builtin/commit.c:1340
+#: builtin/commit.c:1351
 msgid "show ignored files"
 msgstr "показать игнорируемые файлы"
 
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
 msgid "when"
 msgstr "когда"
 
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr "игнорировать изменени� в подмодул�х, опционально когда: all (в�егда), dirty (измененные), untracked (неот�леживаемые). (По умолчанию: all)"
 
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
 msgid "list untracked files in columns"
 msgstr "показать неот�леживаемые файлы по �толбцам"
 
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
 msgid "couldn't look up newly created commit"
 msgstr "нельз� запро�ить ново�озданный коммит"
 
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
 msgid "could not parse newly created commit"
 msgstr "нельз� разобрать ново�озданный коммит"
 
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
 msgid "detached HEAD"
 msgstr "отделённый HEAD"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
 msgid " (root-commit)"
 msgstr " (корневой коммит)"
 
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
 msgid "suppress summary after successful commit"
 msgstr "не выводить �водку по�ле у�пешного коммита"
 
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
 msgid "show diff in commit message template"
 msgstr "добавить �пи�ок изменений в шаблон �ообщени� коммита"
 
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
 msgid "Commit message options"
 msgstr "Опции �ообщени� коммита"
 
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
 msgid "read message from file"
 msgstr "прочитать �ообщение из файла"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "author"
 msgstr "автор"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "override author for commit"
 msgstr "подменить автора коммита"
 
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
 msgid "date"
 msgstr "дата"
 
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
 msgid "override date for commit"
 msgstr "подменить дату коммита"
 
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
 #: builtin/notes.c:558 builtin/tag.c:349
 msgid "message"
 msgstr "�ообщение"
 
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
 msgid "commit message"
 msgstr "�ообщение коммита"
 
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
 msgid "commit"
 msgstr "коммит"
 
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
 msgid "reuse and edit message from specified commit"
 msgstr "и�пользовать и отредактировать �ообщение от указанного коммита"
 
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
 msgid "reuse message from specified commit"
 msgstr "и�пользовать �ообщение указанного коммита"
 
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr "и�пользовать форматированное �ообщение автоуплотнени� дл� и�правлени� указанного коммита"
 
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "и�пользовать форматированное �ообщение автоуплотнени� дл� уплотнени� указанного коммита"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1603
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "коммит теперь за моим автор�твом (� и�пользованием -C/-c/--amend)"
 
-#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
 msgid "add Signed-off-by:"
 msgstr "добавить Signed-off-by:"
 
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
 msgid "use specified template file"
 msgstr "и�пользовать указанный файл шаблона"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
 msgid "force edit of commit"
 msgstr "принудительно редактировать коммит"
 
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
 msgid "default"
 msgstr "по-умолчанию"
 
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
 msgid "how to strip spaces and #comments from message"
 msgstr "как удал�ть пробелы и #комментарии из �ообщени� коммита"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
 msgid "include status in commit message template"
 msgstr "включить �тату� файлов в шаблон �ообщени� коммита"
 
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
 #: builtin/revert.c:93
 msgid "GPG sign commit"
 msgstr "подпи�ать коммит � помощью GPG"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
 msgid "Commit contents options"
 msgstr "Опции �одержимого коммита"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
 msgid "commit all changed files"
 msgstr "закоммитить в�е измененные файлы"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
 msgid "add specified files to index for commit"
 msgstr "добавить указанные файлы в индек� дл� коммита"
 
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
 msgid "interactively add files"
 msgstr "интерактивное добавление файлов"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
 msgid "interactively add changes"
 msgstr "интерактивное добавление изменений"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
 msgid "commit only specified files"
 msgstr "закоммитить только указанные файлы"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
 msgid "bypass pre-commit hook"
 msgstr "пропу�тить перехватчик перед-коммитом"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
 msgid "show what would be committed"
 msgstr "показать, что будет закоммичено"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
 msgid "amend previous commit"
 msgstr "и�править предыдущий коммит"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
 msgid "bypass post-rewrite hook"
 msgstr "пропу�тить перехватчик по�ле-перезапи�и"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
 msgid "ok to record an empty change"
 msgstr "разрешить запи�ь пу�того коммита"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
 msgid "ok to record a change with an empty message"
 msgstr "разрешить запи�ь изменений � пу�тым �ообщением"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
 msgid "could not parse HEAD commit"
 msgstr "не удало�ь разобрать HEAD коммит"
 
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Файл MERGE_HEAD поврежден (%s)"
 
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
 msgid "could not read MERGE_MODE"
 msgstr "не удало�ь прочитать MERGE_MODE"
 
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "не удало�ь открыть �ообщение коммита: %s"
 
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Отмена коммита; вы не изменили �ообщение.\n"
 
-#: builtin/commit.c:1740
+#: builtin/commit.c:1760
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Отмена коммита из-за пу�того �ообщени� коммита.\n"
 
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -5493,7 +5715,7 @@ msgstr "показать и�точник на�тройки (файл, �тан
 msgid "unable to parse default color value"
 msgstr "не удало�ь разобрать значение цвета по умолчанию"
 
-#: builtin/config.c:469
+#: builtin/config.c:472
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -5503,7 +5725,7 @@ msgid ""
 "#\temail = %s\n"
 msgstr "# Это файл конфигурации пользовател� Git.\n[user]\n# Пожалуй�та, адаптируйте и ра�комментируйте �ледующие �троки:\n#\tuser = %s\n#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:614
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "не удало�ь �оздать файл конфигурации %s"
@@ -5539,7 +5761,7 @@ msgstr "аннотированнаÑ� метка %s не Ñ�одержит вÑ�Ñ‚Ñ
 msgid "tag '%s' is really '%s' here"
 msgstr "метка «%s» уже зде�ь «%s»"
 
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "�едей�твительное им� объекта %s"
@@ -5626,9 +5848,9 @@ msgstr "раÑ�Ñ�матривать поÑ�ледние <n> меток (по умÐ
 msgid "only consider tags matching <pattern>"
 msgstr "ра��матривать только метки по <шаблону>"
 
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
 msgid "show abbreviated commit object as fallback"
-msgstr "е�ли не найдено, показать �окращенный номер ревизии коммита"
+msgstr "е�ли не найдено, показать �окращенный номер редакции коммита"
 
 #: builtin/describe.c:411
 msgid "mark"
@@ -5660,21 +5882,21 @@ msgstr "«%s»: не Ñ�влÑ�етÑ�Ñ� обычным файлом или Ñ�имÐ
 msgid "invalid option: %s"
 msgstr "неправильный параметр: %s"
 
-#: builtin/diff.c:358
+#: builtin/diff.c:360
 msgid "Not a git repository"
 msgstr "�е �вл�ет�� репозиторием git"
 
-#: builtin/diff.c:401
+#: builtin/diff.c:403
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "передан неправильный объект «%s»."
 
-#: builtin/diff.c:410
+#: builtin/diff.c:412
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "передано больше двух двоичных объектов: «%s»"
 
-#: builtin/diff.c:417
+#: builtin/diff.c:419
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "передан необработанный объект «%s»."
@@ -5747,19 +5969,19 @@ msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <гру
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<опции>]"
 
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
 msgid "fetch from all remotes"
 msgstr "извлечь �о в�ех внешних репозиториев"
 
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "допи�ать к .git/FETCH_HEAD вме�то перезапи�и"
 
-#: builtin/fetch.c:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
 msgid "path to upload pack on remote end"
 msgstr "путь к программе упаковки пакета на машине � внешним репозиторием"
 
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
 msgid "force overwrite of local branch"
 msgstr "принудительна� перезапи�ь локальной ветки"
 
@@ -5767,7 +5989,7 @@ msgstr "принудительнаÑ� перезапиÑ�ÑŒ локальной вÐ
 msgid "fetch from multiple remotes"
 msgstr "извлечь � не�кольких внешних репозиториев"
 
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
 msgid "fetch all tags and associated objects"
 msgstr "извлечь в�е метки и �в�занные объекты"
 
@@ -5779,19 +6001,19 @@ msgstr "не извлекать в�е метки (--no-tags)"
 msgid "number of submodules fetched in parallel"
 msgstr "количе�тво подмодулей, которые будут �качаны парралельно"
 
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "почи�тить от�леживаемые внешние ветки, которых уже нет на внешнем репозитории"
 
-#: builtin/fetch.c:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
 msgid "on-demand"
 msgstr "по требованию"
 
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
 msgid "control recursive fetching of submodules"
 msgstr "управление рекур�ивным извлечением подмодулей"
 
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
 msgid "keep downloaded pack"
 msgstr "о�тавить загруженный пакет данных"
 
@@ -5799,15 +6021,15 @@ msgstr "о�тавить загруженный пакет данных"
 msgid "allow updating of HEAD ref"
 msgstr "разрешить обновление ��ылки HEAD"
 
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
 msgid "deepen history of shallow clone"
 msgstr "глубока� и�тори� ча�тичного клона"
 
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
 msgid "convert to a complete repository"
 msgstr "преобразовать в полный репозиторий"
 
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
 msgid "dir"
 msgstr "каталог"
 
@@ -5819,15 +6041,15 @@ msgstr "приÑ�оединÑ�Ñ‚ÑŒ Ñ�то Ñ�переди к выводу путеÐ
 msgid "default mode for recursion"
 msgstr "режим по умолчанию дл� рекур�ии"
 
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
 msgid "accept refs that update .git/shallow"
 msgstr "принимать ��ылки, которые обновл�ют .git/shallow"
 
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
 msgid "refmap"
 msgstr "�оответ�твие-��ылок"
 
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
 msgid "specify fetch refmap"
 msgstr "указать �оответ�твие ��ылок при извлечении"
 
@@ -5885,11 +6107,6 @@ msgstr "принудительное обновление"
 msgid "(non-fast-forward)"
 msgstr "(без перемотки вперед)"
 
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "не удало�ь открыть %s: %s\n"
-
 #: builtin/fetch.c:619
 #, c-format
 msgid "%s did not send all necessary objects\n"
@@ -6084,55 +6301,55 @@ msgstr "Проверка �оединени�"
 msgid "Checking object directories"
 msgstr "Проверка каталогов объектов"
 
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<опции>] [<объект>…]"
 
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
 msgid "show unreachable objects"
 msgstr "показать недо�тупные объекты"
 
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
 msgid "show dangling objects"
 msgstr "показать объекты, на которые нет ��ылок"
 
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
 msgid "report tags"
 msgstr "выве�ти отчет по меткам"
 
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
 msgid "report root nodes"
 msgstr "выве�ти отчет по корневым узлам"
 
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
 msgid "make index objects head nodes"
 msgstr "во�принимать объекты в индек�е как корневые узлы"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
 msgid "make reflogs head nodes (default)"
 msgstr "�оздать корневые узлы журналов ��ылок (по умолчанию)"
 
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
 msgid "also consider packs and alternate objects"
 msgstr "также провер�ть пакеты и альтернативные объекты"
 
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
 msgid "check only connectivity"
 msgstr "только проверить �оединение"
 
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
 msgid "enable more strict checking"
 msgstr "и�пользовать более �трогую проверку"
 
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
 msgid "write dangling objects in .git/lost-found"
 msgstr "запи�ать объекты на которые нет ��ылок в .git/lost-found"
 
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
 msgid "show progress"
 msgstr "показать прогре�� выполнени�"
 
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
 msgid "Checking objects"
 msgstr "Проверка объектов"
 
@@ -6227,214 +6444,214 @@ msgstr "не удало�ь прочитать дерево (%s)"
 msgid "unable to grep from object of type %s"
 msgstr "не удало�ь выполнить grep из объекта типа %s"
 
-#: builtin/grep.c:558
+#: builtin/grep.c:560
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "параметр «%c» ожидает чи�ловое значение"
 
-#: builtin/grep.c:575
+#: builtin/grep.c:577
 #, c-format
 msgid "cannot open '%s'"
 msgstr "не удало�ь открыть «%s»"
 
-#: builtin/grep.c:644
+#: builtin/grep.c:646
 msgid "search in index instead of in the work tree"
 msgstr "и�кать в индек�е, а не в рабочем каталоге"
 
-#: builtin/grep.c:646
+#: builtin/grep.c:648
 msgid "find in contents not managed by git"
 msgstr "и�кать в �одержимом не управл�емым git"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:650
 msgid "search in both tracked and untracked files"
 msgstr "и�кать и в от�леживаемых, и в неот�леживаемых файлах"
 
-#: builtin/grep.c:650
+#: builtin/grep.c:652
 msgid "ignore files specified via '.gitignore'"
 msgstr "игнорировать файлы указанные в «.gitignore»"
 
-#: builtin/grep.c:653
+#: builtin/grep.c:655
 msgid "show non-matching lines"
 msgstr "и�кать в не�овпадающих �троках"
 
-#: builtin/grep.c:655
+#: builtin/grep.c:657
 msgid "case insensitive matching"
 msgstr "без учета реги�тра"
 
-#: builtin/grep.c:657
+#: builtin/grep.c:659
 msgid "match patterns only at word boundaries"
 msgstr "и�кать �овпадени� шаблона только на границах �лов"
 
-#: builtin/grep.c:659
+#: builtin/grep.c:661
 msgid "process binary files as text"
 msgstr "обработка двоичных файлов как тек�та"
 
-#: builtin/grep.c:661
+#: builtin/grep.c:663
 msgid "don't match patterns in binary files"
 msgstr "не и�кать �овпадени� шаблона в двоичных файлах"
 
-#: builtin/grep.c:664
+#: builtin/grep.c:666
 msgid "process binary files with textconv filters"
 msgstr "обрабатывать�� двоичные файлы � помощью фильтров textconv"
 
-#: builtin/grep.c:666
+#: builtin/grep.c:668
 msgid "descend at most <depth> levels"
 msgstr "на глубине мак�иму <глубина> уровней"
 
-#: builtin/grep.c:670
+#: builtin/grep.c:672
 msgid "use extended POSIX regular expressions"
 msgstr "и�пользовать ра�ширенные регул�рные выражени� POSIX"
 
-#: builtin/grep.c:673
+#: builtin/grep.c:675
 msgid "use basic POSIX regular expressions (default)"
 msgstr "и�пользовать базовые регул�рные выражени� POSIX (по умолчанию)"
 
-#: builtin/grep.c:676
+#: builtin/grep.c:678
 msgid "interpret patterns as fixed strings"
 msgstr "интерпретировать шаблоны как фик�ированные �троки"
 
-#: builtin/grep.c:679
+#: builtin/grep.c:681
 msgid "use Perl-compatible regular expressions"
 msgstr "и�пользовать Perl-�овме�тимые регул�рные выражени�"
 
-#: builtin/grep.c:682
+#: builtin/grep.c:684
 msgid "show line numbers"
 msgstr "выве�ти номера �трок"
 
-#: builtin/grep.c:683
+#: builtin/grep.c:685
 msgid "don't show filenames"
 msgstr "не выводить имена файлов"
 
-#: builtin/grep.c:684
+#: builtin/grep.c:686
 msgid "show filenames"
 msgstr "выводить имена файлов"
 
-#: builtin/grep.c:686
+#: builtin/grep.c:688
 msgid "show filenames relative to top directory"
 msgstr "выводить имена файлов отно�ительно каталога репозитори�"
 
-#: builtin/grep.c:688
+#: builtin/grep.c:690
 msgid "show only filenames instead of matching lines"
 msgstr "выводить только имена файлов, а не �овпадающие �троки"
 
-#: builtin/grep.c:690
+#: builtin/grep.c:692
 msgid "synonym for --files-with-matches"
 msgstr "�иноним дл� --files-with-matches"
 
-#: builtin/grep.c:693
+#: builtin/grep.c:695
 msgid "show only the names of files without match"
 msgstr "выводить только не�овпадающие имена файлов"
 
-#: builtin/grep.c:695
+#: builtin/grep.c:697
 msgid "print NUL after filenames"
 msgstr "выводить двоичный �ОЛЬ по�ле �пи�ка имен файлов"
 
-#: builtin/grep.c:697
+#: builtin/grep.c:699
 msgid "show the number of matches instead of matching lines"
 msgstr "выводить количе�тво �овпадений, а не �овпадающие �троки"
 
-#: builtin/grep.c:698
+#: builtin/grep.c:700
 msgid "highlight matches"
 msgstr "под�вечивать �овпадени�"
 
-#: builtin/grep.c:700
+#: builtin/grep.c:702
 msgid "print empty line between matches from different files"
 msgstr "выводить пу�тую �троку по�ле �овпадений из разных файлов"
 
-#: builtin/grep.c:702
+#: builtin/grep.c:704
 msgid "show filename only once above matches from same file"
 msgstr "выводить им� файла только раз на не�колько �овпадений в одном файле"
 
-#: builtin/grep.c:705
+#: builtin/grep.c:707
 msgid "show <n> context lines before and after matches"
 msgstr "показать <n> �трок контек�та перед и по�ле �овпадени�"
 
-#: builtin/grep.c:708
+#: builtin/grep.c:710
 msgid "show <n> context lines before matches"
 msgstr "показать <n> �трок контек�та перед �овпадением"
 
-#: builtin/grep.c:710
+#: builtin/grep.c:712
 msgid "show <n> context lines after matches"
 msgstr "показать <n> �трок контек�та по�ле �овпадени�"
 
-#: builtin/grep.c:712
+#: builtin/grep.c:714
 msgid "use <n> worker threads"
 msgstr "и�пользовать <кол> рабочих потоков"
 
-#: builtin/grep.c:713
+#: builtin/grep.c:715
 msgid "shortcut for -C NUM"
 msgstr "тоже, что и -C КОЛИЧЕСТВО"
 
-#: builtin/grep.c:716
+#: builtin/grep.c:718
 msgid "show a line with the function name before matches"
 msgstr "показать �троку � именем функции перед �овпадением"
 
-#: builtin/grep.c:718
+#: builtin/grep.c:720
 msgid "show the surrounding function"
 msgstr "показать окружающую функцию"
 
-#: builtin/grep.c:721
+#: builtin/grep.c:723
 msgid "read patterns from file"
 msgstr "прочитать шаблоны из файла"
 
-#: builtin/grep.c:723
+#: builtin/grep.c:725
 msgid "match <pattern>"
 msgstr "пои�к �оответ�твий � <шаблоном>"
 
-#: builtin/grep.c:725
+#: builtin/grep.c:727
 msgid "combine patterns specified with -e"
 msgstr "объединить шаблоны указанные � помощью -e"
 
-#: builtin/grep.c:737
+#: builtin/grep.c:739
 msgid "indicate hit with exit status without output"
 msgstr "ничего не выводить, указать на �овпадение � помощью кода выхода"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:741
 msgid "show only matches from files that match all patterns"
 msgstr "показать только �овпадени� из файлов в которых �овпадают в�е шаблоны"
 
-#: builtin/grep.c:741
+#: builtin/grep.c:743
 msgid "show parse tree for grep expression"
 msgstr "показать дерево разбора дл� выражени� пои�ка"
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "pager"
 msgstr "пейджер"
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "show matching files in the pager"
 msgstr "показать �овпадающие файлы � помощью программы-пейджера"
 
-#: builtin/grep.c:748
+#: builtin/grep.c:750
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "разрешить вызов grep(1) (игнорирует�� в �той �борке)"
 
-#: builtin/grep.c:811
+#: builtin/grep.c:813
 msgid "no pattern given."
 msgstr "не задан шаблон."
 
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "указано неправильное количе�тво потоков (%d)"
 
-#: builtin/grep.c:873
+#: builtin/grep.c:875
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager работает только в рабочем каталоге"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:901
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached или --untracked нельз� и�пользовать одновременно � --no-index."
 
-#: builtin/grep.c:904
+#: builtin/grep.c:906
 msgid "--no-index or --untracked cannot be used with revs."
-msgstr "--no-index или --untracked нельз� и�пользовать одновременно � указанием ревизии."
+msgstr "--no-index или --untracked нельз� и�пользовать одновременно � указанием редакции."
 
-#: builtin/grep.c:907
+#: builtin/grep.c:909
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard не может и�пользовать�� дл� от�леживаемого �одержимого."
 
-#: builtin/grep.c:915
+#: builtin/grep.c:917
 msgid "both --cached and trees are given."
 msgstr "указано одновременно --cached и дерево."
 
@@ -6521,8 +6738,8 @@ msgstr "вер�и� emacsclient «%d» �лишком �тара� (< 22)."
 
 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
 #, c-format
-msgid "failed to exec '%s': %s"
-msgstr "�бой при запу�ке «%s»: %s"
+msgid "failed to exec '%s'"
+msgstr "�бой при запу�ке «%s»"
 
 #: builtin/help.c:205
 #, c-format
@@ -6780,15 +6997,19 @@ msgstr "безумна� путаница"
 
 #: builtin/index-pack.c:1253
 #, c-format
-msgid "completed with %d local objects"
-msgstr "завершено � %d локальными объектами"
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "завершено � %d локальным объектом"
+msgstr[1] "завершено � %d локальными объектами"
+msgstr[2] "завершено � %d локальными объектами"
+msgstr[3] "завершено � %d локальными объектами"
 
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1265
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "�еожиданна� контрольна� �умма в конце %s (ди�к поврежден?)"
 
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
@@ -6797,59 +7018,59 @@ msgstr[1] "пакет Ñ�одержит %d неразрешенные дельтÑ
 msgstr[2] "пакет �одержит %d неразрешенных дельт"
 msgstr[3] "пакет �одержит %d неразрешенных дельт"
 
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1293
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "нельз� �жать при�оединенный объект (%d)"
 
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "локальный объект %s поврежден"
 
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
 msgid "error while closing pack file"
 msgstr "ошибка при закрытии файла пакета"
 
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "не удало�ь запи�ать файл удержани� «%s»"
 
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "не удало�ь закрыть запи�анный файл удержани� «%s»"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
 msgid "cannot store pack file"
 msgstr "не удало�ь �охранить файл пакета"
 
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
 msgid "cannot store index file"
 msgstr "не удало�ь �охранить файл индек�а"
 
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "плохой pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "нет поддержки потоков, игнорирование %s"
 
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "�е удало�ь открыть �уще�твующий файл пакета «%s»"
 
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "�е удало�ь открыть �уще�твующий файл индек�а дл� «%s»"
 
-#: builtin/index-pack.c:1587
+#: builtin/index-pack.c:1589
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
@@ -6858,7 +7079,7 @@ msgstr[1] "не дельты: %d объекта"
 msgstr[2] "не дельты: %d объектов"
 msgstr[3] "не дельты: %d объектов"
 
-#: builtin/index-pack.c:1594
+#: builtin/index-pack.c:1596
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
@@ -6867,26 +7088,26 @@ msgstr[1] "длина цепочки = %d: %lu объекта"
 msgstr[2] "длина цепочки = %d: %lu объектов"
 msgstr[3] "длина цепочки = %d: %lu объектов"
 
-#: builtin/index-pack.c:1624
+#: builtin/index-pack.c:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "им� пакета «%s» не оканчивает�� на «.pack»"
+
+#: builtin/index-pack.c:1638
 msgid "Cannot come back to cwd"
 msgstr "�е удало�ь вернуть�� в текущий рабочий каталог"
 
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
 #, c-format
 msgid "bad %s"
 msgstr "плохой %s"
 
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin нельз� и�пользовать без --stdin"
 
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "им� пакета «%s» не оканчивает�� на «.pack»"
-
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1731
 msgid "--verify with no packfile name given"
 msgstr "--verify без указани� имени файла пакета"
 
@@ -6925,27 +7146,27 @@ msgstr "не удало�ь �копировать файл «%s» в «%s»"
 msgid "ignoring template %s"
 msgstr "игнорирование шаблона %s"
 
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
 #, c-format
 msgid "templates not found %s"
 msgstr "шаблоны не найдены %s"
 
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
 #, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr "не копирую шаблоны в неправильной вер�ии формата %d из «%s»"
+msgid "not copying templates from '%s': %s"
+msgstr "не копирую шаблоны из «%s»: %s"
 
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
 #, c-format
 msgid "%s already exists"
 msgstr "%s уже �уще�твует"
 
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "не удает�� обработать файл типа %d"
 
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "не удает�� переме�тить файл %s в %s"
@@ -6953,55 +7174,55 @@ msgstr "не удает�� переме�тить файл %s в %s"
 #. TRANSLATORS: The first '%s' is either "Reinitialized
 #. existing" or "Initialized empty", the second " shared" or
 #. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
 #, c-format
 msgid "%s%s Git repository in %s%s\n"
 msgstr "%s%s репозиторий Git в %s%s\n"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Reinitialized existing"
 msgstr "Переинициализаци� �уще�твующего"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Initialized empty"
 msgstr "Инициализирован пу�той"
 
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
 msgid " shared"
 msgstr " общий"
 
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] "
 "[--shared[=<permissions>]] [<directory>]"
 msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-до�тупа>]] [<каталог>]"
 
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
 msgid "permissions"
 msgstr "права-до�тупа"
 
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "укажите, е�ли репозиторий git будет и�пользовать�� не�колькими пользовател�ми"
 
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "не удало�ь выполнить mkdir %s"
 
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "не удало�ь выполнить chdir в %s"
 
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr "%s (или --work-tree=<каталог>) нельз� и�пользовать без указани� %s (или --git-dir=<каталог>)"
 
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "�е удало�ь получить до�туп к рабочему каталогу «%s»"
@@ -7045,274 +7266,317 @@ msgstr "git show [<опции>] <объект>…"
 msgid "invalid --decorate option: %s"
 msgstr "неправильный параметр дл� --decorate: %s"
 
-#: builtin/log.c:131
+#: builtin/log.c:137
 msgid "suppress diff output"
 msgstr "не выводить различи�"
 
-#: builtin/log.c:132
+#: builtin/log.c:138
 msgid "show source"
 msgstr "показать и�точник"
 
-#: builtin/log.c:133
+#: builtin/log.c:139
 msgid "Use mail map file"
 msgstr "И�пользовать файл �оответ�тви� почтовых адре�ов"
 
-#: builtin/log.c:134
+#: builtin/log.c:140
 msgid "decorate options"
 msgstr "опции формата вывода ��ылок"
 
-#: builtin/log.c:137
+#: builtin/log.c:143
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Обработать диапазон �трок n,m из файла, начина� � 1"
 
-#: builtin/log.c:233
+#: builtin/log.c:239
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Финальный вывод: %d %s\n"
 
-#: builtin/log.c:465
+#: builtin/log.c:471
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: плохой файл"
 
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
 #, c-format
 msgid "Could not read object %s"
 msgstr "�е удало�ь прочитать объект %s"
 
-#: builtin/log.c:596
+#: builtin/log.c:602
 #, c-format
 msgid "Unknown type: %d"
 msgstr "�еизве�тный тип объекта: %d"
 
-#: builtin/log.c:715
+#: builtin/log.c:722
 msgid "format.headers without value"
 msgstr "в format.headers не указано значение"
 
-#: builtin/log.c:801
+#: builtin/log.c:812
 msgid "name of output directory is too long"
 msgstr "�лишком длинное им� выходного каталога"
 
-#: builtin/log.c:816
+#: builtin/log.c:827
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "�у удало�ь открыть файл изменений %s"
 
-#: builtin/log.c:830
+#: builtin/log.c:841
 msgid "Need exactly one range."
 msgstr "�ужен только один диапазон."
 
-#: builtin/log.c:840
+#: builtin/log.c:851
 msgid "Not a range."
 msgstr "�е �вл�ет�� диапазоном."
 
-#: builtin/log.c:946
+#: builtin/log.c:957
 msgid "Cover letter needs email format"
 msgstr "Сопроводительное пи�ьмо должно быть в формате �лектронной почты"
 
-#: builtin/log.c:1025
+#: builtin/log.c:1036
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "ошибка в поле in-reply-to: %s"
 
-#: builtin/log.c:1053
+#: builtin/log.c:1064
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<опции>] [<начина�-�> | <диапазон-редакций>]"
 
-#: builtin/log.c:1098
+#: builtin/log.c:1109
 msgid "Two output directories?"
 msgstr "Два выходных каталога?"
 
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "�еизве�тный коммит %s"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "�е удало�ь разрешить «%s» как ��ылку."
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr "�е удало�ь найти точную базу �ли�ни�."
+
+#: builtin/log.c:1235
+msgid ""
+"Failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually."
+msgstr "�е удало�ь получить выше�то�щую ветку. Е�ли вы хотите запи�ать базовый коммит автомитиче�ки, то и�пользуйте git branch --set-upstream-to дл� от�леживани� внешней ветки.\nИли же вы можете указать базовый коммит указанием --base=<идентификатор-базового-коммита> вручную."
+
+#: builtin/log.c:1255
+msgid "Failed to find exact merge base"
+msgstr "�е удало�ь найти точную базу �ли�ни�"
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr "базовый коммит должен быть предком �пи�ка редакций"
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr "базовый коммит не должен быть в �пи�ке редакций"
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr "не удало�ь получить идентификатор патча"
+
+#: builtin/log.c:1377
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "выводить [PATCH n/m] даже когда один патч"
 
-#: builtin/log.c:1217
+#: builtin/log.c:1380
 msgid "use [PATCH] even with multiple patches"
 msgstr "выводить [PATCH] даже когда не�колько патчей"
 
-#: builtin/log.c:1221
+#: builtin/log.c:1384
 msgid "print patches to standard out"
 msgstr "выводить патчи на �тандартный вывод"
 
-#: builtin/log.c:1223
+#: builtin/log.c:1386
 msgid "generate a cover letter"
 msgstr "генерировать �опроводительное пи�ьмо"
 
-#: builtin/log.c:1225
+#: builtin/log.c:1388
 msgid "use simple number sequence for output file names"
 msgstr "и�пользовать про�тую по�ледовательно�ть чи�ел дл� имен выходных файлов"
 
-#: builtin/log.c:1226
+#: builtin/log.c:1389
 msgid "sfx"
 msgstr "�уффик�"
 
-#: builtin/log.c:1227
+#: builtin/log.c:1390
 msgid "use <sfx> instead of '.patch'"
 msgstr "и�пользовать �уффик� <�уффик�> вме�то «.patch»"
 
-#: builtin/log.c:1229
+#: builtin/log.c:1392
 msgid "start numbering patches at <n> instead of 1"
 msgstr "начать нумерацию патчей � <n>, а не � 1"
 
-#: builtin/log.c:1231
+#: builtin/log.c:1394
 msgid "mark the series as Nth re-roll"
 msgstr "пометить �ерию как �нную попытку"
 
-#: builtin/log.c:1233
+#: builtin/log.c:1396
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "И�пользовать [<префик�>] вме�то [PATCH]"
 
-#: builtin/log.c:1236
+#: builtin/log.c:1399
 msgid "store resulting files in <dir>"
 msgstr "�охранить результирующие файлы в <каталог>"
 
-#: builtin/log.c:1239
+#: builtin/log.c:1402
 msgid "don't strip/add [PATCH]"
 msgstr "не обрезать/добавл�ть [PATCH]"
 
-#: builtin/log.c:1242
+#: builtin/log.c:1405
 msgid "don't output binary diffs"
 msgstr "не выводить двоичные различи�"
 
-#: builtin/log.c:1244
+#: builtin/log.c:1407
 msgid "output all-zero hash in From header"
 msgstr "выводить нулевую х�ш-�умму в заголовке From"
 
-#: builtin/log.c:1246
+#: builtin/log.c:1409
 msgid "don't include a patch matching a commit upstream"
 msgstr "не включать патч, е�ли коммит уже е�ть в выше�то�щей ветке"
 
-#: builtin/log.c:1248
+#: builtin/log.c:1411
 msgid "show patch format instead of default (patch + stat)"
 msgstr "выводить в формате патча, а не в �тандартном (патч + �тати�тика)"
 
-#: builtin/log.c:1250
+#: builtin/log.c:1413
 msgid "Messaging"
 msgstr "Передача �ообщений"
 
-#: builtin/log.c:1251
+#: builtin/log.c:1414
 msgid "header"
 msgstr "заголовок"
 
-#: builtin/log.c:1252
+#: builtin/log.c:1415
 msgid "add email header"
 msgstr "добавить заголовок �ообщени�"
 
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
 msgid "email"
 msgstr "почта"
 
-#: builtin/log.c:1253
+#: builtin/log.c:1416
 msgid "add To: header"
 msgstr "добавить заголовок To:"
 
-#: builtin/log.c:1255
+#: builtin/log.c:1418
 msgid "add Cc: header"
 msgstr "добавить заголовок Cc:"
 
-#: builtin/log.c:1257
+#: builtin/log.c:1420
 msgid "ident"
 msgstr "идентификатор"
 
-#: builtin/log.c:1258
+#: builtin/log.c:1421
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "у�тановить адре� отправител� на <идентификатор> (или на идентификатор коммитера, е�ли от�ут�твует)"
 
-#: builtin/log.c:1260
+#: builtin/log.c:1423
 msgid "message-id"
 msgstr "идентификатор-�ообщени�"
 
-#: builtin/log.c:1261
+#: builtin/log.c:1424
 msgid "make first mail a reply to <message-id>"
 msgstr "�делать первое пи�ьмо ответом на <идентификатор-�ообщени�>"
 
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
 msgid "boundary"
 msgstr "вложение"
 
-#: builtin/log.c:1263
+#: builtin/log.c:1426
 msgid "attach the patch"
 msgstr "приложить патч"
 
-#: builtin/log.c:1266
+#: builtin/log.c:1429
 msgid "inline the patch"
 msgstr "включить патч в тек�т пи�ьма"
 
-#: builtin/log.c:1270
+#: builtin/log.c:1433
 msgid "enable message threading, styles: shallow, deep"
 msgstr "включить в пи�ьмах иерархично�ть, �тили: shallow (ча�тичную), deep (глубокую)"
 
-#: builtin/log.c:1272
+#: builtin/log.c:1435
 msgid "signature"
 msgstr "подпи�ь"
 
-#: builtin/log.c:1273
+#: builtin/log.c:1436
 msgid "add a signature"
 msgstr "добавить подпи�ь"
 
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "базовый коммит"
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr "добавить информацию о требовании дерева к �ерии патчей"
+
+#: builtin/log.c:1440
 msgid "add a signature from a file"
 msgstr "добавить подпи�ь из файла"
 
-#: builtin/log.c:1276
+#: builtin/log.c:1441
 msgid "don't print the patch filenames"
 msgstr "не выводить имена файлов патчей"
 
-#: builtin/log.c:1365
+#: builtin/log.c:1531
 msgid "-n and -k are mutually exclusive."
 msgstr "-n и -k нельз� и�пользовать одновременно"
 
-#: builtin/log.c:1367
+#: builtin/log.c:1533
 msgid "--subject-prefix and -k are mutually exclusive."
 msgstr "--subject-prefix и -k нельз� и�пользовать одновременно."
 
-#: builtin/log.c:1375
+#: builtin/log.c:1541
 msgid "--name-only does not make sense"
 msgstr "--name-only не имеет �мы�ла"
 
-#: builtin/log.c:1377
+#: builtin/log.c:1543
 msgid "--name-status does not make sense"
 msgstr "--name-status не имеет �мы�ла"
 
-#: builtin/log.c:1379
+#: builtin/log.c:1545
 msgid "--check does not make sense"
 msgstr "--check не имеет �мы�ла"
 
-#: builtin/log.c:1407
+#: builtin/log.c:1573
 msgid "standard output, or directory, which one?"
 msgstr "�тандартный вывод или каталог?"
 
-#: builtin/log.c:1409
+#: builtin/log.c:1575
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "�е удало�ь �оздать каталог «%s»"
 
-#: builtin/log.c:1506
+#: builtin/log.c:1672
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "не удало�ь прочитать файл подпи�и «%s»"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1743
 msgid "Failed to create output files"
 msgstr "Сбой при �оздании выходных файлов"
 
-#: builtin/log.c:1617
+#: builtin/log.c:1792
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<выше�то�ща�-ветка> [<голова> [<ограничение>]]]"
 
-#: builtin/log.c:1671
+#: builtin/log.c:1846
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> "
 "manually.\n"
 msgstr "�е удало�ь найти от�леживаемую внешнюю ветку, укажите <выше�то�щую-ветку> вручную.\n"
 
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr "�еизве�тный коммит %s"
-
 #: builtin/ls-files.c:378
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<опции>] [<файл>…]"
@@ -7500,170 +7764,174 @@ msgstr "git merge [<опции>] <�ообщение> HEAD <коммит>"
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:100
+#: builtin/merge.c:101
 msgid "switch `m' requires a value"
 msgstr "при указании параметра «m» требует�� указать значение"
 
-#: builtin/merge.c:137
+#: builtin/merge.c:138
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "�е удало�ь найти �тратегию �ли�ни� «%s».\n"
 
-#: builtin/merge.c:138
+#: builtin/merge.c:139
 #, c-format
 msgid "Available strategies are:"
 msgstr "До�тупные �тратегии:"
 
-#: builtin/merge.c:143
+#: builtin/merge.c:144
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "До�тупные пользователь�кие �тратегии:"
 
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
 msgid "do not show a diffstat at the end of the merge"
 msgstr "не выводить �тати�тику изменений по�ле окончани� �ли�ни�"
 
-#: builtin/merge.c:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
 msgid "show a diffstat at the end of the merge"
 msgstr "выве�ти �тати�тику изменений по�ле окончани� �ли�ни�"
 
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
 msgid "(synonym to --stat)"
 msgstr "(�иноним дл� --stat)"
 
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "добавить (мак�имум <n>) запи�ей из короткого журнала в �ообщение коммита у �ли�ни�"
 
-#: builtin/merge.c:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
 msgid "create a single commit instead of doing a merge"
 msgstr "�оздать один коммит, вме�то выполнени� �ли�ни�"
 
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "�делать коммит, е�ли �ли�ние прошло у�пешно (по умолчанию)"
 
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
 msgid "edit message before committing"
 msgstr "отредактировать �ообщение перед выполнением коммита"
 
-#: builtin/merge.c:207
+#: builtin/merge.c:208
 msgid "allow fast-forward (default)"
 msgstr "разрешить перемотку вперед (по умолчанию)"
 
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
 msgid "abort if fast-forward is not possible"
 msgstr "отменить выполнение �ли�ни�, е�ли перемотка вперед невозможна"
 
-#: builtin/merge.c:213
+#: builtin/merge.c:214
 msgid "Verify that the named commit has a valid GPG signature"
 msgstr "Проверить, что указанный коммит имеет верную �лектронную подпи�ь GPG"
 
-#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
 #: builtin/revert.c:89
 msgid "strategy"
 msgstr "�тратеги�"
 
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "merge strategy to use"
 msgstr "и�пользуема� �тратеги� �ли�ни�"
 
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
 msgid "option=value"
 msgstr "опци�=значение"
 
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
 msgid "option for selected merge strategy"
 msgstr "опции дл� выбранной �тратегии �ли�ни�"
 
-#: builtin/merge.c:219
+#: builtin/merge.c:220
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "�ообщение коммита дл� �ли�ни� (дл� �ли�ни� без перемотки вперед)"
 
-#: builtin/merge.c:223
+#: builtin/merge.c:224
 msgid "abort the current in-progress merge"
 msgstr "отменить выполнение прои�ход�щего �ли�ни�"
 
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "разрешить �ли�ние не�в�занных и�торий изменений"
+
+#: builtin/merge.c:254
 msgid "could not run stash."
 msgstr "не удало�ь выполнить stash."
 
-#: builtin/merge.c:256
+#: builtin/merge.c:259
 msgid "stash failed"
 msgstr "�бой при выполнении stash"
 
-#: builtin/merge.c:261
+#: builtin/merge.c:264
 #, c-format
 msgid "not a valid object: %s"
 msgstr "неправильный объект: %s"
 
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
 msgid "read-tree failed"
 msgstr "�бой при выполнении read-tree"
 
-#: builtin/merge.c:327
+#: builtin/merge.c:330
 msgid " (nothing to squash)"
 msgstr " (нечего уплотн�ть)"
 
-#: builtin/merge.c:340
+#: builtin/merge.c:343
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Уплотнение коммита — не обновл�� HEAD\n"
 
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
 #, c-format
 msgid "Could not write to '%s'"
 msgstr "�е удало�ь запи�ать в «%s»"
 
-#: builtin/merge.c:372
+#: builtin/merge.c:375
 msgid "Writing SQUASH_MSG"
 msgstr "Запи�ь SQUASH_MSG"
 
-#: builtin/merge.c:374
+#: builtin/merge.c:377
 msgid "Finishing SQUASH_MSG"
 msgstr "Завершение SQUASH_MSG"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:400
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "�ет �ообщени� �ли�ни� — не обновл�ем HEAD\n"
 
-#: builtin/merge.c:448
+#: builtin/merge.c:451
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "«%s» не указывает на коммит"
 
-#: builtin/merge.c:538
+#: builtin/merge.c:541
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "�еправильна� �трока branch.%s.mergeoptions: %s"
 
-#: builtin/merge.c:657
+#: builtin/merge.c:660
 msgid "Not handling anything other than two heads merge."
 msgstr "�е обрабатываю ничего, кроме �ли�ни� двух указателей на ветки."
 
-#: builtin/merge.c:671
+#: builtin/merge.c:674
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "�еизве�тный параметр merge-recursive: -X%s"
 
-#: builtin/merge.c:684
+#: builtin/merge.c:687
 #, c-format
 msgid "unable to write %s"
 msgstr "не удало�ь запи�ать %s"
 
-#: builtin/merge.c:773
+#: builtin/merge.c:776
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "�е удало�ь проче�ть из «%s»"
 
-#: builtin/merge.c:782
+#: builtin/merge.c:785
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr "�е выполн�ю коммит �ли�ни�; и�пользуйте «git commit» дл� завершени� �ли�ни�.\n"
 
-#: builtin/merge.c:788
+#: builtin/merge.c:791
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -7673,157 +7941,161 @@ msgid ""
 "the commit.\n"
 msgstr "Пожалуй�та, введите �ообщение коммита, дл� объ��нени�, зачем нужно\n�то �ли�ние, о�обенно, е�ли �то �ли�ние обновленной выше�то�щей\nветки в тематиче�кую ветку.\n\nСтроки, начинающие�� � «%c» будут проигнорированы, а пу�тое\n�ообщение отмен�ет проце�� коммита.\n"
 
-#: builtin/merge.c:812
+#: builtin/merge.c:815
 msgid "Empty commit message."
 msgstr "Пу�тое �ообщение коммита."
 
-#: builtin/merge.c:824
+#: builtin/merge.c:835
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Прекра�но.\n"
 
-#: builtin/merge.c:879
+#: builtin/merge.c:890
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "�е удало�ь прове�ти автоматиче�кое �ли�ние; и�правьте конфликты и �делайте коммит результата.\n"
 
-#: builtin/merge.c:895
+#: builtin/merge.c:906
 #, c-format
 msgid "'%s' is not a commit"
 msgstr "«%s» не �вл�ет�� коммитом"
 
-#: builtin/merge.c:936
+#: builtin/merge.c:947
 msgid "No current branch."
 msgstr "�ет текущей ветки."
 
-#: builtin/merge.c:938
+#: builtin/merge.c:949
 msgid "No remote for the current branch."
 msgstr "У текущей ветки нет внешнего репозитори�."
 
-#: builtin/merge.c:940
+#: builtin/merge.c:951
 msgid "No default upstream defined for the current branch."
 msgstr "Дл� текущей ветки не указана выше�то�ща� ветка по умолчанию."
 
-#: builtin/merge.c:945
+#: builtin/merge.c:956
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "�е указана внешн�� от�леживаема� ветка дл� %s на %s"
 
-#: builtin/merge.c:1080
+#: builtin/merge.c:1091
 #, c-format
 msgid "could not close '%s'"
 msgstr "не удало�ь закрыть «%s»"
 
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "�ет �ли�ни�, которое можно отменить (от�ут�твует файл MERGE_HEAD)."
 
-#: builtin/merge.c:1223
+#: builtin/merge.c:1235
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr "Вы не завершили �ли�ние (при�ут�твует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед �ли�нием."
 
-#: builtin/merge.c:1230
+#: builtin/merge.c:1242
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr "Вы не завершили отбор лучшего (при�ут�твует файл CHERRY_PICK_HEAD).\nПожалуй�та, выполните коммит ваших изменений, перед �ли�нием."
 
-#: builtin/merge.c:1233
+#: builtin/merge.c:1245
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Вы не завершили отбор лучшего (при�ут�твует файл CHERRY_PICK_HEAD)."
 
-#: builtin/merge.c:1242
+#: builtin/merge.c:1254
 msgid "You cannot combine --squash with --no-ff."
 msgstr "�ельз� и�пользовать одновременно --squash и --no-ff."
 
-#: builtin/merge.c:1250
+#: builtin/merge.c:1262
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Коммит не указан и параметр merge.defaultToUpstream не у�тановлен."
 
-#: builtin/merge.c:1267
+#: builtin/merge.c:1279
 msgid "Squash commit into empty head not supported yet"
 msgstr "Уплотнение коммита в пу�тую ветку еще не поддерживает��"
 
-#: builtin/merge.c:1269
+#: builtin/merge.c:1281
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Коммит, не �вл�ющий�� перемоткой вперед, нет �мы�ла делать в пу�тую ветку."
 
-#: builtin/merge.c:1275
+#: builtin/merge.c:1286
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s не �вл�ет�� тем, что можно �лить"
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Можно только один коммит в пу�тую ветку."
 
-#: builtin/merge.c:1332
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "Коммит %s �одержит не доверенную GPG подпи�ь, предположительно от %s."
 
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Коммит %s �одержит плохую GPG подпи�ь, предположительно от %s."
 
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Коммит %s не �одержит GPG подпи�ь."
 
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Коммит %s �одержит дей�твительную GPG подпи�ь, от %s.\n"
 
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr "отказ �ли�ни� не�в�занных и�торий изменений"
+
+#: builtin/merge.c:1439
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Обновление %s..%s\n"
 
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Попытка тривиального �ли�ни� в индек�е…\n"
 
-#: builtin/merge.c:1468
+#: builtin/merge.c:1483
 #, c-format
 msgid "Nope.\n"
 msgstr "�е вышло.\n"
 
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
 msgid "Not possible to fast-forward, aborting."
 msgstr "Перемотка вперед невозможна, отмена."
 
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Перемотка дерева к и�ходному �о�то�нию…\n"
 
-#: builtin/merge.c:1527
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Попытка �ли�ни� � помощью �тратегии %s…\n"
 
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "�и одна �тратеги� �ли�ни� не обработала �ли�ние.\n"
 
-#: builtin/merge.c:1595
+#: builtin/merge.c:1610
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Сбой при �ли�нии � помощью �тратегии %s.\n"
 
-#: builtin/merge.c:1604
+#: builtin/merge.c:1619
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "И�пользую %s дл� подготовки ручного разрешени� конфликтов.\n"
 
-#: builtin/merge.c:1616
+#: builtin/merge.c:1631
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "�втоматиче�кое �ли�ние прошло у�пешно; как и запрашивали, о�тановлено перед выполнением коммита\n"
@@ -7858,7 +8130,7 @@ msgstr "выве�ти предков дл� одного многоходово
 
 #: builtin/merge-base.c:218
 msgid "list revs not reachable from others"
-msgstr "выве�ти �пи�ок ревизий, которые не до�тижимы из друг друга"
+msgstr "выве�ти �пи�ок редаций, которые не до�тижимы из друг друга"
 
 #: builtin/merge-base.c:220
 msgid "is the first one ancestor of the other?"
@@ -7931,7 +8203,7 @@ msgstr "git mv [<опции>] <и�точник>… <назначение>"
 msgid "Directory %s is in index and no submodule?"
 msgstr "Каталог %s в индек�е и не �вл�ет�� подмодулем?"
 
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr "Чтобы продолжить, проиндек�ируйте или �пр�чьте ваши изменени� в файле .gitmodules"
 
@@ -8009,48 +8281,48 @@ msgstr "%s, откуда=%s, куда=%s"
 msgid "Renaming %s to %s\n"
 msgstr "Переименование %s в %s\n"
 
-#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "�бой при переименовании «%s»"
 
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<опции>] <коммит>…"
 
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<опции>] --all"
 
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<опции>] --stdin"
 
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
 msgid "print only names (no SHA-1)"
 msgstr "выводить только имена (без SHA-1)"
 
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
 msgid "only use tags to name the commits"
 msgstr "и�пользовать только метки дл� именовани� коммитов"
 
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
 msgid "only use refs matching <pattern>"
 msgstr "и�пользовать только ��ылки, �оответ�твующие <шаблону> "
 
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
 msgid "list all commits reachable from all refs"
 msgstr "выве�ти �пи�ок в�ех коммитов, до�тижимых �о в�ех ��ылок"
 
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
 msgid "read from stdin"
 msgstr "прочитать из �тандартного ввода"
 
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
 msgid "allow to print `undefined` names (default)"
 msgstr "разрешить вывод «undefined», е�ли не найдено (по умолчанию)"
 
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
 msgid "dereference tags in the input (internal use)"
 msgstr "разыменовывать введенные метки (дл� внутреннего и�пользовани�)"
 
@@ -8191,24 +8463,16 @@ msgstr "не удало�ь запи�ать объект заметки"
 msgid "The note contents have been left in %s"
 msgstr "Содержимое заметки о�тало�ь в %s"
 
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
 #, c-format
 msgid "cannot read '%s'"
 msgstr "не удало�ь прочитать «%s»"
 
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "не удало�ь открыть или прочитать «%s»"
 
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "�е удало�ь разрешить «%s» как ��ылку."
-
 #: builtin/notes.c:256
 #, c-format
 msgid "Failed to read object '%s'."
@@ -8221,7 +8485,7 @@ msgstr "�е удало�ь прочитать данные заметки из
 
 #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
 msgid "too many parameters"
 msgstr "передано �лишком много параметров"
 
@@ -8266,7 +8530,7 @@ msgstr "�е удало�ь добавить заметку. �айдена �у
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Перезапи�ь �уще�твующих заметок у объекта %s\n"
 
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Удаление заметки у объекта %s\n"
@@ -8302,63 +8566,63 @@ msgid ""
 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
 msgstr "Опции -m/-F/-c/-C дл� подкоманды «edit» у�тарели.\nИ�пользуйте вме�то них «git notes add -f -m/-F/-c/-C».\n"
 
-#: builtin/notes.c:767
+#: builtin/notes.c:768
 msgid "General options"
 msgstr "Общие опции"
 
-#: builtin/notes.c:769
+#: builtin/notes.c:770
 msgid "Merge options"
 msgstr "Опции �ли�ни�"
 
-#: builtin/notes.c:771
+#: builtin/notes.c:772
 msgid ""
 "resolve notes conflicts using the given strategy "
 "(manual/ours/theirs/union/cat_sort_uniq)"
 msgstr "разрешить конфликты заметок � помощью указанной �тратегии (manual/ours/theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "Committing unmerged notes"
 msgstr "Коммит не �литых заметок"
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "завершить �ли�ние заметок коммитом не �литых заметок"
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid "Aborting notes merge resolution"
 msgstr "Отмена разрешени� �ли�ни� заметок"
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "abort notes merge"
 msgstr "отменить �ли�ние заметок"
 
-#: builtin/notes.c:856
+#: builtin/notes.c:857
 #, c-format
 msgid "A notes merge into %s is already in-progress at %s"
 msgstr "Сли�ние заметок в %s уже выполн�ет�� на %s"
 
-#: builtin/notes.c:883
+#: builtin/notes.c:884
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "У объекта %s нет заметки\n"
 
-#: builtin/notes.c:895
+#: builtin/notes.c:896
 msgid "attempt to remove non-existent note is not an error"
 msgstr "попытка удалени� не�уще�твующей заметки не �вл�ет�� ошибкой"
 
-#: builtin/notes.c:898
+#: builtin/notes.c:899
 msgid "read object names from the standard input"
 msgstr "прочитать имена объектов из �тандартного ввода"
 
-#: builtin/notes.c:979
+#: builtin/notes.c:980
 msgid "notes-ref"
 msgstr "��ылка-на-заметку"
 
-#: builtin/notes.c:980
+#: builtin/notes.c:981
 msgid "use notes from <notes-ref>"
 msgstr "и�пользовать заметку из <��ылка-на-заметку>"
 
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "�еизве�тна� подкоманда: %s"
@@ -8378,165 +8642,169 @@ msgstr "git pack-objects [<опции>…] <им�-базы> [< <�пи�ок-�
 msgid "deflate error (%d)"
 msgstr "ошибка �жати� (%d)"
 
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr "отключение запи�и битовых карт, так как карты были разбиты на ча�ти из-за pack.packSizeLimit"
+
+#: builtin/pack-objects.c:776
 msgid "Writing objects"
 msgstr "Запи�ь объектов"
 
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "отключение запи�и битовых карт, так как некоторые объекты не были упакованы"
 
-#: builtin/pack-objects.c:2172
+#: builtin/pack-objects.c:2177
 msgid "Compressing objects"
 msgstr "Сжатие объектов"
 
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
 #, c-format
 msgid "unsupported index version %s"
 msgstr "неподдерживаема� вер�и� индек�а %s"
 
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2567
 #, c-format
 msgid "bad index version '%s'"
 msgstr "плоха� вер�и� индек�а «%s»"
 
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
 msgid "do not show progress meter"
 msgstr "не выводить прогре�� выполнени�"
 
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
 msgid "show progress meter"
 msgstr "показать прогре�� выполнени�"
 
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
 msgid "show progress meter during object writing phase"
 msgstr "показать прогре�� выполнени� во врем� запи�и объектов"
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2604
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "похоже на --all-progress при включенном прогре��е выполнени�"
 
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2605
 msgid "version[,offset]"
 msgstr "вер�и�[,�мещение]"
 
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
 msgid "write the pack index file in the specified idx format version"
 msgstr "запи�ать файл индек�а пакета в указанной вер�ии формата"
 
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2609
 msgid "maximum size of each output pack file"
 msgstr "мак�имальный размер каждого выходного файла пакета"
 
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2611
 msgid "ignore borrowed objects from alternate object store"
 msgstr "игнорировать чужие объекты, вз�тые из альтернативного хранилища объектов"
 
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2613
 msgid "ignore packed objects"
 msgstr "игнорировать упакованные объекты"
 
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
 msgid "limit pack window by objects"
 msgstr "ограничить окно пакета по количе�тву объектов"
 
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2617
 msgid "limit pack window by memory in addition to object limit"
 msgstr "дополнительно к количе�тву объектов ограничить окно пакета по пам�ти"
 
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2619
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "мак�имальна� разрешенна� длина цепочки дельт в результирующем пакете"
 
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2621
 msgid "reuse existing deltas"
 msgstr "и�пользовать повторно �уще�твующие дельты"
 
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
 msgid "reuse existing objects"
 msgstr "и�пользовать повторно �уще�твующие объекты"
 
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
 msgid "use OFS_DELTA objects"
 msgstr "и�пользовать объекты OFS_DELTA"
 
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
 msgid "use threads when searching for best delta matches"
 msgstr "и�пользовать многопоточно�ть при пои�ке лучших �овпадений дельт"
 
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2629
 msgid "do not create an empty pack output"
 msgstr "не �оздавать пу�тые выходные пакеты"
 
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2631
 msgid "read revision arguments from standard input"
 msgstr "прочитать аргументы редакций из �тандартного ввода"
 
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
 msgid "limit the objects to those that are not yet packed"
 msgstr "ограничить�� объектами, которые еще не упакованы"
 
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2636
 msgid "include objects reachable from any reference"
 msgstr "включить объекты, которые до�тижимы по любой из ��ылок"
 
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2639
 msgid "include objects referred by reflog entries"
 msgstr "включить объекты, на которые ��ылают�� запи�и журнала ��ылок"
 
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2642
 msgid "include objects referred to by the index"
 msgstr "включить объекты, на которые ��ылает�� индек�"
 
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2645
 msgid "output pack to stdout"
 msgstr "выве�ти пакет на  �тандартный вывод"
 
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
 msgid "include tag objects that refer to objects to be packed"
 msgstr "включить объекты меток, которые ��ылают�� на упаковываемые объекты"
 
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2649
 msgid "keep unreachable objects"
 msgstr "�охран�ть ��ылки на недо�тупные объекты"
 
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
 msgid "time"
 msgstr "врем�"
 
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
 msgid "unpack unreachable objects newer than <time>"
 msgstr "ра�паковать недо�тупные объекты, которые новее, чем <врем�>"
 
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2654
 msgid "create thin packs"
 msgstr "�оздавать тонкие пакеты"
 
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
 msgid "create packs suitable for shallow fetches"
 msgstr "�оздавать пакеты, подход�щие дл� ча�тичных извлечений"
 
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2658
 msgid "ignore packs that have companion .keep file"
 msgstr "игнорировать пакеты, р�дом � которыми лежит .keep файл"
 
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2660
 msgid "pack compression level"
 msgstr "уровень �жати� пакета"
 
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
 msgid "do not hide commits by grafts"
 msgstr "не �крывать коммиты �ращени�ми"
 
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2664
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "по возможно�ти и�пользовать индек� в битовых картах, дл� у�корени� под�чета объектов"
 
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2666
 msgid "write a bitmap index together with the pack index"
 msgstr "запи�ь индек�а в битовых картах вме�те � индек�ом пакета"
 
-#: builtin/pack-objects.c:2752
+#: builtin/pack-objects.c:2757
 msgid "Counting objects"
 msgstr "Под�чет объектов"
 
@@ -8564,15 +8832,15 @@ msgstr "Удаление дублирующих�� объектов"
 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--expire <врем�>] [--] [<им�-ветки>…]"
 
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
 msgid "do not remove, show only"
 msgstr "не удал�ть, только показать �пи�ок"
 
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
 msgid "report pruned objects"
 msgstr "выве�ти �пи�ок удаленных объектов"
 
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
 msgid "expire objects older than <time>"
 msgstr "удалить объекты �тарее чем <дата-окончани�>"
 
@@ -8584,65 +8852,69 @@ msgstr "нельзÑ� почиÑ�тить неиÑ�пользуемые объекÑ
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<опции>] [<репозиторий> [<�пецификаци�-��ылки>…]]"
 
-#: builtin/pull.c:117
+#: builtin/pull.c:120
 msgid "Options related to merging"
 msgstr "Опции, �в�занные �о �ли�нием"
 
-#: builtin/pull.c:120
+#: builtin/pull.c:123
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "забрать изменени� � помощью перебазировани�, а не �ли�ни�"
 
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
 msgid "allow fast-forward"
 msgstr "разрешить перемотку вперед"
 
-#: builtin/pull.c:150
+#: builtin/pull.c:153
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "проверить, что указанный коммит имеет верную �лектронную подпи�ь GPG"
 
-#: builtin/pull.c:164
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "автоматиче�ки выполн�ть stash/stash pop до и по�ле перемещени�"
+
+#: builtin/pull.c:172
 msgid "Options related to fetching"
 msgstr "Опции, �в�занные � извлечением изменений"
 
-#: builtin/pull.c:186
+#: builtin/pull.c:194
 msgid "number of submodules pulled in parallel"
 msgstr "количе�тво подмодулей, которые будут получены парралельно"
 
-#: builtin/pull.c:275
+#: builtin/pull.c:283
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "�еправильное значение дл� pull.ff: %s"
 
-#: builtin/pull.c:359
+#: builtin/pull.c:379
 msgid "Cannot pull with rebase: You have unstaged changes."
 msgstr "�е удало�ь получить � перемещением: У ва� е�ть непроиндек�ированные изменени�."
 
-#: builtin/pull.c:365
+#: builtin/pull.c:385
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "К тому же, в вашем индек�е е�ть незакоммиченные изменени�."
 
-#: builtin/pull.c:367
+#: builtin/pull.c:387
 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
 msgstr "�е удало�ь получить � перемещением: В вашем индек�е е�ть незакоммиченные изменени�."
 
-#: builtin/pull.c:443
+#: builtin/pull.c:463
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "�ет претендентов дл� перемещени� �реди ��ылок, которые вы только что получили."
 
-#: builtin/pull.c:445
+#: builtin/pull.c:465
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "�ет претендентов дл� �ли�ни� �реди ��ылок, которые вы только что получили."
 
-#: builtin/pull.c:446
+#: builtin/pull.c:466
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr "Обычно �то означает, что вы передали �пецификацию ��ылки � помощью шаблона и �тот шаблон ни � чем не �овпал на внешнем репозитории."
 
-#: builtin/pull.c:449
+#: builtin/pull.c:469
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -8650,46 +8922,57 @@ msgid ""
 "for your current branch, you must specify a branch on the command line."
 msgstr "Вы попро�или получить изменени� �о внешнего репозитори� «%s», но не указали ветку. Так как �то не репозиторий по умолчанию дл�  вашей текущей ветки, вы должны указать ветку в командной �троке."
 
-#: builtin/pull.c:454
+#: builtin/pull.c:474 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Вы �ейча� ни на одной из веток."
 
-#: builtin/pull.c:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Пожалуй�та, укажите на какую ветку вы хотите переме�тить изменени�."
 
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Пожалуй�та, укажите � какой веткой вы хотите �лить изменени�."
 
-#: builtin/pull.c:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
 msgid "See git-pull(1) for details."
 msgstr "Дл� дополнительной информации, �мотрите git-pull(1)."
 
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<внешний-репозиторий>"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<ветка>"
+
+#: builtin/pull.c:489 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "У текущей ветки нет информации об от�леживании."
 
-#: builtin/pull.c:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
 msgid ""
-"If you wish to set tracking information for this branch you can do so with:\n"
-"\n"
-"    git branch --set-upstream-to=%s/<branch> %s\n"
-msgstr "Е�ли вы хотите указать информацию о от�леживаемой ветке, выполните:\n\n    git branch --set-upstream-to=%s/<branch> %s\n"
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr "Е�ли вы хотите указать информацию о от�леживаемой ветке, выполните:"
 
-#: builtin/pull.c:483
+#: builtin/pull.c:503
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 "from the remote, but no such ref was fetched."
 msgstr "Ваша конфигураци� указывает, что нужно �лить изменени� �о ��ылкой\n«%s» из внешнего репозитори�, но така� ��ылка не была получена."
 
-#: builtin/pull.c:841
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "--[no-]autostash можно и�пользовать только вме�те � --rebase."
+
+#: builtin/pull.c:872
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Обновление еще не начавшей�� ветки � изменени�ми, добавленными в индек�."
 
-#: builtin/pull.c:870
+#: builtin/pull.c:900
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -8697,7 +8980,7 @@ msgid ""
 "commit %s."
 msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\n� коммита %s."
 
-#: builtin/pull.c:875
+#: builtin/pull.c:905
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -8708,11 +8991,11 @@ msgid ""
 "to recover."
 msgstr "�е удало�ь перемотать вперёд изменени� в вашем рабочем каталоге.\nПо�ле того, как вы убедите�ь, что вы �охранили в�ё необходимое из вывода\n$ git diff %s\n, запу�тите\n$ git reset --hard\nдл� во��тановлени� и�ходного �о�то�ни�."
 
-#: builtin/pull.c:890
+#: builtin/pull.c:920
 msgid "Cannot merge multiple branches into empty head."
 msgstr "�ельз� �лить не�колько веток в пу�той указатель на ветку."
 
-#: builtin/pull.c:894
+#: builtin/pull.c:924
 msgid "Cannot rebase onto multiple branches."
 msgstr "�евозможно переме�тить над не�колькими ветками."
 
@@ -9011,12 +9294,24 @@ msgstr "не обновлÑ�Ñ‚ÑŒ индекÑ� или рабочий каталоÐ
 
 #: builtin/read-tree.c:137
 msgid "skip applying sparse checkout filter"
-msgstr "пропу�тить применение фильтра ча�тичного перехода"
+msgstr "пропу�тить применение фильтра ча�тичного переключени� на �о�то�ние"
 
 #: builtin/read-tree.c:139
 msgid "debug unpack-trees"
 msgstr "отладка unpack-trees"
 
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <каталог-git>"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "тихий режим"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "Вы должны указать каталог."
+
 #: builtin/reflog.c:423
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
@@ -9330,26 +9625,28 @@ msgstr "* внешний репозиторий %s"
 msgid "  Fetch URL: %s"
 msgstr "  URL дл� извлечени�: %s"
 
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
 msgid "(no URL)"
 msgstr "(нет URL)"
 
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in "  Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL дл� отправки: %s"
 
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD ветка: %s"
 
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
 #, c-format
 msgid "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD ветка (HEAD внешнего репозитори� неоднозначный, может быть одним из):\n"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1181
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
@@ -9358,11 +9655,11 @@ msgstr[1] "    Внешние ветки:%s"
 msgstr[2] "    Внешние ветки:%s"
 msgstr[3] "    Внешние ветки:%s"
 
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
 msgid " (status not queried)"
 msgstr " (�тату� не запрошен)"
 
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Локальна� ветка, на�троенна� дл� «git pull»:"
@@ -9370,11 +9667,11 @@ msgstr[1] "  Локальные ветки, на�троенные дл� «git
 msgstr[2] "  Локальные ветки, на�троенные дл� «git pull»:"
 msgstr[3] "  Локальные ветки, на�троенные дл� «git pull»:"
 
-#: builtin/remote.c:1199
+#: builtin/remote.c:1201
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr " Локальные ��ылки, зеркалируемые � помощью «git push»"
 
-#: builtin/remote.c:1206
+#: builtin/remote.c:1208
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
@@ -9383,128 +9680,128 @@ msgstr[1] "  Локальные ��ылки, на�троенные дл� «gi
 msgstr[2] "  Локальные ��ылки, на�троенные дл� «git push»%s:"
 msgstr[3] "  Локальные ��ылки, на�троенные дл� «git push»%s:"
 
-#: builtin/remote.c:1227
+#: builtin/remote.c:1229
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "у�тановить refs/remotes/<им�>/HEAD в зави�имо�ти от внешнего репозитори�"
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1231
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "удалить refs/remotes/<им�>/HEAD"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
 msgid "Cannot determine remote HEAD"
 msgstr "�е удало�ь определить внешний HEAD"
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "�е�колько внешних HEAD веток. Укажите �вно одну из них:"
 
-#: builtin/remote.c:1256
+#: builtin/remote.c:1258
 #, c-format
 msgid "Could not delete %s"
 msgstr "�е удало�ь удалить %s"
 
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "�еправильна� ��ылка: %s"
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
 #, c-format
 msgid "Could not setup %s"
 msgstr "�е удало�ь на�троить %s"
 
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s будет ви��щей веткой!"
 
-#: builtin/remote.c:1285
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s �тала ви��щей веткой!"
 
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
 #, c-format
 msgid "Pruning %s"
 msgstr "Удаление %s"
 
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [будет удалена] %s"
 
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [удалена] %s"
 
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
 msgid "prune remotes after fetching"
 msgstr "почи�тить внешние репозитории по�ле извлечени�"
 
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
 #, c-format
 msgid "No such remote '%s'"
 msgstr "�ет такого внешнего репозитори� «%s»"
 
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
 msgid "add branch"
 msgstr "добавить ветку"
 
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
 msgid "no remote specified"
 msgstr "не указан внешний репозиторий"
 
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
 msgid "query push URLs rather than fetch URLs"
 msgstr "запро�ить URL отправки, вме�то URL извлечени�"
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1467
 msgid "return all URLs"
 msgstr "вернуть в�е URL"
 
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "URL не на�троены дл� внешнего репозитори� «%s»"
 
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
 msgid "manipulate push URLs"
 msgstr "управление URL отправки"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
 msgid "add URL"
 msgstr "добавить URL"
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
 msgid "delete URLs"
 msgstr "удалить URL"
 
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
 msgid "--add --delete doesn't make sense"
 msgstr "--add нельз� и�пользовать одновременно � --delete"
 
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "�еправильный шаблон �тарого URL: %s"
 
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
 #, c-format
 msgid "No such URL found: %s"
 msgstr "�е найдены �овпадени� URL: %s"
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
 msgid "Will not delete all non-push URLs"
 msgstr "�ельз� удалить в�е URL не-отправки"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 msgid "be verbose; must be placed before a subcommand"
 msgstr "быть много�ловнее; должно �то�ть перед подкомандой"
 
@@ -9998,10 +10295,6 @@ msgstr "разрешить рекур�ивное удаление"
 msgid "exit with a zero status even if nothing matched"
 msgstr "выход � нулевым кодом возврата, даже е�ли ничего не найдено"
 
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr "Пожалуй�та, проиндек�ируйте ваши изменени� в .gitmodules или �пр�чьте их, чтобы продолжить"
-
 #: builtin/rm.c:335
 #, c-format
 msgid "not removing '%s' recursively without -r"
@@ -10192,80 +10485,178 @@ msgstr "пропу�тить и удалить в�е �троки, начина
 msgid "prepend comment character and space to each line"
 msgstr "добавить перед каждой �трокой �имвол комметари� и пробел"
 
-#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "�ет такой ��ылки: %s"
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Ожидало�ь полное им� ��ылки, а получено %s"
+
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "не удало�ь обрезать один компонент url «%s»"
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
 msgid "alternative anchor for relative paths"
 msgstr "альтернативный �имвол дл� отно�ительных путей"
 
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<путь>] [<путь>…]"
 
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "URL дл� подмодул� по пути «%s» не найден в .gitmodules"
+
+#: builtin/submodule--helper.c:366
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "Сбой реги�трации адре�а дл� пути подмодул� «%s»"
+
+#: builtin/submodule--helper.c:370
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "Подмодуль «%s» (%s) зареги�трирован по пути «%s»\n"
+
+#: builtin/submodule--helper.c:380
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "внимание: предполагаемый режим обновлени� дл� подмодул� «%s»\n"
+
+#: builtin/submodule--helper.c:387
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr "Сбой реги�трации режима обновлени� дл� пути подмодул� «%s»"
+
+#: builtin/submodule--helper.c:406
+msgid "Suppress output for initializing a submodule"
+msgstr "�е выводить информацию о инициализации подмодул�"
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<путь>]"
+
+#: builtin/submodule--helper.c:432
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <путь>"
 
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "не найдено �оответ�твие подмодулей в .gitmodules дл� пути «%s»"
 
-#: builtin/submodule--helper.c:164
+#: builtin/submodule--helper.c:489
 msgid "where the new submodule will be cloned to"
 msgstr "куда должен быть �клонирован новый подмодуль"
 
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:492
 msgid "name of the new submodule"
 msgstr "им� нового подмодул�"
 
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
 msgid "url where to clone the submodule from"
 msgstr "url откуда должен был �клонирован новый подмодуль"
 
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:501
 msgid "depth for shallow clones"
 msgstr "глубина дл� ча�тичного клона"
 
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] "
-"[<path>...]"
-msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <им�>] [--url <url>][--depth <глубина>] [--] [<путь>…]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <им�>] [--depth <глубина>] --url <url> --path <путь>"
 
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "не удало�ь �оздать каталог «%s»"
 
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "не удало�ь клонировать «%s» в подмодуль по пути «%s»"
 
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:550
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "не удало�ь открыть файл «%s»"
 
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
 #, c-format
 msgid "could not close file %s"
 msgstr "не удало�ь закрыть файл %s"
 
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "не удало�ь получить каталог дл� подмодул� «%s»"
 
-#: builtin/submodule--helper.c:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
-msgstr "критиче�ка� ошибка: подкоманда submodule--helper должна вызывать�� � указанием подкоманды"
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Подмодуль по пути «%s» не инициализирован"
+
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Возможно, вы хотели и�пользовать «update --init»?"
+
+#: builtin/submodule--helper.c:639
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "Пропу�к не �литого подмодул� %s"
 
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:660
 #, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr "критиче�ка� ошибка: «%s» не �вл�ет�� подкомандой submodule--helper"
+msgid "Skipping submodule '%s'"
+msgstr "Пропу�к подмодул� «%s»"
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "путь в рабочем каталоге"
+
+#: builtin/submodule--helper.c:771
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "путь в рабочем каталоге, в пределах границ подмодул�"
+
+#: builtin/submodule--helper.c:775
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout или none"
+
+#: builtin/submodule--helper.c:779
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "Создать ча�тичный клон, ограниченный указанным количе�твом редакций"
+
+#: builtin/submodule--helper.c:782
+msgid "parallel jobs"
+msgstr "параллельные задачи"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "вы выводить прогре�� клонировани�"
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<путь>] [<путь>…]"
+
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr "плохое значение дл� параметра update"
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "подкоманда submodule--helper должна вызывать�� � указанием подкоманды"
+
+#: builtin/submodule--helper.c:862
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "«%s» не �вл�ет�� подкомандой submodule--helper"
 
 #: builtin/symbolic-ref.c:7
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10315,27 +10706,22 @@ msgstr "git tag -l [-n[<количе�тво>]] [--contains <коммит>] [--p
 msgid "git tag -v <tagname>..."
 msgstr "git tag -v <им�-метки>…"
 
-#: builtin/tag.c:80
+#: builtin/tag.c:81
 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr "�лишком длинное им� метки: %.*s…"
 
-#: builtin/tag.c:85
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr "метка  «%s» не найдена."
 
-#: builtin/tag.c:100
+#: builtin/tag.c:101
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Метка «%s» удалена (была %s)\n"
 
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "не удало�ь проверить метку «%s»"
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
 #, c-format
 msgid ""
 "\n"
@@ -10344,7 +10730,7 @@ msgid ""
 "Lines starting with '%c' will be ignored.\n"
 msgstr "\nВведите �ообщение дл� метки:\n  %s\nСтроки, начинающие�� � «%c» будут проигнорированы.\n"
 
-#: builtin/tag.c:126
+#: builtin/tag.c:121
 #, c-format
 msgid ""
 "\n"
@@ -10470,21 +10856,21 @@ msgstr "опции --merged и --no-merged можно иÑ�пользовать Ñ
 msgid "only one -F or -m option is allowed."
 msgstr "-F и -m нельз� и�пользовать одновременно."
 
-#: builtin/tag.c:453
+#: builtin/tag.c:452
 msgid "too many params"
 msgstr "передано �лишком много параметров"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:458
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "«%s» не �вл�ет�� допу�тимым именем метки."
 
-#: builtin/tag.c:464
+#: builtin/tag.c:463
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "метка «%s» уже �уще�твует"
 
-#: builtin/tag.c:489
+#: builtin/tag.c:491
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Метка «%s» обновлена (была %s)\n"
@@ -10732,7 +11118,7 @@ msgstr "git verify-commit [-v | --verbose] <коммит>…"
 msgid "print commit contents"
 msgstr "выве�ти �одержимое коммита"
 
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
 msgid "print raw gpg status output"
 msgstr "выводить �ырой вывод �тату�а от gpg"
 
@@ -10752,7 +11138,7 @@ msgstr "выве�ти только �тати�тику"
 msgid "git verify-tag [-v | --verbose] <tag>..."
 msgstr "git verify-tag [-v | --verbose] <метка>…"
 
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
 msgid "print tag contents"
 msgstr "выве�ти �одержимое метки"
 
@@ -10768,68 +11154,72 @@ msgstr "git worktree prune [<опции>]"
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<опции>]"
 
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Удаление рабочих каталогов/%s: не �вл�ет�� каталогом"
 
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Удаление рабочих каталогов/%s: файл gitdir не �уще�твует"
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Удаление рабочих каталогов/%s: не удало�ь прочитать файл gitdir (%s)"
 
-#: builtin/worktree.c:61
+#: builtin/worktree.c:62
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Удаление рабочих каталогов/%s: недей�твительный файл gitdir"
 
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "Удаление рабочих каталогов/%s: gitdir указывает на не�уще�твующее ра�положение"
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:113
 #, c-format
-msgid "failed to remove: %s"
-msgstr "не удало�ь удалить: %s"
+msgid "failed to remove '%s'"
+msgstr "�бой удалени� «%s»"
 
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
 #, c-format
 msgid "'%s' already exists"
 msgstr "«%s» уже �уще�твует"
 
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "не удало�ь �оздать каталог «%s»"
 
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Подготовка %s (идентификатор %s)"
 
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
 msgid "checkout <branch> even if already checked out in other worktree"
-msgstr "перейти на <ветка> даже е�ли она уже активна в другом рабоче�м каталоге"
+msgstr "переключить�� на <ветка> даже е�ли она уже активна в другом рабоче�м каталоге"
 
-#: builtin/worktree.c:319
+#: builtin/worktree.c:324
 msgid "create a new branch"
 msgstr "�оздать новую ветку"
 
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
 msgid "create or reset a branch"
 msgstr "�оздать или перейти на ветку"
 
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
 msgid "detach HEAD at named commit"
 msgstr "от�оединить HEAD на указанном коммите"
 
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "наполнить новый рабочий каталог"
+
+#: builtin/worktree.c:336
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B и --detach нельз� и�пользовать одновременно"
 
@@ -10849,7 +11239,7 @@ msgstr "вывеÑ�ти объект дерева длÑ� подкаталога Ñ
 msgid "only useful for debugging"
 msgstr "и�пользует�� только при отладке"
 
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "вывод отладочных �ообщений на stderr"
 
@@ -10860,7 +11250,7 @@ msgid ""
 "to read about a specific subcommand or concept."
 msgstr "«git help -а» и «git help -g» выводит �пи�ок до�тупных подкоманд и\nнекоторые руковод�тва по темам. Запу�тите «git help <команда>» или\n«git help <термин>», чтобы проче�ть о конкретных подкоманде или теме."
 
-#: http.c:321
+#: http.c:322
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "Public key pinning не поддерживает�� � cURL < 7.44.0"
 
@@ -10988,7 +11378,7 @@ msgstr "тихий режим"
 msgid "use <n> digits to display SHA-1s"
 msgstr "и�пользовать <n> цифр дл� вывода SHA-1"
 
-#: rerere.h:38
+#: rerere.h:40
 msgid "update the index with reused conflict resolution if possible"
 msgstr "обновить индек� � помощью переи�пользовани� разрешени� конфликта, е�ли возможно"
 
@@ -11180,58 +11570,54 @@ msgid ""
 "To check out the original branch and stop rebasing, run \"git rebase --abort\"."
 msgstr "Когда вы разрешите �тот конфликт, запу�тите «git rebase --continue».\nЕ�ли вы хотите пропу�тить �тот патч, то запу�тите «git rebase --skip».\nЧтобы перейти на оригинальную ветку и о�тановить перемещение, запу�тите «git rebase --abort»."
 
-#: git-rebase.sh:165
+#: git-rebase.sh:168
 msgid "Applied autostash."
 msgstr "Применено автоматиче�кое пр�танье."
 
-#: git-rebase.sh:168
+#: git-rebase.sh:171
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "�е удало�ь �охранить $stash_sha1"
 
-#: git-rebase.sh:169
+#: git-rebase.sh:172
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 "Your changes are safe in the stash.\n"
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr "Применение автоматиче�кого пр�тань� вызвало конфликты.\nВаши изменени� �пр�таны и в безопа�но�ти.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n"
 
-#: git-rebase.sh:208
+#: git-rebase.sh:211
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Перехватчик пре-перемещени� отказал в перемещении."
 
-#: git-rebase.sh:213
+#: git-rebase.sh:216
 msgid "It looks like git-am is in progress. Cannot rebase."
 msgstr "Похоже, git-am выполн�ет��. Перемещение невозможно."
 
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "Опци� --exec должна и�пользовать�� вме�те � опцией --interactive"
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
 msgid "No rebase in progress?"
 msgstr "�ет перемещени� в проце��е?"
 
-#: git-rebase.sh:370
+#: git-rebase.sh:368
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "Дей�твие --edit-todo может и�пользовать�� только при интерактивном перемещении."
 
-#: git-rebase.sh:377
+#: git-rebase.sh:375
 msgid "Cannot read HEAD"
 msgstr "�е удало�ь прочитать HEAD"
 
-#: git-rebase.sh:380
+#: git-rebase.sh:378
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
 msgstr "Вы должны отредактировать в�е\nконфликты �ли�ни�, а потом пометить\nих как разрешенные � помощью git add"
 
-#: git-rebase.sh:398
+#: git-rebase.sh:396
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "�е удало�ь перейти назад на $head_name"
 
-#: git-rebase.sh:417
+#: git-rebase.sh:415
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -11244,64 +11630,64 @@ msgid ""
 "valuable there."
 msgstr "Похоже, каталог $state_dir_base уже �уще�твует и � предполагаю, что вы в проце��е другого перемещени�.  Е�ли �то так, попробуйте\n\t$cmd_live_rebase\nЕ�ли нет\n\t$cmd_clear_stale_rebase\nи запу�тите мен� �нова.  Я о�танавливаю�ь, чтобы вы не потер�ли что-то важное."
 
-#: git-rebase.sh:468
+#: git-rebase.sh:466
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "недей�твительна� выше�то�ща� ветка $upstream_name"
 
-#: git-rebase.sh:492
+#: git-rebase.sh:490
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: имеет�� больше одной базы �ли�ни�"
 
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: нет базы �ли�ни�"
 
-#: git-rebase.sh:504
+#: git-rebase.sh:502
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "�е указывает на дей�твительный коммит: $onto_name"
 
-#: git-rebase.sh:527
+#: git-rebase.sh:525
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "критиче�ка� ошибка: нет такой ветки: $branch_name"
 
-#: git-rebase.sh:560
+#: git-rebase.sh:558
 msgid "Cannot autostash"
 msgstr "�е удало�ь выполнить автоматиче�кое пр�танье"
 
-#: git-rebase.sh:565
+#: git-rebase.sh:563
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "Изменени� автоматиче�ки �пр�таны: $stash_abbrev"
 
-#: git-rebase.sh:569
+#: git-rebase.sh:567
 msgid "Please commit or stash them."
 msgstr "Сделайте коммит или �пр�чьте их."
 
-#: git-rebase.sh:589
+#: git-rebase.sh:587
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "Текуща� ветка $branch_name уже �вежа�."
 
-#: git-rebase.sh:593
+#: git-rebase.sh:591
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "Текуща� ветка $branch_name уже �вежа�, принудительное перемещение."
 
-#: git-rebase.sh:604
+#: git-rebase.sh:602
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Изменени� от $mb до $onto:"
 
-#: git-rebase.sh:613
+#: git-rebase.sh:611
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr "Сначала перематываем указатель текущего коммита, чтобы применить ваши изменени� поверх него…"
 
-#: git-rebase.sh:623
+#: git-rebase.sh:621
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "Перемотана вперед $branch_name до $onto_name."
@@ -11442,26 +11828,21 @@ msgstr "�е указано им� ветки"
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Чтобы во��тановить их, наберите «git stash apply»)"
 
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "не удало�ь отрезать один компонент адре�а «$remoteurl»"
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr "Отно�ительный путь можно и�пользовать только наход��ь на вершине рабочего каталога"
 
-#: git-submodule.sh:291
+#: git-submodule.sh:229
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "URL репозитори�: «$repo» должен быть аб�олютным или начинать�� � ./|../"
 
-#: git-submodule.sh:308
+#: git-submodule.sh:246
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "«$sm_path» уже �одержит�� в индек�е"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:250
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
@@ -11469,235 +11850,217 @@ msgid ""
 "Use -f if you really want to add it."
 msgstr "Следующие пути игнорируют�� одним из ваших файлов .gitignore:\n$sm_path\nИ�пользуйте опцию -f, е�ли вы дей�твительно хотите его добавить."
 
-#: git-submodule.sh:330
+#: git-submodule.sh:268
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Добавл�ю �уще�твующий репозиторий из «$sm_path» в индек�"
 
-#: git-submodule.sh:332
+#: git-submodule.sh:270
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "«$sm_path» уже �уще�твует и не �вл�ет�� дей�твительным репозиторием git"
 
-#: git-submodule.sh:340
+#: git-submodule.sh:278
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr "Каталог git дл� «$sm_name» найден локально на внешних репозитори�х:"
 
-#: git-submodule.sh:342
+#: git-submodule.sh:280
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from"
 msgstr "Е�ли вы хотите переи�пользовать локальный каталог git вме�то повторного клонировани� из"
 
-#: git-submodule.sh:344
+#: git-submodule.sh:282
 #, sh-format
 msgid ""
 "use the '--force' option. If the local git directory is not the correct repo"
 msgstr ", то и�пользуйте опцию «--force». Е�ли локальный каталог git не �вл�ет�� дей�твительным репозиторием"
 
-#: git-submodule.sh:345
+#: git-submodule.sh:283
 #, sh-format
 msgid ""
 "or you are unsure what this means choose another name with the '--name' "
 "option."
 msgstr "или е�ли вы не пон�ли, что �то значит, то про�то и�пользуйте другое им� � помощью опции «--name»."
 
-#: git-submodule.sh:347
+#: git-submodule.sh:285
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "Во��тановление локального каталога git дл� подмодул� «$sm_name»."
 
-#: git-submodule.sh:359
+#: git-submodule.sh:297
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
-msgstr "�е удало�ь перейти на �о�то�ние у подмодул� «$sm_path»"
+msgstr "�е удало�ь переключить�� на �о�то�ние у подмодул� «$sm_path»"
 
-#: git-submodule.sh:364
+#: git-submodule.sh:302
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Сбой добавлени� подмодул� «$sm_path»"
 
-#: git-submodule.sh:373
+#: git-submodule.sh:311
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "�е удало�ь зареги�трировать подмодуль «$sm_path»"
 
-#: git-submodule.sh:417
-#, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "Заходим в «$prefix$displaypath»"
-
-#: git-submodule.sh:437
-#, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
-msgstr "О�танавливаем�� на «$prefix$displaypath»; �ценарий вернул не нулевой код возврата."
-
-#: git-submodule.sh:483
+#: git-submodule.sh:355
 #, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr "�дре� дл� пути подмодул� «$displaypath» не найден в .gitmodules"
+msgid "Entering '$displaypath'"
+msgstr "Заходим в «$displaypath»"
 
-#: git-submodule.sh:492
+#: git-submodule.sh:375
 #, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr "Сбой реги�трации адре�е дл� пути подмодул� «$displaypath»"
+msgid "Stopping at '$displaypath'; script returned non-zero status."
+msgstr "О�танавливаем�� на «$displaypath»; �ценарий вернул не нулевой код возврата."
 
-#: git-submodule.sh:494
+#: git-submodule.sh:448
 #, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr "Подмодуль «$name» ($url) зареги�трирован дл� пути «$displaypath»"
+msgid "pathspec and --all are incompatible"
+msgstr "�пецификацию пути и --all нельз� и�пользовать одновременно"
 
-#: git-submodule.sh:511
+#: git-submodule.sh:453
 #, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr "Сбой реги�трации режима обновлени� дл� пути подмодул� «$displaypath»"
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "И�пользуйте «--all», е�ли вы дей�твительно хотите деинициализировать в�е подмодули"
 
-#: git-submodule.sh:549
-#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr "И�пользуйте «.», е�ли вы дей�твительно хотите деинициализировать в�е подмодули"
-
-#: git-submodule.sh:566
+#: git-submodule.sh:470
 #, sh-format
 msgid "Submodule work tree '$displaypath' contains a .git directory"
 msgstr "Рабочий каталог подмодул� «$displaypath» �одержит каталог .git"
 
-#: git-submodule.sh:567
+#: git-submodule.sh:471
 #, sh-format
 msgid ""
 "(use 'rm -rf' if you really want to remove it including all of its history)"
 msgstr "(и�пользуйте «rm -rf», е�ли вы дей�твительно хотите удалить его, включа� в�ю его и�торию)"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:477
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to"
 " discard them"
 msgstr "Рабочий каталог подмодул� «$displaypath» �одержит локальные изменени�; и�пользуйте «-f», чтобы отменить их"
 
-#: git-submodule.sh:576
+#: git-submodule.sh:480
 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr "Очищен каталог «$displaypath»"
 
-#: git-submodule.sh:577
+#: git-submodule.sh:481
 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr "�е удало�ь удалить рабочий каталог подмодул� «$displaypath»"
 
-#: git-submodule.sh:580
+#: git-submodule.sh:484
 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr "�е удало�ь �оздать пу�той каталог подмодул� «$displaypath»"
 
-#: git-submodule.sh:589
+#: git-submodule.sh:493
 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr "Подмодуль «$name» ($url) был �н�т � реги�трации по пути «$displaypath»"
 
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr "Подмодуль по пути «$displaypath» не инициализирован\nВозможно, вам нужно и�пользовать «update --init»?"
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "�е удало�ь найти текущую редакцию дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:745
+#: git-submodule.sh:644
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "�е удало�ь выполнить извлечение дл� подмодул� по пути «$sm_path»"
 
-#: git-submodule.sh:768
+#: git-submodule.sh:667
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "�е удало�ь выполнить извлечение дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:788
+#: git-submodule.sh:680
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "�е удало�ь выполнить переход на �о�то�ние «$sha1» дл� подмодул� по пути «$displaypath»"
+msgstr "�е удало�ь переключить�� на �о�то�ние «$sha1» дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:789
+#: git-submodule.sh:681
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Подмодуль по пути «$displaypath»: забрано �о�то�ние «$sha1»"
 
-#: git-submodule.sh:793
+#: git-submodule.sh:685
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "�е удало�ь переме�тить «$sha1» дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:794
+#: git-submodule.sh:686
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»"
 
-#: git-submodule.sh:799
+#: git-submodule.sh:691
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "�е удало�ь выполнить �ли�ние � «$sha1» дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:800
+#: git-submodule.sh:692
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Подмодуль по пути «$displaypath»: �лито � «$sha1»"
 
-#: git-submodule.sh:805
+#: git-submodule.sh:697
 #, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
-msgstr "Сбой выполнени� «$command $sha1» дл� подмодул� по пути «$prefix$sm_path»"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr "Сбой выполнени� «$command $sha1» дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:806
+#: git-submodule.sh:698
 #, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "Подмодуль по пути «$prefix$sm_path»: «$command $sha1»"
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Подмодуль по пути «$displaypath»: «$command $sha1»"
 
-#: git-submodule.sh:836
+#: git-submodule.sh:729
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "�е удало�ь выполнить рекур�ивно дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:944
+#: git-submodule.sh:837
 msgid "The --cached option cannot be used with the --files option"
 msgstr "Опцию --cached нельз� и�пользовать одновременно � опцией --files"
 
-#: git-submodule.sh:996
+#: git-submodule.sh:889
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "неизве�тный режим $mod_dst"
 
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Предупреждение: $display_name не �одержит коммит $sha1_src"
 
-#: git-submodule.sh:1019
+#: git-submodule.sh:912
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Предупреждение: $display_name не �одержит коммит $sha1_dst"
 
-#: git-submodule.sh:1022
+#: git-submodule.sh:915
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr "  Предупреждение: $display_name не �одержит коммиты $sha1_src и $sha1_dst"
 
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
 msgid "blob"
 msgstr "двоичный объект"
 
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "�е удало�ь выполнить рекур�ивно дл� подмодул� по пути «$sm_path»"
 
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "Синхронизаци� url дл� подмодул� «$displaypath»"
+
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "Дл� дополнительной информации, �мотрите git-${cmd}(1)."
diff --git a/po/sv.po b/po/sv.po
index 32bcaba6b5..e7416af8c0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git 2.8.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
-"PO-Revision-Date: 2016-03-15 22:35+0100\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"PO-Revision-Date: 2016-05-27 14:04+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -31,7 +31,7 @@ msgstr ""
 "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
 "som lämpligt för att ange lösning och checka in."
 
-#: advice.c:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
 
@@ -75,7 +75,7 @@ msgstr "fmt"
 msgid "archive format"
 msgstr "arkivformat"
 
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
 msgid "prefix"
 msgstr "prefix"
 
@@ -83,9 +83,9 @@ msgstr "prefix"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "lägg till prefix till varje sökväg i arkivet"
 
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547
-#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548
+#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
 #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
 #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
 msgid "file"
@@ -119,7 +119,8 @@ msgstr "komprimera bättre"
 msgid "list supported archive formats"
 msgstr "visa understödda arkivformat"
 
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
 msgid "repo"
 msgstr "arkiv"
 
@@ -271,11 +272,16 @@ msgstr "Objektnamnet är tvetydigt: \"%s\"."
 msgid "Not a valid branch point: '%s'."
 msgstr "Avgreningspunkten är inte giltig: \"%s\""
 
-#: branch.c:344
+#: branch.c:345
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "\"%s\" är redan utcheckad på \"%s\""
 
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
+
 #: bundle.c:34
 #, c-format
 msgid "'%s' does not look like a v2 bundle file"
@@ -286,7 +292,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "okänt huvud: %s%s (%d)"
 
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
 #, c-format
 msgid "could not open '%s'"
 msgstr "kunde inte öppna \"%s\""
@@ -295,10 +301,10 @@ msgstr "kunde inte öppna \"%s\""
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
 
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
 msgid "revision walk setup failed"
 msgstr "misslyckades skapa revisionstraversering"
 
@@ -337,21 +343,21 @@ msgstr "rev-list dog"
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
 
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "okänt argument: %s"
 
-#: bundle.c:449
+#: bundle.c:451
 msgid "Refusing to create empty bundle."
 msgstr "Vägrar skapa ett tomt paket (bundle)."
 
-#: bundle.c:459
+#: bundle.c:463
 #, c-format
 msgid "cannot create '%s'"
 msgstr "kan inte skapa \"%s\""
 
-#: bundle.c:480
+#: bundle.c:491
 msgid "index-pack died"
 msgstr "index-pack dog"
 
@@ -360,8 +366,8 @@ msgstr "index-pack dog"
 msgid "invalid color value: %.*s"
 msgstr "felaktigt färgvärde: %.*s"
 
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
 #, c-format
 msgid "could not parse %s"
 msgstr "kunde inte tolka %s"
@@ -395,21 +401,21 @@ msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
 msgid "failed to expand user dir in: '%s'"
 msgstr "misslyckades expandera användarkatalog i: \"%s\""
 
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "felaktigt zlib-komprimeringsgrad %d"
 
-#: config.c:891
+#: config.c:890
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "felaktigt läge för skapande av objekt: %s"
 
-#: config.c:1220
+#: config.c:1228
 msgid "unable to parse command-line config"
 msgstr "kan inte tolka kommandoradskonfiguration"
 
-#: config.c:1281
+#: config.c:1284
 msgid "unknown error occured while reading the configuration files"
 msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
 
@@ -428,24 +434,27 @@ msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
 msgid "%s has multiple values"
 msgstr "%s har flera värden"
 
+#: config.c:2224
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "kunde inte ställa in \"%s\" till \"%s\""
+
 #: config.c:2226
 #, c-format
-msgid "Could not set '%s' to '%s'"
-msgstr "Kunde inte ställa in \"%s\" till \"%s\""
+msgid "could not unset '%s'"
+msgstr "kunde inte ta bort inställning för \"%s\""
 
 #: connected.c:69
 msgid "Could not run 'git rev-list'"
 msgstr "Kunde inte köra \"git rev-list\""
 
 #: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "kunde inte skriva till rev-list: %s"
+msgid "failed write to rev-list"
+msgstr "kunde inte skriva till rev-list"
 
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "kunde inte stänga rev-list:s standard in: %s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
+msgstr "kunde inte stänga rev-list:s standard in"
 
 #: date.c:95
 msgid "in the future"
@@ -520,26 +529,26 @@ msgstr[1] "%lu år sedan"
 msgid "failed to read orderfile '%s'"
 msgstr "kunde inte läsa orderfilen \"%s\""
 
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
 msgid "Performing inexact rename detection"
 msgstr "Utför onöjaktig namnbytesdetektering"
 
-#: diff.c:115
+#: diff.c:116
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
 
-#: diff.c:120
+#: diff.c:121
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Okänd dirstat-parameter \"%s\"\n"
 
-#: diff.c:215
+#: diff.c:225
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
 
-#: diff.c:267
+#: diff.c:277
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -548,16 +557,16 @@ msgstr ""
 "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
 "%s"
 
-#: diff.c:2997
+#: diff.c:3007
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "extern diff dog, stannar vid %s"
 
-#: diff.c:3393
+#: diff.c:3405
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow kräver exakt en sökvägsangivelse"
 
-#: diff.c:3556
+#: diff.c:3568
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -566,20 +575,20 @@ msgstr ""
 "Misslyckades tolka argument till flaggan --dirstat/-X;\n"
 "%s"
 
-#: diff.c:3570
+#: diff.c:3582
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
 
-#: dir.c:2004
+#: dir.c:1823
 msgid "failed to get kernel name and information"
 msgstr "misslyckades hämta kärnans namn och information"
 
-#: dir.c:2123
+#: dir.c:1942
 msgid "Untracked cache is disabled on this system or location."
 msgstr "Ospårad cache är inaktiverad på systemet eller platsen."
 
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
 msgid "could not run gpg."
 msgstr "kunde inte köra gpg."
 
@@ -593,28 +602,28 @@ msgstr "gpg misslyckades signera data"
 
 #: gpg-interface.c:222
 #, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "kunde inte skapa temporära filen \"%s\": %s"
+msgid "could not create temporary file '%s'"
+msgstr "kunde inte skapa temporära filen \"%s\""
 
-#: gpg-interface.c:225
+#: gpg-interface.c:224
 #, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "misslyckades skriva fristående signatur till \"%s\": %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "misslyckades skriva fristående signatur till \"%s\""
 
 #: grep.c:1718
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "\"%s\" kunde inte läsa %s"
 
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
 #, c-format
-msgid "'%s': %s"
-msgstr "\"%s\": %s"
+msgid "failed to stat '%s'"
+msgstr "misslyckades ta status på \"%s\""
 
 #: grep.c:1746
 #, c-format
-msgid "'%s': short read %s"
-msgstr "\"%s\": kort läsning %s"
+msgid "'%s': short read"
+msgstr "\"%s\": kort läsning"
 
 #: help.c:205
 #, c-format
@@ -680,12 +689,37 @@ msgstr[1] ""
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
+#: lockfile.c:152
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"Kunde inte skapa \"%s.lock\": %s.\n"
+"\n"
+"Det verkar som en annan git-process kör i det här arkivet, t.ex.\n"
+"ett textredigeringsprogram startat av \"git commit\". Se till att\n"
+"alla processer avslutats och försök sedan igen. Om det fortfarande\n"
+"misslyckas kanske en git-process har kraschat i det här arkivet\n"
+"tidigare:\n"
+"ta bort filen manuellt för att fortsätta."
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "kunde inte skapa \"%s.lock\": %s"
+
 #: merge.c:41
 msgid "failed to read the cache"
 msgstr "misslyckades läsa cachen"
 
-#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
 msgid "unable to write new index file"
 msgstr "kunde inte skriva ny indexfil"
 
@@ -732,7 +766,7 @@ msgstr "kan inte läsa objektet %s: \"%s\""
 msgid "blob expected for %s '%s'"
 msgstr "blob förväntades för %s \"%s\""
 
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
 #, c-format
 msgid "failed to open '%s'"
 msgstr "misslyckades öppna \"%s\""
@@ -866,7 +900,7 @@ msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
 msgid "Auto-merging %s"
 msgstr "Slår ihop %s automatiskt"
 
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
 msgid "submodule"
 msgstr "undermodul"
 
@@ -894,50 +928,50 @@ msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"
 
-#: merge-recursive.c:1783
+#: merge-recursive.c:1781
 #, c-format
 msgid "Adding %s"
 msgstr "Lägger till %s"
 
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
 msgid "Fatal merge failure, shouldn't happen."
 msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa."
 
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
 msgid "Already up-to-date!"
 msgstr "Redan à jour!"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "sammanslagning av träden %s och %s misslyckades"
 
-#: merge-recursive.c:1858
+#: merge-recursive.c:1856
 #, c-format
 msgid "Unprocessed path??? %s"
 msgstr "Obehandlad sökväg??? %s"
 
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
 msgid "Merging:"
 msgstr "Slår ihop:"
 
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "hittade %u gemensam förfader:"
 msgstr[1] "hittade %u gemensamma förfäder:"
 
-#: merge-recursive.c:1956
+#: merge-recursive.c:1954
 msgid "merge returned no commit"
 msgstr "sammanslagningen returnerade ingen incheckning"
 
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Kunde inte tolka objektet \"%s\""
 
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
 msgid "Unable to write index."
 msgstr "Kunde inte skriva indexet."
 
@@ -967,28 +1001,28 @@ msgstr "Felaktigt värde på %s: \"%s\""
 msgid "unable to parse object: %s"
 msgstr "kunde inte tolka objektet: %s"
 
-#: parse-options.c:570
+#: parse-options.c:572
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:588
+#: parse-options.c:590
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
 
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
 #, c-format
 msgid "   or: %s"
 msgstr "     eller: %s"
 
-#: parse-options.c:595
+#: parse-options.c:597
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:629
+#: parse-options.c:631
 msgid "-NUM"
 msgstr "-TAL"
 
@@ -997,7 +1031,7 @@ msgstr "-TAL"
 msgid "malformed object name '%s'"
 msgstr "felformat objektnamn \"%s\""
 
-#: path.c:752
+#: path.c:796
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Kunde inte göra %s skrivbar för gruppen"
@@ -1067,7 +1101,7 @@ msgstr ""
 "Ingenting att exkludera från med :(exkludera)-mönster.\n"
 "Glömde du kanske att antingen lägga till \":/\" eller \".\"?"
 
-#: pretty.c:969
+#: pretty.c:971
 msgid "unable to parse --pretty format"
 msgstr "kunde inte tolka format för --pretty"
 
@@ -1093,23 +1127,23 @@ msgstr ""
 "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
 "Använder version %i"
 
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "Kunde inte öppna \"%s\" för skrivning"
 
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "kunde inte ta bort referensen %s: %s"
 
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2246
 #, c-format
 msgid "could not delete references: %s"
 msgstr "kunde inte ta bort referenser: %s"
 
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
 #, c-format
 msgid "could not remove reference %s"
 msgstr "kunde inte ta bort referensen %s"
@@ -1248,93 +1282,93 @@ msgstr "format: atomen %%(end) saknas"
 msgid "malformed object name %s"
 msgstr "felformat objektnamn %s"
 
-#: remote.c:745
+#: remote.c:746
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Kan inte hämta både %s och %s till %s"
 
-#: remote.c:749
+#: remote.c:750
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s spårar vanligtvis %s, inte %s"
 
-#: remote.c:753
+#: remote.c:754
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s spårar både %s och %s"
 
-#: remote.c:761
+#: remote.c:762
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
 msgid "HEAD does not point to a branch"
 msgstr "HEAD pekar inte på en gren"
 
-#: remote.c:1686
+#: remote.c:1687
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "okänd gren: \"%s\""
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "ingen standarduppström angiven för grenen \"%s\""
 
-#: remote.c:1695
+#: remote.c:1696
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"
 
-#: remote.c:1710
+#: remote.c:1711
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"
 
-#: remote.c:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "grenen \"%s\" har ingen fjärr för \"push\""
 
-#: remote.c:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "\"enkel push\" motsvarar flera olika mål"
 
-#: remote.c:2073
+#: remote.c:2074
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"
 
-#: remote.c:2077
+#: remote.c:2078
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (använd \"git branch --unset-upstream\" för att rätta)\n"
 
-#: remote.c:2080
+#: remote.c:2081
 #, c-format
 msgid "Your branch is up-to-date with '%s'.\n"
 msgstr "Din gren är à jour med \"%s\".\n"
 
-#: remote.c:2084
+#: remote.c:2085
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n"
 msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"
 
-#: remote.c:2090
+#: remote.c:2091
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (använd \"git push\" för att publicera dina lokala incheckningar)\n"
 
-#: remote.c:2093
+#: remote.c:2094
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -1344,11 +1378,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
 
-#: remote.c:2101
+#: remote.c:2102
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (använd \"git pull\" för att uppdatera din lokala gren)\n"
 
-#: remote.c:2104
+#: remote.c:2105
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -1363,20 +1397,20 @@ msgstr[1] ""
 "Din gren och \"%s\" har divergerat,\n"
 "och har %d respektive %d olika incheckningar.\n"
 
-#: remote.c:2114
+#: remote.c:2115
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
 
-#: revision.c:2131
+#: revision.c:2142
 msgid "your current branch appears to be broken"
 msgstr "din nuvarande gren verkar vara trasig"
 
-#: revision.c:2134
+#: revision.c:2145
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"
 
-#: revision.c:2328
+#: revision.c:2339
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent är inkompatibelt med --bisect"
 
@@ -1427,7 +1461,7 @@ msgstr ""
 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
 "och checka in resultatet med \"git commit\""
 
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
 #, c-format
 msgid "Could not write to %s"
 msgstr "Kunde inte skriva till %s"
@@ -1585,12 +1619,12 @@ msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
 msgid "Could not create sequencer directory %s"
 msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\""
 
-#: sequencer.c:835 sequencer.c:917
+#: sequencer.c:835 sequencer.c:916
 #, c-format
 msgid "Error wrapping up %s."
 msgstr "Fel vid ombrytning av %s."
 
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
 msgid "no cherry-pick or revert in progress"
 msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
 
@@ -1602,63 +1636,72 @@ msgstr "kan inte bestämma HEAD"
 msgid "cannot abort from a branch yet to be born"
 msgstr "kan inte avbryta från en gren som ännu inte är född"
 
-#: sequencer.c:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
 #, c-format
-msgid "cannot open %s: %s"
-msgstr "kan inte öppna %s: %s"
+msgid "cannot open %s"
+msgstr "kan inte öppna %s"
 
-#: sequencer.c:881
+#: sequencer.c:880
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "kan inte läsa %s: %s"
 
-#: sequencer.c:882
+#: sequencer.c:881
 msgid "unexpected end of file"
 msgstr "oväntat filslut"
 
-#: sequencer.c:888
+#: sequencer.c:887
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
 
-#: sequencer.c:910
+#: sequencer.c:909
 #, c-format
 msgid "Could not format %s."
 msgstr "Kunde inte formatera %s."
 
-#: sequencer.c:1055
+#: sequencer.c:1054
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
 
-#: sequencer.c:1058
+#: sequencer.c:1057
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: felaktig revision"
 
-#: sequencer.c:1092
+#: sequencer.c:1091
 msgid "Can't revert as initial commit"
 msgstr "Kan inte ångra som första incheckning"
 
-#: sequencer.c:1093
+#: sequencer.c:1092
 msgid "Can't cherry-pick into empty head"
 msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
 
-#: setup.c:246
+#: setup.c:248
 #, c-format
 msgid "failed to read %s"
 msgstr "misslyckades läsa %s"
 
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Förväntade git-arkivversion <= %d, hittade %d"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "okända arkivutökningar hittades:"
+
 #: sha1_file.c:1080
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset före slutet av packfilen (trasig .idx?)"
 
-#: sha1_file.c:2459
+#: sha1_file.c:2458
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "offset före slutet av packindex för %s (trasigt index?)"
 
-#: sha1_file.c:2463
+#: sha1_file.c:2462
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
@@ -1685,31 +1728,40 @@ msgstr ""
 "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
 "genom att köra \"git config advice.objectNameWarning false\""
 
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "
 "sammanslagningskonflikter först"
 
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s"
 
-#: submodule.c:74
+#: submodule.c:76
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Kunde inte uppdatera .gitmodules-posten %s"
 
-#: submodule.c:107
+#: submodule.c:109
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "Kunde inte ta bort .gitmodules-posten för %s"
 
-#: submodule.c:118
+#: submodule.c:120
 msgid "staging updated .gitmodules failed"
 msgstr "misslyckades köa uppdaterad .gitmodules"
 
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "negativa värden är inte tillåtna för submodule.fetchJobs"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "ogiltigt värde för %s"
+
 #: trailer.c:237
 #, c-format
 msgid "running trailer command '%s' failed"
@@ -1769,7 +1821,231 @@ msgstr "kunde inte byta nman på temporära file till %s"
 msgid "Could not read ref %s"
 msgstr "Kunde inte läsa referensen %s"
 
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you can switch branches."
+msgstr ""
+"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
+"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you can merge."
+msgstr ""
+"Dina lokala ändringar av följande filer skulle skrivas över av "
+"sammanslagning:\n"
+"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
+
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Dina lokala ändringar av följande filer skulle skrivas över av "
+"sammanslagning:\n"
+"%%s"
+
+#: unpack-trees.c:74
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you can %s."
+msgstr ""
+"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
+"%%sChecka in dina ändringar eller använd \"stash\" innan du kan utföra \"%s"
+"\"."
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"Uppdatering av följande kataloger gör att ospårade filer går förlorade i "
+"dem:\n"
+"%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
+"%%sFlytta eller ta bort dem innan du byter gren."
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle tas bort av "
+"sammanslagningen:\n"
+"%%sFlytta eller ta bort dem innan du byter gren."
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle tas bort av "
+"sammanslagningen:\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
+"%%sFlytta eller ta bort dem innan du kan utföra \"%s\"."
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
+"%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
+"utcheckningen:\n"
+"%%sFlytta eller ta bort dem innan du byter gren."
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
+"utcheckningen:\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
+"sammanslagningen:\n"
+"%%sFlytta eller ta bort dem innan du byter gren."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
+"sammanslagningen:\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
+"%%sFlytta eller ta bort dem innan du kan \"%s\"."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"Kan inte uppdatera gles utcheckning: följande poster är inte àjour:\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Följande filer i arbetskatalogen skulle skrivas över av uppdatering av gles "
+"utcheckning:\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Följande filer i arbetskatalogen skulle tas bort av uppdatering av gles "
+"utcheckning:\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "Avbryter\n"
+
+#: unpack-trees.c:237
 msgid "Checking out files"
 msgstr "Checkar ut filer"
 
@@ -1807,198 +2083,194 @@ msgstr "felaktigt \"..\"-sökvägssegment"
 msgid "could not open '%s' for reading and writing"
 msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
 
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "kunde inte öppna \"%s\" för skrivning"
 
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "kunde inte öppna \"%s\" för läsning"
 
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "kan inte komma åt \"%s\": %s"
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
 #, c-format
 msgid "unable to access '%s'"
 msgstr "kan inte komma åt \"%s\""
 
-#: wrapper.c:640
+#: wrapper.c:623
 msgid "unable to get current working directory"
 msgstr "kan inte hämta aktuell arbetskatalog"
 
-#: wrapper.c:667
+#: wrapper.c:650
 #, c-format
 msgid "could not open %s for writing"
 msgstr "kunde inte öppna %s för skrivning"
 
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
 #, c-format
 msgid "could not write to %s"
 msgstr "kunde inte skriva till %s"
 
-#: wrapper.c:684
+#: wrapper.c:667
 #, c-format
 msgid "could not close %s"
 msgstr "kunde inte stänga %s"
 
-#: wt-status.c:149
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "Ej sammanslagna sökvägar:"
 
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (använd \"git reset %s <fil>...\" för att ta bort från kö)"
 
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
 
-#: wt-status.c:182
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (använd \"git add <fil>...\" för att ange lösning)"
 
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr "  (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"
 
-#: wt-status.c:186
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (använd \"git rm <fil>...\" för att ange lösning)"
 
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
 msgid "Changes to be committed:"
 msgstr "Ändringar att checka in:"
 
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
 msgid "Changes not staged for commit:"
 msgstr "Ändringar ej i incheckningskön:"
 
-#: wt-status.c:219
+#: wt-status.c:220
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 "  (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"
 
-#: wt-status.c:221
+#: wt-status.c:222
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "
 "arbetskatalogen)"
 
-#: wt-status.c:224
+#: wt-status.c:225
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
 
-#: wt-status.c:236
+#: wt-status.c:237
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)"
 
-#: wt-status.c:251
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "borttaget av bägge:"
 
-#: wt-status.c:253
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "tillagt av oss:"
 
-#: wt-status.c:255
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "borttaget av dem:"
 
-#: wt-status.c:257
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "tillagt av dem:"
 
-#: wt-status.c:259
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "borttaget av oss:"
 
-#: wt-status.c:261
+#: wt-status.c:262
 msgid "both added:"
 msgstr "tillagt av bägge:"
 
-#: wt-status.c:263
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "ändrat av bägge:"
 
-#: wt-status.c:265
+#: wt-status.c:266
 #, c-format
 msgid "bug: unhandled unmerged status %x"
 msgstr "programfel: ej hanterad \"unmerged\"-status %x"
 
-#: wt-status.c:273
+#: wt-status.c:274
 msgid "new file:"
 msgstr "ny fil:"
 
-#: wt-status.c:275
+#: wt-status.c:276
 msgid "copied:"
 msgstr "kopierad:"
 
-#: wt-status.c:277
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "borttagen:"
 
-#: wt-status.c:279
+#: wt-status.c:280
 msgid "modified:"
 msgstr "ändrad:"
 
-#: wt-status.c:281
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "namnbytt:"
 
-#: wt-status.c:283
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "typbyte:"
 
-#: wt-status.c:285
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "okänd:"
 
-#: wt-status.c:287
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "osammanslagen:"
 
-#: wt-status.c:369
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "nya incheckningar, "
 
-#: wt-status.c:371
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "ändrat innehåll, "
 
-#: wt-status.c:373
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "ospårat innehåll, "
 
-#: wt-status.c:390
+#: wt-status.c:391
 #, c-format
 msgid "bug: unhandled diff status %c"
 msgstr "programfel: diff-status %c ej hanterad"
 
-#: wt-status.c:754
+#: wt-status.c:755
 msgid "Submodules changed but not updated:"
 msgstr "Undermoduler ändrade men inte uppdaterade:"
 
-#: wt-status.c:756
+#: wt-status.c:757
 msgid "Submodule changes to be committed:"
 msgstr "Undermodulers ändringar att checka in:"
 
-#: wt-status.c:837
+#: wt-status.c:838
 msgid ""
 "Do not touch the line above.\n"
 "Everything below will be removed."
@@ -2006,39 +2278,39 @@ msgstr ""
 "Rör inte raden ovan.\n"
 "Allt nedan kommer tas bort."
 
-#: wt-status.c:948
+#: wt-status.c:949
 msgid "You have unmerged paths."
 msgstr "Du har ej sammanslagna sökvägar."
 
-#: wt-status.c:951
+#: wt-status.c:952
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (rätta konflikter och kör \"git commit\")"
 
-#: wt-status.c:954
+#: wt-status.c:956
 msgid "All conflicts fixed but you are still merging."
 msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
 
-#: wt-status.c:957
+#: wt-status.c:959
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (använd \"git commit\" för att slutföra sammanslagningen)"
 
-#: wt-status.c:967
+#: wt-status.c:969
 msgid "You are in the middle of an am session."
 msgstr "Du är i mitten av en körning av \"git am\"."
 
-#: wt-status.c:970
+#: wt-status.c:972
 msgid "The current patch is empty."
 msgstr "Aktuell patch är tom."
 
-#: wt-status.c:974
+#: wt-status.c:976
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (rätta konflikter och kör sedan \"git am --continue\")"
 
-#: wt-status.c:976
+#: wt-status.c:978
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (använd \"git am --skip\" för att hoppa över patchen)"
 
-#: wt-status.c:978
+#: wt-status.c:980
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (använd \"git am --abort\" för att återställa ursprungsgrenen)"
 
@@ -2185,43 +2457,43 @@ msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 "  (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
 
-#: wt-status.c:1438
+#: wt-status.c:1460
 msgid "On branch "
 msgstr "PÃ¥ grenen "
 
-#: wt-status.c:1444
+#: wt-status.c:1466
 msgid "interactive rebase in progress; onto "
 msgstr "interaktiv ombasering pågår; ovanpå"
 
-#: wt-status.c:1446
+#: wt-status.c:1468
 msgid "rebase in progress; onto "
 msgstr "ombasering pågår; ovanpå"
 
-#: wt-status.c:1451
+#: wt-status.c:1473
 msgid "HEAD detached at "
 msgstr "HEAD frånkopplad vid "
 
-#: wt-status.c:1453
+#: wt-status.c:1475
 msgid "HEAD detached from "
 msgstr "HEAD frånkopplad från "
 
-#: wt-status.c:1456
+#: wt-status.c:1478
 msgid "Not currently on any branch."
 msgstr "Inte på någon gren för närvarande."
 
-#: wt-status.c:1474
+#: wt-status.c:1496
 msgid "Initial commit"
 msgstr "Första incheckning"
 
-#: wt-status.c:1488
+#: wt-status.c:1510
 msgid "Untracked files"
 msgstr "Ospårade filer"
 
-#: wt-status.c:1490
+#: wt-status.c:1512
 msgid "Ignored files"
 msgstr "Ignorerade filer"
 
-#: wt-status.c:1494
+#: wt-status.c:1516
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2233,32 +2505,32 @@ msgstr ""
 "lägga till nya filer själv (se \"git help status\")."
 
 # %s är nästa sträng eller tom.
-#: wt-status.c:1500
+#: wt-status.c:1522
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Ospårade filer visas ej%s"
 
-#: wt-status.c:1502
+#: wt-status.c:1524
 msgid " (use -u option to show untracked files)"
 msgstr " (använd flaggan -u för att visa ospårade filer)"
 
-#: wt-status.c:1508
+#: wt-status.c:1530
 msgid "No changes"
 msgstr "Inga ändringar"
 
-#: wt-status.c:1513
+#: wt-status.c:1535
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
 "\")\n"
 
-#: wt-status.c:1516
+#: wt-status.c:1538
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "inga ändringar att checka in\n"
 
-#: wt-status.c:1519
+#: wt-status.c:1541
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -2267,52 +2539,52 @@ msgstr ""
 "inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
 "\")\n"
 
-#: wt-status.c:1522
+#: wt-status.c:1544
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "inget köat för incheckning, men ospårade filer finns\n"
 
-#: wt-status.c:1525
+#: wt-status.c:1547
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
 
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
 #, c-format
 msgid "nothing to commit\n"
 msgstr "inget att checka in\n"
 
-#: wt-status.c:1531
+#: wt-status.c:1553
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
 
-#: wt-status.c:1535
+#: wt-status.c:1557
 #, c-format
 msgid "nothing to commit, working directory clean\n"
 msgstr "inget att checka in, arbetskatalogen ren\n"
 
-#: wt-status.c:1642
+#: wt-status.c:1664
 msgid "Initial commit on "
 msgstr "Första incheckning på "
 
-#: wt-status.c:1646
+#: wt-status.c:1668
 msgid "HEAD (no branch)"
 msgstr "HEAD (ingen gren)"
 
-#: wt-status.c:1675
+#: wt-status.c:1697
 msgid "gone"
 msgstr "försvunnen"
 
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
 msgid "behind "
 msgstr "efter "
 
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
 msgid "ahead "
 msgstr "före "
 
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "misslyckades ta bort länken \"%s\""
@@ -2326,7 +2598,7 @@ msgstr "git add [<flaggor>] [--] <sökväg>..."
 msgid "unexpected diff status %c"
 msgstr "diff-status %c förväntades inte"
 
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
 msgid "updating files failed"
 msgstr "misslyckades uppdatera filer"
 
@@ -2339,7 +2611,7 @@ msgstr "ta bort \"%s\"\n"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
 
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
 msgid "Could not read the index"
 msgstr "Kunde inte läsa indexet"
 
@@ -2375,14 +2647,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
 
 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
 msgid "dry run"
 msgstr "testkörning"
 
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
 msgid "be verbose"
 msgstr "var pratsam"
 
@@ -2390,7 +2662,7 @@ msgstr "var pratsam"
 msgid "interactive picking"
 msgstr "plocka interaktivt"
 
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
 msgid "select hunks interactively"
 msgstr "välj stycken interaktivt"
 
@@ -2458,16 +2730,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Kanske menade du att skriva \"git add .\"?\n"
 
 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
 msgid "index file corrupt"
 msgstr "indexfilen trasig"
 
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "Kunde inte skriva ny indexfil"
 
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
 #, c-format
 msgid "could not read '%s'"
 msgstr "kunde inte läsa \"%s\""
@@ -2495,16 +2767,6 @@ msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
 msgid "fseek failed"
 msgstr "\"fseek\" misslyckades"
 
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "kunde inte öppna \"%s\" för läsning: %s"
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "Kunde inte öppna \"%s\" för skrivning: %s"
-
 #: builtin/am.c:788
 #, c-format
 msgid "could not parse patch '%s'"
@@ -2514,76 +2776,76 @@ msgstr "kunde inte tolka patchen \"%s\""
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"
 
-#: builtin/am.c:901
+#: builtin/am.c:900
 msgid "invalid timestamp"
 msgstr "ogiltig tidsstämpel"
 
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
 msgid "invalid Date line"
 msgstr "ogiltig \"Date\"-rad"
 
-#: builtin/am.c:909
+#: builtin/am.c:908
 msgid "invalid timezone offset"
 msgstr "ogiltig tidszons-offset"
 
-#: builtin/am.c:996
+#: builtin/am.c:995
 msgid "Patch format detection failed."
 msgstr "Misslyckades detektera patchformat."
 
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "misslyckades skapa katalogen \"%s\""
 
-#: builtin/am.c:1005
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Misslyckades dela patchar."
 
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
 msgid "unable to write index file"
 msgstr "kan inte skriva indexfil"
 
-#: builtin/am.c:1188
+#: builtin/am.c:1187
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "När du har löst problemet, kör \"%s --continue\"."
 
-#: builtin/am.c:1189
+#: builtin/am.c:1188
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."
 
-#: builtin/am.c:1190
+#: builtin/am.c:1189
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."
 
-#: builtin/am.c:1328
+#: builtin/am.c:1327
 msgid "Patch is empty. Was it split wrong?"
 msgstr "Patchen är tom. Delades den upp felaktigt?"
 
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ogiltig ident-rad: %s"
 
-#: builtin/am.c:1429
+#: builtin/am.c:1428
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "kunde inte tolka incheckningen %s"
 
-#: builtin/am.c:1631
+#: builtin/am.c:1630
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Arkivet saknar objekt som behövs för att falla tillbaka på 3-"
 "vägssammanslagning."
 
-#: builtin/am.c:1633
+#: builtin/am.c:1632
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Använder indexinfo för att återskapa ett basträd..."
 
-#: builtin/am.c:1652
+#: builtin/am.c:1651
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -2591,39 +2853,39 @@ msgstr ""
 "Har du handredigerat din patch?\n"
 "Den kan inte tillämpas på blobbar som antecknats i dess index."
 
-#: builtin/am.c:1658
+#: builtin/am.c:1657
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
 
-#: builtin/am.c:1673
+#: builtin/am.c:1672
 msgid "Failed to merge in the changes."
 msgstr "Misslyckades slå ihop ändringarna."
 
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree misslyckades skriva ett träd"
 
-#: builtin/am.c:1704
+#: builtin/am.c:1703
 msgid "applying to an empty history"
 msgstr "tillämpar på en tom historik"
 
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
 msgid "failed to write commit object"
 msgstr "kunde inte skriva incheckningsobjekt"
 
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "kan inte återuppta: %s finns inte."
 
-#: builtin/am.c:1769
+#: builtin/am.c:1768
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "kan inte vara interaktiv om standard in inte är ansluten till en terminal."
 
-#: builtin/am.c:1774
+#: builtin/am.c:1773
 msgid "Commit Body is:"
 msgstr "Incheckningskroppen är:"
 
@@ -2631,35 +2893,35 @@ msgstr "Incheckningskroppen är:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1784
+#: builtin/am.c:1783
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "
 
-#: builtin/am.c:1834
+#: builtin/am.c:1833
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
 
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Tillämpar: %.*s"
 
-#: builtin/am.c:1885
+#: builtin/am.c:1884
 msgid "No changes -- Patch already applied."
 msgstr "Inga ändringar -- Patchen har redan tillämpats."
 
-#: builtin/am.c:1893
+#: builtin/am.c:1892
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Patch misslyckades på %s %.*s"
 
-#: builtin/am.c:1899
+#: builtin/am.c:1898
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "En kopia av patchen som misslyckades finns i: %s"
 
-#: builtin/am.c:1944
+#: builtin/am.c:1943
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -2669,7 +2931,7 @@ msgstr ""
 "Om det inte är något kvar att köa kan det hända att något annat redan\n"
 "introducerat samma ändringar; kanske du bör hoppa över patchen."
 
-#: builtin/am.c:1951
+#: builtin/am.c:1950
 msgid ""
 "You still have unmerged paths in your index.\n"
 "Did you forget to use 'git add'?"
@@ -2677,17 +2939,17 @@ msgstr ""
 "Du har fortfarande sökvägar som inte slagits samman i ditt index.\n"
 "Glömde du använda \"git add\"?"
 
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
 #: builtin/reset.c:316
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Kan inte tolka objektet \"%s\""
 
-#: builtin/am.c:2111
+#: builtin/am.c:2110
 msgid "failed to clean index"
 msgstr "misslyckades städa upp indexet"
 
-#: builtin/am.c:2145
+#: builtin/am.c:2144
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -2695,152 +2957,154 @@ msgstr ""
 "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
 "Återställer inte till ORIG_HEAD"
 
-#: builtin/am.c:2206
+#: builtin/am.c:2205
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Felaktigt värde för --patch-format: %s"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2238
 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
 msgstr "git am [<flaggor>] [(<mbox>|<Maildir>)...]"
 
-#: builtin/am.c:2240
+#: builtin/am.c:2239
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2246
+#: builtin/am.c:2245
 msgid "run interactively"
 msgstr "kör interaktivt"
 
-#: builtin/am.c:2248
+#: builtin/am.c:2247
 msgid "historical option -- no-op"
 msgstr "historisk flagga -- no-op"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2249
 msgid "allow fall back on 3way merging if needed"
 msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
 
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
 #: builtin/repack.c:171
 msgid "be quiet"
 msgstr "var tyst"
 
-#: builtin/am.c:2253
+#: builtin/am.c:2252
 msgid "add a Signed-off-by line to the commit message"
 msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2255
 msgid "recode into utf8 (default)"
 msgstr "koda om till utf8 (standard)"
 
-#: builtin/am.c:2258
+#: builtin/am.c:2257
 msgid "pass -k flag to git-mailinfo"
 msgstr "sänd flaggan -k till git-mailinfo"
 
-#: builtin/am.c:2260
+#: builtin/am.c:2259
 msgid "pass -b flag to git-mailinfo"
 msgstr "sänd flaggan -b till git-mailinfo"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2261
 msgid "pass -m flag to git-mailinfo"
 msgstr "sänd flaggan -m till git-mailinfo"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2263
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"
 
-#: builtin/am.c:2267
+#: builtin/am.c:2266
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "strip everything before a scissors line"
 msgstr "ta bort allting före en saxlinje"
 
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
 msgid "action"
 msgstr "åtgärd"
 
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
 msgid "pass it through git-apply"
 msgstr "sänd det genom git-apply"
 
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
 msgid "root"
 msgstr "rot"
 
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
 msgid "path"
 msgstr "sökväg"
 
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
-#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134
+#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182
 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
 #: parse-options.h:132 parse-options.h:134 parse-options.h:244
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
 msgid "num"
 msgstr "antal"
 
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
 #: builtin/tag.c:372
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "format the patch(es) are in"
 msgstr "format för patch(ar)"
 
-#: builtin/am.c:2302
+#: builtin/am.c:2301
 msgid "override error message when patch failure occurs"
 msgstr "överstyr felmeddelanden när patchfel uppstår"
 
-#: builtin/am.c:2304
+#: builtin/am.c:2303
 msgid "continue applying patches after resolving a conflict"
 msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
 
-#: builtin/am.c:2307
+#: builtin/am.c:2306
 msgid "synonyms for --continue"
 msgstr "synonymer till --continue"
 
-#: builtin/am.c:2310
+#: builtin/am.c:2309
 msgid "skip the current patch"
 msgstr "hoppa över den aktuella grenen"
 
-#: builtin/am.c:2313
+#: builtin/am.c:2312
 msgid "restore the original branch and abort the patching operation."
 msgstr "återställ originalgrenen och avbryt patchningen."
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 msgid "lie about committer date"
 msgstr "ljug om incheckningsdatum"
 
-#: builtin/am.c:2319
+#: builtin/am.c:2318
 msgid "use current timestamp for author date"
 msgstr "använd nuvarande tidsstämpel för författardatum"
 
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
 msgid "key-id"
 msgstr "nyckel-id"
 
-#: builtin/am.c:2322
+#: builtin/am.c:2321
 msgid "GPG-sign commits"
 msgstr "GPG-signera incheckningar"
 
-#: builtin/am.c:2325
+#: builtin/am.c:2324
 msgid "(internal use for git-rebase)"
 msgstr "(används internt av git-rebase)"
 
-#: builtin/am.c:2340
+#: builtin/am.c:2339
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -2848,16 +3112,16 @@ msgstr ""
 "Flaggan -b/--binary har varit utan funktion länge, och\n"
 "kommer tas bort. Vi ber dig att inte använda den längre."
 
-#: builtin/am.c:2347
+#: builtin/am.c:2346
 msgid "failed to read the index"
 msgstr "misslyckades läsa indexet"
 
-#: builtin/am.c:2362
+#: builtin/am.c:2361
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."
 
-#: builtin/am.c:2386
+#: builtin/am.c:2385
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -2866,7 +3130,7 @@ msgstr ""
 "Kvarbliven katalog %s hittades.\n"
 "Använd \"git am --abort\" för att ta bort den."
 
-#: builtin/am.c:2392
+#: builtin/am.c:2391
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Lösningsoperation pågår inte, vi återupptar inte."
 
@@ -2899,37 +3163,37 @@ msgstr "regexec returnerade %d för indata: %s"
 msgid "unable to find filename in patch at line %d"
 msgstr "kan inte hitta filnamn i patchen på rad %d"
 
-#: builtin/apply.c:940
+#: builtin/apply.c:937
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"
 
-#: builtin/apply.c:944
+#: builtin/apply.c:942
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"
 
-#: builtin/apply.c:945
+#: builtin/apply.c:943
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"
 
-#: builtin/apply.c:952
+#: builtin/apply.c:949
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"
 
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: förväntade rad: %.*s"
 
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "patch-fragment utan huvud på rad %d: %.*s"
 
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -2945,77 +3209,77 @@ msgstr[1] ""
 "sökvägskomponenter\n"
 "tas bort (rad %d)"
 
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
 msgid "new file depends on old contents"
 msgstr "ny fil beror på gammalt innehåll"
 
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
 msgid "deleted file still has contents"
 msgstr "borttagen fil har fortfarande innehåll"
 
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "trasig patch på rad %d"
 
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "nya filen %s beror på gammalt innehåll"
 
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "borttagna filen %s har fortfarande innehåll"
 
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** varning: filen %s blir tom men har inte tagits bort"
 
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "trasig binärpatch på rad %d: %.*s"
 
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "binärpatchen på rad %d känns inte igen"
 
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "patch med bara skräp på rad %d"
 
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "kunde inte läsa symboliska länken %s"
 
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
 #, c-format
 msgid "unable to open or read %s"
 msgstr "kunde inte öppna eller läsa %s"
 
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "felaktig inledning på rad: \"%c\""
 
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "Stycke %d lyckades på %d (offset %d rad)."
 msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."
 
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"
 
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -3024,319 +3288,329 @@ msgstr ""
 "vid sökning efter:\n"
 "%.*s"
 
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "saknar binära patchdata för \"%s\""
 
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "binärpatchen kan inte tillämpas på \"%s\""
 
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"
 
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "patch misslyckades: %s:%ld"
 
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
 #, c-format
 msgid "cannot checkout %s"
 msgstr "kan inte checka ut %s"
 
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
 #, c-format
 msgid "read of %s failed"
 msgstr "misslyckades läsa %s"
 
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
 
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "sökvägen %s har ändrat namn/tagits bort"
 
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: finns inte i indexet"
 
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: motsvarar inte indexet"
 
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
 msgid "removal patch leaves file contents"
 msgstr "patch för borttagning lämnar kvar filinnehåll"
 
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: fel typ"
 
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s har typen %o, förväntade %o"
 
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
 #, c-format
 msgid "invalid path '%s'"
 msgstr "ogiltig sökväg: %s"
 
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: finns redan i indexet"
 
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: finns redan i arbetskatalogen"
 
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
 
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
 
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"
 
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: patchen kan inte tillämpas"
 
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Kontrollerar patchen %s..."
 
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
 
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "kan inte ta bort %s från indexet"
 
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "trasig patch för undermodulen %s"
 
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "kan inte ta status på nyligen skapade filen \"%s\""
 
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
 
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "kan inte lägga till cachepost för %s"
 
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
 #, c-format
 msgid "closing file '%s'"
 msgstr "stänger filen \"%s\""
 
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "kan inte skriva filen \"%s\" läge %o"
 
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Tillämpade patchen %s rent."
 
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
 msgid "internal error"
 msgstr "internt fel"
 
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
 msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
 
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "trunkerar .rej-filnamnet till %.*s.rej"
 
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "kan inte öppna %s: %s"
+
+#: builtin/apply.c:4298
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Stycke %d tillämpades rent."
 
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Refuserar stycke %d."
 
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Ignorerar patch \"%s\"."
+
+#: builtin/apply.c:4395
 msgid "unrecognized input"
 msgstr "indata känns inte igen"
 
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
 msgid "unable to read index file"
 msgstr "kan inte läsa indexfilen"
 
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
 msgid "don't apply changes matching the given path"
 msgstr "tillämpa inte ändringar som motsvarar given sökväg"
 
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
 msgid "apply changes matching the given path"
 msgstr "tillämpa ändringar som motsvarar given sökväg"
 
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
 
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
 msgid "ignore additions made by the patch"
 msgstr "ignorera tillägg gjorda av patchen"
 
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
 
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "visa antal tillagda och borttagna rader decimalt"
 
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
 
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
 
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
 msgid "make sure the patch is applicable to the current index"
 msgstr "se till att patchen kan tillämpas på aktuellt index"
 
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
 msgid "apply a patch without touching the working tree"
 msgstr "tillämpa en patch utan att röra arbetskatalogen"
 
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
 msgid "accept a patch that touches outside the working area"
 msgstr "godta en patch som rör filer utanför arbetskatalogen"
 
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
 
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
 
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
 msgid "build a temporary index based on embedded index information"
 msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
 
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
 msgid "paths are separated with NUL character"
 msgstr "sökvägar avdelas med NUL-tecken"
 
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
 msgid "ensure at least <n> lines of context match"
 msgstr "se till att åtminstone <n> rader sammanhang är lika"
 
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
 
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignorera ändringar i blanktecken för sammanhang"
 
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
 msgid "apply the patch in reverse"
 msgstr "tillämpa patchen baklänges"
 
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
 msgid "don't expect at least one line of context"
 msgstr "förvänta inte minst en rad sammanhang"
 
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
 
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
 msgid "allow overlapping hunks"
 msgstr "tillåt överlappande stycken"
 
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
 
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
 msgid "do not trust the line counts in the hunk headers"
 msgstr "lite inte på antalet linjer i styckehuvuden"
 
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
 msgid "prepend <root> to all filenames"
 msgstr "lägg till <rot> i alla filnamn"
 
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
 msgid "--3way outside a repository"
 msgstr "--3way utanför arkiv"
 
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
 msgid "--index outside a repository"
 msgstr "--index utanför arkiv"
 
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
 msgid "--cached outside a repository"
 msgstr "--cached utanför arkiv"
 
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
 #, c-format
 msgid "can't open patch '%s'"
 msgstr "kan inte öppna patchen \"%s\""
 
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "undertryckte %d fel i blanksteg"
 msgstr[1] "undertryckte %d fel i blanksteg"
 
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
@@ -3402,99 +3676,99 @@ msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
 msgid "Blaming lines"
 msgstr "Klandra rader"
 
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
 msgid "Show blame entries as we find them, incrementally"
 msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
 
-#: builtin/blame.c:2531
+#: builtin/blame.c:2532
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
 
-#: builtin/blame.c:2532
+#: builtin/blame.c:2533
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
 
-#: builtin/blame.c:2533
+#: builtin/blame.c:2534
 msgid "Show work cost statistics"
 msgstr "Visa statistik över arbetskostnad"
 
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
 msgid "Force progress reporting"
 msgstr "Tvinga förloppsrapportering"
 
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
 msgid "Show output score for blame entries"
 msgstr "Visa utdatapoäng för klandringsposter"
 
-#: builtin/blame.c:2536
+#: builtin/blame.c:2537
 msgid "Show original filename (Default: auto)"
 msgstr "Visa originalfilnamn (Standard: auto)"
 
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
 msgid "Show original linenumber (Default: off)"
 msgstr "Visa ursprungligt radnummer (Standard: av)"
 
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
 msgid "Show in a format designed for machine consumption"
 msgstr "Visa i ett format avsett för maskinkonsumtion"
 
-#: builtin/blame.c:2539
+#: builtin/blame.c:2540
 msgid "Show porcelain format with per-line commit information"
 msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
 
-#: builtin/blame.c:2540
+#: builtin/blame.c:2541
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "Använd samma utdataläge som git-annotate (Standard: av)"
 
-#: builtin/blame.c:2541
+#: builtin/blame.c:2542
 msgid "Show raw timestamp (Default: off)"
 msgstr "Visa rå tidsstämpel (Standard: av)"
 
-#: builtin/blame.c:2542
+#: builtin/blame.c:2543
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
 
-#: builtin/blame.c:2543
+#: builtin/blame.c:2544
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
 
-#: builtin/blame.c:2544
+#: builtin/blame.c:2545
 msgid "Show author email instead of name (Default: off)"
 msgstr "Visa författarens e-post istället för namn (Standard: av)"
 
-#: builtin/blame.c:2545
+#: builtin/blame.c:2546
 msgid "Ignore whitespace differences"
 msgstr "Ignorera ändringar i blanksteg"
 
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
 msgid "Spend extra cycles to find better match"
 msgstr "Slösa extra cykler med att hitta bättre träff"
 
-#: builtin/blame.c:2547
+#: builtin/blame.c:2548
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"
 
-#: builtin/blame.c:2548
+#: builtin/blame.c:2549
 msgid "Use <file>'s contents as the final image"
 msgstr "Använd <fil>s innehåll som slutgiltig bild"
 
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
 msgid "score"
 msgstr "poäng"
 
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
 msgid "Find line copies within and across files"
 msgstr "Hitta kopierade rader inuti och mellan filer"
 
-#: builtin/blame.c:2550
+#: builtin/blame.c:2551
 msgid "Find line movements within and across files"
 msgstr "Hitta flyttade rader inuti och mellan filer"
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "Process only line range n,m, counting from 1"
 msgstr "Behandla endast radintervallet n,m, med början på 1"
 
@@ -3504,31 +3778,31 @@ msgstr "Behandla endast radintervallet n,m, med början på 1"
 #. takes 22 places, is the longest among various forms of
 #. relative timestamps, but your language may need more or
 #. fewer display columns.
-#: builtin/blame.c:2640
+#: builtin/blame.c:2641
 msgid "4 years, 11 months ago"
 msgstr "4 år, 11 månader sedan"
 
-#: builtin/branch.c:25
+#: builtin/branch.c:26
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]"
 
-#: builtin/branch.c:26
+#: builtin/branch.c:27
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr "git branch [<flaggor>] [-l] [-f] <grennamn> [<startpunkt>]"
 
-#: builtin/branch.c:27
+#: builtin/branch.c:28
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..."
 
-#: builtin/branch.c:28
+#: builtin/branch.c:29
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>"
 
-#: builtin/branch.c:29
+#: builtin/branch.c:30
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<flaggor>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:142
+#: builtin/branch.c:143
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -3537,7 +3811,7 @@ msgstr ""
 "tar bort grenen \"%s\" som har slagits ihop med\n"
 "         \"%s\", men ännu inte slagits ihop med HEAD."
 
-#: builtin/branch.c:146
+#: builtin/branch.c:147
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -3546,12 +3820,12 @@ msgstr ""
 "tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
 "         \"%s\", trots att den har slagits ihop med HEAD."
 
-#: builtin/branch.c:160
+#: builtin/branch.c:161
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
 
-#: builtin/branch.c:164
+#: builtin/branch.c:165
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -3560,340 +3834,361 @@ msgstr ""
 "Grenen \"%s\" har inte slagits samman i sin helhet.\n"
 "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."
 
-#: builtin/branch.c:177
+#: builtin/branch.c:178
 msgid "Update of config-file failed"
 msgstr "Misslyckades uppdatera konfigurationsfil"
 
-#: builtin/branch.c:205
+#: builtin/branch.c:206
 msgid "cannot use -a with -d"
 msgstr "kan inte ange -a med -d"
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
 
-#: builtin/branch.c:219
+#: builtin/branch.c:226
 #, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande."
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\""
 
-#: builtin/branch.c:235
+#: builtin/branch.c:241
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "fjärrspårande grenen \"%s\" hittades inte."
 
-#: builtin/branch.c:236
+#: builtin/branch.c:242
 #, c-format
 msgid "branch '%s' not found."
 msgstr "grenen \"%s\" hittades inte."
 
-#: builtin/branch.c:251
+#: builtin/branch.c:257
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""
 
-#: builtin/branch.c:252
+#: builtin/branch.c:258
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Fel vid borttagning av grenen \"%s\""
 
-#: builtin/branch.c:259
+#: builtin/branch.c:265
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"
 
-#: builtin/branch.c:260
+#: builtin/branch.c:266
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Tog bort grenen %s (var %s).\n"
 
-#: builtin/branch.c:303
+#: builtin/branch.c:309
 #, c-format
 msgid "[%s: gone]"
 msgstr "[%s: försvunnen]"
 
-#: builtin/branch.c:308
+#: builtin/branch.c:314
 #, c-format
 msgid "[%s]"
 msgstr "[%s]"
 
-#: builtin/branch.c:313
+#: builtin/branch.c:319
 #, c-format
 msgid "[%s: behind %d]"
 msgstr "[%s: bakom %d] "
 
-#: builtin/branch.c:315
+#: builtin/branch.c:321
 #, c-format
 msgid "[behind %d]"
 msgstr "[bakom %d] "
 
-#: builtin/branch.c:319
+#: builtin/branch.c:325
 #, c-format
 msgid "[%s: ahead %d]"
 msgstr "[%s: före %d] "
 
-#: builtin/branch.c:321
+#: builtin/branch.c:327
 #, c-format
 msgid "[ahead %d]"
 msgstr "[före %d] "
 
-#: builtin/branch.c:324
+#: builtin/branch.c:330
 #, c-format
 msgid "[%s: ahead %d, behind %d]"
 msgstr "[%s: före %d, bakom %d] "
 
-#: builtin/branch.c:327
+#: builtin/branch.c:333
 #, c-format
 msgid "[ahead %d, behind %d]"
 msgstr "[före %d, bakom %d] "
 
-#: builtin/branch.c:340
+#: builtin/branch.c:346
 msgid " **** invalid ref ****"
 msgstr " **** ogiltig ref ****"
 
-#: builtin/branch.c:366
+#: builtin/branch.c:372
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(ingen gren, ombaserar %s)"
 
-#: builtin/branch.c:369
+#: builtin/branch.c:375
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(ingen gren, \"bisect\" startad på %s)"
 
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD frånkopplat vid %s)"
 
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD frånkopplat från %s)"
 
-#: builtin/branch.c:382
+#: builtin/branch.c:390
 msgid "(no branch)"
 msgstr "(ingen gren)"
 
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "Grenen %s ombaseras på %s"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "Grenen %s är i en \"bisect\" på %s"
+
+#: builtin/branch.c:560
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 "kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
 
-#: builtin/branch.c:534
+#: builtin/branch.c:570
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Felaktigt namn på gren: \"%s\""
 
-#: builtin/branch.c:549
+#: builtin/branch.c:587
 msgid "Branch rename failed"
 msgstr "Misslyckades byta namn på gren"
 
-#: builtin/branch.c:553
+#: builtin/branch.c:591
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
 
-#: builtin/branch.c:557
+#: builtin/branch.c:594
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:601
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
 
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "kunde inte skriva grenbeskrivningsmall: %s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "kunde inte skriva grenbeskrivningsmall"
 
-#: builtin/branch.c:615
+#: builtin/branch.c:651
 msgid "Generic options"
 msgstr "Allmänna flaggor"
 
-#: builtin/branch.c:617
+#: builtin/branch.c:653
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:654
 msgid "suppress informational messages"
 msgstr "undertryck informationsmeddelanden"
 
-#: builtin/branch.c:619
+#: builtin/branch.c:655
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "ställ in spårningsläge (se git-pull(1))"
 
-#: builtin/branch.c:621
+#: builtin/branch.c:657
 msgid "change upstream info"
 msgstr "ändra uppströmsinformation"
 
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "uppströms"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "ändra uppströmsinformationen"
+
+#: builtin/branch.c:661
 msgid "use colored output"
 msgstr "använd färgad utdata"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:662
 msgid "act on remote-tracking branches"
 msgstr "arbeta på fjärrspårande grenar"
 
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
 msgid "print only branches that contain the commit"
 msgstr "visa endast grenar som innehåller incheckningen"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:668
 msgid "Specific git-branch actions:"
 msgstr "Specifika git-branch-åtgärder:"
 
-#: builtin/branch.c:633
+#: builtin/branch.c:669
 msgid "list both remote-tracking and local branches"
 msgstr "visa både fjärrspårande och lokala grenar"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:671
 msgid "delete fully merged branch"
 msgstr "ta bort helt sammanslagen gren"
 
-#: builtin/branch.c:636
+#: builtin/branch.c:672
 msgid "delete branch (even if not merged)"
 msgstr "ta bort gren (även om inte helt sammanslagen)"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:673
 msgid "move/rename a branch and its reflog"
 msgstr "flytta/ta bort en gren och dess reflogg"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:674
 msgid "move/rename a branch, even if target exists"
 msgstr "flytta/ta bort en gren, även om målet finns"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:675
 msgid "list branch names"
 msgstr "lista namn på grenar"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:676
 msgid "create the branch's reflog"
 msgstr "skapa grenens reflogg"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:678
 msgid "edit the description for the branch"
 msgstr "redigera beskrivning för grenen"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:679
 msgid "force creation, move/rename, deletion"
 msgstr "tvinga skapande, flytt/namnändring, borttagande"
 
-#: builtin/branch.c:644
+#: builtin/branch.c:680
 msgid "print only branches that are merged"
 msgstr "visa endast sammanslagna grenar"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:681
 msgid "print only branches that are not merged"
 msgstr "visa endast ej sammanslagna grenar"
 
-#: builtin/branch.c:646
+#: builtin/branch.c:682
 msgid "list branches in columns"
 msgstr "visa grenar i spalter"
 
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
 msgid "key"
 msgstr "nyckel"
 
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
 msgid "field name to sort on"
 msgstr "fältnamn att sortera på"
 
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
 #: builtin/tag.c:369
 msgid "object"
 msgstr "objekt"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:687
 msgid "print only branches of the object"
 msgstr "visa endast grenar för objektet"
 
-#: builtin/branch.c:669
+#: builtin/branch.c:705
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Misslyckades slå upp HEAD som giltig referens"
 
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD hittades inte under refs/heads!"
 
-#: builtin/branch.c:693
+#: builtin/branch.c:729
 msgid "--column and --verbose are incompatible"
 msgstr "--column och --verbose är inkompatibla"
 
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
 msgid "branch name required"
 msgstr "grennamn krävs"
 
-#: builtin/branch.c:722
+#: builtin/branch.c:758
 msgid "Cannot give description to detached HEAD"
 msgstr "Kan inte beskriva frånkopplad HEAD"
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 msgid "cannot edit description of more than one branch"
 msgstr "kan inte redigera beskrivning för mer än en gren"
 
-#: builtin/branch.c:734
+#: builtin/branch.c:770
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Inga incheckningar på grenen \"%s\" ännu"
 
-#: builtin/branch.c:737
+#: builtin/branch.c:773
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Ingen gren vid namnet \"%s\"."
 
-#: builtin/branch.c:752
+#: builtin/branch.c:788
 msgid "too many branches for a rename operation"
 msgstr "för många grenar för namnbyte"
 
-#: builtin/branch.c:757
+#: builtin/branch.c:793
 msgid "too many branches to set new upstream"
 msgstr "för många grenar för att byta uppström"
 
-#: builtin/branch.c:761
+#: builtin/branch.c:797
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
 "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."
 
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
 #, c-format
 msgid "no such branch '%s'"
 msgstr "okänd gren \"%s\""
 
-#: builtin/branch.c:768
+#: builtin/branch.c:804
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "grenen \"%s\" finns inte"
 
-#: builtin/branch.c:780
+#: builtin/branch.c:816
 msgid "too many branches to unset upstream"
 msgstr "för många grenar för att ta bort uppström"
 
-#: builtin/branch.c:784
+#: builtin/branch.c:820
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."
 
-#: builtin/branch.c:790
+#: builtin/branch.c:826
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Grenen \"%s\" har ingen uppströmsinformation"
 
-#: builtin/branch.c:804
+#: builtin/branch.c:840
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "kan inte skapa \"HEAD\" manuellt"
 
-#: builtin/branch.c:810
+#: builtin/branch.c:846
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "
 "grennamn"
 
-#: builtin/branch.c:813
+#: builtin/branch.c:849
 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3902,7 +4197,7 @@ msgstr ""
 "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
 "eller --set-upstream-to\n"
 
-#: builtin/branch.c:830
+#: builtin/branch.c:866
 #, c-format
 msgid ""
 "\n"
@@ -3913,16 +4208,6 @@ msgstr ""
 "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"
 "\n"
 
-#: builtin/branch.c:831
-#, c-format
-msgid "    git branch -d %s\n"
-msgstr "    git branch -d %s\n"
-
-#: builtin/branch.c:832
-#, c-format
-msgid "    git branch --set-upstream-to %s\n"
-msgstr "    git branch --set-upstream-to %s\n"
-
 #: builtin/bundle.c:51
 #, c-format
 msgid "%s is okay\n"
@@ -4021,7 +4306,7 @@ msgstr "läs filnamn från standard in"
 msgid "terminate input and output records by a NUL character"
 msgstr "avsluta in- och utdataposter med NUL-tecken"
 
-#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
 msgid "suppress progress reporting"
 msgstr "undertryck förloppsrapportering"
 
@@ -4111,8 +4396,9 @@ msgid "write the content to temporary files"
 msgstr "skriv innehåll till temporära filer"
 
 #: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
 msgid "string"
 msgstr "sträng"
 
@@ -4162,79 +4448,79 @@ msgstr "sökväg \"%s\": kan inte slå ihop"
 msgid "Unable to add merge result for '%s'"
 msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
 
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"
 
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "\"%s\" kan inte användas med %s"
 
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
 
-#: builtin/checkout.c:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
 msgid "corrupt index file"
 msgstr "indexfilen är trasig"
 
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "sökvägen \"%s\" har inte slagits ihop"
 
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
 msgid "you need to resolve your current index first"
 msgstr "du måste lösa ditt befintliga index först"
 
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
 
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
 msgid "HEAD is now at"
 msgstr "HEAD är nu på"
 
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
 msgid "unable to update HEAD"
 msgstr "kan inte uppdatera HEAD"
 
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Återställ gren \"%s\"\n"
 
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Redan på \"%s\"\n"
 
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Växlade till och nollställde grenen \"%s\"\n"
 
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Växlade till en ny gren \"%s\"\n"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Växlade till grenen \"%s\"\n"
 
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... och %d till.\n"
 
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -4257,7 +4543,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4284,151 +4570,151 @@ msgstr[1] ""
 " git branch <nytt_grennamn> %s\n"
 "\n"
 
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
 msgid "internal error in revision walk"
 msgstr "internt fel vid genomgång av revisioner (revision walk)"
 
-#: builtin/checkout.c:797
+#: builtin/checkout.c:796
 msgid "Previous HEAD position was"
 msgstr "Tidigare position för HEAD var"
 
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
 msgid "You are on a branch yet to be born"
 msgstr "Du är på en gren som ännu inte är född"
 
-#: builtin/checkout.c:969
+#: builtin/checkout.c:968
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "endast en referens förväntades, %d gavs."
 
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
 #, c-format
 msgid "invalid reference: %s"
 msgstr "felaktig referens: %s"
 
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "referensen är inte ett träd: %s"
 
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1076
 msgid "paths cannot be used with switching branches"
 msgstr "sökvägar kan inte användas vid byte av gren"
 
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "\"%s\" kan inte användas vid byte av gren"
 
-#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "\"%s\" kan inte användas med \"%s\""
 
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
 
-#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
 msgid "branch"
 msgstr "gren"
 
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
 msgid "create and checkout a new branch"
 msgstr "skapa och checka ut en ny gren"
 
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
 msgid "create/reset and checkout a branch"
 msgstr "skapa/nollställ och checka ut en gren"
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
 msgid "create reflog for new branch"
 msgstr "skapa reflogg för ny gren"
 
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
 msgid "detach the HEAD at named commit"
 msgstr "koppla från HEAD vid namngiven incheckning"
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
 msgid "set upstream info for new branch"
 msgstr "sätt uppströmsinformation för ny gren"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new-branch"
 msgstr "ny-gren"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new unparented branch"
 msgstr "ny gren utan förälder"
 
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
 msgid "checkout our version for unmerged files"
 msgstr "checka ut vår version för ej sammanslagna filer"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
 msgid "checkout their version for unmerged files"
 msgstr "checka ut deras version för ej sammanslagna filer"
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
 msgid "force checkout (throw away local modifications)"
 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
 
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1150
 msgid "perform a 3-way merge with the new branch"
 msgstr "utför en 3-vägssammanslagning för den nya grenen"
 
-#: builtin/checkout.c:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
 msgid "update ignored files (default)"
 msgstr "uppdatera ignorerade filer (standard)"
 
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
 msgid "style"
 msgstr "stil"
 
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
 msgid "conflict style (merge or diff3)"
 msgstr "konfliktstil (merge eller diff3)"
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "begränsa inte sökvägar till endast glesa poster"
 
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "förutspå \"git checkout <gren-saknas>\""
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 "kontrollera inte om en annan arbetskatalog håller den angivna referensen"
 
-#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
 #: builtin/send-pack.c:168
 msgid "force progress reporting"
 msgstr "tvinga förloppsrapportering"
 
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
 
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1209
 msgid "--track needs a branch name"
 msgstr "--track behöver ett namn på en gren"
 
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
 msgid "Missing branch name; try -b"
 msgstr "Grennamn saknas; försök med -b"
 
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
 msgid "invalid path specification"
 msgstr "felaktig sökvägsangivelse"
 
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
 #, c-format
 msgid ""
 "Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4437,12 +4723,12 @@ msgstr ""
 "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"
 "Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"
 
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""
 
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1266
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -4595,8 +4881,8 @@ msgstr "städa interaktivt"
 msgid "remove whole directories"
 msgstr "ta bort hela kataloger"
 
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
 msgid "pattern"
 msgstr "mönster"
 
@@ -4636,104 +4922,113 @@ msgstr ""
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
 
-#: builtin/clone.c:60
+#: builtin/clone.c:62
 msgid "don't create a checkout"
 msgstr "skapa inte någon utcheckning"
 
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
 msgid "create a bare repository"
 msgstr "skapa ett naket (\"bare\") arkiv"
 
-#: builtin/clone.c:65
+#: builtin/clone.c:67
 msgid "create a mirror repository (implies bare)"
 msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
 
-#: builtin/clone.c:67
+#: builtin/clone.c:69
 msgid "to clone from a local repository"
 msgstr "för att klona från ett lokalt arkiv"
 
-#: builtin/clone.c:69
+#: builtin/clone.c:71
 msgid "don't use local hardlinks, always copy"
 msgstr "skapa inte lokala hårda länkar, kopiera alltid"
 
-#: builtin/clone.c:71
+#: builtin/clone.c:73
 msgid "setup as shared repository"
 msgstr "skapa som ett delat arkiv"
 
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
 msgid "initialize submodules in the clone"
 msgstr "initiera undermoduler i klonen"
 
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "antal undermoduler som klonas parallellt"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
 msgid "template-directory"
 msgstr "mallkatalog"
 
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
 msgid "directory from which templates will be used"
 msgstr "katalog att använda mallar från"
 
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
 msgid "reference repository"
 msgstr "referensarkiv"
 
-#: builtin/clone.c:81
+#: builtin/clone.c:85
 msgid "use --reference only while cloning"
 msgstr "använd --reference endast under kloningen"
 
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
 msgid "name"
 msgstr "namn"
 
-#: builtin/clone.c:83
+#: builtin/clone.c:87
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"
 
-#: builtin/clone.c:85
+#: builtin/clone.c:89
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "checka ut <gren> istället för fjärrens HEAD"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:91
 msgid "path to git-upload-pack on the remote"
 msgstr "sökväg till git-upload-pack på fjärren"
 
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
-#: builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667
+#: builtin/pull.c:201
 msgid "depth"
 msgstr "djup"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:93
 msgid "create a shallow clone of that depth"
 msgstr "skapa en grund klon på detta djup"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:95
 msgid "clone only one branch, HEAD or --branch"
 msgstr "klona endast en gren, HEAD eller --branch"
 
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "klonade undermoduler kommer vara grunda"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
 msgid "gitdir"
 msgstr "gitkat"
 
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
 msgid "separate git dir from working tree"
 msgstr "separera gitkatalogen från arbetskatalogen"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:100
 msgid "key=value"
 msgstr "nyckel=värde"
 
-#: builtin/clone.c:95
+#: builtin/clone.c:101
 msgid "set config inside the new repository"
 msgstr "ställ in konfiguration i det nya arkivet"
 
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
 msgid "use IPv4 addresses only"
 msgstr "använd endast IPv4-adresser"
 
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
 msgid "use IPv6 addresses only"
 msgstr "använd endast IPv6-adresser"
 
-#: builtin/clone.c:239
+#: builtin/clone.c:241
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -4741,57 +5036,52 @@ msgstr ""
 "Kunde inte gissa katalognamn.\n"
 "Ange en katalog på kommandoraden"
 
-#: builtin/clone.c:305
+#: builtin/clone.c:307
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."
 
-#: builtin/clone.c:307
+#: builtin/clone.c:309
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
 
-#: builtin/clone.c:312
+#: builtin/clone.c:314
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "referensarkivet \"%s\" är grunt"
 
-#: builtin/clone.c:315
+#: builtin/clone.c:317
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "referensarkivet \"%s\" är ympat"
 
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "misslyckades ta status på \"%s\""
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s finns och är ingen katalog"
 
-#: builtin/clone.c:396
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "misslyckades ta status på %s\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "misslyckades skapa länken \"%s\""
 
-#: builtin/clone.c:422
+#: builtin/clone.c:424
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "misslyckades kopiera filen till \"%s\""
 
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
 #, c-format
 msgid "done.\n"
 msgstr "klart.\n"
 
-#: builtin/clone.c:459
+#: builtin/clone.c:461
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -4801,129 +5091,129 @@ msgstr ""
 "Du kan inspektera det som checkades ut med \"git status\"\n"
 "och försöka checka ut igen med \"git checkout -f HEAD\"\n"
 
-#: builtin/clone.c:536
+#: builtin/clone.c:538
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
 
 # Vague original, not networking-related, but rather related to the actual
 # objects downloaded.
-#: builtin/clone.c:626
+#: builtin/clone.c:628
 #, c-format
 msgid "Checking connectivity... "
 msgstr "Kontrollerar om vi fick alla objekt..."
 
-#: builtin/clone.c:629
+#: builtin/clone.c:631
 msgid "remote did not send all necessary objects"
 msgstr "fjärren sände inte alla nödvändiga objekt"
 
-#: builtin/clone.c:647
+#: builtin/clone.c:649
 #, c-format
 msgid "unable to update %s"
 msgstr "kan inte uppdatera %s"
 
-#: builtin/clone.c:696
+#: builtin/clone.c:698
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"
 
-#: builtin/clone.c:727
+#: builtin/clone.c:729
 msgid "unable to checkout working tree"
 msgstr "kunde inte checka ut arbetskatalogen"
 
-#: builtin/clone.c:753
+#: builtin/clone.c:767
 msgid "unable to write parameters to config file"
 msgstr "kunde inte skriva parametrar till konfigurationsfilen"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:830
 msgid "cannot repack to clean up"
 msgstr "kan inte packa om för att städa upp"
 
-#: builtin/clone.c:818
+#: builtin/clone.c:832
 msgid "cannot unlink temporary alternates file"
 msgstr "kunde inte ta bort temporär \"alternates\"-fil"
 
-#: builtin/clone.c:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
 msgid "Too many arguments."
 msgstr "För många argument."
 
-#: builtin/clone.c:854
+#: builtin/clone.c:868
 msgid "You must specify a repository to clone."
 msgstr "Du måste ange ett arkiv att klona."
 
-#: builtin/clone.c:865
+#: builtin/clone.c:879
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "flaggorna --bare och --origin %s är inkompatibla."
 
-#: builtin/clone.c:868
+#: builtin/clone.c:882
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
 
-#: builtin/clone.c:881
+#: builtin/clone.c:895
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "arkivet \"%s\" finns inte"
 
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "djupet %s är inte ett positivt tal"
 
-#: builtin/clone.c:897
+#: builtin/clone.c:911
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
 
-#: builtin/clone.c:907
+#: builtin/clone.c:921
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "arbetsträdet \"%s\" finns redan."
 
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "kunde inte skapa inledande kataloger för \"%s\""
 
-#: builtin/clone.c:925
+#: builtin/clone.c:939
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "kunde inte skapa arbetskatalogen \"%s\""
 
-#: builtin/clone.c:943
+#: builtin/clone.c:957
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Klonar till ett naket arkiv \"%s\"...\n"
 
-#: builtin/clone.c:945
+#: builtin/clone.c:959
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Klonar till \"%s\"...\n"
 
-#: builtin/clone.c:984
+#: builtin/clone.c:998
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1001
 msgid "source repository is shallow, ignoring --local"
 msgstr "källarkivet är grunt, ignorerar --local"
 
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
 msgid "--local is ignored"
 msgstr "--local ignoreras"
 
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "Vet inte hur man klonar %s"
 
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
 
-#: builtin/clone.c:1056
+#: builtin/clone.c:1070
 msgid "You appear to have cloned an empty repository."
 msgstr "Du verkar ha klonat ett tomt arkiv."
 
@@ -5063,66 +5353,66 @@ msgstr ""
 "\"git cherry-pick --continue\" kommer därefter att återuppta\n"
 "cherry-pick för återstående incheckningar.\n"
 
-#: builtin/commit.c:305
+#: builtin/commit.c:307
 msgid "failed to unpack HEAD tree object"
 msgstr "misslyckades packa upp HEAD:s trädobjekt"
 
-#: builtin/commit.c:346
+#: builtin/commit.c:348
 msgid "unable to create temporary index"
 msgstr "kunde inte skapa temporär indexfil"
 
-#: builtin/commit.c:352
+#: builtin/commit.c:354
 msgid "interactive add failed"
 msgstr "interaktiv tilläggning misslyckades"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:367
 msgid "unable to update temporary index"
 msgstr "kan inte uppdatera temporärt index"
 
-#: builtin/commit.c:367
+#: builtin/commit.c:369
 msgid "Failed to update main cache tree"
 msgstr "Misslyckades uppdatera huvud-cacheträdet"
 
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
 msgid "unable to write new_index file"
 msgstr "kunde inte skriva filen new_index"
 
-#: builtin/commit.c:445
+#: builtin/commit.c:447
 msgid "cannot do a partial commit during a merge."
 msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
 
-#: builtin/commit.c:447
+#: builtin/commit.c:449
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "kan inte utföra en delvis incheckning under en cherry-pick."
 
-#: builtin/commit.c:456
+#: builtin/commit.c:458
 msgid "cannot read the index"
 msgstr "kan inte läsa indexet"
 
-#: builtin/commit.c:475
+#: builtin/commit.c:477
 msgid "unable to write temporary index file"
 msgstr "kunde inte skriva temporär indexfil"
 
-#: builtin/commit.c:580
+#: builtin/commit.c:582
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "incheckningen \"%s\" saknar författarhuvud"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:584
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
 
-#: builtin/commit.c:601
+#: builtin/commit.c:603
 msgid "malformed --author parameter"
 msgstr "felformad \"--author\"-flagga"
 
-#: builtin/commit.c:609
+#: builtin/commit.c:611
 #, c-format
 msgid "invalid date format: %s"
 msgstr "felaktigt datumformat: %s"
 
-#: builtin/commit.c:653
+#: builtin/commit.c:655
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -5130,38 +5420,38 @@ msgstr ""
 "kunde inte välja ett kommentarstecken som inte använts\n"
 "i det befintliga incheckningsmeddelandet"
 
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "kunde inte slå upp incheckningen %s"
 
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(läser loggmeddelande från standard in)\n"
 
-#: builtin/commit.c:704
+#: builtin/commit.c:706
 msgid "could not read log from standard input"
 msgstr "kunde inte läsa logg från standard in"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:710
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "kunde inte läsa loggfilen \"%s\""
 
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "kunde inte läsa MERGE_MSG"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
 msgid "could not read SQUASH_MSG"
 msgstr "kunde inte läsa SQUASH_MSG"
 
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "kunde inte läsa MERGE_MSG"
+
+#: builtin/commit.c:796
 msgid "could not write commit template"
 msgstr "kunde inte skriva incheckningsmall"
 
-#: builtin/commit.c:803
+#: builtin/commit.c:814
 #, c-format
 msgid ""
 "\n"
@@ -5176,7 +5466,7 @@ msgstr ""
 "\t%s\n"
 "och försöker igen.\n"
 
-#: builtin/commit.c:808
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -5191,7 +5481,7 @@ msgstr ""
 "\t%s\n"
 "och försöker igen.\n"
 
-#: builtin/commit.c:821
+#: builtin/commit.c:832
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5201,7 +5491,7 @@ msgstr ""
 "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
 "incheckningen.\n"
 
-#: builtin/commit.c:828
+#: builtin/commit.c:839
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5212,146 +5502,146 @@ msgstr ""
 "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
 "Ett tomt meddelande avbryter incheckningen.\n"
 
-#: builtin/commit.c:848
+#: builtin/commit.c:859
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sFörfattare: %.*s <%.*s>"
 
-#: builtin/commit.c:856
+#: builtin/commit.c:867
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDatum:      %s"
 
-#: builtin/commit.c:863
+#: builtin/commit.c:874
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sIncheckare: %.*s <%.*s>"
 
-#: builtin/commit.c:881
+#: builtin/commit.c:892
 msgid "Cannot read index"
 msgstr "Kan inte läsa indexet"
 
-#: builtin/commit.c:938
+#: builtin/commit.c:949
 msgid "Error building trees"
 msgstr "Fel vid byggande av träd"
 
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
 
-#: builtin/commit.c:1055
+#: builtin/commit.c:1066
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"
 
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Ogiltigt läge för ospårade filer: \"%s\""
 
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
 msgid "--long and -z are incompatible"
 msgstr "--long och -z är inkompatibla"
 
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Kan inte använda både --reset-author och --author"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1157
 msgid "You have nothing to amend."
 msgstr "Du har inget att utöka."
 
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1162
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
 
-#: builtin/commit.c:1154
+#: builtin/commit.c:1165
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
 
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Endast en av -c/-C/-F/--fixup kan användas."
 
-#: builtin/commit.c:1166
+#: builtin/commit.c:1177
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."
 
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author kan endast användas med -C, -c eller --amend."
 
-#: builtin/commit.c:1191
+#: builtin/commit.c:1202
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Endast en av --include/--only/--all/--interactive/--patch kan användas."
 
-#: builtin/commit.c:1193
+#: builtin/commit.c:1204
 msgid "No paths with --include/--only does not make sense."
 msgstr "Du måste ange sökvägar tillsammans med --include/--only."
 
-#: builtin/commit.c:1195
+#: builtin/commit.c:1206
 msgid "Clever... amending the last one with dirty index."
 msgstr "Smart... utöka den senaste med smutsigt index."
 
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
 msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."
 
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Felaktigt städningsläge %s"
 
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
 msgid "Paths with -a does not make sense."
 msgstr "Kan inte ange sökvägar med -a."
 
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
 msgid "show status concisely"
 msgstr "visa koncis status"
 
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
 msgid "show branch information"
 msgstr "visa information om gren"
 
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
 msgid "machine-readable output"
 msgstr "maskinläsbar utdata"
 
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
 msgid "show status in long format (default)"
 msgstr "visa status i långt format (standard)"
 
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
 msgid "terminate entries with NUL"
 msgstr "terminera poster med NUL"
 
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
 #: builtin/fast-export.c:984 builtin/tag.c:353
 msgid "mode"
 msgstr "läge"
 
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"
 
-#: builtin/commit.c:1340
+#: builtin/commit.c:1351
 msgid "show ignored files"
 msgstr "visa ignorerade filer"
 
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
 msgid "when"
 msgstr "när"
 
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -5359,201 +5649,201 @@ msgstr ""
 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
 "(Default: all)"
 
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
 msgid "list untracked files in columns"
 msgstr "visa ospårade filer i spalter"
 
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
 msgid "couldn't look up newly created commit"
 msgstr "kunde inte slå upp en precis skapad incheckning"
 
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
 msgid "could not parse newly created commit"
 msgstr "kunde inte tolka en precis skapad incheckning"
 
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
 msgid "detached HEAD"
 msgstr "frånkopplad HEAD"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
 msgid " (root-commit)"
 msgstr " (rotincheckning)"
 
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
 msgid "suppress summary after successful commit"
 msgstr "undertryck sammanfattning efter framgångsrik incheckning"
 
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
 msgid "show diff in commit message template"
 msgstr "visa diff i mallen för incheckningsmeddelandet"
 
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
 msgid "Commit message options"
 msgstr "Alternativ för incheckningsmeddelande"
 
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
 msgid "read message from file"
 msgstr "läs meddelande från fil"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "author"
 msgstr "författare"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "override author for commit"
 msgstr "överstyr författare för incheckningen"
 
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
 msgid "date"
 msgstr "datum"
 
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
 msgid "override date for commit"
 msgstr "överstyr datum för incheckningen"
 
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
 #: builtin/notes.c:558 builtin/tag.c:349
 msgid "message"
 msgstr "meddelande"
 
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
 msgid "commit message"
 msgstr "incheckningsmeddelande"
 
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
 msgid "commit"
 msgstr "incheckning"
 
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
 msgid "reuse and edit message from specified commit"
 msgstr "återanvänd och redigera meddelande från angiven incheckning"
 
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
 msgid "reuse message from specified commit"
 msgstr "återanvänd meddelande från angiven incheckning"
 
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"
 
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "använd autosquash-formaterat meddelande för att slå ihop med angiven "
 "incheckning"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1603
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
 
-#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
 msgid "add Signed-off-by:"
 msgstr "lägg till Signed-off-by:"
 
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
 msgid "use specified template file"
 msgstr "använd angiven mallfil"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
 msgid "force edit of commit"
 msgstr "tvinga redigering av incheckning"
 
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
 msgid "default"
 msgstr "standard"
 
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
 msgid "how to strip spaces and #comments from message"
 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
 msgid "include status in commit message template"
 msgstr "inkludera status i mallen för incheckningsmeddelandet"
 
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
 #: builtin/revert.c:93
 msgid "GPG sign commit"
 msgstr "GPG-signera incheckning"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
 msgid "Commit contents options"
 msgstr "Alternativ för incheckningens innehåll"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
 msgid "commit all changed files"
 msgstr "checka in alla ändrade filer"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
 msgid "add specified files to index for commit"
 msgstr "lägg till angivna filer till indexet för incheckning"
 
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
 msgid "interactively add files"
 msgstr "lägg till filer interaktivt"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
 msgid "interactively add changes"
 msgstr "lägg till ändringar interaktivt"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
 msgid "commit only specified files"
 msgstr "checka endast in angivna filer"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
 msgid "bypass pre-commit hook"
 msgstr "förbigå pre-commit-krok"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
 msgid "show what would be committed"
 msgstr "visa vad som skulle checkas in"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
 msgid "amend previous commit"
 msgstr "lägg till föregående incheckning"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
 msgid "bypass post-rewrite hook"
 msgstr "förbigå post-rewrite-krok"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
 msgid "ok to record an empty change"
 msgstr "ok att registrera en tom ändring"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
 msgid "ok to record a change with an empty message"
 msgstr "ok att registrera en ändring med tomt meddelande"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
 msgid "could not parse HEAD commit"
 msgstr "kunde inte tolka HEAD:s incheckning"
 
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Trasig MERGE_HEAD-fil (%s)"
 
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
 msgid "could not read MERGE_MODE"
 msgstr "kunde inte läsa MERGE_MODE"
 
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "kunde inte läsa incheckningsmeddelande: %s"
 
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
 
-#: builtin/commit.c:1740
+#: builtin/commit.c:1760
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
 
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -5700,7 +5990,7 @@ msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"
 msgid "unable to parse default color value"
 msgstr "kan inte tolka standardfärgvärde"
 
-#: builtin/config.c:469
+#: builtin/config.c:472
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -5715,7 +6005,7 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:614
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "kan inte skapa konfigurationsfilen \"%s\""
@@ -5751,7 +6041,7 @@ msgstr "den annoterade taggen %s har inget inbäddat namn"
 msgid "tag '%s' is really '%s' here"
 msgstr "taggen \"%s\" är i verkligheten \"%s\" här"
 
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Objektnamnet är inte giltigt: %s"
@@ -5844,7 +6134,7 @@ msgstr "överväg de <n> nyaste taggarna (standard: 10)"
 msgid "only consider tags matching <pattern>"
 msgstr "överväg endast taggar som motsvarar <mönster>"
 
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
 msgid "show abbreviated commit object as fallback"
 msgstr "visa förkortade incheckningsobjekt som standard"
 
@@ -5878,21 +6168,21 @@ msgstr "\"%s\": inte en normal fil eller symbolisk länk"
 msgid "invalid option: %s"
 msgstr "ogiltig flagga: %s"
 
-#: builtin/diff.c:358
+#: builtin/diff.c:360
 msgid "Not a git repository"
 msgstr "Inte ett git-arkiv"
 
-#: builtin/diff.c:401
+#: builtin/diff.c:403
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objektet \"%s\" som angavs är felaktigt."
 
-#: builtin/diff.c:410
+#: builtin/diff.c:412
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "mer än två blobbar angavs: \"%s\""
 
-#: builtin/diff.c:417
+#: builtin/diff.c:419
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "ej hanterat objekt \"%s\" angavs."
@@ -5965,19 +6255,19 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<flaggor>]"
 
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
 msgid "fetch from all remotes"
 msgstr "hämta från alla fjärrar"
 
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"
 
-#: builtin/fetch.c:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
 msgid "path to upload pack on remote end"
 msgstr "sökväg till upload pack på fjärren"
 
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
 msgid "force overwrite of local branch"
 msgstr "tvinga överskrivning av lokal gren"
 
@@ -5985,7 +6275,7 @@ msgstr "tvinga överskrivning av lokal gren"
 msgid "fetch from multiple remotes"
 msgstr "hämta från flera fjärrar"
 
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
 msgid "fetch all tags and associated objects"
 msgstr "hämta alla taggar och associerade objekt"
 
@@ -5997,19 +6287,19 @@ msgstr "hämta inte alla taggar (--no-tags)"
 msgid "number of submodules fetched in parallel"
 msgstr "antal undermoduler som hämtas parallellt"
 
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "rensa fjärrspårande grenar ej längre på fjärren"
 
-#: builtin/fetch.c:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
 msgid "control recursive fetching of submodules"
 msgstr "styr rekursiv hämtning av undermoduler"
 
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
 msgid "keep downloaded pack"
 msgstr "behåll hämtade paket"
 
@@ -6017,15 +6307,15 @@ msgstr "behåll hämtade paket"
 msgid "allow updating of HEAD ref"
 msgstr "tillåt uppdatering av HEAD-referens"
 
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
 msgid "deepen history of shallow clone"
 msgstr "fördjupa historik för grund klon"
 
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
 msgid "convert to a complete repository"
 msgstr "konvertera till komplett arkiv"
 
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
 msgid "dir"
 msgstr "kat"
 
@@ -6037,15 +6327,15 @@ msgstr "lägg till i början av undermodulens sökvägsutdata"
 msgid "default mode for recursion"
 msgstr "standardläge för rekursion"
 
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
 msgid "accept refs that update .git/shallow"
 msgstr "tar emot referenser som uppdaterar .git/shallow"
 
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
 msgid "refmap"
 msgstr "referenskarta"
 
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
 msgid "specify fetch refmap"
 msgstr "ange referenskarta för \"fetch\""
 
@@ -6103,11 +6393,6 @@ msgstr "tvingad uppdatering"
 msgid "(non-fast-forward)"
 msgstr "(ej snabbspolad)"
 
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "kan inte öppna %s: %s\n"
-
 #: builtin/fetch.c:619
 #, c-format
 msgid "%s did not send all necessary objects\n"
@@ -6309,57 +6594,57 @@ msgstr "Kontrollerar konnektivitet"
 msgid "Checking object directories"
 msgstr "Kontrollerar objektkataloger"
 
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<flaggor>] [<objekt>...]"
 
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
 msgid "show unreachable objects"
 msgstr "visa onåbara objekt"
 
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
 msgid "show dangling objects"
 msgstr "visa dinglande objekt"
 
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
 msgid "report tags"
 msgstr "rapportera taggar"
 
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
 msgid "report root nodes"
 msgstr "rapportera rotnoder"
 
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
 msgid "make index objects head nodes"
 msgstr "gör indexojekt till huvudnoder"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
 msgid "make reflogs head nodes (default)"
 msgstr "gör refloggar till huvudnoder (standard)"
 
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
 msgid "also consider packs and alternate objects"
 msgstr "ta även hänsyn till paket och alternativa objekt"
 
 # Vague original, not networking-related, but rather related to the actual
 # objects in the database.
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
 msgid "check only connectivity"
 msgstr "kontrollera endast konnektivitet"
 
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
 msgid "enable more strict checking"
 msgstr "aktivera striktare kontroll"
 
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
 msgid "write dangling objects in .git/lost-found"
 msgstr "skriv dinglande objekt i .git/lost-found"
 
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
 msgid "show progress"
 msgstr "visa förlopp"
 
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
 msgid "Checking objects"
 msgstr "Kontrollerar objekt"
 
@@ -6462,214 +6747,214 @@ msgstr "kunde inte läsa träd (%s)"
 msgid "unable to grep from object of type %s"
 msgstr "Kunde inte \"grep\" från objekt av typen %s"
 
-#: builtin/grep.c:558
+#: builtin/grep.c:560
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "flaggan \"%c\" antar ett numeriskt värde"
 
-#: builtin/grep.c:575
+#: builtin/grep.c:577
 #, c-format
 msgid "cannot open '%s'"
 msgstr "kan inte öppna \"%s\""
 
-#: builtin/grep.c:644
+#: builtin/grep.c:646
 msgid "search in index instead of in the work tree"
 msgstr "sök i indexet istället för i arbetskatalogen"
 
-#: builtin/grep.c:646
+#: builtin/grep.c:648
 msgid "find in contents not managed by git"
 msgstr "sök i innehåll som inte hanteras av git"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:650
 msgid "search in both tracked and untracked files"
 msgstr "sök i både spårade och ospårade filer"
 
-#: builtin/grep.c:650
+#: builtin/grep.c:652
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorera filer angivna i \".gitignore\""
 
-#: builtin/grep.c:653
+#: builtin/grep.c:655
 msgid "show non-matching lines"
 msgstr "visa rader som inte träffas"
 
-#: builtin/grep.c:655
+#: builtin/grep.c:657
 msgid "case insensitive matching"
 msgstr "skiftlägesokänslig sökning"
 
-#: builtin/grep.c:657
+#: builtin/grep.c:659
 msgid "match patterns only at word boundaries"
 msgstr "matcha endast mönster vid ordgränser"
 
-#: builtin/grep.c:659
+#: builtin/grep.c:661
 msgid "process binary files as text"
 msgstr "hantera binärfiler som text"
 
-#: builtin/grep.c:661
+#: builtin/grep.c:663
 msgid "don't match patterns in binary files"
 msgstr "träffa inte mönster i binärfiler"
 
-#: builtin/grep.c:664
+#: builtin/grep.c:666
 msgid "process binary files with textconv filters"
 msgstr "hantera binärfiler med textconv-filter"
 
-#: builtin/grep.c:666
+#: builtin/grep.c:668
 msgid "descend at most <depth> levels"
 msgstr "gå som mest ned <djup> nivåer"
 
-#: builtin/grep.c:670
+#: builtin/grep.c:672
 msgid "use extended POSIX regular expressions"
 msgstr "använd utökade POSIX-reguljära uttryck"
 
-#: builtin/grep.c:673
+#: builtin/grep.c:675
 msgid "use basic POSIX regular expressions (default)"
 msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
 
-#: builtin/grep.c:676
+#: builtin/grep.c:678
 msgid "interpret patterns as fixed strings"
 msgstr "tolka mönster som fixerade strängar"
 
-#: builtin/grep.c:679
+#: builtin/grep.c:681
 msgid "use Perl-compatible regular expressions"
 msgstr "använd Perlkompatibla reguljära uttryck"
 
-#: builtin/grep.c:682
+#: builtin/grep.c:684
 msgid "show line numbers"
 msgstr "visa radnummer"
 
-#: builtin/grep.c:683
+#: builtin/grep.c:685
 msgid "don't show filenames"
 msgstr "visa inte filnamn"
 
-#: builtin/grep.c:684
+#: builtin/grep.c:686
 msgid "show filenames"
 msgstr "visa filnamn"
 
-#: builtin/grep.c:686
+#: builtin/grep.c:688
 msgid "show filenames relative to top directory"
 msgstr "visa filnamn relativa till toppkatalogen"
 
-#: builtin/grep.c:688
+#: builtin/grep.c:690
 msgid "show only filenames instead of matching lines"
 msgstr "visa endast filnamn istället för träffade rader"
 
-#: builtin/grep.c:690
+#: builtin/grep.c:692
 msgid "synonym for --files-with-matches"
 msgstr "synonym för --files-with-matches"
 
-#: builtin/grep.c:693
+#: builtin/grep.c:695
 msgid "show only the names of files without match"
 msgstr "visa endast namn på filer utan träffar"
 
-#: builtin/grep.c:695
+#: builtin/grep.c:697
 msgid "print NUL after filenames"
 msgstr "skriv NUL efter filnamn"
 
-#: builtin/grep.c:697
+#: builtin/grep.c:699
 msgid "show the number of matches instead of matching lines"
 msgstr "visa antal träffar istället för träffade rader"
 
-#: builtin/grep.c:698
+#: builtin/grep.c:700
 msgid "highlight matches"
 msgstr "ljusmarkera träffar"
 
-#: builtin/grep.c:700
+#: builtin/grep.c:702
 msgid "print empty line between matches from different files"
 msgstr "skriv tomma rader mellan träffar från olika filer"
 
-#: builtin/grep.c:702
+#: builtin/grep.c:704
 msgid "show filename only once above matches from same file"
 msgstr "visa filnamn endast en gång ovanför träffar från samma fil"
 
-#: builtin/grep.c:705
+#: builtin/grep.c:707
 msgid "show <n> context lines before and after matches"
 msgstr "visa <n> rader sammanhang före och efter träffar"
 
-#: builtin/grep.c:708
+#: builtin/grep.c:710
 msgid "show <n> context lines before matches"
 msgstr "visa <n> rader sammanhang före träffar"
 
-#: builtin/grep.c:710
+#: builtin/grep.c:712
 msgid "show <n> context lines after matches"
 msgstr "visa <n> rader sammanhang efter träffar"
 
-#: builtin/grep.c:712
+#: builtin/grep.c:714
 msgid "use <n> worker threads"
 msgstr "använd <n> jobbtrådar"
 
-#: builtin/grep.c:713
+#: builtin/grep.c:715
 msgid "shortcut for -C NUM"
 msgstr "genväg för -C NUM"
 
-#: builtin/grep.c:716
+#: builtin/grep.c:718
 msgid "show a line with the function name before matches"
 msgstr "visa en rad med funktionsnamnet före träffen"
 
-#: builtin/grep.c:718
+#: builtin/grep.c:720
 msgid "show the surrounding function"
 msgstr "visa den omkringliggande funktionen"
 
-#: builtin/grep.c:721
+#: builtin/grep.c:723
 msgid "read patterns from file"
 msgstr "läs mönster från fil"
 
-#: builtin/grep.c:723
+#: builtin/grep.c:725
 msgid "match <pattern>"
 msgstr "träffa <mönster>"
 
-#: builtin/grep.c:725
+#: builtin/grep.c:727
 msgid "combine patterns specified with -e"
 msgstr "kombinera mönster som anges med -e"
 
-#: builtin/grep.c:737
+#: builtin/grep.c:739
 msgid "indicate hit with exit status without output"
 msgstr "ange träff med slutstatuskod utan utdata"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:741
 msgid "show only matches from files that match all patterns"
 msgstr "visa endast träffar från filer som träffar alla mönster"
 
-#: builtin/grep.c:741
+#: builtin/grep.c:743
 msgid "show parse tree for grep expression"
 msgstr "visa analysträd för grep-uttryck"
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "pager"
 msgstr "bläddrare"
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "show matching files in the pager"
 msgstr "visa träffade filer i filbläddraren"
 
-#: builtin/grep.c:748
+#: builtin/grep.c:750
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
 
-#: builtin/grep.c:811
+#: builtin/grep.c:813
 msgid "no pattern given."
 msgstr "inget mönster angavs."
 
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "felaktigt antal trådar angivet (%d)"
 
-#: builtin/grep.c:873
+#: builtin/grep.c:875
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:901
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached och --untracked kan inte användas med --no-index."
 
-#: builtin/grep.c:904
+#: builtin/grep.c:906
 msgid "--no-index or --untracked cannot be used with revs."
 msgstr "--no-index och --untracked kan inte användas med revisioner."
 
-#: builtin/grep.c:907
+#: builtin/grep.c:909
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."
 
-#: builtin/grep.c:915
+#: builtin/grep.c:917
 msgid "both --cached and trees are given."
 msgstr "både --cached och träd angavs."
 
@@ -6759,8 +7044,8 @@ msgstr "emacsclient version \"%d\" för gammal (< 22)."
 
 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
 #, c-format
-msgid "failed to exec '%s': %s"
-msgstr "exec misslyckades för \"%s\": %s"
+msgid "failed to exec '%s'"
+msgstr "exec misslyckades för \"%s\""
 
 #: builtin/help.c:205
 #, c-format
@@ -7018,107 +7303,109 @@ msgstr "förvirrad bortom vanvett"
 
 #: builtin/index-pack.c:1253
 #, c-format
-msgid "completed with %d local objects"
-msgstr "slutfördes med %d lokala objekt"
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "slutfördes med %d lokalt objekt"
+msgstr[1] "slutfördes med %d lokala objekt"
 
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1265
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Oväntad svanschecksumma för %s (trasig disk?)"
 
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "paketet har %d oanalyserat delta"
 msgstr[1] "paketet har %d oanalyserade delta"
 
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1293
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
 
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "lokalt objekt %s är trasigt"
 
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
 msgid "error while closing pack file"
 msgstr "fel vid stängning av paketfil"
 
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
 
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
 msgid "cannot store pack file"
 msgstr "kan inte spara paketfil"
 
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
 msgid "cannot store index file"
 msgstr "kan inte spara indexfil"
 
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "felaktig pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "trådstöd saknas, ignorerar %s"
 
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Kan inte öppna befintlig paketfil \"%s\""
 
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""
 
-#: builtin/index-pack.c:1587
+#: builtin/index-pack.c:1589
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "icke-delta: %d objekt"
 msgstr[1] "icke-delta: %d objekt"
 
-#: builtin/index-pack.c:1594
+#: builtin/index-pack.c:1596
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "kedjelängd = %d: %lu objekt"
 msgstr[1] "kedjelängd = %d: %lu objekt"
 
-#: builtin/index-pack.c:1624
+#: builtin/index-pack.c:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
+
+#: builtin/index-pack.c:1638
 msgid "Cannot come back to cwd"
 msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
 
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
 #, c-format
 msgid "bad %s"
 msgstr "felaktig %s"
 
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin kan inte användas med --stdin"
 
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
-
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1731
 msgid "--verify with no packfile name given"
 msgstr "--verify angavs utan paketfilnamn"
 
@@ -7157,27 +7444,27 @@ msgstr "kan inte kopiera \"%s\" till \"%s\""
 msgid "ignoring template %s"
 msgstr "ignorerar mallen %s"
 
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
 #, c-format
 msgid "templates not found %s"
 msgstr "mallarna hittades inte %s"
 
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
 #, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\""
+msgid "not copying templates from '%s': %s"
+msgstr "kopierade inte mallar från \"%s\": %s"
 
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
 #, c-format
 msgid "%s already exists"
 msgstr "%s finns redan"
 
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "kan inte hantera filtyp %d"
 
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "kan inte flytta %s till %s"
@@ -7185,24 +7472,24 @@ msgstr "kan inte flytta %s till %s"
 #. TRANSLATORS: The first '%s' is either "Reinitialized
 #. existing" or "Initialized empty", the second " shared" or
 #. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
 #, c-format
 msgid "%s%s Git repository in %s%s\n"
 msgstr "%s%s Git-arkiv i %s%s\n"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Reinitialized existing"
 msgstr "Ominitierade befintligt"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Initialized empty"
 msgstr "Initierade tomt"
 
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
 msgid " shared"
 msgstr " delat"
 
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -7210,25 +7497,25 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
 "shared[=<behörigheter>]] [<katalog>]"
 
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
 msgid "permissions"
 msgstr "behörigheter"
 
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "ange att git-arkivet skall delas bland flera användare"
 
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "kan inte skapa katalogen (mkdir) %s"
 
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "kan inte byta katalog (chdir) till %s"
 
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7237,7 +7524,7 @@ msgstr ""
 "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"
 "dir=<katalog>)"
 
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Kan inte komma åt arbetskatalogen \"%s\""
@@ -7283,273 +7570,320 @@ msgstr "git show [<flaggor>] <objekt>..."
 msgid "invalid --decorate option: %s"
 msgstr "ogiltig flagga för --decorate: %s"
 
-#: builtin/log.c:131
+#: builtin/log.c:137
 msgid "suppress diff output"
 msgstr "undertryck diff-utdata"
 
-#: builtin/log.c:132
+#: builtin/log.c:138
 msgid "show source"
 msgstr "visa källkod"
 
-#: builtin/log.c:133
+#: builtin/log.c:139
 msgid "Use mail map file"
 msgstr "Använd e-postmappningsfil"
 
-#: builtin/log.c:134
+#: builtin/log.c:140
 msgid "decorate options"
 msgstr "dekoreringsflaggor"
 
-#: builtin/log.c:137
+#: builtin/log.c:143
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Behandla radintervallet n,m i filen, med början på 1"
 
-#: builtin/log.c:233
+#: builtin/log.c:239
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Slututdata: %d %s\n"
 
-#: builtin/log.c:465
+#: builtin/log.c:471
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: felaktig fil"
 
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
 #, c-format
 msgid "Could not read object %s"
 msgstr "Kunde inte läsa objektet %s"
 
-#: builtin/log.c:596
+#: builtin/log.c:602
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Okänd typ: %d"
 
-#: builtin/log.c:715
+#: builtin/log.c:722
 msgid "format.headers without value"
 msgstr "format.headers utan värde"
 
-#: builtin/log.c:801
+#: builtin/log.c:812
 msgid "name of output directory is too long"
 msgstr "namnet på utdatakatalogen är för långt"
 
-#: builtin/log.c:816
+#: builtin/log.c:827
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Kan inte öppna patchfilen %s"
 
-#: builtin/log.c:830
+#: builtin/log.c:841
 msgid "Need exactly one range."
 msgstr "Behöver precis ett intervall."
 
-#: builtin/log.c:840
+#: builtin/log.c:851
 msgid "Not a range."
 msgstr "Inte ett intervall."
 
-#: builtin/log.c:946
+#: builtin/log.c:957
 msgid "Cover letter needs email format"
 msgstr "Omslagsbrevet behöver e-postformat"
 
-#: builtin/log.c:1025
+#: builtin/log.c:1036
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "tokigt in-reply-to: %s"
 
-#: builtin/log.c:1053
+#: builtin/log.c:1064
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
 
-#: builtin/log.c:1098
+#: builtin/log.c:1109
 msgid "Two output directories?"
 msgstr "Två utdatakataloger?"
 
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "Okänd incheckning %s"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr "Kunde inte hitta exakt sammanslagningsbas."
+
+#: builtin/log.c:1235
+msgid ""
+"Failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually."
+msgstr ""
+"Kunde inte hämta uppström, om du vill lagra basincheckningen automatiskt,\n"
+"använd git branch --set-upstream-to för att spåra en fjärrgren.\n"
+"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> "
+"manuellt."
+
+#: builtin/log.c:1255
+msgid "Failed to find exact merge base"
+msgstr "Kunde inte hitta exakt sammanslagningsbas"
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr "basincheckningen bör vara förfader till revisionslistan"
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr "basincheckningen bör inte vara i revisionslistan"
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr "kan inte hämta patch-id"
+
+#: builtin/log.c:1377
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "använd [PATCH n/m] även för en ensam patch"
 
-#: builtin/log.c:1217
+#: builtin/log.c:1380
 msgid "use [PATCH] even with multiple patches"
 msgstr "använd [PATCH] även för flera patchar"
 
-#: builtin/log.c:1221
+#: builtin/log.c:1384
 msgid "print patches to standard out"
 msgstr "skriv patcharna på standard ut"
 
-#: builtin/log.c:1223
+#: builtin/log.c:1386
 msgid "generate a cover letter"
 msgstr "generera ett följebrev"
 
-#: builtin/log.c:1225
+#: builtin/log.c:1388
 msgid "use simple number sequence for output file names"
 msgstr "använd enkel nummersekvens för utdatafilnamn"
 
-#: builtin/log.c:1226
+#: builtin/log.c:1389
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1227
+#: builtin/log.c:1390
 msgid "use <sfx> instead of '.patch'"
 msgstr "använd <sfx> istället för \".patch\""
 
-#: builtin/log.c:1229
+#: builtin/log.c:1392
 msgid "start numbering patches at <n> instead of 1"
 msgstr "börja numrera patchar på <n> istället för 1"
 
-#: builtin/log.c:1231
+#: builtin/log.c:1394
 msgid "mark the series as Nth re-roll"
 msgstr "markera serien som N:te försök"
 
-#: builtin/log.c:1233
+#: builtin/log.c:1396
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Använd [<prefix>] istället för [PATCH]"
 
-#: builtin/log.c:1236
+#: builtin/log.c:1399
 msgid "store resulting files in <dir>"
 msgstr "spara filerna i <katalog>"
 
-#: builtin/log.c:1239
+#: builtin/log.c:1402
 msgid "don't strip/add [PATCH]"
 msgstr "ta inte bort eller lägg till [PATCH]"
 
-#: builtin/log.c:1242
+#: builtin/log.c:1405
 msgid "don't output binary diffs"
 msgstr "skriv inte binära diffar"
 
-#: builtin/log.c:1244
+#: builtin/log.c:1407
 msgid "output all-zero hash in From header"
 msgstr "använd hashvärde med nollor i From-huvud"
 
-#: builtin/log.c:1246
+#: builtin/log.c:1409
 msgid "don't include a patch matching a commit upstream"
 msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
 
-#: builtin/log.c:1248
+#: builtin/log.c:1411
 msgid "show patch format instead of default (patch + stat)"
 msgstr "visa patchformat istället för standard (patch + stat)"
 
-#: builtin/log.c:1250
+#: builtin/log.c:1413
 msgid "Messaging"
 msgstr "E-post"
 
-#: builtin/log.c:1251
+#: builtin/log.c:1414
 msgid "header"
 msgstr "huvud"
 
-#: builtin/log.c:1252
+#: builtin/log.c:1415
 msgid "add email header"
 msgstr "lägg till e-posthuvud"
 
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
 msgid "email"
 msgstr "epost"
 
-#: builtin/log.c:1253
+#: builtin/log.c:1416
 msgid "add To: header"
 msgstr "Lägg till mottagarhuvud (\"To:\")"
 
-#: builtin/log.c:1255
+#: builtin/log.c:1418
 msgid "add Cc: header"
 msgstr "Lägg till kopiehuvud (\"Cc:\")"
 
-#: builtin/log.c:1257
+#: builtin/log.c:1420
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1258
+#: builtin/log.c:1421
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"
 
-#: builtin/log.c:1260
+#: builtin/log.c:1423
 msgid "message-id"
 msgstr "meddelande-id"
 
-#: builtin/log.c:1261
+#: builtin/log.c:1424
 msgid "make first mail a reply to <message-id>"
 msgstr "Gör det första brevet ett svar till <meddelande-id>"
 
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
 msgid "boundary"
 msgstr "gräns"
 
-#: builtin/log.c:1263
+#: builtin/log.c:1426
 msgid "attach the patch"
 msgstr "bifoga patchen"
 
-#: builtin/log.c:1266
+#: builtin/log.c:1429
 msgid "inline the patch"
 msgstr "gör patchen ett inline-objekt"
 
-#: builtin/log.c:1270
+#: builtin/log.c:1433
 msgid "enable message threading, styles: shallow, deep"
 msgstr "aktivera brevtrådning, typer: shallow, deep"
 
-#: builtin/log.c:1272
+#: builtin/log.c:1435
 msgid "signature"
 msgstr "signatur"
 
-#: builtin/log.c:1273
+#: builtin/log.c:1436
 msgid "add a signature"
 msgstr "lägg till signatur"
 
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "basincheckning"
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr "lägg till förhandskrävd trädinfo i patchserien"
+
+#: builtin/log.c:1440
 msgid "add a signature from a file"
 msgstr "lägg till signatur från fil"
 
-#: builtin/log.c:1276
+#: builtin/log.c:1441
 msgid "don't print the patch filenames"
 msgstr "visa inte filnamn för patchar"
 
-#: builtin/log.c:1365
+#: builtin/log.c:1531
 msgid "-n and -k are mutually exclusive."
 msgstr "-n och -k kan inte användas samtidigt."
 
-#: builtin/log.c:1367
+#: builtin/log.c:1533
 msgid "--subject-prefix and -k are mutually exclusive."
 msgstr "--subject-prefix och -k kan inte användas samtidigt."
 
-#: builtin/log.c:1375
+#: builtin/log.c:1541
 msgid "--name-only does not make sense"
 msgstr "kan inte använda --name-only"
 
-#: builtin/log.c:1377
+#: builtin/log.c:1543
 msgid "--name-status does not make sense"
 msgstr "kan inte använda --name-status"
 
-#: builtin/log.c:1379
+#: builtin/log.c:1545
 msgid "--check does not make sense"
 msgstr "kan inte använda --check"
 
-#: builtin/log.c:1407
+#: builtin/log.c:1573
 msgid "standard output, or directory, which one?"
 msgstr "standard ut, eller katalog, vilken skall det vara?"
 
-#: builtin/log.c:1409
+#: builtin/log.c:1575
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Kunde inte skapa katalogen \"%s\""
 
-#: builtin/log.c:1506
+#: builtin/log.c:1672
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "kunde inte läsa signaturfil \"%s\""
 
-#: builtin/log.c:1569
+#: builtin/log.c:1743
 msgid "Failed to create output files"
 msgstr "Misslyckades skapa utdatafiler"
 
-#: builtin/log.c:1617
+#: builtin/log.c:1792
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
 
-#: builtin/log.c:1671
+#: builtin/log.c:1846
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
 
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr "Okänd incheckning %s"
-
 #: builtin/ls-files.c:378
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<flaggor>] [<fil>...]"
@@ -7740,173 +8074,177 @@ msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>"
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:100
+#: builtin/merge.c:101
 msgid "switch `m' requires a value"
 msgstr "flaggan \"m\" behöver ett värde"
 
-#: builtin/merge.c:137
+#: builtin/merge.c:138
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
 
-#: builtin/merge.c:138
+#: builtin/merge.c:139
 #, c-format
 msgid "Available strategies are:"
 msgstr "Tillgängliga strategier är:"
 
-#: builtin/merge.c:143
+#: builtin/merge.c:144
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Tillgängliga skräddarsydda strategier är:"
 
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
 msgid "do not show a diffstat at the end of the merge"
 msgstr "visa inte en diffstat när sammanslagningen är färdig"
 
-#: builtin/merge.c:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
 msgid "show a diffstat at the end of the merge"
 msgstr "visa en diffstat när sammanslagningen är färdig"
 
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
 msgid "(synonym to --stat)"
 msgstr "(synonym till --stat)"
 
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"
 
-#: builtin/merge.c:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
 msgid "create a single commit instead of doing a merge"
 msgstr "skapa en ensam incheckning istället för en sammanslagning"
 
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
 
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
 msgid "edit message before committing"
 msgstr "redigera meddelande innan incheckning"
 
-#: builtin/merge.c:207
+#: builtin/merge.c:208
 msgid "allow fast-forward (default)"
 msgstr "tillåt snabbspolning (standard)"
 
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
 msgid "abort if fast-forward is not possible"
 msgstr "avbryt om snabbspolning inte är möjlig"
 
-#: builtin/merge.c:213
+#: builtin/merge.c:214
 msgid "Verify that the named commit has a valid GPG signature"
 msgstr "Bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
 
-#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
 #: builtin/revert.c:89
 msgid "strategy"
 msgstr "strategi"
 
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "merge strategy to use"
 msgstr "sammanslagningsstrategi att använda"
 
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
 msgid "option=value"
 msgstr "alternativ=värde"
 
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
 msgid "option for selected merge strategy"
 msgstr "alternativ för vald sammanslagningsstrategi"
 
-#: builtin/merge.c:219
+#: builtin/merge.c:220
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
 
-#: builtin/merge.c:223
+#: builtin/merge.c:224
 msgid "abort the current in-progress merge"
 msgstr "avbryt den pågående sammanslagningen"
 
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "tillåt sammanslagning av orelaterade historier"
+
+#: builtin/merge.c:254
 msgid "could not run stash."
 msgstr "kunde köra stash."
 
-#: builtin/merge.c:256
+#: builtin/merge.c:259
 msgid "stash failed"
 msgstr "stash misslyckades"
 
-#: builtin/merge.c:261
+#: builtin/merge.c:264
 #, c-format
 msgid "not a valid object: %s"
 msgstr "inte ett giltigt objekt: %s"
 
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
 msgid "read-tree failed"
 msgstr "read-tree misslyckades"
 
-#: builtin/merge.c:327
+#: builtin/merge.c:330
 msgid " (nothing to squash)"
 msgstr " (inget att platta till)"
 
-#: builtin/merge.c:340
+#: builtin/merge.c:343
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
 
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
 #, c-format
 msgid "Could not write to '%s'"
 msgstr "Kunde inte skriva till \"%s\""
 
-#: builtin/merge.c:372
+#: builtin/merge.c:375
 msgid "Writing SQUASH_MSG"
 msgstr "Skriver SQUASH_MSG"
 
-#: builtin/merge.c:374
+#: builtin/merge.c:377
 msgid "Finishing SQUASH_MSG"
 msgstr "Avslutar SQUASH_MSG"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:400
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
 
-#: builtin/merge.c:448
+#: builtin/merge.c:451
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "\"%s\" verkar inte peka på en incheckning"
 
-#: builtin/merge.c:538
+#: builtin/merge.c:541
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
 
-#: builtin/merge.c:657
+#: builtin/merge.c:660
 msgid "Not handling anything other than two heads merge."
 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
 
-#: builtin/merge.c:671
+#: builtin/merge.c:674
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Felaktig flagga för merge-recursive: -X%s"
 
-#: builtin/merge.c:684
+#: builtin/merge.c:687
 #, c-format
 msgid "unable to write %s"
 msgstr "kunde inte skriva %s"
 
-#: builtin/merge.c:773
+#: builtin/merge.c:776
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Kunde inte läsa från \"%s\""
 
-#: builtin/merge.c:782
+#: builtin/merge.c:785
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "
 "den.\n"
 
-#: builtin/merge.c:788
+#: builtin/merge.c:791
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -7922,53 +8260,53 @@ msgstr ""
 "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
 "avbryter incheckningen.\n"
 
-#: builtin/merge.c:812
+#: builtin/merge.c:815
 msgid "Empty commit message."
 msgstr "Tomt incheckningsmeddelande."
 
-#: builtin/merge.c:824
+#: builtin/merge.c:835
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Underbart.\n"
 
-#: builtin/merge.c:879
+#: builtin/merge.c:890
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
 
-#: builtin/merge.c:895
+#: builtin/merge.c:906
 #, c-format
 msgid "'%s' is not a commit"
 msgstr "\"%s\" är inte en incheckning"
 
-#: builtin/merge.c:936
+#: builtin/merge.c:947
 msgid "No current branch."
 msgstr "Inte på någon gren."
 
-#: builtin/merge.c:938
+#: builtin/merge.c:949
 msgid "No remote for the current branch."
 msgstr "Ingen fjärr för aktuell gren."
 
-#: builtin/merge.c:940
+#: builtin/merge.c:951
 msgid "No default upstream defined for the current branch."
 msgstr "Ingen standarduppström angiven för aktuell gren."
 
-#: builtin/merge.c:945
+#: builtin/merge.c:956
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Ingen fjärrspårande gren för %s från %s"
 
-#: builtin/merge.c:1080
+#: builtin/merge.c:1091
 #, c-format
 msgid "could not close '%s'"
 msgstr "kunde inte stänga \"%s\""
 
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
 
-#: builtin/merge.c:1223
+#: builtin/merge.c:1235
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -7976,7 +8314,7 @@ msgstr ""
 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
 "Checka in dina ändringar innan du slår ihop."
 
-#: builtin/merge.c:1230
+#: builtin/merge.c:1242
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -7984,102 +8322,106 @@ msgstr ""
 "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
 "Checka in dina ändringar innan du slår ihop."
 
-#: builtin/merge.c:1233
+#: builtin/merge.c:1245
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."
 
-#: builtin/merge.c:1242
+#: builtin/merge.c:1254
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Du kan inte kombinera --squash med --no-ff."
 
-#: builtin/merge.c:1250
+#: builtin/merge.c:1262
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
 
-#: builtin/merge.c:1267
+#: builtin/merge.c:1279
 msgid "Squash commit into empty head not supported yet"
 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
 
-#: builtin/merge.c:1269
+#: builtin/merge.c:1281
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
 
-#: builtin/merge.c:1275
+#: builtin/merge.c:1286
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - inte något vi kan slå ihop"
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."
 
-#: builtin/merge.c:1332
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."
 
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."
 
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Incheckning %s har inte någon GPG-signatur."
 
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
 
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr "vägrar slå samman orelaterad historik"
+
+#: builtin/merge.c:1439
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Uppdaterar %s..%s\n"
 
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
 
-#: builtin/merge.c:1468
+#: builtin/merge.c:1483
 #, c-format
 msgid "Nope.\n"
 msgstr "Nej.\n"
 
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
 msgid "Not possible to fast-forward, aborting."
 msgstr "Kan inte snabbspola, avbryter."
 
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Återspolar trädet till orört...\n"
 
-#: builtin/merge.c:1527
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Försöker sammanslagningsstrategin %s...\n"
 
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
 
-#: builtin/merge.c:1595
+#: builtin/merge.c:1610
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Sammanslagning med strategin %s misslyckades.\n"
 
-#: builtin/merge.c:1604
+#: builtin/merge.c:1619
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Använder %s för att förbereda lösning för hand.\n"
 
-#: builtin/merge.c:1616
+#: builtin/merge.c:1631
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -8190,7 +8532,7 @@ msgstr "git mv [<flaggor>] <källa>... <mål>"
 msgid "Directory %s is in index and no submodule?"
 msgstr "Katalogen %s är i indexet och inte en undermodul?"
 
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
@@ -8269,48 +8611,48 @@ msgstr "%s, källa=%s, mål=%s"
 msgid "Renaming %s to %s\n"
 msgstr "Byter namn på %s till %s\n"
 
-#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "misslyckades byta namn på \"%s\""
 
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<flaggor>] <incheckning>..."
 
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<flaggor>] --all"
 
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<flaggor>] --stdin"
 
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
 msgid "print only names (no SHA-1)"
 msgstr "skriv endast namn (ingen SHA-1)"
 
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
 msgid "only use tags to name the commits"
 msgstr "använd endast taggar för att namnge incheckningar"
 
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
 msgid "only use refs matching <pattern>"
 msgstr "använd endast referenser som motsvarar <mönster>"
 
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
 msgid "list all commits reachable from all refs"
 msgstr "lista alla incheckningar som kan nås alla referenser"
 
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
 msgid "read from stdin"
 msgstr "läs från standard in"
 
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
 msgid "allow to print `undefined` names (default)"
 msgstr "tillåt att skriva \"odefinierade\" namn (standard)"
 
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
 msgid "dereference tags in the input (internal use)"
 msgstr "avreferera taggar i indata (används internt)"
 
@@ -8458,24 +8800,16 @@ msgstr "kunde inte skriva anteckningsobjekt"
 msgid "The note contents have been left in %s"
 msgstr "Anteckningens innehåll har lämnats kvar i %s"
 
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
 #, c-format
 msgid "cannot read '%s'"
 msgstr "kunde inte läsa \"%s\""
 
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "kunde inte öppna eller läsa \"%s\""
 
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
-
 #: builtin/notes.c:256
 #, c-format
 msgid "Failed to read object '%s'."
@@ -8488,7 +8822,7 @@ msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"."
 
 #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
 msgid "too many parameters"
 msgstr "för många parametrar"
 
@@ -8535,7 +8869,7 @@ msgstr ""
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Skriver över befintliga anteckningar för objektet %s\n"
 
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Tar bort anteckning för objektet %s\n"
@@ -8575,15 +8909,15 @@ msgstr ""
 "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"
 "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"
 
-#: builtin/notes.c:767
+#: builtin/notes.c:768
 msgid "General options"
 msgstr "Allmänna flaggor"
 
-#: builtin/notes.c:769
+#: builtin/notes.c:770
 msgid "Merge options"
 msgstr "Flaggor för sammanslagning"
 
-#: builtin/notes.c:771
+#: builtin/notes.c:772
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -8591,51 +8925,51 @@ msgstr ""
 "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "Committing unmerged notes"
 msgstr "Checkar in ej sammanslagna anteckningar"
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 "färdigställ sammanslagning av anteckningar genom att checka in ej "
 "sammanslagna anteckningar"
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid "Aborting notes merge resolution"
 msgstr "Avbryt lösning av sammanslagning av anteckningar"
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "abort notes merge"
 msgstr "avbryt sammanslagning av anteckningar"
 
-#: builtin/notes.c:856
+#: builtin/notes.c:857
 #, c-format
 msgid "A notes merge into %s is already in-progress at %s"
 msgstr "Sammanslagning av anteckningar till %s är redan igångsatt på %s"
 
-#: builtin/notes.c:883
+#: builtin/notes.c:884
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "Objektet %s har ingen anteckning\n"
 
-#: builtin/notes.c:895
+#: builtin/notes.c:896
 msgid "attempt to remove non-existent note is not an error"
 msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"
 
-#: builtin/notes.c:898
+#: builtin/notes.c:899
 msgid "read object names from the standard input"
 msgstr "läs objektnamn från standard in"
 
-#: builtin/notes.c:979
+#: builtin/notes.c:980
 msgid "notes-ref"
 msgstr "anteckningar-ref"
 
-#: builtin/notes.c:980
+#: builtin/notes.c:981
 msgid "use notes from <notes-ref>"
 msgstr "använd anteckningar från <anteckningsref>"
 
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Okänt underkommando: %s"
@@ -8657,165 +8991,170 @@ msgstr ""
 msgid "deflate error (%d)"
 msgstr "fel i deflate (%d)"
 
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+"inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit"
+
+#: builtin/pack-objects.c:776
 msgid "Writing objects"
 msgstr "Skriver objekt"
 
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"
 
-#: builtin/pack-objects.c:2172
+#: builtin/pack-objects.c:2177
 msgid "Compressing objects"
 msgstr "Komprimerar objekt"
 
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
 #, c-format
 msgid "unsupported index version %s"
 msgstr "indexversionen %s stöds ej"
 
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2567
 #, c-format
 msgid "bad index version '%s'"
 msgstr "felaktig indexversion \"%s\""
 
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
 msgid "do not show progress meter"
 msgstr "visa inte förloppsindikator"
 
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
 msgid "show progress meter"
 msgstr "visa förloppsindikator"
 
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
 msgid "show progress meter during object writing phase"
 msgstr "visa förloppsindikator under objektskrivningsfasen"
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2604
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "som --all-progress när förloppsindikatorn visas"
 
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2605
 msgid "version[,offset]"
 msgstr "version[,offset]"
 
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
 msgid "write the pack index file in the specified idx format version"
 msgstr "skriv paketindexfilen i angiven indexformatversion"
 
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2609
 msgid "maximum size of each output pack file"
 msgstr "maximal storlek på varje utdatapaketfil"
 
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2611
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorera lånade objekt från alternativa objektlager"
 
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2613
 msgid "ignore packed objects"
 msgstr "ignorera packade objekt"
 
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
 msgid "limit pack window by objects"
 msgstr "begränsa paketfönster efter objekt"
 
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2617
 msgid "limit pack window by memory in addition to object limit"
 msgstr "begränsa paketfönster efter minne förutom objektgräns"
 
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2619
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "maximal längd på deltakedja tillåten i slutligt paket"
 
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2621
 msgid "reuse existing deltas"
 msgstr "återanvänd befintliga delta"
 
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
 msgid "reuse existing objects"
 msgstr "återanvänd befintliga objekt"
 
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
 msgid "use OFS_DELTA objects"
 msgstr "använd OFS_DELTA-objekt"
 
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
 msgid "use threads when searching for best delta matches"
 msgstr "använd trådar vid sökning efter bästa deltaträffar"
 
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2629
 msgid "do not create an empty pack output"
 msgstr "försök inte skapa tom paketutdata"
 
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2631
 msgid "read revision arguments from standard input"
 msgstr "läs revisionsargument från standard in"
 
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
 msgid "limit the objects to those that are not yet packed"
 msgstr "begränsa objekt till de som ännu inte packats"
 
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2636
 msgid "include objects reachable from any reference"
 msgstr "inkludera objekt som kan nås från någon referens"
 
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2639
 msgid "include objects referred by reflog entries"
 msgstr "inkludera objekt som refereras från referensloggposter"
 
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2642
 msgid "include objects referred to by the index"
 msgstr "inkludera objekt som refereras från indexet"
 
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2645
 msgid "output pack to stdout"
 msgstr "skriv paket på standard ut"
 
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
 msgid "include tag objects that refer to objects to be packed"
 msgstr "inkludera taggobjekt som refererar objekt som skall packas"
 
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2649
 msgid "keep unreachable objects"
 msgstr "behåll onåbara objekt"
 
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
 msgid "time"
 msgstr "tid"
 
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
 msgid "unpack unreachable objects newer than <time>"
 msgstr "packa upp onåbara objekt nyare än <tid>"
 
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2654
 msgid "create thin packs"
 msgstr "skapa tunna paket"
 
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
 msgid "create packs suitable for shallow fetches"
 msgstr "skapa packfiler lämpade för grunda hämtningar"
 
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2658
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorera paket som har tillhörande .keep-fil"
 
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2660
 msgid "pack compression level"
 msgstr "komprimeringsgrad för paket"
 
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
 msgid "do not hide commits by grafts"
 msgstr "göm inte incheckningar med ympningar (\"grafts\")"
 
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2664
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"
 
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2666
 msgid "write a bitmap index together with the pack index"
 msgstr "använd bitkartindex tillsammans med packindexet"
 
-#: builtin/pack-objects.c:2752
+#: builtin/pack-objects.c:2757
 msgid "Counting objects"
 msgstr "Räknar objekt"
 
@@ -8843,15 +9182,15 @@ msgstr "Tar bort duplicerade objekt"
 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]"
 
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
 msgid "do not remove, show only"
 msgstr "ta inte bort, bara visa"
 
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
 msgid "report pruned objects"
 msgstr "rapportera borttagna objekt"
 
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
 msgid "expire objects older than <time>"
 msgstr "låt tid gå ut för objekt äldre än <tid>"
 
@@ -8863,49 +9202,53 @@ msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
 
-#: builtin/pull.c:117
+#: builtin/pull.c:120
 msgid "Options related to merging"
 msgstr "Alternativ gällande sammanslagning"
 
-#: builtin/pull.c:120
+#: builtin/pull.c:123
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
 
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
 msgid "allow fast-forward"
 msgstr "tillåt snabbspolning"
 
-#: builtin/pull.c:150
+#: builtin/pull.c:153
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
 
-#: builtin/pull.c:164
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "utför automatiskt stash/stash pop före och efter ombasering"
+
+#: builtin/pull.c:172
 msgid "Options related to fetching"
 msgstr "Alternativ gällande hämtningar"
 
-#: builtin/pull.c:186
+#: builtin/pull.c:194
 msgid "number of submodules pulled in parallel"
 msgstr "antal undermoduler som hämtas parallellt"
 
-#: builtin/pull.c:275
+#: builtin/pull.c:283
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Felaktigt värde för pull.ff: %s"
 
-#: builtin/pull.c:359
+#: builtin/pull.c:379
 msgid "Cannot pull with rebase: You have unstaged changes."
 msgstr "Kan inte hämta med ombasering: Du har oköade ändringar."
 
-#: builtin/pull.c:365
+#: builtin/pull.c:385
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "Dessutom innehåller dit index ändringar som inte har checkats in."
 
-#: builtin/pull.c:367
+#: builtin/pull.c:387
 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
 msgstr ""
 "Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar."
 
-#: builtin/pull.c:443
+#: builtin/pull.c:463
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -8913,14 +9256,14 @@ msgstr ""
 "Det finns ingen kandidat för ombasering bland referenserna du precis har "
 "hämtat."
 
-#: builtin/pull.c:445
+#: builtin/pull.c:465
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Det finns ingen kandidat för sammanslagning bland referenserna du precis har "
 "hämtat."
 
-#: builtin/pull.c:446
+#: builtin/pull.c:466
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -8928,7 +9271,7 @@ msgstr ""
 "Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n"
 "motsvarade något i fjärränden."
 
-#: builtin/pull.c:449
+#: builtin/pull.c:469
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -8939,38 +9282,42 @@ msgstr ""
 "gren. Eftersom det inte är den fjärr som är konfigurerad som\n"
 "standard för aktuell gren måste du ange en gren på kommandoraden."
 
-#: builtin/pull.c:454
+#: builtin/pull.c:474 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Du är inte på någon gren för närvarande."
 
-#: builtin/pull.c:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Ange vilken gren du vill ombasera mot."
 
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Ange vilken gren du vill slå samman med."
 
-#: builtin/pull.c:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
 msgid "See git-pull(1) for details."
 msgstr "Se git-pull(1) för detaljer."
 
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<fjärr>"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<gren>"
+
+#: builtin/pull.c:489 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "Det finns ingen spårningsinformation för aktuell gren."
 
-#: builtin/pull.c:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
 msgid ""
-"If you wish to set tracking information for this branch you can do so with:\n"
-"\n"
-"    git branch --set-upstream-to=%s/<branch> %s\n"
-msgstr ""
-"Om du vill ange spårningsinformation för grenen kan du göra det med:\n"
-"\n"
-" git branch --set-upstream-to=%s/<gren> %s\n"
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:"
 
-#: builtin/pull.c:483
+#: builtin/pull.c:503
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -8979,11 +9326,15 @@ msgstr ""
 "Dina inställningar anger sammanslagning med referensen \"%s\"\n"
 "från fjärren, men någon sådan referens togs inte emot."
 
-#: builtin/pull.c:841
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "--[no-]autostash är endast giltig med --rebase."
+
+#: builtin/pull.c:872
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet."
 
-#: builtin/pull.c:870
+#: builtin/pull.c:900
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -8994,7 +9345,7 @@ msgstr ""
 "snabbspolar din arbetskatalog från\n"
 "incheckningen %s."
 
-#: builtin/pull.c:875
+#: builtin/pull.c:905
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -9011,11 +9362,11 @@ msgstr ""
 "$ git reset --hard\n"
 "för att återgå."
 
-#: builtin/pull.c:890
+#: builtin/pull.c:920
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
 
-#: builtin/pull.c:894
+#: builtin/pull.c:924
 msgid "Cannot rebase onto multiple branches."
 msgstr "Kan inte ombasera ovanpå flera grenar."
 
@@ -9376,6 +9727,18 @@ msgstr "hoppa över att applicera filter för gles utcheckning"
 msgid "debug unpack-trees"
 msgstr "felsök unpack-trees"
 
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <git-katalog>"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "tyst"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "Du måste ange en katalog."
+
 #: builtin/reflog.c:423
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
@@ -9699,176 +10062,178 @@ msgstr "* fjärr %s"
 msgid "  Fetch URL: %s"
 msgstr "  Hämt-URL: %s"
 
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
 msgid "(no URL)"
 msgstr "(ingen URL)"
 
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in "  Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  Sänd-URL: %s"
 
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD-gren: %s"
 
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1181
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Fjärrgren:%s"
 msgstr[1] "  Fjärrgrenar:%s"
 
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
 msgid " (status not queried)"
 msgstr " (status inte förfrågad)"
 
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Lokal gren konfigurerad för \"git pull\":"
 msgstr[1] "  Lokala grenar konfigurerade för \"git pull\":"
 
-#: builtin/remote.c:1199
+#: builtin/remote.c:1201
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Lokala referenser speglas av \"git push\""
 
-#: builtin/remote.c:1206
+#: builtin/remote.c:1208
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Lokal referens konfigurerad för \"git push\"%s:"
 msgstr[1] "  Lokala referenser konfigurerade för \"git push\"%s:"
 
-#: builtin/remote.c:1227
+#: builtin/remote.c:1229
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1231
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "ta bort refs/remotes/<namn>/HEAD"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
 msgid "Cannot determine remote HEAD"
 msgstr "Kan inte bestämma HEAD på fjärren"
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:"
 
-#: builtin/remote.c:1256
+#: builtin/remote.c:1258
 #, c-format
 msgid "Could not delete %s"
 msgstr "Kunde inte ta bort %s"
 
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Inte en giltig referens: %s"
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
 #, c-format
 msgid "Could not setup %s"
 msgstr "Kunde inte ställa in %s"
 
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s kommer bli dinglande!"
 
-#: builtin/remote.c:1285
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s har blivit dinglande!"
 
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
 #, c-format
 msgid "Pruning %s"
 msgstr "Rensar %s"
 
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [skulle rensa] %s"
 
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [rensad] %s"
 
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
 msgid "prune remotes after fetching"
 msgstr "rensa fjärrar efter hämtning"
 
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Ingen sådan fjärr \"%s\""
 
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
 msgid "add branch"
 msgstr "lägg till gren"
 
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
 msgid "no remote specified"
 msgstr "ingen fjärr angavs"
 
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
 msgid "query push URLs rather than fetch URLs"
 msgstr "fråga sänd-URL:er istället för hämta-URL:er"
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1467
 msgid "return all URLs"
 msgstr "returnera alla URL:er"
 
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "ingen URL:er angivna för fjärren \"%s\""
 
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
 msgid "manipulate push URLs"
 msgstr "manipulera URL:ar för sändning"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
 msgid "add URL"
 msgstr "lägg till URL"
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
 msgid "delete URLs"
 msgstr "ta bort URL:ar"
 
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete ger ingen mening"
 
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Felaktig gammalt URL-mönster: %s"
 
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Ingen sådan URL hittades: %s"
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
 msgid "Will not delete all non-push URLs"
 msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 msgid "be verbose; must be placed before a subcommand"
 msgstr "var pratsam; måste skrivas före ett underkommando"
 
@@ -10376,11 +10741,6 @@ msgstr "tillåt rekursiv borttagning"
 msgid "exit with a zero status even if nothing matched"
 msgstr "avsluta med nollstatus även om inget träffades"
 
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-"Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
-
 #: builtin/rm.c:335
 #, c-format
 msgid "not removing '%s' recursively without -r"
@@ -10583,84 +10943,180 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken"
 msgid "prepend comment character and space to each line"
 msgstr "lägg in kommentarstecken och blanksteg först på varje rad"
 
-#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "Ingen sådan referens: %s"
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Förväntade fullt referensnamn, fick %s"
+
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "kan inte ta bort en komponent från url:en \"%s\""
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
 msgid "alternative anchor for relative paths"
 msgstr "alternativa ankare för relativa sökvägar"
 
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
 
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"
+
+#: builtin/submodule--helper.c:366
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "Misslyckades registrera url för undermodulsökväg \"%s\""
+
+#: builtin/submodule--helper.c:370
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
+
+#: builtin/submodule--helper.c:380
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n"
+
+#: builtin/submodule--helper.c:387
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\""
+
+#: builtin/submodule--helper.c:406
+msgid "Suppress output for initializing a submodule"
+msgstr "Dölj utdata från initiering av undermodul"
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<sökväg>]"
+
+#: builtin/submodule--helper.c:432
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <sökväg>"
 
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\""
 
-#: builtin/submodule--helper.c:164
+#: builtin/submodule--helper.c:489
 msgid "where the new submodule will be cloned to"
 msgstr "var den nya undermodulen skall klonas till"
 
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:492
 msgid "name of the new submodule"
 msgstr "namn på den nya undermodulen"
 
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
 msgid "url where to clone the submodule from"
 msgstr "URL att klona undermodulen från"
 
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:501
 msgid "depth for shallow clones"
 msgstr "djup för grunda kloner"
 
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference "
-"<arkvi>] [--name <namn>] [--url <url>][--depth <djup>] [--] [<sökväg>...]"
+"<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>"
 
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "kunde inte skapa katalogen \"%s\""
 
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
 
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:550
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "kan inte öppna filen \"%s\""
 
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
 #, c-format
 msgid "could not close file %s"
 msgstr "kunde inte stänga filen %s"
 
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
 
-#: builtin/submodule--helper.c:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
-msgstr ""
-"ödesdigert: underkommandot submodule--helper måste anropas med ett "
-"underkommando"
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Undermodulsökvägen \"%s\" har inte initierats"
+
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Kanske menade du att använda \"update --init\"?"
 
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:639
 #, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr ""
-"ödesdigert: \"%s\" är inte ett giltigt underkommando till submodule--helper"
+msgid "Skipping unmerged submodule %s"
+msgstr "Hoppar över ej sammanslagen undermodul %s"
+
+#: builtin/submodule--helper.c:660
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "Hoppar över undermodulen \"%s\""
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "sökväg inuti arbetskatalogen"
+
+#: builtin/submodule--helper.c:771
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser"
+
+#: builtin/submodule--helper.c:775
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout eller none"
+
+#: builtin/submodule--helper.c:779
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "Skapa en grund klon trunkerad till angivet antal revisioner"
+
+#: builtin/submodule--helper.c:782
+msgid "parallel jobs"
+msgstr "parallella jobb"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "skriv inte klonförlopp"
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<sökväg>] [<sökväg>...]"
+
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr "felaktigt värde för parametern update"
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "underkommandot submodule--helper måste anropas med ett underkommando"
+
+#: builtin/submodule--helper.c:862
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
 
 #: builtin/symbolic-ref.c:7
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10715,27 +11171,22 @@ msgstr ""
 msgid "git tag -v <tagname>..."
 msgstr "git tag -v <taggnamn>..."
 
-#: builtin/tag.c:80
+#: builtin/tag.c:81
 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr "taggnamnet för långt: %.*s..."
 
-#: builtin/tag.c:85
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr "taggen \"%s\" hittades inte."
 
-#: builtin/tag.c:100
+#: builtin/tag.c:101
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Tog bort tagg \"%s\" (var %s)\n"
 
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "kunde inte bekräfta taggen \"%s\""
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
 #, c-format
 msgid ""
 "\n"
@@ -10748,7 +11199,7 @@ msgstr ""
 "  %s\n"
 "Rader som inleds med \"%c\" ignoreras.\n"
 
-#: builtin/tag.c:126
+#: builtin/tag.c:121
 #, c-format
 msgid ""
 "\n"
@@ -10880,21 +11331,21 @@ msgstr "flaggorna --merged och --no-merged tillåts endast tillsammans med -l"
 msgid "only one -F or -m option is allowed."
 msgstr "endast en av flaggorna -F eller -m tillåts."
 
-#: builtin/tag.c:453
+#: builtin/tag.c:452
 msgid "too many params"
 msgstr "för många parametrar"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:458
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "\"%s\" är inte ett giltigt taggnamn."
 
-#: builtin/tag.c:464
+#: builtin/tag.c:463
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "taggen \"%s\" finns redan"
 
-#: builtin/tag.c:489
+#: builtin/tag.c:491
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
@@ -11145,7 +11596,7 @@ msgstr "git verify-commit [-v | --verbose] <incheckning>..."
 msgid "print commit contents"
 msgstr "visa innehåll för incheckning"
 
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
 msgid "print raw gpg status output"
 msgstr "visa råa gpg-statusdata"
 
@@ -11165,7 +11616,7 @@ msgstr "visa endast statistik"
 msgid "git verify-tag [-v | --verbose] <tag>..."
 msgstr "git verify-tag [-v | --verbose] <tagg>..."
 
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
 msgid "print tag contents"
 msgstr "visa innehåll för tag"
 
@@ -11181,69 +11632,73 @@ msgstr "git worktree prune [<flaggor>]"
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<flaggor>]"
 
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Tar bort worktrees/%s: inte en giltig katalog"
 
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
 
-#: builtin/worktree.c:61
+#: builtin/worktree.c:62
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
 
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:113
 #, c-format
-msgid "failed to remove: %s"
-msgstr "misslyckades ta bort: %s"
+msgid "failed to remove '%s'"
+msgstr "misslyckades ta bort \"%s\""
 
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
 #, c-format
 msgid "'%s' already exists"
 msgstr "\"%s\" finns redan"
 
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "kunde inte skapa katalogen \"%s\""
 
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Förbereder %s (identifieraren %s)"
 
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
 
-#: builtin/worktree.c:319
+#: builtin/worktree.c:324
 msgid "create a new branch"
 msgstr "skapa en ny gren"
 
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
 msgid "create or reset a branch"
 msgstr "skapa eller återställ en gren"
 
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
 msgid "detach HEAD at named commit"
 msgstr "koppla från HEAD vid namngiven incheckning"
 
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "befolka den nya arbetskatalogen"
+
+#: builtin/worktree.c:336
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B och --detach är ömsesidigt uteslutande"
 
@@ -11263,7 +11718,7 @@ msgstr "visa trädobjekt för underkatalogen <prefix>"
 msgid "only useful for debugging"
 msgstr "endast användbart vid felsökning"
 
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "skriv felsökningsmeddelanden på standard fel"
 
@@ -11277,7 +11732,7 @@ msgstr ""
 "några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
 "<koncept>\" för att läsa mer om specifika underkommandon och koncept."
 
-#: http.c:321
+#: http.c:322
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0"
 
@@ -11405,7 +11860,7 @@ msgstr "var mer tyst"
 msgid "use <n> digits to display SHA-1s"
 msgstr "använd <n> siffror för att visa SHA-1:or"
 
-#: rerere.h:38
+#: rerere.h:40
 msgid "update the index with reused conflict resolution if possible"
 msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt"
 
@@ -11623,16 +12078,16 @@ msgstr ""
 "Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n"
 "För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"."
 
-#: git-rebase.sh:165
+#: git-rebase.sh:168
 msgid "Applied autostash."
 msgstr "Tillämpade autostash."
 
-#: git-rebase.sh:168
+#: git-rebase.sh:171
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "Kan inte spara $stash_sha1"
 
-#: git-rebase.sh:169
+#: git-rebase.sh:172
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 "Your changes are safe in the stash.\n"
@@ -11642,31 +12097,27 @@ msgstr ""
 "Dina ändringar är säkra i stashen.\n"
 "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
 
-#: git-rebase.sh:208
+#: git-rebase.sh:211
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Kroken pre-rebase vägrade ombaseringen."
 
-#: git-rebase.sh:213
+#: git-rebase.sh:216
 msgid "It looks like git-am is in progress. Cannot rebase."
 msgstr "Det verkar som en git-am körs. Kan inte ombasera."
 
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive"
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
 msgid "No rebase in progress?"
 msgstr "Ingen ombasering pågår?"
 
-#: git-rebase.sh:370
+#: git-rebase.sh:368
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
 
-#: git-rebase.sh:377
+#: git-rebase.sh:375
 msgid "Cannot read HEAD"
 msgstr "Kan inte läsa HEAD"
 
-#: git-rebase.sh:380
+#: git-rebase.sh:378
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -11674,12 +12125,12 @@ msgstr ""
 "Du måste redigera alla sammanslagningskonflikter och\n"
 "därefter markera dem som lösta med git add"
 
-#: git-rebase.sh:398
+#: git-rebase.sh:396
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "Kunde inte flytta tillbaka till $head_name"
 
-#: git-rebase.sh:417
+#: git-rebase.sh:415
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -11700,65 +12151,65 @@ msgstr ""
 "och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
 "något av värde där."
 
-#: git-rebase.sh:468
+#: git-rebase.sh:466
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "ogiltig uppström $upstream_name"
 
-#: git-rebase.sh:492
+#: git-rebase.sh:490
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: mer än en sammanslagningsbas finns"
 
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: ingen sammanslagningsbas finns"
 
-#: git-rebase.sh:504
+#: git-rebase.sh:502
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "Peka på en giltig incheckning: $onto_name"
 
-#: git-rebase.sh:527
+#: git-rebase.sh:525
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "ödesdigert: ingen sådan gren: $branch_name"
 
-#: git-rebase.sh:560
+#: git-rebase.sh:558
 msgid "Cannot autostash"
 msgstr "Kan inte utföra \"autostash\""
 
-#: git-rebase.sh:565
+#: git-rebase.sh:563
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "Skapade autostash: $stash_abbrev"
 
-#: git-rebase.sh:569
+#: git-rebase.sh:567
 msgid "Please commit or stash them."
 msgstr "Checka in eller använd \"stash\" på dem."
 
-#: git-rebase.sh:589
+#: git-rebase.sh:587
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "Aktuell gren $branch_name är à jour."
 
-#: git-rebase.sh:593
+#: git-rebase.sh:591
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
 
-#: git-rebase.sh:604
+#: git-rebase.sh:602
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Ändringar från $mb till $onto:"
 
-#: git-rebase.sh:613
+#: git-rebase.sh:611
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
 
-#: git-rebase.sh:623
+#: git-rebase.sh:621
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "Snabbspolade $branch_name till $onto_name."
@@ -11902,26 +12353,21 @@ msgstr "Inget grennamn angavs"
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(För att återställa dem, skriv \"git stash apply\")"
 
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\""
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå"
 
-#: git-submodule.sh:291
+#: git-submodule.sh:229
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"
 
-#: git-submodule.sh:308
+#: git-submodule.sh:246
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "\"$sm_path\" finns redan i indexet"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:250
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
@@ -11932,22 +12378,22 @@ msgstr ""
 "$sm_path\n"
 "Använd -f om du verkligen vill lägga till den"
 
-#: git-submodule.sh:330
+#: git-submodule.sh:268
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"
 
-#: git-submodule.sh:332
+#: git-submodule.sh:270
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"
 
-#: git-submodule.sh:340
+#: git-submodule.sh:278
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):"
 
-#: git-submodule.sh:342
+#: git-submodule.sh:280
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from"
@@ -11955,14 +12401,14 @@ msgstr ""
 "För att återanvända den lokala git-katalogen istället för att på nytt klona "
 "från"
 
-#: git-submodule.sh:344
+#: git-submodule.sh:282
 #, sh-format
 msgid ""
 "use the '--force' option. If the local git directory is not the correct repo"
 msgstr ""
 "använd flaggan \"--force\". Om den lokala git-katalogen inte är riktigt arkiv"
 
-#: git-submodule.sh:345
+#: git-submodule.sh:283
 #, sh-format
 msgid ""
 "or you are unsure what this means choose another name with the '--name' "
@@ -11971,81 +12417,61 @@ msgstr ""
 "eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--name"
 "\"."
 
-#: git-submodule.sh:347
+#: git-submodule.sh:285
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt."
 
-#: git-submodule.sh:359
+#: git-submodule.sh:297
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "Kan inte checka ut undermodulen \"$sm_path\""
 
-#: git-submodule.sh:364
+#: git-submodule.sh:302
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
 
-#: git-submodule.sh:373
+#: git-submodule.sh:311
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Misslyckades registrera undermodulen \"$sm_path\""
 
-#: git-submodule.sh:417
+#: git-submodule.sh:355
 #, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "GÃ¥r in i \"$prefix$displaypath\""
+msgid "Entering '$displaypath'"
+msgstr "GÃ¥r in i \"$displaypath\""
 
-#: git-submodule.sh:437
+#: git-submodule.sh:375
 #, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
+msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr ""
-"Stoppar på \"$prefix$displaypath\"; skriptet returnerade en status skild "
-"från noll."
+"Stoppar på \"$displaypath\"; skriptet returnerade en status skild från noll."
 
-#: git-submodule.sh:483
+#: git-submodule.sh:448
 #, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr ""
-"Hittade ingen url för undermodulsökvägen \"$displaypath\" i .gitmodules"
+msgid "pathspec and --all are incompatible"
+msgstr "sökvägsangivelse och --all är inkompatibla"
 
-#: git-submodule.sh:492
+#: git-submodule.sh:453
 #, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr "Misslyckades registrera url för undermodulsökväg \"$displaypath\""
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
 
-#: git-submodule.sh:494
-#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr ""
-"Undermodulen \"$name\" ($url) registrerad för sökvägen \"$displaypath\""
-
-#: git-submodule.sh:511
-#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr ""
-"Misslyckades registrera uppdateringsläge för undermodulsökväg \"$displaypath"
-"\""
-
-#: git-submodule.sh:549
-#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr "Använd \".\" om du verkligen vill avinitiera alla undermoduler"
-
-#: git-submodule.sh:566
+#: git-submodule.sh:470
 #, sh-format
 msgid "Submodule work tree '$displaypath' contains a .git directory"
 msgstr ""
 "Undermodulens arbetskatalog \"$displaypath\" innehåller katalogen \".git\""
 
-#: git-submodule.sh:567
+#: git-submodule.sh:471
 #, sh-format
 msgid ""
 "(use 'rm -rf' if you really want to remove it including all of its history)"
 msgstr ""
 "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:477
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12054,138 +12480,174 @@ msgstr ""
 "Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" "
 "kastar bort dem"
 
-#: git-submodule.sh:576
+#: git-submodule.sh:480
 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr "Rensade katalogen \"$displaypath\""
 
-#: git-submodule.sh:577
+#: git-submodule.sh:481
 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\""
 
-#: git-submodule.sh:580
+#: git-submodule.sh:484
 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\""
 
-#: git-submodule.sh:589
+#: git-submodule.sh:493
 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr ""
 "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\""
 
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"Undermodulen \"$displaypath\" har inte initierats\n"
-"Kanske du vill köra \"update --init\"?"
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\""
 
-#: git-submodule.sh:745
+#: git-submodule.sh:644
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
 
-#: git-submodule.sh:768
+#: git-submodule.sh:667
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\""
 
-#: git-submodule.sh:788
+#: git-submodule.sh:680
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\""
 
-#: git-submodule.sh:789
+#: git-submodule.sh:681
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
 
-#: git-submodule.sh:793
+#: git-submodule.sh:685
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
 
-#: git-submodule.sh:794
+#: git-submodule.sh:686
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
 
-#: git-submodule.sh:799
+#: git-submodule.sh:691
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\""
 
-#: git-submodule.sh:800
+#: git-submodule.sh:692
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
 
-#: git-submodule.sh:805
+#: git-submodule.sh:697
 #, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
-"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$prefix$sm_path\""
+"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\""
 
-#: git-submodule.sh:806
+#: git-submodule.sh:698
 #, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "Undermodulsökvägen \"$prefix$sm_path\": \"$command $sha1\""
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
 
-#: git-submodule.sh:836
+#: git-submodule.sh:729
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
 
-#: git-submodule.sh:944
+#: git-submodule.sh:837
 msgid "The --cached option cannot be used with the --files option"
 msgstr "Flaggan --cached kan inte användas med flaggan --files"
 
-#: git-submodule.sh:996
+#: git-submodule.sh:889
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "oväntat läge $mod_dst"
 
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Varning: $display_name innehåller inte incheckningen $sha1_src"
 
-#: git-submodule.sh:1019
+#: git-submodule.sh:912
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Varning: $display_name innehåller inte incheckningen $sha1_dst"
 
-#: git-submodule.sh:1022
+#: git-submodule.sh:915
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 "  Varning: $display_name innehåller inte incheckningarna $sha1_src och "
 "$sha1_dst"
 
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
 msgid "blob"
 msgstr "blob"
 
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
 
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "Synkroniserar undermodul-url för \"$displaypath\""
 
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "Se git-${cmd}(1) för detaljer."
+
+#~ msgid "'%s': %s"
+#~ msgstr "\"%s\": %s"
+
+#~ msgid "unable to access '%s': %s"
+#~ msgstr "kan inte komma åt \"%s\": %s"
+
+#~ msgid "could not open '%s' for reading: %s"
+#~ msgstr "kunde inte öppna \"%s\" för läsning: %s"
+
+#~ msgid "could not open '%s' for writing: %s"
+#~ msgstr "Kunde inte öppna \"%s\" för skrivning: %s"
+
+#~ msgid "    git branch -d %s\n"
+#~ msgstr "    git branch -d %s\n"
+
+#~ msgid "    git branch --set-upstream-to %s\n"
+#~ msgstr "    git branch --set-upstream-to %s\n"
+
+#~ msgid "cannot open %s: %s\n"
+#~ msgstr "kan inte öppna %s: %s\n"
+
+#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+#~ msgstr ""
+#~ "Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
+
+#~ msgid "could not verify the tag '%s'"
+#~ msgstr "kunde inte bekräfta taggen \"%s\""
+
+#~ msgid "failed to remove: %s"
+#~ msgstr "misslyckades ta bort: %s"
+
+#~ msgid "The --exec option must be used with the --interactive option"
+#~ msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive"
+
+#~ msgid ""
+#~ "Submodule path '$displaypath' not initialized\n"
+#~ "Maybe you want to use 'update --init'?"
+#~ msgstr ""
+#~ "Undermodulen \"$displaypath\" har inte initierats\n"
+#~ "Kanske du vill köra \"update --init\"?"
+
 #~ msgid "Forward-port local commits to the updated upstream head"
 #~ msgstr "Framåtanpassa lokala kommandon på uppdaterat uppströmshuvud"
 
@@ -12253,9 +12715,6 @@ msgstr "Synkroniserar undermodul-url för \"$displaypath\""
 #~ msgid "Could not append '%s'"
 #~ msgstr "Kunde inte lägga till på \"%s\""
 
-#~ msgid "Could not set '%s'"
-#~ msgstr "Kunde inte sätta \"%s\""
-
 #~ msgid "Missing author: %s"
 #~ msgstr "Författare saknas: %s"
 
@@ -12384,13 +12843,6 @@ msgstr "Synkroniserar undermodul-url för \"$displaypath\""
 #~ msgstr ""
 #~ "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in."
 
-#~ msgid ""
-#~ "You have not concluded your merge (MERGE_HEAD exists).\n"
-#~ "Please, commit your changes before you can merge."
-#~ msgstr ""
-#~ "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
-#~ "Checka in dina ändringar innan du kan slå ihop."
-
 #~ msgid "no branch specified"
 #~ msgstr "inget grennamn angavs"
 
@@ -12593,13 +13045,6 @@ msgstr "Synkroniserar undermodul-url för \"$displaypath\""
 #~ msgstr "sökvägar avdelas med null-tecken"
 
 #~ msgid ""
-#~ "The following untracked files would NOT be saved but need to be removed "
-#~ "by stash save:"
-#~ msgstr ""
-#~ "Följande ospårade ändringar skulle INTE sparas utan måste tas bort med "
-#~ "\"stash save\":"
-
-#~ msgid ""
 #~ "Aborting. Consider using either the --force or --include-untracked option."
 #~ msgstr ""
 #~ "Avbryter. Överväg att använda antingen flaggan --force eller --include-"
diff --git a/po/vi.po b/po/vi.po
index edd8e29322..f048244d32 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,12 +6,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: git v2.8.0-rc0\n"
+"Project-Id-Version: git v2.9.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
-"PO-Revision-Date: 2016-03-21 07:14+0700\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"PO-Revision-Date: 2016-05-25 07:39+0700\n"
 "Last-Translator: Trần Ng�c Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
+"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +36,7 @@ msgstr ""
 "và sau đó dùng lệnh “git add/rm <tập-tin>�\n"
 "dành riêng cho việc đánh dấu cần giải quyết và tạo lần chuyển giao."
 
-#: advice.c:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại)."
 
@@ -80,7 +80,7 @@ msgstr "định_dạng"
 msgid "archive format"
 msgstr "định dạng lưu trữ"
 
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
 msgid "prefix"
 msgstr "ti�n_tố"
 
@@ -88,9 +88,9 @@ msgstr "ti�n_tố"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "nối thêm ti�n tố vào từng đư�ng dẫn tập tin trong kho lưu"
 
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 builtin/blame.c:2548
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549
 #: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:720 builtin/hash-object.c:100 builtin/ls-files.c:459
+#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459
 #: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561
 #: builtin/read-tree.c:109 parse-options.h:153
 msgid "file"
@@ -124,7 +124,8 @@ msgstr "nén nh� hơn"
 msgid "list supported archive formats"
 msgstr "liệt kê các kiểu nén được hỗ trợ"
 
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
 msgid "repo"
 msgstr "kho"
 
@@ -277,11 +278,16 @@ msgstr "Tên đối tượng chưa rõ ràng: “%s�."
 msgid "Not a valid branch point: '%s'."
 msgstr "Nhánh không hợp lệ: “%s�."
 
-#: branch.c:344
+#: branch.c:345
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "“%s� đã sẵn được lấy ra tại “%s�"
 
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "HEAD của cây làm việc %s chưa được cập nhật"
+
 #: bundle.c:34
 #, c-format
 msgid "'%s' does not look like a v2 bundle file"
@@ -292,7 +298,7 @@ msgstr "“%sâ€� không giống nhÆ° tập tin v2 bundle (định dạng dump cá
 msgid "unrecognized header: %s%s (%d)"
 msgstr "phần đầu không được thừa nhận: %s%s (%d)"
 
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
 #, c-format
 msgid "could not open '%s'"
 msgstr "không thể mở “%s�"
@@ -301,10 +307,10 @@ msgstr "không thể mở “%s�"
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết này:"
 
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
 msgid "revision walk setup failed"
 msgstr "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi"
 
@@ -341,21 +347,21 @@ msgstr "rev-list đã chết"
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "th.chiếu “%s� bị loại trừ bởi các tùy ch�n rev-list"
 
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "đối số không được thừa nhận: %s"
 
-#: bundle.c:449
+#: bundle.c:451
 msgid "Refusing to create empty bundle."
 msgstr "Từ chối tạo một bó dữ liệu trống rỗng."
 
-#: bundle.c:459
+#: bundle.c:463
 #, c-format
 msgid "cannot create '%s'"
 msgstr "không thể tạo “%s�"
 
-#: bundle.c:480
+#: bundle.c:491
 msgid "index-pack died"
 msgstr "mục lục gói đã chết"
 
@@ -364,8 +370,8 @@ msgstr "mục lục gói đã chết"
 msgid "invalid color value: %.*s"
 msgstr "giá trị màu không hợp lệ: %.*s"
 
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
 #, c-format
 msgid "could not parse %s"
 msgstr "không thể phân tích cú pháp %s"
@@ -399,21 +405,21 @@ msgstr "sai giá trị bằng số của cấu hình “%s� cho “%s�: %s"
 msgid "failed to expand user dir in: '%s'"
 msgstr "gặp lỗi mở rộng thư mục ngư�i dùng trong: “%s�"
 
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "mức nén zlib %d là sai"
 
-#: config.c:891
+#: config.c:890
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "chế độ không hợp lệ đối với việc tạo đối tượng: %s"
 
-#: config.c:1220
+#: config.c:1228
 msgid "unable to parse command-line config"
 msgstr "không thể phân tích cấu hình dòng lệnh"
 
-#: config.c:1281
+#: config.c:1284
 msgid "unknown error occured while reading the configuration files"
 msgstr "đã có lỗi chưa biết xảy ra trong khi đ�c các tập tin cấu hình"
 
@@ -432,24 +438,27 @@ msgstr "sai biến cấu hình “%s� trong tập tin “%s� tại dòng %d"
 msgid "%s has multiple values"
 msgstr "%s có đa giá trị"
 
+#: config.c:2224
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "không thể đặt “%s� thành “%s�"
+
 #: config.c:2226
 #, c-format
-msgid "Could not set '%s' to '%s'"
-msgstr "Không thể đặt “%s� thành “%s�"
+msgid "could not unset '%s'"
+msgstr "không thể thôi đặt “%s�"
 
 #: connected.c:69
 msgid "Could not run 'git rev-list'"
 msgstr "Không thể chạy “git rev-list�"
 
 #: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "gặp lỗi khi ghi vào rev-list: %s"
+msgid "failed write to rev-list"
+msgstr "gặp lỗi khi ghi vào rev-list"
 
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list: %s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
+msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list"
 
 #: date.c:95
 msgid "in the future"
@@ -515,26 +524,26 @@ msgstr[0] "%lu năm trước"
 msgid "failed to read orderfile '%s'"
 msgstr "gặp lỗi khi đ�c tập-tin-thứ-tự “%s�"
 
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
 msgid "Performing inexact rename detection"
 msgstr "�ang thực hiện dò tìm đổi tên không chính xác"
 
-#: diff.c:115
+#: diff.c:116
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  Gặp lỗi khi phân tích dirstat cắt b� phần trăm “%s�\n"
 
-#: diff.c:120
+#: diff.c:121
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Không hiểu đối số dirstat “%s�\n"
 
-#: diff.c:215
+#: diff.c:225
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "Không hiểu giá trị cho biến cấu hình “diff.submodule�: “%s�"
 
-#: diff.c:267
+#: diff.c:277
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -543,16 +552,16 @@ msgstr ""
 "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat�:\n"
 "%s"
 
-#: diff.c:2997
+#: diff.c:3007
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "phần m�m diff ở bên ngoài đã chết, dừng tại %s"
 
-#: diff.c:3393
+#: diff.c:3405
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow cần chính xác một đặc tả đư�ng dẫn"
 
-#: diff.c:3556
+#: diff.c:3568
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -561,20 +570,20 @@ msgstr ""
 "Gặp lỗi khi phân tích đối số tùy ch�n --dirstat/-X:\n"
 "%s"
 
-#: diff.c:3570
+#: diff.c:3582
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Gặp lỗi khi phân tích đối số tùy ch�n --submodule: “%s�"
 
-#: dir.c:2004
+#: dir.c:1823
 msgid "failed to get kernel name and information"
 msgstr "gặp lỗi khi lấy tên và thông tin của nhân"
 
-#: dir.c:2123
+#: dir.c:1942
 msgid "Untracked cache is disabled on this system or location."
 msgstr "Bộ nhớ tạm không theo vết bị tắt trên hệ thống hay vị trí này."
 
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
 msgid "could not run gpg."
 msgstr "không thể chạy gpg."
 
@@ -588,28 +597,28 @@ msgstr "gpg gặp lỗi khi ký dữ liệu"
 
 #: gpg-interface.c:222
 #, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "không thể tạo tập tin tạm th�i “%s�: %s"
+msgid "could not create temporary file '%s'"
+msgstr "không thể tạo tập tin tạm th�i “%s�"
 
-#: gpg-interface.c:225
+#: gpg-interface.c:224
 #, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s�: %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s�"
 
 #: grep.c:1718
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "“%s�: không thể đ�c %s"
 
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
 #, c-format
-msgid "'%s': %s"
-msgstr "“%s�: %s"
+msgid "failed to stat '%s'"
+msgstr "gặp lỗi khi lấy thống kê v� “%s�"
 
 #: grep.c:1746
 #, c-format
-msgid "'%s': short read %s"
-msgstr "“%s�: đ�c ngắn %s"
+msgid "'%s': short read"
+msgstr "“%s�: đ�c ngắn"
 
 #: help.c:205
 #, c-format
@@ -672,12 +681,36 @@ msgstr[0] ""
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
+#: lockfile.c:152
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"Không thể tạo “%s.lock�: %s.\n"
+"\n"
+"Tiến trình git khác có lẽ đang chạy ở kho này, ví dụ\n"
+"một trình soạn thảo được mở bởi “git commit�. Vui lòng chắc chắn\n"
+"rằng m�i tiến trình đã chấm dứt và sau đó thử lại. Nếu vẫn lỗi,\n"
+"một tiến trình git có lẽ đã đổ vỡ khi thực hiện ở kho này trước đó:\n"
+"gõ b� tập tin một cách thủ công để tiếp tục."
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Không thể tạo “%s.lock�: %s"
+
 #: merge.c:41
 msgid "failed to read the cache"
 msgstr "gặp lỗi khi đ�c bộ nhớ đệm"
 
-#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
 msgid "unable to write new index file"
 msgstr "không thể ghi tập tin lưu bảng mục lục mới"
 
@@ -724,7 +757,7 @@ msgstr "không thể đ�c đối tượng %s “%s�"
 msgid "blob expected for %s '%s'"
 msgstr "đối tượng blob được mong đợi cho %s “%s�"
 
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
 #, c-format
 msgid "failed to open '%s'"
 msgstr "gặp lỗi khi mở “%s�"
@@ -859,7 +892,7 @@ msgstr "�ã b� qua %s (đã có sẵn lần hòa trộn này)"
 msgid "Auto-merging %s"
 msgstr "Tự-động-hòa-trộn %s"
 
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
 msgid "submodule"
 msgstr "mô-đun-con"
 
@@ -888,49 +921,49 @@ msgstr ""
 "XUNG �ỘT (%s): Ở đây không có thư mục nào có tên %s trong %s. Thêm %s như là "
 "%s"
 
-#: merge-recursive.c:1783
+#: merge-recursive.c:1781
 #, c-format
 msgid "Adding %s"
 msgstr "Thêm \"%s\""
 
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
 msgid "Fatal merge failure, shouldn't happen."
 msgstr "Việc hòa trộn h�ng nghiêm tr�ng, không nên để xảy ra."
 
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
 msgid "Already up-to-date!"
 msgstr "�ã cập nhật rồi!"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "hòa trộn các cây %s và %s gặp lỗi"
 
-#: merge-recursive.c:1858
+#: merge-recursive.c:1856
 #, c-format
 msgid "Unprocessed path??? %s"
 msgstr "�ư�ng dẫn chưa được xử lý??? %s"
 
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
 msgid "Merging:"
 msgstr "�ang trộn:"
 
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "tìm thấy %u tổ tiên chung:"
 
-#: merge-recursive.c:1956
+#: merge-recursive.c:1954
 msgid "merge returned no commit"
 msgstr "hòa trộn không trả v� lần chuyển giao nào"
 
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Không thể phân tích đối tượng “%s�"
 
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
 msgid "Unable to write index."
 msgstr "Không thể ghi bảng mục lục"
 
@@ -962,28 +995,28 @@ msgstr "Giá trị %s sai: “%s�"
 msgid "unable to parse object: %s"
 msgstr "không thể phân tích đối tượng: “%s�"
 
-#: parse-options.c:570
+#: parse-options.c:572
 msgid "..."
 msgstr "…"
 
-#: parse-options.c:588
+#: parse-options.c:590
 #, c-format
 msgid "usage: %s"
 msgstr "cách dùng: %s"
 
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
 #, c-format
 msgid "   or: %s"
 msgstr "     hoặc: %s"
 
-#: parse-options.c:595
+#: parse-options.c:597
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:629
+#: parse-options.c:631
 msgid "-NUM"
 msgstr "-S�"
 
@@ -992,7 +1025,7 @@ msgstr "-S�"
 msgid "malformed object name '%s'"
 msgstr "tên đối tượng dị hình “%s�"
 
-#: path.c:752
+#: path.c:796
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Không thể làm %s được ghi bởi nhóm"
@@ -1062,7 +1095,7 @@ msgstr ""
 "Ở đây không có gì bị loại trừ bởi: các mẫu (loại trừ).\n"
 "Có lẽ bạn đã quên thêm hoặc là “:/� hoặc là “.�?"
 
-#: pretty.c:969
+#: pretty.c:971
 msgid "unable to parse --pretty format"
 msgstr "không thể phân tích định dạng --pretty"
 
@@ -1088,23 +1121,23 @@ msgstr ""
 "GIT_INDEX_VERSION được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
 "Dùng phiên bản %i"
 
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "Không thể mở “%s� để ghi"
 
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "không thể xóa b� tham chiếu %s: %s"
 
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2246
 #, c-format
 msgid "could not delete references: %s"
 msgstr "không thể xóa b� tham chiếu: %s"
 
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
 #, c-format
 msgid "could not remove reference %s"
 msgstr "không thể gỡ b� tham chiếu: %s"
@@ -1243,94 +1276,94 @@ msgstr "định dạng: thiếu nguyên tử %%(end)"
 msgid "malformed object name %s"
 msgstr "tên đối tượng dị hình %s"
 
-#: remote.c:745
+#: remote.c:746
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Không thể lấy v� cả %s và %s cho %s"
 
-#: remote.c:749
+#: remote.c:750
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s thư�ng theo dõi %s, không phải %s"
 
-#: remote.c:753
+#: remote.c:754
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s theo dõi cả %s và %s"
 
-#: remote.c:761
+#: remote.c:762
 msgid "Internal error"
 msgstr "Lá»—i ná»™i bá»™"
 
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
 msgid "HEAD does not point to a branch"
 msgstr "HEAD không chỉ đến một nhánh nào cả"
 
-#: remote.c:1686
+#: remote.c:1687
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "không có nhánh nào như thế: “%s�"
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "không có thượng nguồn được cấu hình cho nhánh “%s�"
 
-#: remote.c:1695
+#: remote.c:1696
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr ""
 "nhánh thượng nguồn “%s� không được lưu lại như là một nhánh theo dõi máy chủ"
 
-#: remote.c:1710
+#: remote.c:1711
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "đẩy lên đích “%s� trên máy chủ “%s� không có nhánh theo dõi nội bộ"
 
-#: remote.c:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "nhánh “%s� không có máy chủ để đẩy lên"
 
-#: remote.c:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "đẩy refspecs cho “%s� không bao gồm “%s�"
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "đẩy lên mà không có đích (push.default là “nothing�)"
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "không thể phân giải đẩy “đơn giản� đến một đích đơn"
 
-#: remote.c:2073
+#: remote.c:2074
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr ""
 "Nhánh của bạn dựa trên cơ sở là “%s�, nhưng trên thượng nguồn không còn.\n"
 
-#: remote.c:2077
+#: remote.c:2078
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "   (dùng \" git branch --unset-upstream\" để sửa)\n"
 
-#: remote.c:2080
+#: remote.c:2081
 #, c-format
 msgid "Your branch is up-to-date with '%s'.\n"
 msgstr "Nhánh của bạn đã cập nhật với “%s�.\n"
 
-#: remote.c:2084
+#: remote.c:2085
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Nhánh của bạn đứng trước “%s� %d lần chuyển giao.\n"
 
-#: remote.c:2090
+#: remote.c:2091
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (dùng \"git push\" để xuất bản các lần chuyển giao nội bộ của bạn)\n"
 
-#: remote.c:2093
+#: remote.c:2094
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -1339,11 +1372,11 @@ msgstr[0] ""
 "Nhánh của bạn đứng đằng sau “%s� %d lần chuyển giao, và có thể được chuyển-"
 "tiếp-nhanh.\n"
 
-#: remote.c:2101
+#: remote.c:2102
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (dùng \"git pull\" để cập nhật nhánh nội bộ của bạn)\n"
 
-#: remote.c:2104
+#: remote.c:2105
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -1356,22 +1389,22 @@ msgstr[0] ""
 "và có %d và %d lần chuyển giao khác nhau cho từng cái,\n"
 "tương ứng với mỗi lần.\n"
 
-#: remote.c:2114
+#: remote.c:2115
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 "  (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của "
 "bạn)\n"
 
-#: revision.c:2131
+#: revision.c:2142
 msgid "your current branch appears to be broken"
 msgstr "nhánh hiện tại của bạn có vẻ như bị h�ng"
 
-#: revision.c:2134
+#: revision.c:2145
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "nhánh hiện tại của bạn “%s� không có một lần chuyển giao nào cả"
 
-#: revision.c:2328
+#: revision.c:2339
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent xung khắc với --bisect"
 
@@ -1422,7 +1455,7 @@ msgstr ""
 "với lệnh “git add <đư�ng_dẫn>� hoặc “git rm <đư�ng_dẫn>�\n"
 "và chuyển giao kết quả bằng lệnh “git commit�"
 
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
 #, c-format
 msgid "Could not write to %s"
 msgstr "Không thể ghi vào %s"
@@ -1582,12 +1615,12 @@ msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\""
 msgid "Could not create sequencer directory %s"
 msgstr "Không thể tạo thư mục xếp dãy %s"
 
-#: sequencer.c:835 sequencer.c:917
+#: sequencer.c:835 sequencer.c:916
 #, c-format
 msgid "Error wrapping up %s."
 msgstr "Lỗi bao b�c %s."
 
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
 msgid "no cherry-pick or revert in progress"
 msgstr "không cherry-pick hay hoàn nguyên trong tiến trình"
 
@@ -1599,63 +1632,72 @@ msgstr "không thể phân giải HEAD"
 msgid "cannot abort from a branch yet to be born"
 msgstr "không thể hủy b� từ một nhánh mà nó còn chưa được tạo ra"
 
-#: sequencer.c:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
 #, c-format
-msgid "cannot open %s: %s"
-msgstr "không thể mở %s: %s"
+msgid "cannot open %s"
+msgstr "không mở được “%s�"
 
-#: sequencer.c:881
+#: sequencer.c:880
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "không thể đ�c %s: %s"
 
-#: sequencer.c:882
+#: sequencer.c:881
 msgid "unexpected end of file"
 msgstr "gặp kết thúc tập tin đột xuất"
 
-#: sequencer.c:888
+#: sequencer.c:887
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "tập tin HEAD “pre-cherry-pick� đã lưu “%s� bị h�ng"
 
-#: sequencer.c:910
+#: sequencer.c:909
 #, c-format
 msgid "Could not format %s."
 msgstr "Không thể định dạng “%s�."
 
-#: sequencer.c:1055
+#: sequencer.c:1054
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: không thể cherry-pick một %s"
 
-#: sequencer.c:1058
+#: sequencer.c:1057
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: điểm xét duyệt sai"
 
-#: sequencer.c:1092
+#: sequencer.c:1091
 msgid "Can't revert as initial commit"
 msgstr "Không thể hoàn nguyên một lần chuyển giao khởi tạo"
 
-#: sequencer.c:1093
+#: sequencer.c:1092
 msgid "Can't cherry-pick into empty head"
 msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng"
 
-#: setup.c:246
+#: setup.c:248
 #, c-format
 msgid "failed to read %s"
 msgstr "gặp lỗi khi đ�c %s"
 
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Cần phiên bản kho git <= %d, nhưng lại nhận được %d"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "tìm thấy phần mở rộng kho chưa biết:"
+
 #: sha1_file.c:1080
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "vị trí tương đối trước điểm kết thúc của tập tin gói (.idx h�ng à?)"
 
-#: sha1_file.c:2459
+#: sha1_file.c:2458
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "vị trí tương đối nằm trước chỉ mục gói cho %s (mục lục bị h�ng à?)"
 
-#: sha1_file.c:2463
+#: sha1_file.c:2462
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
@@ -1685,31 +1727,40 @@ msgstr ""
 "này\n"
 "bằng cách chạy lệnh \"git config advice.objectNameWarning false\""
 
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "Không thể thay đổi .gitmodules chưa hòa trộn, hãy giải quyết xung đột trộn "
 "trÆ°á»›c"
 
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "Không thể tìm thấy phần trong .gitmodules nơi mà đư�ng_dẫn=%s"
 
-#: submodule.c:74
+#: submodule.c:76
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Không thể cập nhật mục .gitmodules %s"
 
-#: submodule.c:107
+#: submodule.c:109
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "Không thể gỡ b� mục .gitmodules dành cho %s"
 
-#: submodule.c:118
+#: submodule.c:120
 msgid "staging updated .gitmodules failed"
 msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật"
 
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "không cho phép giá trị âm ở submodule.fetchJobs"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "giá trị cho %s không hợp lệ"
+
 #: trailer.c:237
 #, c-format
 msgid "running trailer command '%s' failed"
@@ -1769,7 +1820,241 @@ msgstr "không thể đổi tên tập tin tạm th�i thành %s"
 msgid "Could not read ref %s"
 msgstr "Không thể đ�c tham chiếu %s"
 
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you can switch branches."
+msgstr ""
+"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
+"checkout:\n"
+"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn có "
+"thể chuyển nhánh."
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
+"checkout:\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you can merge."
+msgstr ""
+"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
+"hòa trộn:\n"
+"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn có "
+"thể hòa trộn."
+
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
+"hòa trộn:\n"
+"%%s"
+
+#: unpack-trees.c:74
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you can %s."
+msgstr ""
+"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
+"%s:\n"
+"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn có "
+"thể %s."
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
+"%s:\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"Việc cập nhật các thư mục sau đây có thể làm mất các tập tin theo dõi trong "
+"nó:\n"
+"%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ b� bởi lệnh "
+"checkout:\n"
+"%%sVui lòng di chuyển hay gỡ b� chúng trước khi bạn có thể chuyển nhánh."
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ b� bởi lệnh "
+"checkout:\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ b� bởi lệnh hòa "
+"trá»™n:\n"
+"%%sVui lòng di chuyển hay gỡ b� chúng trước khi bạn có thể hòa trộn."
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ b� bởi lệnh hòa "
+"trá»™n:\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ b� bởi %s:\n"
+"%%sVui lòng di chuyển hay gỡ b� chúng trước khi bạn có thể %s."
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ b� bởi %s:\n"
+"%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"checkout:\n"
+"%%sVui lòng di chuyển hay gỡ b� chúng trước khi bạn có thể chuyển nhánh."
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"checkout:\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"hòa trộn:\n"
+"%%sVui lòng di chuyển hay gỡ b� chúng trước khi bạn có thể hòa trộn."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"hòa trộn:\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"%s:\n"
+"%%sVui lòng di chuyển hay gỡ b� chúng trước khi bạn có thể %s."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"%s:\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "Mục “%s� đè lên “%s�. Không thể buộc."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"Không thể cập nhật checkout rải rác: các mục tin sau đây chưa cập nhật:\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi cập "
+"nhật checkout rải rác:\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị xóa b� bởi cập "
+"nhật checkout rải rác:\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "Bãi b�\n"
+
+#: unpack-trees.c:237
 msgid "Checking out files"
 msgstr "�ang lấy ra các tập tin"
 
@@ -1807,200 +2092,196 @@ msgstr "đoạn đư�ng dẫn “..� không hợp lệ"
 msgid "could not open '%s' for reading and writing"
 msgstr "không thể mở “%s� để đ�c và ghi"
 
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "không thể mở “%s� để ghi"
 
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "không thể mở “%s� để đ�c"
 
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "không thể truy cập “%s�: %s"
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
 #, c-format
 msgid "unable to access '%s'"
 msgstr "không thể truy cập “%s�"
 
-#: wrapper.c:640
+#: wrapper.c:623
 msgid "unable to get current working directory"
 msgstr "Không thể lấy thư mục làm việc hiện hành"
 
-#: wrapper.c:667
+#: wrapper.c:650
 #, c-format
 msgid "could not open %s for writing"
 msgstr "không thể mở %s để ghi"
 
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
 #, c-format
 msgid "could not write to %s"
 msgstr "không thể ghi vào %s"
 
-#: wrapper.c:684
+#: wrapper.c:667
 #, c-format
 msgid "could not close %s"
 msgstr "không thể đóng %s"
 
-#: wt-status.c:149
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "Những đư�ng dẫn chưa được hòa trộn:"
 
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (dùng \"git reset %s <tập-tin>…\" để b� ra kh�i bệ phóng)"
 
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (dùng \"git rm --cached <tập-tin>…\" để b� ra kh�i bệ phóng)"
 
-#: wt-status.c:182
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (dùng \"git add <tập-tin>…\" để đánh dấu là cần giải quyết)"
 
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (dùng \"git add/rm <tập-tin>…\" như là một cách thích hợp để đánh dấu là "
 "cần được giải quyết)"
 
-#: wt-status.c:186
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (dùng \"git rm <tập-tin>…\" để đánh dấu là cần giải quyết)"
 
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
 msgid "Changes to be committed:"
 msgstr "Những thay đổi sẽ được chuyển giao:"
 
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
 msgid "Changes not staged for commit:"
 msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:"
 
-#: wt-status.c:219
+#: wt-status.c:220
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  (dùng \"git add <tập-tin>…\" để cập nhật những gì sẽ chuyển giao)"
 
-#: wt-status.c:221
+#: wt-status.c:222
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (dùng \"git add/rm <tập-tin>…\" để cập nhật những gì sẽ được chuyển giao)"
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (dùng \"git checkout -- <tập-tin>…\" để loại b� các thay đổi trong thư mục "
 "làm việc)"
 
-#: wt-status.c:224
+#: wt-status.c:225
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (chuyển giao hoặc là loại b� các nội dung chưa được theo dõi hay đã sửa "
 "chữa trong mô-đun-con)"
 
-#: wt-status.c:236
+#: wt-status.c:237
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (dùng \"git %s <tập-tin>…\" để thêm vào những gì cần được chuyển giao)"
 
-#: wt-status.c:251
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "bị xóa bởi cả hai:"
 
-#: wt-status.c:253
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "được thêm vào bởi chúng ta:"
 
-#: wt-status.c:255
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "bị xóa đi bởi h�:"
 
-#: wt-status.c:257
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "được thêm vào bởi h�:"
 
-#: wt-status.c:259
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "bị xóa bởi chúng ta:"
 
-#: wt-status.c:261
+#: wt-status.c:262
 msgid "both added:"
 msgstr "được thêm vào bởi cả hai:"
 
-#: wt-status.c:263
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "bị sửa bởi cả hai:"
 
-#: wt-status.c:265
+#: wt-status.c:266
 #, c-format
 msgid "bug: unhandled unmerged status %x"
 msgstr "lỗi: không thể tiếp nhận trạng thái chưa hòa trộn %x"
 
-#: wt-status.c:273
+#: wt-status.c:274
 msgid "new file:"
 msgstr "tập tin mới:"
 
-#: wt-status.c:275
+#: wt-status.c:276
 msgid "copied:"
 msgstr "đã chép:"
 
-#: wt-status.c:277
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "đã xóa:"
 
-#: wt-status.c:279
+#: wt-status.c:280
 msgid "modified:"
 msgstr "đã sửa:"
 
-#: wt-status.c:281
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "đã đổi tên:"
 
-#: wt-status.c:283
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "đổi-kiểu:"
 
-#: wt-status.c:285
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "không hiểu:"
 
-#: wt-status.c:287
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "chưa hòa trộn:"
 
-#: wt-status.c:369
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "lần chuyển giao mới, "
 
-#: wt-status.c:371
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "nội dung bị sửa đổi, "
 
-#: wt-status.c:373
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "nội dung chưa được theo dõi, "
 
-#: wt-status.c:390
+#: wt-status.c:391
 #, c-format
 msgid "bug: unhandled diff status %c"
 msgstr "lỗi: không thể tiếp nhận trạng thái lệnh diff %c"
 
-#: wt-status.c:754
+#: wt-status.c:755
 msgid "Submodules changed but not updated:"
 msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:"
 
-#: wt-status.c:756
+#: wt-status.c:757
 msgid "Submodule changes to be committed:"
 msgstr "Những mô-đun-con thay đổi đã được chuyển giao:"
 
-#: wt-status.c:837
+#: wt-status.c:838
 msgid ""
 "Do not touch the line above.\n"
 "Everything below will be removed."
@@ -2008,39 +2289,39 @@ msgstr ""
 "Không động đến đư�ng ở trên.\n"
 "M�i thứ phía dưới sẽ được xóa b�."
 
-#: wt-status.c:948
+#: wt-status.c:949
 msgid "You have unmerged paths."
 msgstr "Bạn có những đư�ng dẫn chưa được hòa trộn."
 
-#: wt-status.c:951
+#: wt-status.c:952
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (sửa các xung đột rồi chạy \"git commit\")"
 
-#: wt-status.c:954
+#: wt-status.c:956
 msgid "All conflicts fixed but you are still merging."
 msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn."
 
-#: wt-status.c:957
+#: wt-status.c:959
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (dùng \"git commit\" để hoàn tất việc hòa trộn)"
 
-#: wt-status.c:967
+#: wt-status.c:969
 msgid "You are in the middle of an am session."
 msgstr "Bạn đang ở giữa của một phiên “am�."
 
-#: wt-status.c:970
+#: wt-status.c:972
 msgid "The current patch is empty."
 msgstr "Miếng vá hiện tại bị trống rỗng."
 
-#: wt-status.c:974
+#: wt-status.c:976
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")"
 
-#: wt-status.c:976
+#: wt-status.c:978
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (dùng \"git am --skip\" để b� qua miếng vá này)"
 
-#: wt-status.c:978
+#: wt-status.c:980
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)"
 
@@ -2197,43 +2478,43 @@ msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)"
 
-#: wt-status.c:1438
+#: wt-status.c:1460
 msgid "On branch "
 msgstr "Trên nhánh "
 
-#: wt-status.c:1444
+#: wt-status.c:1466
 msgid "interactive rebase in progress; onto "
 msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên "
 
-#: wt-status.c:1446
+#: wt-status.c:1468
 msgid "rebase in progress; onto "
 msgstr "rebase đang được thực hiện: lên trên "
 
-#: wt-status.c:1451
+#: wt-status.c:1473
 msgid "HEAD detached at "
 msgstr "HEAD được tách r�i tại "
 
-#: wt-status.c:1453
+#: wt-status.c:1475
 msgid "HEAD detached from "
 msgstr "HEAD được tách r�i từ "
 
-#: wt-status.c:1456
+#: wt-status.c:1478
 msgid "Not currently on any branch."
 msgstr "Hiện tại chẳng ở nhánh nào cả."
 
-#: wt-status.c:1474
+#: wt-status.c:1496
 msgid "Initial commit"
 msgstr "Lần chuyển giao khởi tạo"
 
-#: wt-status.c:1488
+#: wt-status.c:1510
 msgid "Untracked files"
 msgstr "Những tập tin chưa được theo dõi"
 
-#: wt-status.c:1490
+#: wt-status.c:1512
 msgid "Ignored files"
 msgstr "Những tập tin bị l� đi"
 
-#: wt-status.c:1494
+#: wt-status.c:1516
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2245,32 +2526,32 @@ msgstr ""
 "có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n"
 "tự thêm các tập tin mới (xem “git help status�.."
 
-#: wt-status.c:1500
+#: wt-status.c:1522
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s"
 
-#: wt-status.c:1502
+#: wt-status.c:1524
 msgid " (use -u option to show untracked files)"
 msgstr " (dùng tùy ch�n -u để hiển thị các tập tin chưa được theo dõi)"
 
-#: wt-status.c:1508
+#: wt-status.c:1530
 msgid "No changes"
 msgstr "Không có thay đổi nào"
 
-#: wt-status.c:1513
+#: wt-status.c:1535
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "không có thay đổi nào được thêm vào để chuyển giao (dùng \"git add\" và/hoặc "
 "\"git commit -a\")\n"
 
-#: wt-status.c:1516
+#: wt-status.c:1538
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "không có thay đổi nào được thêm vào để chuyển giao\n"
 
-#: wt-status.c:1519
+#: wt-status.c:1541
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -2279,57 +2560,57 @@ msgstr ""
 "không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
 "theo dõi hiện diện (dùng \"git add\" để đưa vào theo dõi)\n"
 
-#: wt-status.c:1522
+#: wt-status.c:1544
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 "không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
 "theo dõi hiện diện\n"
 
-#: wt-status.c:1525
+#: wt-status.c:1547
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "không có gì để chuyển giao (tạo/sao-chép các tập tin và dùng \"git add\" để "
 "đưa vào theo dõi)\n"
 
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
 #, c-format
 msgid "nothing to commit\n"
 msgstr "không có gì để chuyển giao\n"
 
-#: wt-status.c:1531
+#: wt-status.c:1553
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "không có gì để chuyển giao (dùng -u xem các tập tin chưa được theo dõi)\n"
 
-#: wt-status.c:1535
+#: wt-status.c:1557
 #, c-format
 msgid "nothing to commit, working directory clean\n"
 msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n"
 
-#: wt-status.c:1642
+#: wt-status.c:1664
 msgid "Initial commit on "
 msgstr "Lần chuyển giao khởi tạo trên "
 
-#: wt-status.c:1646
+#: wt-status.c:1668
 msgid "HEAD (no branch)"
 msgstr "HEAD (không nhánh)"
 
-#: wt-status.c:1675
+#: wt-status.c:1697
 msgid "gone"
 msgstr "đã ra đi"
 
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
 msgid "behind "
 msgstr "đằng sau "
 
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
 msgid "ahead "
 msgstr "phía trước "
 
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "gặp lỗi khi b� liên kết (unlink) “%s�"
@@ -2343,7 +2624,7 @@ msgstr "git add [<các-tùy-ch�n>] [--]  <pathspec>…"
 msgid "unexpected diff status %c"
 msgstr "trạng thái lệnh diff không như mong đợi %c"
 
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
 msgid "updating files failed"
 msgstr "Cập nhật tập tin gặp lỗi"
 
@@ -2357,7 +2638,7 @@ msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 "�ưa ra kh�i bệ phóng các thay đổi sau khi làm tươi mới lại bảng mục lục:"
 
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
 msgid "Could not read the index"
 msgstr "Không thể đ�c bảng mục lục"
 
@@ -2395,14 +2676,14 @@ msgstr ""
 "của bạn:\n"
 
 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
 msgid "dry run"
 msgstr "chạy thử"
 
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
 msgid "be verbose"
 msgstr "chi tiết"
 
@@ -2410,7 +2691,7 @@ msgstr "chi tiết"
 msgid "interactive picking"
 msgstr "sửa bằng cách tương tác"
 
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
 msgid "select hunks interactively"
 msgstr "ch�n “hunks� theo kiểu tương tác"
 
@@ -2482,16 +2763,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Có lẽ ý bạn là “git add .� phải không?\n"
 
 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
 msgid "index file corrupt"
 msgstr "tập tin ghi bảng mục lục bị h�ng"
 
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "Không thể ghi tập tin lưu bảng mục lục mới"
 
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
 #, c-format
 msgid "could not read '%s'"
 msgstr "Không thể đ�c “%s�."
@@ -2519,16 +2800,6 @@ msgstr "Gặp lỗi khi sao chép ghi chú (note) từ “%s� tới “%s�"
 msgid "fseek failed"
 msgstr "fseek gặp lỗi"
 
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "không thể mở “%s� để đ�c: %s"
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "Không thể mở “%s� để ghi: %s"
-
 #: builtin/am.c:788
 #, c-format
 msgid "could not parse patch '%s'"
@@ -2538,75 +2809,75 @@ msgstr "không thể phân tích cú pháp “%s�"
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Chỉ có một sê-ri miếng vá StGIT được áp dụng một lúc"
 
-#: builtin/am.c:901
+#: builtin/am.c:900
 msgid "invalid timestamp"
 msgstr "dấu th�i gian không hợp lệ"
 
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
 msgid "invalid Date line"
 msgstr "dòng Ngày tháng không hợp lệ"
 
-#: builtin/am.c:909
+#: builtin/am.c:908
 msgid "invalid timezone offset"
 msgstr "độ lệch múi gi� không hợp lệ"
 
-#: builtin/am.c:996
+#: builtin/am.c:995
 msgid "Patch format detection failed."
 msgstr "Dò tìm định dạng miếng vá gặp lỗi."
 
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "tạo thư mục \"%s\" gặp lỗi"
 
-#: builtin/am.c:1005
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Gặp lỗi khi chia nh� các miếng vá."
 
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
 msgid "unable to write index file"
 msgstr "không thể ghi tập tin lưu mục lục"
 
-#: builtin/am.c:1188
+#: builtin/am.c:1187
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Khi bạn đã phân giải xong trục trặc này, hãy chạy \"%s --continue\"."
 
-#: builtin/am.c:1189
+#: builtin/am.c:1188
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 "Nếu bạn muốn b� qua miếng vá này, hãy chạy lệnh \"%s --skip\" để thay thế."
 
-#: builtin/am.c:1190
+#: builtin/am.c:1189
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "�ể phục hồi lại nhánh gốc và dừng vá, hãy chạy \"%s --abort\"."
 
-#: builtin/am.c:1328
+#: builtin/am.c:1327
 msgid "Patch is empty. Was it split wrong?"
 msgstr "Miếng vá trống rỗng. Quá trình chia nh� miếng vá có lỗi?"
 
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "dòng thụt l� không hợp lệ: %s"
 
-#: builtin/am.c:1429
+#: builtin/am.c:1428
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "không thể phân tích lần chuyển giao “%s�"
 
-#: builtin/am.c:1631
+#: builtin/am.c:1630
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "Kho thiếu đối tượng blob cần thiết để trở v� trên “3-way merge�."
 
-#: builtin/am.c:1633
+#: builtin/am.c:1632
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Sử dụng thông tin trong bảng mục lục để cấu trúc lại một cây (tree) cơ sở…"
 
-#: builtin/am.c:1652
+#: builtin/am.c:1651
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -2614,38 +2885,38 @@ msgstr ""
 "Bạn đã sửa miếng vá của mình bằng cách thủ công à?\n"
 "Nó không thể áp dụng các blob đã được ghi lại trong bảng mục lục của nó."
 
-#: builtin/am.c:1658
+#: builtin/am.c:1657
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "�ang trở lại để vá cơ sở và “hòa trộn 3-đư�ng�…"
 
-#: builtin/am.c:1673
+#: builtin/am.c:1672
 msgid "Failed to merge in the changes."
 msgstr "Gặp lỗi khi trộn vào các thay đổi."
 
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
 msgid "git write-tree failed to write a tree"
 msgstr "lệnh git write-tree gặp lỗi khi ghi một cây"
 
-#: builtin/am.c:1704
+#: builtin/am.c:1703
 msgid "applying to an empty history"
 msgstr "áp dụng vào một lịch sử trống rỗng"
 
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
 msgid "failed to write commit object"
 msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
 
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "không thể phục hồi: %s không tồn tại."
 
-#: builtin/am.c:1769
+#: builtin/am.c:1768
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "không thể được tương tác mà không có stdin kết nối với một thiết bị cuối"
 
-#: builtin/am.c:1774
+#: builtin/am.c:1773
 msgid "Commit Body is:"
 msgstr "Thân của lần chuyển giao là:"
 
@@ -2653,37 +2924,37 @@ msgstr "Thân của lần chuyển giao là:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1784
+#: builtin/am.c:1783
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 "�p dụng? đồng ý [y]/khô[n]g/chỉnh sửa [e]/hiển thị miếng [v]á/chấp nhận tất "
 "cả [a]: "
 
-#: builtin/am.c:1834
+#: builtin/am.c:1833
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Bảng mục lục bẩn: không thể áp dụng các miếng vá (bẩn: %s)"
 
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
 #, c-format
 msgid "Applying: %.*s"
 msgstr "�p dụng: %.*s"
 
-#: builtin/am.c:1885
+#: builtin/am.c:1884
 msgid "No changes -- Patch already applied."
 msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi."
 
-#: builtin/am.c:1893
+#: builtin/am.c:1892
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Gặp lỗi khi vá tại %s %.*s"
 
-#: builtin/am.c:1899
+#: builtin/am.c:1898
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong: %s"
 
-#: builtin/am.c:1944
+#: builtin/am.c:1943
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -2694,7 +2965,7 @@ msgstr ""
 "đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn b� qua miếng "
 "vá này."
 
-#: builtin/am.c:1951
+#: builtin/am.c:1950
 msgid ""
 "You still have unmerged paths in your index.\n"
 "Did you forget to use 'git add'?"
@@ -2702,17 +2973,17 @@ msgstr ""
 "Bạn vẫn có những đư�ng dẫn chưa được hòa trộn trong bảng mục lục của mình.\n"
 "Bạn đã quên sử dụng lệnh “git add� à?"
 
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
 #: builtin/reset.c:316
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "không thể phân tích đối tượng “%s�."
 
-#: builtin/am.c:2111
+#: builtin/am.c:2110
 msgid "failed to clean index"
 msgstr "gặp lỗi khi d�n bảng mục lục"
 
-#: builtin/am.c:2145
+#: builtin/am.c:2144
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -2720,153 +2991,155 @@ msgstr ""
 "Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần “am� thất bại cuối cùng.\n"
 "Không thể chuyển tới ORIG_HEAD"
 
-#: builtin/am.c:2206
+#: builtin/am.c:2205
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Giá trị không hợp lệ cho --patch-format: %s"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2238
 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
 msgstr "git am [<các-tùy-ch�n>] [(<mbox>|<Maildir>)…]"
 
-#: builtin/am.c:2240
+#: builtin/am.c:2239
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<các-tùy-ch�n>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2246
+#: builtin/am.c:2245
 msgid "run interactively"
 msgstr "chạy kiểu tương tác"
 
-#: builtin/am.c:2248
+#: builtin/am.c:2247
 msgid "historical option -- no-op"
 msgstr "tùy ch�n lịch sử -- không-toán-tử"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2249
 msgid "allow fall back on 3way merging if needed"
 msgstr "cho phép quay trở lại để hòa trộn kiểu “3way� nếu cần"
 
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
 #: builtin/repack.c:171
 msgid "be quiet"
 msgstr "im lặng"
 
-#: builtin/am.c:2253
+#: builtin/am.c:2252
 msgid "add a Signed-off-by line to the commit message"
 msgstr "Thêm dòng Signed-off-by cho ghi chú của lần chuyển giao"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2255
 msgid "recode into utf8 (default)"
 msgstr "chuyển mã thành utf8 (mặc định)"
 
-#: builtin/am.c:2258
+#: builtin/am.c:2257
 msgid "pass -k flag to git-mailinfo"
 msgstr "chuyển c� -k cho git-mailinfo"
 
-#: builtin/am.c:2260
+#: builtin/am.c:2259
 msgid "pass -b flag to git-mailinfo"
 msgstr "chuyển c� -b cho git-mailinfo"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2261
 msgid "pass -m flag to git-mailinfo"
 msgstr "chuyển c� -m cho git-mailinfo"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2263
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "chuyển c� --keep-cr cho git-mailsplit với định dạng mbox"
 
-#: builtin/am.c:2267
+#: builtin/am.c:2266
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "đừng chuyển c� --keep-cr cho git-mailsplit không phụ thuộc vào am.keepcr"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "strip everything before a scissors line"
 msgstr "cắt m�i thứ trước dòng scissors"
 
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
 msgid "action"
 msgstr "hành động"
 
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
 msgid "pass it through git-apply"
 msgstr "chuyển nó qua git-apply"
 
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
 msgid "root"
 msgstr "gốc"
 
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
 msgid "path"
 msgstr "đư�ng-dẫn"
 
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 builtin/pull.c:185
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193
 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
 #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
 #: parse-options.h:134 parse-options.h:244
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
 msgid "num"
 msgstr "số"
 
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
 #: builtin/tag.c:372
 msgid "format"
 msgstr "định dạng"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "format the patch(es) are in"
 msgstr "định dạng (các) miếng vá theo"
 
-#: builtin/am.c:2302
+#: builtin/am.c:2301
 msgid "override error message when patch failure occurs"
 msgstr "đè lên các l�i nhắn lỗi khi xảy ra lỗi vá nghiêm tr�ng"
 
-#: builtin/am.c:2304
+#: builtin/am.c:2303
 msgid "continue applying patches after resolving a conflict"
 msgstr "tiếp tục áp dụng các miếng vá sau khi giải quyết xung đột"
 
-#: builtin/am.c:2307
+#: builtin/am.c:2306
 msgid "synonyms for --continue"
 msgstr "đồng nghĩa với --continue"
 
-#: builtin/am.c:2310
+#: builtin/am.c:2309
 msgid "skip the current patch"
 msgstr "b� qua miếng vá hiện hành"
 
-#: builtin/am.c:2313
+#: builtin/am.c:2312
 msgid "restore the original branch and abort the patching operation."
 msgstr "phục hồi lại nhánh gốc và loại b� thao tác vá."
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 msgid "lie about committer date"
 msgstr "nói dối v� ngày chuyển giao"
 
-#: builtin/am.c:2319
+#: builtin/am.c:2318
 msgid "use current timestamp for author date"
 msgstr "dùng dấu th�i gian hiện tại cho ngày tác giả"
 
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
 msgid "key-id"
 msgstr "mã-số-khóa"
 
-#: builtin/am.c:2322
+#: builtin/am.c:2321
 msgid "GPG-sign commits"
 msgstr "lần chuyển giao ký-GPG"
 
-#: builtin/am.c:2325
+#: builtin/am.c:2324
 msgid "(internal use for git-rebase)"
 msgstr "(dùng nội bộ cho git-rebase)"
 
-#: builtin/am.c:2340
+#: builtin/am.c:2339
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -2874,16 +3147,16 @@ msgstr ""
 "Tùy ch�n -b/--binary đã không dùng từ lâu rồi, và\n"
 "nó sẽ được b� đi. Xin đừng sử dụng nó thêm nữa."
 
-#: builtin/am.c:2347
+#: builtin/am.c:2346
 msgid "failed to read the index"
 msgstr "gặp lỗi đ�c bảng mục lục"
 
-#: builtin/am.c:2362
+#: builtin/am.c:2361
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "thư mục rebase trước %s không sẵn có nhưng mbox lại đưa ra."
 
-#: builtin/am.c:2386
+#: builtin/am.c:2385
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -2892,7 +3165,7 @@ msgstr ""
 "Tìm thấy thư mục lạc %s.\n"
 "Dùng \"git am --abort\" để loại b� nó đi."
 
-#: builtin/am.c:2392
+#: builtin/am.c:2391
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại."
 
@@ -2927,38 +3200,38 @@ msgstr "thi hành biểu thức chính quy trả v� %d cho đầu vào: %s"
 msgid "unable to find filename in patch at line %d"
 msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d"
 
-#: builtin/apply.c:940
+#: builtin/apply.c:937
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: git-diff sai - cần /dev/null, nhưng lại nhận được %s trên dòng %d"
 
-#: builtin/apply.c:944
+#: builtin/apply.c:942
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply: git-diff sai - tên tập tin mới không nhất quán trên dòng %d"
 
-#: builtin/apply.c:945
+#: builtin/apply.c:943
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply: git-diff sai - tên tập tin cũ không nhất quán trên dòng %d"
 
-#: builtin/apply.c:952
+#: builtin/apply.c:949
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: git-diff sai - cần “/dev/null� trên dòng %d"
 
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "chi tiết: dòng không cần: %.*s"
 
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s"
 
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -2970,76 +3243,76 @@ msgstr[0] ""
 "phần đầu diff cho git  thiếu thông tin tên tập tin khi gỡ b� đi %d trong "
 "thành phần dẫn đầu tên của đư�ng dẫn (dòng %d)"
 
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
 msgid "new file depends on old contents"
 msgstr "tập tin mới phụ thuộc vào nội dung cũ"
 
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
 msgid "deleted file still has contents"
 msgstr "tập tin đã xóa vẫn còn nội dung"
 
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "miếng vá h�ng tại dòng %d"
 
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "tập tin mới %s phụ thuộc vào nội dung cũ"
 
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "tập tin đã xóa %s vẫn còn nội dung"
 
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa"
 
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "miếng vá định dạng nhị phân sai h�ng tại dòng %d: %.*s"
 
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d"
 
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "vá chỉ với “rác� tại dòng %d"
 
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "không thể đ�c liên kết m�m %s"
 
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
 #, c-format
 msgid "unable to open or read %s"
 msgstr "không thể mở hay đ�c %s"
 
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "sai khởi đầu dòng: “%c�"
 
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)."
 
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Nội dung bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d"
 
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -3048,324 +3321,334 @@ msgstr ""
 "trong khi đang tìm kiếm cho:\n"
 "%.*s"
 
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%s�"
 
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "miếng vá định dạng nhị phân không được áp dụng cho “%s�"
 
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "vá nhị phân cho “%s� tạo ra kết quả không chính xác (mong ch� %s, lại nhận "
 "%s)"
 
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "gặp lỗi khi vá: %s:%ld"
 
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
 #, c-format
 msgid "cannot checkout %s"
 msgstr "không thể lấy ra %s"
 
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
 #, c-format
 msgid "read of %s failed"
 msgstr "đ�c %s gặp lỗi"
 
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "đ�c từ “%s� vượt ra ngoài liên kết m�m"
 
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "đư�ng dẫn %s đã bị xóa hoặc đổi tên"
 
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: không tồn tại trong bảng mục lục"
 
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: không khớp trong mục lục"
 
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
 msgid "removal patch leaves file contents"
 msgstr "loại b� miếng vá để lại nội dung tập tin"
 
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: sai kiểu"
 
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s có kiểu %o, cần %o"
 
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
 #, c-format
 msgid "invalid path '%s'"
 msgstr "đư�ng dẫn không hợp lệ “%s�"
 
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: đã có từ trước trong bảng mục lục"
 
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: đã sẵn có trong thư mục đang làm việc"
 
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)"
 
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s"
 
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "tập tin chịu tác động “%s� vượt ra ngoài liên kết m�m"
 
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: miếng vá không được áp dụng"
 
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
 #, c-format
 msgid "Checking patch %s..."
 msgstr "�ang kiểm tra miếng vá %s…"
 
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry gặp lỗi đối với đư�ng dẫn “%s�"
 
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "không thể gỡ b� %s từ mục lục"
 
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "miếng vá sai h�ng cho mô-đun-con %s"
 
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "không thể lấy thống k� v� tập tin %s mới hơn đã được tạo"
 
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "không thể tạo “kho lưu đằng sau� cho tập tin được tạo mới hơn %s"
 
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "không thể thêm mục nhớ đệm cho %s"
 
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
 #, c-format
 msgid "closing file '%s'"
 msgstr "đang đóng tập tin “%s�"
 
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "không thể ghi vào tập tin “%s� chế độ %o"
 
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "�ã áp dụng miếng vá %s một cách sạch sẽ."
 
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
 msgid "internal error"
 msgstr "lá»—i ná»™i bá»™"
 
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "�ang áp dụng miếng vá %%s với %d lần từ chối…"
 
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej"
 
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "không thể mở %s: %s"
+
+#: builtin/apply.c:4298
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Khối nhớ #%d được áp dụng g�n gàng."
 
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "đoạn dữ liệu #%d bị từ chối."
 
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "b� qua đư�ng dẫn “%s�."
+
+#: builtin/apply.c:4395
 msgid "unrecognized input"
 msgstr "không thừa nhận đầu vào"
 
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
 msgid "unable to read index file"
 msgstr "không thể đ�c tập tin lưu bảng mục lục"
 
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
 msgid "don't apply changes matching the given path"
 msgstr "không áp dụng các thay đổi khớp với đư�ng dẫn đã cho"
 
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
 msgid "apply changes matching the given path"
 msgstr "áp dụng các thay đổi khớp với đư�ng dẫn đã cho"
 
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "gỡ b� <số> dấu gạch chéo dẫn đầu từ đư�ng dẫn diff cổ điển"
 
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
 msgid "ignore additions made by the patch"
 msgstr "l� đi phần bổ xung được tạo ra bởi miếng vá"
 
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 "thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra"
 
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân"
 
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào"
 
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không"
 
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
 msgid "make sure the patch is applicable to the current index"
 msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành"
 
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
 msgid "apply a patch without touching the working tree"
 msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc"
 
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
 msgid "accept a patch that touches outside the working area"
 msgstr "chấp nhận một miếng vá mà không động chạm đến cây làm việc"
 
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 "đồng th�i áp dụng miếng vá (dùng với tùy ch�n --stat/--summary/--check)"
 
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được"
 
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "xây dựng bảng mục lục tạm th�i trên cơ sở thông tin bảng mục lục được nhúng"
 
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
 msgid "paths are separated with NUL character"
 msgstr "các đư�ng dẫn bị ngăn cách bởi ký tự NULL"
 
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
 msgid "ensure at least <n> lines of context match"
 msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp"
 
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng"
 
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
 msgid "ignore changes in whitespace when finding context"
 msgstr "l� đi sự thay đổi do khoảng trắng gây ra khi quét nội dung"
 
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
 msgid "apply the patch in reverse"
 msgstr "áp dụng miếng vá theo chi�u ngược"
 
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
 msgid "don't expect at least one line of context"
 msgstr "đừng hy v�ng có ít nhất một dòng nội dung"
 
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng"
 
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
 msgid "allow overlapping hunks"
 msgstr "cho phép chồng khối nhớ"
 
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 "đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin"
 
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
 msgid "do not trust the line counts in the hunk headers"
 msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu"
 
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
 msgid "prepend <root> to all filenames"
 msgstr "treo thêm <root> vào tất cả các tên tập tin"
 
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
 msgid "--3way outside a repository"
 msgstr "--3way ở ngoài một kho chứa"
 
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
 msgid "--index outside a repository"
 msgstr "--index ở ngoài một kho chứa"
 
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
 msgid "--cached outside a repository"
 msgstr "--cached ở ngoài một kho chứa"
 
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
 #, c-format
 msgid "can't open patch '%s'"
 msgstr "không thể mở miếng vá “%s�"
 
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "đã chấm dứt %d lỗi khoảng trắng"
 
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
@@ -3431,101 +3714,101 @@ msgstr "<rev-opts> được mô tả trong tài liệu git-rev-list(1)"
 msgid "Blaming lines"
 msgstr "Các dòng blame"
 
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
 msgid "Show blame entries as we find them, incrementally"
 msgstr "Hiển thị các mục “blame� như là chúng ta thấy chúng, tăng dần"
 
-#: builtin/blame.c:2531
+#: builtin/blame.c:2532
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr ""
 "Hiển thị SHA-1 trắng cho những lần chuyển giao biên giới (Mặc định: off)"
 
-#: builtin/blame.c:2532
+#: builtin/blame.c:2533
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "Không coi các lần chuyển giao gốc là giới hạn (Mặc định: off)"
 
-#: builtin/blame.c:2533
+#: builtin/blame.c:2534
 msgid "Show work cost statistics"
 msgstr "Hiển thị thống kê công sức làm việc"
 
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
 msgid "Force progress reporting"
 msgstr "Ép buộc báo cáo tiến triển công việc"
 
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
 msgid "Show output score for blame entries"
 msgstr "Hiển thị kết xuất điểm số có các mục tin “blame�"
 
-#: builtin/blame.c:2536
+#: builtin/blame.c:2537
 msgid "Show original filename (Default: auto)"
 msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)"
 
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
 msgid "Show original linenumber (Default: off)"
 msgstr "Hiển thị số dòng gốc (Mặc định: off)"
 
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
 msgid "Show in a format designed for machine consumption"
 msgstr "Hiển thị ở định dạng đã thiết kế cho sự tiêu dùng bằng máy"
 
-#: builtin/blame.c:2539
+#: builtin/blame.c:2540
 msgid "Show porcelain format with per-line commit information"
 msgstr "Hiển thị định dạng “porcelain� với thông tin chuyển giao mỗi dòng"
 
-#: builtin/blame.c:2540
+#: builtin/blame.c:2541
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "Dùng cùng chế độ xuất ra với git-annotate (Mặc định: off)"
 
-#: builtin/blame.c:2541
+#: builtin/blame.c:2542
 msgid "Show raw timestamp (Default: off)"
 msgstr "Hiển thị dấu vết th�i gian dạng thô (Mặc định: off)"
 
-#: builtin/blame.c:2542
+#: builtin/blame.c:2543
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Hiển thị SHA1 của lần chuyển giao dạng dài (Mặc định: off)"
 
-#: builtin/blame.c:2543
+#: builtin/blame.c:2544
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Không hiển thị tên tác giả và dấu vết th�i gian (Mặc định: off)"
 
-#: builtin/blame.c:2544
+#: builtin/blame.c:2545
 msgid "Show author email instead of name (Default: off)"
 msgstr "Hiển thị thư điện tử của tác giả thay vì tên (Mặc định: off)"
 
-#: builtin/blame.c:2545
+#: builtin/blame.c:2546
 msgid "Ignore whitespace differences"
 msgstr "B� qua các khác biệt do khoảng trắng gây ra"
 
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
 msgid "Spend extra cycles to find better match"
 msgstr "Tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa"
 
-#: builtin/blame.c:2547
+#: builtin/blame.c:2548
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 "Sử dụng điểm xét duyệt (revision) từ <tập tin> thay vì g�i “git-rev-list�"
 
-#: builtin/blame.c:2548
+#: builtin/blame.c:2549
 msgid "Use <file>'s contents as the final image"
 msgstr "Sử dụng nội dung của <tập tin> như là ảnh cuối cùng"
 
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
 msgid "score"
 msgstr "điểm số"
 
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
 msgid "Find line copies within and across files"
 msgstr "Tìm các bản sao chép dòng trong và ngang qua tập tin"
 
-#: builtin/blame.c:2550
+#: builtin/blame.c:2551
 msgid "Find line movements within and across files"
 msgstr "Tìm các di chuyển dòng trong và ngang qua tập tin"
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "Process only line range n,m, counting from 1"
 msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1"
 
@@ -3535,31 +3818,31 @@ msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1"
 #. takes 22 places, is the longest among various forms of
 #. relative timestamps, but your language may need more or
 #. fewer display columns.
-#: builtin/blame.c:2640
+#: builtin/blame.c:2641
 msgid "4 years, 11 months ago"
 msgstr "4 năm, 11 tháng trước"
 
-#: builtin/branch.c:25
+#: builtin/branch.c:26
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr "git branch [<các-tùy-ch�n>] [-r | -a] [--merged | --no-merged]"
 
-#: builtin/branch.c:26
+#: builtin/branch.c:27
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr "git branch [<các-tùy-ch�n>] [-l] [-f] <tên-nhánh> [<điểm-đầu>]"
 
-#: builtin/branch.c:27
+#: builtin/branch.c:28
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<các-tùy-ch�n>] [-r] (-d | -D) <tên-nhánh> …"
 
-#: builtin/branch.c:28
+#: builtin/branch.c:29
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<các-tùy-ch�n>] (-m | -M) [<nhánh-cũ>] <nhánh-mới>"
 
-#: builtin/branch.c:29
+#: builtin/branch.c:30
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<các-tùy-ch�n>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:142
+#: builtin/branch.c:143
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -3568,7 +3851,7 @@ msgstr ""
 "đang xóa nhánh “%s� mà nó lại đã được hòa trộn vào\n"
 "         “%s�, nhưng vẫn chưa được hòa trộn vào HEAD."
 
-#: builtin/branch.c:146
+#: builtin/branch.c:147
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -3577,12 +3860,12 @@ msgstr ""
 "không xóa nhánh “%s� cái mà chưa được hòa trộn vào\n"
 "         “%s�, cho dù là nó đã được hòa trộn vào HEAD."
 
-#: builtin/branch.c:160
+#: builtin/branch.c:161
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Không thể tìm kiếm đối tượng chuyển giao cho “%s�"
 
-#: builtin/branch.c:164
+#: builtin/branch.c:165
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -3591,298 +3874,319 @@ msgstr ""
 "Nhánh “%s� không được trộn một cách đầy đủ.\n"
 "Nếu bạn thực sự muốn xóa nó, thì chạy lệnh “git branch -D %s�."
 
-#: builtin/branch.c:177
+#: builtin/branch.c:178
 msgid "Update of config-file failed"
 msgstr "Cập nhật tập tin cấu hình gặp lỗi"
 
-#: builtin/branch.c:205
+#: builtin/branch.c:206
 msgid "cannot use -a with -d"
 msgstr "không thể dùng tùy ch�n -a với -d"
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Không thể tìm kiếm đối tượng chuyển giao cho HEAD"
 
-#: builtin/branch.c:219
+#: builtin/branch.c:226
 #, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "Không thể xóa nhánh “%s� cái mà bạn hiện nay đang ở."
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "Không thể xóa nhánh “%s� đã được lấy ra tại “%s�"
 
-#: builtin/branch.c:235
+#: builtin/branch.c:241
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "không tìm thấy nhánh theo dõi máy chủ “%s�."
 
-#: builtin/branch.c:236
+#: builtin/branch.c:242
 #, c-format
 msgid "branch '%s' not found."
 msgstr "không tìm thấy nhánh “%s�."
 
-#: builtin/branch.c:251
+#: builtin/branch.c:257
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Gặp lỗi khi đang xóa nhánh theo dõi máy chủ “%s�"
 
-#: builtin/branch.c:252
+#: builtin/branch.c:258
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Gặp lỗi khi xóa b� nhánh “%s�"
 
-#: builtin/branch.c:259
+#: builtin/branch.c:265
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "�ã xóa nhánh theo dõi máy chủ \"%s\" (từng là %s).\n"
 
-#: builtin/branch.c:260
+#: builtin/branch.c:266
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Nhánh “%s� đã bị xóa (từng là %s)\n"
 
-#: builtin/branch.c:303
+#: builtin/branch.c:309
 #, c-format
 msgid "[%s: gone]"
 msgstr "[%s: đã ra đi]"
 
-#: builtin/branch.c:308
+#: builtin/branch.c:314
 #, c-format
 msgid "[%s]"
 msgstr "[%s]"
 
-#: builtin/branch.c:313
+#: builtin/branch.c:319
 #, c-format
 msgid "[%s: behind %d]"
 msgstr "[%s: đứng sau %d]"
 
-#: builtin/branch.c:315
+#: builtin/branch.c:321
 #, c-format
 msgid "[behind %d]"
 msgstr "[đằng sau %d]"
 
-#: builtin/branch.c:319
+#: builtin/branch.c:325
 #, c-format
 msgid "[%s: ahead %d]"
 msgstr "[%s: phía trước %d]"
 
-#: builtin/branch.c:321
+#: builtin/branch.c:327
 #, c-format
 msgid "[ahead %d]"
 msgstr "[phía trước %d]"
 
-#: builtin/branch.c:324
+#: builtin/branch.c:330
 #, c-format
 msgid "[%s: ahead %d, behind %d]"
 msgstr "[%s: trÆ°á»›c %d, sau %d]"
 
-#: builtin/branch.c:327
+#: builtin/branch.c:333
 #, c-format
 msgid "[ahead %d, behind %d]"
 msgstr "[trÆ°á»›c %d, sau %d]"
 
-#: builtin/branch.c:340
+#: builtin/branch.c:346
 msgid " **** invalid ref ****"
 msgstr " **** tham chiếu không hợp lệ ****"
 
-#: builtin/branch.c:366
+#: builtin/branch.c:372
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(không nhánh, đang cải tổ %s)"
 
-#: builtin/branch.c:369
+#: builtin/branch.c:375
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s)"
 
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD được tách r�i tại %s)"
 
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD được tách r�i từ %s)"
 
-#: builtin/branch.c:382
+#: builtin/branch.c:390
 msgid "(no branch)"
 msgstr "(không nhánh)"
 
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "Nhánh %s đang được cải tổ lại tại %s"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "Nhánh %s đang được di chuyển phân đôi (bisect) tại %s"
+
+#: builtin/branch.c:560
 msgid "cannot rename the current branch while not on any."
 msgstr "không thể đổi tên nhánh hiện hành trong khi nó chẳng ở đâu cả."
 
-#: builtin/branch.c:534
+#: builtin/branch.c:570
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Tên nhánh không hợp lệ: “%s�"
 
-#: builtin/branch.c:549
+#: builtin/branch.c:587
 msgid "Branch rename failed"
 msgstr "Gặp lỗi khi đổi tên nhánh"
 
-#: builtin/branch.c:553
+#: builtin/branch.c:591
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "�ã đổi tên nhánh khuyết danh “%s� đi"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:594
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Nhánh bị đổi tên thành %s, nhưng HEAD lại không được cập nhật!"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:601
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Nhánh bị đổi tên, nhưng cập nhật tập tin cấu hình gặp lỗi"
 
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "không thể ghi vào mẫu mô tả nhánh: %s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "không thể ghi mẫu mô tả nhánh"
 
-#: builtin/branch.c:615
+#: builtin/branch.c:651
 msgid "Generic options"
 msgstr "Tùy ch�n chung"
 
-#: builtin/branch.c:617
+#: builtin/branch.c:653
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "hiển thị mã băm và chủ đ�, đưa ra hai lần cho nhánh thượng nguồn"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:654
 msgid "suppress informational messages"
 msgstr "không xuất các thông tin"
 
-#: builtin/branch.c:619
+#: builtin/branch.c:655
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "cài đặt chế độ theo dõi (xem git-pull(1))"
 
-#: builtin/branch.c:621
+#: builtin/branch.c:657
 msgid "change upstream info"
 msgstr "thay đổi thông tin thượng nguồn"
 
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "thượng nguồn"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "thay đổi thông tin thượng nguồn"
+
+#: builtin/branch.c:661
 msgid "use colored output"
 msgstr "tô màu kết xuất"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:662
 msgid "act on remote-tracking branches"
 msgstr "thao tác trên nhánh “remote-tracking�"
 
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
 msgid "print only branches that contain the commit"
 msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:668
 msgid "Specific git-branch actions:"
 msgstr "Hành động git-branch:"
 
-#: builtin/branch.c:633
+#: builtin/branch.c:669
 msgid "list both remote-tracking and local branches"
 msgstr "liệt kê cả nhánh “remote-tracking� và nội bộ"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:671
 msgid "delete fully merged branch"
 msgstr "xóa một toàn bộ nhánh đã hòa trộn"
 
-#: builtin/branch.c:636
+#: builtin/branch.c:672
 msgid "delete branch (even if not merged)"
 msgstr "xóa nhánh (cho dù là chưa được hòa trộn)"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:673
 msgid "move/rename a branch and its reflog"
 msgstr "di chuyển hay đổi tên một nhánh và reflog của nó"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:674
 msgid "move/rename a branch, even if target exists"
 msgstr "di chuyển hoặc đổi tên một nhánh ngay cả khi đích đã có sẵn"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:675
 msgid "list branch names"
 msgstr "liệt kê các tên nhánh"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:676
 msgid "create the branch's reflog"
 msgstr "tạo reflog của nhánh"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:678
 msgid "edit the description for the branch"
 msgstr "sửa mô tả cho nhánh"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:679
 msgid "force creation, move/rename, deletion"
 msgstr "buộc tạo, di chuyển/đổi tên, xóa"
 
-#: builtin/branch.c:644
+#: builtin/branch.c:680
 msgid "print only branches that are merged"
 msgstr "chỉ hiển thị những nhánh mà nó được hòa trộn"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:681
 msgid "print only branches that are not merged"
 msgstr "chỉ hiển thị những nhánh mà nó không được hòa trộn"
 
-#: builtin/branch.c:646
+#: builtin/branch.c:682
 msgid "list branches in columns"
 msgstr "liệt kê các nhánh trong các cột"
 
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
 msgid "key"
 msgstr "khóa"
 
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
 msgid "field name to sort on"
 msgstr "tên trư�ng cần sắp xếp"
 
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
 #: builtin/tag.c:369
 msgid "object"
 msgstr "đối tượng"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:687
 msgid "print only branches of the object"
 msgstr "chỉ hiển thị các nhánh của đối tượng"
 
-#: builtin/branch.c:669
+#: builtin/branch.c:705
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu hợp lệ."
 
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
 msgid "HEAD not found below refs/heads!"
 msgstr "không tìm thấy HEAD ở dưới refs/heads!"
 
-#: builtin/branch.c:693
+#: builtin/branch.c:729
 msgid "--column and --verbose are incompatible"
 msgstr "tùy ch�n --column và --verbose xung khắc nhau"
 
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
 msgid "branch name required"
 msgstr "cần chỉ ra tên nhánh"
 
-#: builtin/branch.c:722
+#: builtin/branch.c:758
 msgid "Cannot give description to detached HEAD"
 msgstr "Không thể đưa ra mô tả HEAD đã tách r�i"
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 msgid "cannot edit description of more than one branch"
 msgstr "không thể sửa mô tả cho nhi�u hơn một nhánh"
 
-#: builtin/branch.c:734
+#: builtin/branch.c:770
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Vẫn chưa chuyển giao trên nhánh “%s�."
 
-#: builtin/branch.c:737
+#: builtin/branch.c:773
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Không có nhánh nào có tên “%s�."
 
-#: builtin/branch.c:752
+#: builtin/branch.c:788
 msgid "too many branches for a rename operation"
 msgstr "quá nhi�u nhánh dành cho thao tác đổi tên"
 
-#: builtin/branch.c:757
+#: builtin/branch.c:793
 msgid "too many branches to set new upstream"
 msgstr "quá nhi�u nhánh được đặt cho thượng nguồn mới"
 
-#: builtin/branch.c:761
+#: builtin/branch.c:797
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -3890,40 +4194,40 @@ msgstr ""
 "không thể đặt thượng nguồn của HEAD thành %s khi mà nó chẳng chỉ đến nhánh "
 "nào cả."
 
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
 #, c-format
 msgid "no such branch '%s'"
 msgstr "không có nhánh nào như thế “%s�"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:804
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "chưa có nhánh “%s�"
 
-#: builtin/branch.c:780
+#: builtin/branch.c:816
 msgid "too many branches to unset upstream"
 msgstr "quá nhi�u nhánh để b� đặt thượng nguồn"
 
-#: builtin/branch.c:784
+#: builtin/branch.c:820
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr "không thể b� đặt thượng nguồn của HEAD không chỉ đến một nhánh nào cả."
 
-#: builtin/branch.c:790
+#: builtin/branch.c:826
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Nhánh “%s� không có thông tin thượng nguồn"
 
-#: builtin/branch.c:804
+#: builtin/branch.c:840
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "không hợp lý khi tạo “HEAD� thủ công"
 
-#: builtin/branch.c:810
+#: builtin/branch.c:846
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 "hai tùy ch�n -a và -r áp dụng cho lệnh “git branch� không hợp lý đối với tên "
 "nhánh"
 
-#: builtin/branch.c:813
+#: builtin/branch.c:849
 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3932,7 +4236,7 @@ msgstr ""
 "C� --set-upstream đã lạc hậu và sẽ bị xóa b�. Nên dùng --track hoặc --set-"
 "upstream-to\n"
 
-#: builtin/branch.c:830
+#: builtin/branch.c:866
 #, c-format
 msgid ""
 "\n"
@@ -3943,16 +4247,6 @@ msgstr ""
 "Nếu bạn muốn “%s� theo dõi “%s�, thực hiện lệnh sau:\n"
 "\n"
 
-#: builtin/branch.c:831
-#, c-format
-msgid "    git branch -d %s\n"
-msgstr "    git branch -d %s\n"
-
-#: builtin/branch.c:832
-#, c-format
-msgid "    git branch --set-upstream-to %s\n"
-msgstr "    git branch --set-upstream-to %s\n"
-
 #: builtin/bundle.c:51
 #, c-format
 msgid "%s is okay\n"
@@ -4051,7 +4345,7 @@ msgstr "đ�c tên tập tin từ đầu vào tiêu chuẩn"
 msgid "terminate input and output records by a NUL character"
 msgstr "chấm dứt các bản ghi vào và ra bằng ký tự NULL"
 
-#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
 msgid "suppress progress reporting"
 msgstr "chặn các báo cáo tiến trình hoạt động"
 
@@ -4142,8 +4436,9 @@ msgid "write the content to temporary files"
 msgstr "ghi nội dung vào tập tin tạm"
 
 #: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
 msgid "string"
 msgstr "chuá»—i"
 
@@ -4193,80 +4488,80 @@ msgstr "đư�ng dẫn “%s�: không thể hòa trộn"
 msgid "Unable to add merge result for '%s'"
 msgstr "Không thể thêm kết quả hòa trộn cho “%s�"
 
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "không được dùng “%s� với các đư�ng dẫn cập nhật"
 
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "không được dùng “%s� với %s"
 
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Không thể cập nhật các đư�ng dẫn và chuyển đến nhánh “%s� cùng một lúc."
 
-#: builtin/checkout.c:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
 msgid "corrupt index file"
 msgstr "tập tin ghi bảng mục lục bị h�ng"
 
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "đư�ng dẫn “%s� không được hòa trộn"
 
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
 msgid "you need to resolve your current index first"
 msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã"
 
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Không thể thực hiện reflog cho “%s�: %s\n"
 
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
 msgid "HEAD is now at"
 msgstr "HEAD hiện gi� tại"
 
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
 msgid "unable to update HEAD"
 msgstr "không thể cập nhật HEAD"
 
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "�ặt lại nhánh “%s�\n"
 
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "�ã sẵn sàng trên “%s�\n"
 
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "�ã chuyển tới và đặt lại nhánh “%s�\n"
 
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "�ã chuyển đến nhánh mới “%s�\n"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "�ã chuyển đến nhánh “%s�\n"
 
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " … và nhi�u hơn %d.\n"
 
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -4285,7 +4580,7 @@ msgstr[0] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4306,152 +4601,152 @@ msgstr[0] ""
 " git branch <tên_nhánh_mới> %s\n"
 "\n"
 
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
 msgid "internal error in revision walk"
 msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét duyệt"
 
-#: builtin/checkout.c:797
+#: builtin/checkout.c:796
 msgid "Previous HEAD position was"
 msgstr "Vị trí trước kia của HEAD là"
 
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
 msgid "You are on a branch yet to be born"
 msgstr "Bạn tại nhánh mà nó chưa h� được sinh ra"
 
-#: builtin/checkout.c:969
+#: builtin/checkout.c:968
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "chỉ cần một tham chiếu, nhưng lại đưa ra %d."
 
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
 #, c-format
 msgid "invalid reference: %s"
 msgstr "tham chiếu không hợp lệ: %s"
 
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "tham chiếu không phải là một cây:%s"
 
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1076
 msgid "paths cannot be used with switching branches"
 msgstr "các đư�ng dẫn không thể dùng cùng với các nhánh chuyển"
 
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "“%s� không thể được sử dụng với các nhánh chuyển"
 
-#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "“%s� không thể được dùng với “%s�"
 
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Không thể chuyển nhánh đến một thứ không phải là lần chuyển giao “%s�"
 
-#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
 msgid "branch"
 msgstr "nhánh"
 
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
 msgid "create and checkout a new branch"
 msgstr "tạo và checkout một nhánh mới"
 
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
 msgid "create/reset and checkout a branch"
 msgstr "tạo/đặt_lại và checkout một nhánh"
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
 msgid "create reflog for new branch"
 msgstr "tạo reflog cho nhánh mới"
 
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
 msgid "detach the HEAD at named commit"
 msgstr "r�i b� HEAD tại lần chuyển giao danh nghĩa"
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
 msgid "set upstream info for new branch"
 msgstr "đặt thông tin thượng nguồn cho nhánh mới"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new-branch"
 msgstr "nhánh-mới"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new unparented branch"
 msgstr "nhánh không cha mới"
 
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
 msgid "checkout our version for unmerged files"
 msgstr ""
 "lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
 msgid "checkout their version for unmerged files"
 msgstr ""
 "lấy ra (checkout) phiên bản của chúng h� cho các tập tin chưa được hòa trộn"
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
 msgid "force checkout (throw away local modifications)"
 msgstr "ép buộc lấy ra (b� đi những thay đổi nội bộ)"
 
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1150
 msgid "perform a 3-way merge with the new branch"
 msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới"
 
-#: builtin/checkout.c:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
 msgid "update ignored files (default)"
 msgstr "cập nhật các tập tin bị b� qua (mặc định)"
 
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
 msgid "style"
 msgstr "kiểu"
 
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
 msgid "conflict style (merge or diff3)"
 msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "không giới hạn đặc tả đư�ng dẫn thành chỉ các mục thưa thớt"
 
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\""
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
 msgid "do not check if another worktree is holding the given ref"
 msgstr "không kiểm tra nếu cây làm việc khác đang giữ tham chiếu đã cho"
 
-#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
 #: builtin/send-pack.c:168
 msgid "force progress reporting"
 msgstr "ép buộc báo cáo tiến triển công việc"
 
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "Các tùy ch�n -b, -B và --orphan loại từ lẫn nhau"
 
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1209
 msgid "--track needs a branch name"
 msgstr "--track cần tên một nhánh"
 
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
 msgid "Missing branch name; try -b"
 msgstr "Thiếu tên nhánh; hãy thử -b"
 
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
 msgid "invalid path specification"
 msgstr "đư�ng dẫn đã cho không hợp lệ"
 
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
 #, c-format
 msgid ""
 "Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4461,12 +4756,12 @@ msgstr ""
 "Bạn đã có ý định checkout “%s� cái mà không thể được phân giải như là lần "
 "chuyển giao?"
 
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach không nhận một đối số đư�ng dẫn “%s�"
 
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1266
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -4617,8 +4912,8 @@ msgstr "d�n bằng kiểu tương tác"
 msgid "remove whole directories"
 msgstr "gỡ b� toàn bộ thư mục"
 
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
 msgid "pattern"
 msgstr "mẫu"
 
@@ -4658,103 +4953,112 @@ msgstr ""
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<các-tùy-ch�n>] [--] <kho> [<t.mục>]"
 
-#: builtin/clone.c:60
+#: builtin/clone.c:62
 msgid "don't create a checkout"
 msgstr "không tạo một checkout"
 
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
 msgid "create a bare repository"
 msgstr "tạo kho thuần"
 
-#: builtin/clone.c:65
+#: builtin/clone.c:67
 msgid "create a mirror repository (implies bare)"
 msgstr "tạo kho bản sao (ý là kho thuần)"
 
-#: builtin/clone.c:67
+#: builtin/clone.c:69
 msgid "to clone from a local repository"
 msgstr "để nhân bản từ kho nội bộ"
 
-#: builtin/clone.c:69
+#: builtin/clone.c:71
 msgid "don't use local hardlinks, always copy"
 msgstr "không sử dụng liên kết cứng nội bộ, luôn sao chép"
 
-#: builtin/clone.c:71
+#: builtin/clone.c:73
 msgid "setup as shared repository"
 msgstr "cài đặt đây là kho chia sẻ"
 
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
 msgid "initialize submodules in the clone"
 msgstr "khởi tạo mô-đun-con trong bản sao"
 
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "số lượng mô-đun-con được nhân bản đồng th�i"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
 msgid "template-directory"
 msgstr "thư-mục-mẫu"
 
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
 msgid "directory from which templates will be used"
 msgstr "thư mục mà tại đó các mẫu sẽ được dùng"
 
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
 msgid "reference repository"
 msgstr "kho tham chiếu"
 
-#: builtin/clone.c:81
+#: builtin/clone.c:85
 msgid "use --reference only while cloning"
 msgstr "chỉ dùng --reference khi nhân bản"
 
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
 msgid "name"
 msgstr "tên"
 
-#: builtin/clone.c:83
+#: builtin/clone.c:87
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "dùng <tên> thay cho “origin� để theo dõi thượng nguồn"
 
-#: builtin/clone.c:85
+#: builtin/clone.c:89
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:91
 msgid "path to git-upload-pack on the remote"
 msgstr "đư�ng dẫn đến git-upload-pack trên máy chủ"
 
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201
 msgid "depth"
 msgstr "độ-sâu"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:93
 msgid "create a shallow clone of that depth"
 msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:95
 msgid "clone only one branch, HEAD or --branch"
 msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch"
 
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "m�i mô-đun-con nhân bản sẽ là shallow (nông)"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
 msgid "separate git dir from working tree"
 msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:100
 msgid "key=value"
 msgstr "khóa=giá_trị"
 
-#: builtin/clone.c:95
+#: builtin/clone.c:101
 msgid "set config inside the new repository"
 msgstr "đặt cấu hình bên trong một kho chứa mới"
 
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
 msgid "use IPv4 addresses only"
 msgstr "chỉ dùng địa chỉ IPv4"
 
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
 msgid "use IPv6 addresses only"
 msgstr "chỉ dùng địa chỉ IPv6"
 
-#: builtin/clone.c:239
+#: builtin/clone.c:241
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -4762,57 +5066,52 @@ msgstr ""
 "Không đoán được thư mục tên là gì.\n"
 "Vui lòng chỉ định tên một thư mục trên dòng lệnh"
 
-#: builtin/clone.c:305
+#: builtin/clone.c:307
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "kho tham chiếu “%s� như là lấy ra liên kết vẫn chưa được hỗ trợ."
 
-#: builtin/clone.c:307
+#: builtin/clone.c:309
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "kho tham chiếu “%s� không phải là một kho nội bộ."
 
-#: builtin/clone.c:312
+#: builtin/clone.c:314
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "kho tham chiếu “%s� là nông"
 
-#: builtin/clone.c:315
+#: builtin/clone.c:317
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "kho tham chiếu “%s� bị cấy ghép"
 
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "gặp lỗi khi lấy thống kê v� “%s�"
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s có tồn tại nhưng lại không phải là một thư mục"
 
-#: builtin/clone.c:396
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "gặp lỗi khi lấy thông tin thống kê v� %s\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "gặp lỗi khi tạo được liên kết m�m %s"
 
-#: builtin/clone.c:422
+#: builtin/clone.c:424
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "gặp lỗi khi sao chép tập tin và “%s�"
 
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
 #, c-format
 msgid "done.\n"
 msgstr "hoàn tất.\n"
 
-#: builtin/clone.c:459
+#: builtin/clone.c:461
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -4822,126 +5121,126 @@ msgstr ""
 "Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status�\n"
 "và thử lấy ra với lệnh “git checkout -f HEAD�\n"
 
-#: builtin/clone.c:536
+#: builtin/clone.c:538
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)."
 
-#: builtin/clone.c:626
+#: builtin/clone.c:628
 #, c-format
 msgid "Checking connectivity... "
 msgstr "�ang kiểm tra kết nối… "
 
-#: builtin/clone.c:629
+#: builtin/clone.c:631
 msgid "remote did not send all necessary objects"
 msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết"
 
-#: builtin/clone.c:647
+#: builtin/clone.c:649
 #, c-format
 msgid "unable to update %s"
 msgstr "không thể cập nhật %s"
 
-#: builtin/clone.c:696
+#: builtin/clone.c:698
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "refers HEAD máy chủ  chỉ đến ref không tồn tại, không thể lấy ra.\n"
 
-#: builtin/clone.c:727
+#: builtin/clone.c:729
 msgid "unable to checkout working tree"
 msgstr "không thể lấy ra (checkout) cây làm việc"
 
-#: builtin/clone.c:753
+#: builtin/clone.c:767
 msgid "unable to write parameters to config file"
 msgstr "không thể ghi các tham số vào tập tin cấu hình"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:830
 msgid "cannot repack to clean up"
 msgstr "không thể đóng gói để d�n dẹp"
 
-#: builtin/clone.c:818
+#: builtin/clone.c:832
 msgid "cannot unlink temporary alternates file"
 msgstr "không thể b� liên kết tập tin thay thế tạm th�i"
 
-#: builtin/clone.c:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
 msgid "Too many arguments."
 msgstr "Có quá nhi�u đối số."
 
-#: builtin/clone.c:854
+#: builtin/clone.c:868
 msgid "You must specify a repository to clone."
 msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)."
 
-#: builtin/clone.c:865
+#: builtin/clone.c:879
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "tùy ch�n --bare và --origin %s xung khắc nhau."
 
-#: builtin/clone.c:868
+#: builtin/clone.c:882
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "tùy ch�n --bare và --separate-git-dir xung khắc nhau."
 
-#: builtin/clone.c:881
+#: builtin/clone.c:895
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "kho chứa “%s� chưa tồn tại"
 
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "độ sâu %s không phải là một số nguyên dương"
 
-#: builtin/clone.c:897
+#: builtin/clone.c:911
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "đư�ng dẫn đích “%s� đã có từ trước và không phải là một thư mục rỗng."
 
-#: builtin/clone.c:907
+#: builtin/clone.c:921
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "cây làm việc “%s� đã sẵn tồn tại rồi."
 
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "không thể tạo các thư mục dẫn đầu của “%s�"
 
-#: builtin/clone.c:925
+#: builtin/clone.c:939
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "không thể tạo cây thư mục làm việc dir “%s�"
 
-#: builtin/clone.c:943
+#: builtin/clone.c:957
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "�ang nhân bản thành kho chứa bare “%s�…\n"
 
-#: builtin/clone.c:945
+#: builtin/clone.c:959
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "�ang nhân bản thành “%s�…\n"
 
-#: builtin/clone.c:984
+#: builtin/clone.c:998
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth bị l� đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế."
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1001
 msgid "source repository is shallow, ignoring --local"
 msgstr "kho nguồn là nông, nên b� qua --local"
 
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
 msgid "--local is ignored"
 msgstr "--local bị l� đi"
 
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "Không biết làm cách nào để nhân bản (clone) %s"
 
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s"
 
-#: builtin/clone.c:1056
+#: builtin/clone.c:1070
 msgid "You appear to have cloned an empty repository."
 msgstr "Bạn hình như là đã nhân bản một kho trống rỗng."
 
@@ -5092,68 +5391,68 @@ msgstr ""
 "Thế thì \"git cherry-pick --continue\" sẽ phục hồi lại việc cherry-pick\n"
 "những lần chuyển giao còn lại.\n"
 
-#: builtin/commit.c:305
+#: builtin/commit.c:307
 msgid "failed to unpack HEAD tree object"
 msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây"
 
-#: builtin/commit.c:346
+#: builtin/commit.c:348
 msgid "unable to create temporary index"
 msgstr "không thể tạo bảng mục lục tạm th�i"
 
-#: builtin/commit.c:352
+#: builtin/commit.c:354
 msgid "interactive add failed"
 msgstr "gặp lỗi khi thêm bằng cách tương"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:367
 msgid "unable to update temporary index"
 msgstr "không thể cập nhật bảng mục lục tạm th�i"
 
-#: builtin/commit.c:367
+#: builtin/commit.c:369
 msgid "Failed to update main cache tree"
 msgstr "Gặp lỗi khi cập nhật cây bộ nhớ đệm"
 
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
 msgid "unable to write new_index file"
 msgstr "không thể ghi tập tin lưu bảng mục lục mới (new_index)"
 
-#: builtin/commit.c:445
+#: builtin/commit.c:447
 msgid "cannot do a partial commit during a merge."
 msgstr ""
 "không thể thực hiện việc chuyển giao cục bộ trong khi đang được hòa trộn."
 
-#: builtin/commit.c:447
+#: builtin/commit.c:449
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 "không thể thực hiện việc chuyển giao bộ phận trong khi đang cherry-pick."
 
-#: builtin/commit.c:456
+#: builtin/commit.c:458
 msgid "cannot read the index"
 msgstr "không đ�c được bảng mục lục"
 
-#: builtin/commit.c:475
+#: builtin/commit.c:477
 msgid "unable to write temporary index file"
 msgstr "không thể ghi tập tin lưu bảng mục lục tạm th�i"
 
-#: builtin/commit.c:580
+#: builtin/commit.c:582
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "lần chuyển giao “%s� thiếu phần tác giả ở đầu"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:584
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "lần chuyển giao “%s� có phần tác giả ở đầu dị dạng"
 
-#: builtin/commit.c:601
+#: builtin/commit.c:603
 msgid "malformed --author parameter"
 msgstr "đối số cho --author bị dị hình"
 
-#: builtin/commit.c:609
+#: builtin/commit.c:611
 #, c-format
 msgid "invalid date format: %s"
 msgstr "ngày tháng không hợp lệ: %s"
 
-#: builtin/commit.c:653
+#: builtin/commit.c:655
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -5161,38 +5460,38 @@ msgstr ""
 "không thể ch�n một ký tự ghi chú cái mà không được dùng\n"
 "trong phần ghi chú hiện tại"
 
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "không thể tìm kiếm commit (lần chuyển giao) %s"
 
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(đang đ�c thông điệp nhật ký từ đầu vào tiêu chuẩn)\n"
 
-#: builtin/commit.c:704
+#: builtin/commit.c:706
 msgid "could not read log from standard input"
 msgstr "không thể đ�c nhật ký từ đầu vào tiêu chuẩn"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:710
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "không đ�c được tệp nhật ký “%s�"
 
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "không thể đ�c MERGE_MSG"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
 msgid "could not read SQUASH_MSG"
 msgstr "không thể đ�c SQUASH_MSG"
 
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "không thể đ�c MERGE_MSG"
+
+#: builtin/commit.c:796
 msgid "could not write commit template"
 msgstr "không thể ghi mẫu chuyển giao"
 
-#: builtin/commit.c:803
+#: builtin/commit.c:814
 #, c-format
 msgid ""
 "\n"
@@ -5207,7 +5506,7 @@ msgstr ""
 "\t%s\n"
 "và thử lại.\n"
 
-#: builtin/commit.c:808
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -5222,7 +5521,7 @@ msgstr ""
 "\t%s\n"
 "và thử lại.\n"
 
-#: builtin/commit.c:821
+#: builtin/commit.c:832
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5233,7 +5532,7 @@ msgstr ""
 "bắt đầu bằng “%c� sẽ được b� qua, nếu phần chú thích rỗng sẽ hủy b� lần "
 "chuyển giao.\n"
 
-#: builtin/commit.c:828
+#: builtin/commit.c:839
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5245,157 +5544,157 @@ msgstr ""
 "bắt đầu bằng “%c� sẽ được b� qua; bạn có thể xóa chúng đi nếu muốn thế.\n"
 "Phần chú thích này nếu trống rỗng sẽ hủy b� lần chuyển giao.\n"
 
-#: builtin/commit.c:848
+#: builtin/commit.c:859
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sTác giả:           %.*s <%.*s>"
 
-#: builtin/commit.c:856
+#: builtin/commit.c:867
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sNgày tháng:        %s"
 
-#: builtin/commit.c:863
+#: builtin/commit.c:874
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sNgư�i chuyển giao: %.*s <%.*s>"
 
-#: builtin/commit.c:881
+#: builtin/commit.c:892
 msgid "Cannot read index"
 msgstr "Không đ�c được bảng mục lục"
 
-#: builtin/commit.c:938
+#: builtin/commit.c:949
 msgid "Error building trees"
 msgstr "Gặp lỗi khi xây dựng cây"
 
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Xin hãy cung cấp l�i chú giải hoặc là dùng tùy ch�n -m hoặc là -F.\n"
 
-#: builtin/commit.c:1055
+#: builtin/commit.c:1066
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author “%s� không phải là “H� và tên <thư điện tửl>� và không khớp bất kỳ "
 "tác giả nào sẵn có"
 
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Chế độ cho các tập tin chưa được theo dõi không hợp lệ “%s�"
 
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
 msgid "--long and -z are incompatible"
 msgstr "hai tùy ch�n -long và -z không tương thích với nhau"
 
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Sử dụng cả hai tùy ch�n --reset-author và --author không hợp lý"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1157
 msgid "You have nothing to amend."
 msgstr "Không có gì để mà “tu bổ� cả."
 
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr ""
 "Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “tu bổ�."
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1162
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr ""
 "Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc “tu "
 "bổ�."
 
-#: builtin/commit.c:1154
+#: builtin/commit.c:1165
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Các tùy ch�n --squash và --fixup không thể sử dụng cùng với nhau"
 
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr ""
 "Chỉ được dùng một trong số tùy ch�n trong số các tùy ch�n -c/-C/-F/--fixup"
 
-#: builtin/commit.c:1166
+#: builtin/commit.c:1177
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "Tùy ch�n -m không thể được tổ hợp cùng với -c/-C/-F/--fixup."
 
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 "--reset-author chỉ có thể được sử dụng với tùy ch�n -C, -c hay --amend."
 
-#: builtin/commit.c:1191
+#: builtin/commit.c:1202
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Chỉ một trong các tùy ch�n --include/--only/--all/--interactive/--patch được "
 "sử dụng."
 
-#: builtin/commit.c:1193
+#: builtin/commit.c:1204
 msgid "No paths with --include/--only does not make sense."
 msgstr "Không đư�ng dẫn với các tùy ch�n --include/--only không hợp lý."
 
-#: builtin/commit.c:1195
+#: builtin/commit.c:1206
 msgid "Clever... amending the last one with dirty index."
 msgstr "Gi�i…  “tu bổ� cái cuối với bảng mục lục bẩn."
 
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
 msgstr ""
 "Những đư�ng dẫn rõ ràng được chỉ ra không có tùy ch�n -i cũng không -o; coi "
 "là --only những đư�ng dẫn"
 
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Chế độ d�n dẹp không hợp lệ %s"
 
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
 msgid "Paths with -a does not make sense."
 msgstr "Các đư�ng dẫn với tùy ch�n -a không hợp lý."
 
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
 msgid "show status concisely"
 msgstr "hiển thị trạng thái ở dạng súc tích"
 
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
 msgid "show branch information"
 msgstr "hiển thị thông tin nhánh"
 
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
 msgid "machine-readable output"
 msgstr "kết xuất dạng máy-có-thể-đ�c"
 
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
 msgid "show status in long format (default)"
 msgstr "hiển thị trạng thái ở định dạng dài (mặc định)"
 
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
 msgid "terminate entries with NUL"
 msgstr "chấm dứt các mục bằng NUL"
 
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
 #: builtin/fast-export.c:984 builtin/tag.c:353
 msgid "mode"
 msgstr "chế độ"
 
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "hiển thị các tập tin chưa được theo dõi  dấu vết, các chế độ tùy ch�n:  all, "
 "normal, no. (Mặc định: all)"
 
-#: builtin/commit.c:1340
+#: builtin/commit.c:1351
 msgid "show ignored files"
 msgstr "hiển thị các tập tin ẩn"
 
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
 msgid "when"
 msgstr "khi"
 
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -5403,205 +5702,205 @@ msgstr ""
 "b� qua các thay đổi trong mô-đun-con, tùy ch�n khi: all, dirty, untracked. "
 "(Mặc định: all)"
 
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
 msgid "list untracked files in columns"
 msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong các cột"
 
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
 msgid "couldn't look up newly created commit"
 msgstr "không thể tìm thấy lần chuyển giao mới hơn đã được tạo"
 
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
 msgid "could not parse newly created commit"
 msgstr ""
 "không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo"
 
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
 msgid "detached HEAD"
 msgstr "đã r�i kh�i HEAD"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
 msgid " (root-commit)"
 msgstr " (root-commit)"
 
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
 msgid "suppress summary after successful commit"
 msgstr "không hiển thị tổng kết sau khi chuyển giao thành công"
 
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
 msgid "show diff in commit message template"
 msgstr "hiển thị sự khác biệt trong mẫu tin nhắn chuyển giao"
 
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
 msgid "Commit message options"
 msgstr "Các tùy ch�n ghi chú commit"
 
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
 msgid "read message from file"
 msgstr "đ�c chú thích từ tập tin"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "author"
 msgstr "tác giả"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "override author for commit"
 msgstr "ghi đè tác giả cho commit"
 
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
 msgid "date"
 msgstr "ngày tháng"
 
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
 msgid "override date for commit"
 msgstr "ghi đè ngày tháng cho lần chuyển giao"
 
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
 #: builtin/notes.c:558 builtin/tag.c:349
 msgid "message"
 msgstr "chú thích"
 
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
 msgid "commit message"
 msgstr "chú thích của lần chuyển giao"
 
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
 msgid "commit"
 msgstr "lần_chuyển_giao"
 
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
 msgid "reuse and edit message from specified commit"
 msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho nhưng có cho sửa chữa"
 
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
 msgid "reuse message from specified commit"
 msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho"
 
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "dùng ghi chú có định dạng autosquash để sửa chữa lần chuyển giao đã chỉ ra"
 
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "dùng l�i nhắn có định dạng tự động nén để nén lại các lần chuyển giao đã chỉ "
 "ra"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1603
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 "lần chuyển giao nhận tôi là tác giả (được dùng với tùy ch�n -C/-c/--amend)"
 
-#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
 msgid "add Signed-off-by:"
 msgstr "(nên dùng) thêm dòng Signed-off-by:"
 
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
 msgid "use specified template file"
 msgstr "sử dụng tập tin mẫu đã cho"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
 msgid "force edit of commit"
 msgstr "ép buộc sửa lần commit"
 
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
 msgid "default"
 msgstr "mặc định"
 
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
 msgid "how to strip spaces and #comments from message"
 msgstr "làm thế nào để cắt b� khoảng trắng và #ghichú từ mẩu tin nhắn"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
 msgid "include status in commit message template"
 msgstr "bao gồm các trạng thái trong mẫu ghi chú chuyển giao"
 
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
 #: builtin/revert.c:93
 msgid "GPG sign commit"
 msgstr "ký lần chuyển giao dùng GPG"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
 msgid "Commit contents options"
 msgstr "Các tùy nội dung ghi chú commit"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
 msgid "commit all changed files"
 msgstr "chuyển giao tất cả các tập tin có thay đổi"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
 msgid "add specified files to index for commit"
 msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao"
 
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
 msgid "interactively add files"
 msgstr "thêm các tập-tin bằng tương tác"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
 msgid "interactively add changes"
 msgstr "thêm các thay đổi bằng tương tác"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
 msgid "commit only specified files"
 msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
 msgid "bypass pre-commit hook"
 msgstr "vòng qua móc (hook) pre-commit"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
 msgid "show what would be committed"
 msgstr "hiển thị xem cái gì có thể được chuyển giao"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
 msgid "amend previous commit"
 msgstr "“tu bổ� (amend) lần commit trước"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
 msgid "bypass post-rewrite hook"
 msgstr "vòng qua móc (hook) post-rewrite"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
 msgid "ok to record an empty change"
 msgstr "ok để ghi lại một thay đổi trống rỗng"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
 msgid "ok to record a change with an empty message"
 msgstr "ok để ghi các thay đổi với l�i nhắn trống rỗng"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
 msgid "could not parse HEAD commit"
 msgstr "không thể phân tích commit (lần chuyển giao) HEAD"
 
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Tập tin MERGE_HEAD sai h�ng (%s)"
 
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
 msgid "could not read MERGE_MODE"
 msgstr "không thể đ�c MERGE_MODE"
 
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "không thể đ�c phần chú thích (message) của llần chuyển giao: %s"
 
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr ""
 "�ang b� qua việc chuyển giao; bạn đã không biên soạn phần chú thích "
 "(message).\n"
 
-#: builtin/commit.c:1740
+#: builtin/commit.c:1760
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Bãi b� việc chuyển giao bởi vì phần chú thích của nó trống rỗng.\n"
 
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -5750,7 +6049,7 @@ msgstr ""
 msgid "unable to parse default color value"
 msgstr "không thể phân tích giá trị màu mặc định"
 
-#: builtin/config.c:469
+#: builtin/config.c:472
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -5765,7 +6064,7 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:614
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "không thể tạo tập tin cấu hình “%s�"
@@ -5801,7 +6100,7 @@ msgstr "thẻ được chú giải %s không có tên nhúng"
 msgid "tag '%s' is really '%s' here"
 msgstr "thẻ “%s� đã thực sự ở đây “%s� rồi"
 
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Không phải tên đối tượng %s hợp lệ"
@@ -5894,7 +6193,7 @@ msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)"
 msgid "only consider tags matching <pattern>"
 msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>"
 
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
 msgid "show abbreviated commit object as fallback"
 msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback"
 
@@ -5928,21 +6227,21 @@ msgstr "“%s�: không phải tập tin bình thư�ng hay liên kết m�m"
 msgid "invalid option: %s"
 msgstr "tùy ch�n không hợp lệ: %s"
 
-#: builtin/diff.c:358
+#: builtin/diff.c:360
 msgid "Not a git repository"
 msgstr "Không phải là kho git"
 
-#: builtin/diff.c:401
+#: builtin/diff.c:403
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "đối tượng đã cho “%s� không hợp lệ."
 
-#: builtin/diff.c:410
+#: builtin/diff.c:412
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "đã cho nhi�u hơn hai đối tượng blob: “%s�"
 
-#: builtin/diff.c:417
+#: builtin/diff.c:419
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "đã cho đối tượng không thể nắm giữ “%s�."
@@ -6015,19 +6314,19 @@ msgstr "git fetch --multiple [<các-tùy-ch�n>] [(<kho> | <nhóm>)…]"
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<các-tùy-ch�n>]"
 
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
 msgid "fetch from all remotes"
 msgstr "lấy v� từ tất cả các máy chủ"
 
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "nối thêm vào .git/FETCH_HEAD thay vì ghi đè lên nó"
 
-#: builtin/fetch.c:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
 msgid "path to upload pack on remote end"
 msgstr "đư�ng dẫn đến gói tải lên trên máy chủ cuối"
 
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
 msgid "force overwrite of local branch"
 msgstr "ép buộc ghi đè lên nhánh nội bộ"
 
@@ -6035,7 +6334,7 @@ msgstr "ép buộc ghi đè lên nhánh nội bộ"
 msgid "fetch from multiple remotes"
 msgstr "lấy từ nhi�u máy chủ cùng lúc"
 
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
 msgid "fetch all tags and associated objects"
 msgstr "lấy tất cả các thẻ cùng với các đối tượng liên quan đến nó"
 
@@ -6047,21 +6346,21 @@ msgstr "không lấy tất cả các thẻ (--no-tags)"
 msgid "number of submodules fetched in parallel"
 msgstr "số lượng mô-đun-con được lấy đồng th�i"
 
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 "cắt cụt (prune) các nhánh “remote-tracking� không còn tồn tại trên máy chủ "
 "nữa"
 
-#: builtin/fetch.c:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
 msgid "on-demand"
 msgstr "khi-cần"
 
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
 msgid "control recursive fetching of submodules"
 msgstr "đi�u khiển việc lấy v� đệ quy trong các mô-đun-con"
 
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
 msgid "keep downloaded pack"
 msgstr "giữ lại gói đã tải v�"
 
@@ -6069,15 +6368,15 @@ msgstr "giữ lại gói đã tải v�"
 msgid "allow updating of HEAD ref"
 msgstr "cho phép cập nhật th.chiếu HEAD"
 
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
 msgid "deepen history of shallow clone"
 msgstr "làm sâu hơn lịch sử của bản sao"
 
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
 msgid "convert to a complete repository"
 msgstr "chuyển đổi hoàn toàn sang kho git"
 
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
 msgid "dir"
 msgstr "tmục"
 
@@ -6089,15 +6388,15 @@ msgstr "soạn sẵn cái này cho kết xuất đư�ng dẫn mô-đun-con"
 msgid "default mode for recursion"
 msgstr "chế độ mặc định cho đệ qui"
 
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
 msgid "accept refs that update .git/shallow"
 msgstr "chấp nhận tham chiếu cập nhật .git/shallow"
 
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
 msgid "refmap"
 msgstr "refmap"
 
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
 msgid "specify fetch refmap"
 msgstr "chỉ ra refmap cần lấy v�"
 
@@ -6155,11 +6454,6 @@ msgstr "cưỡng bức cập nhật"
 msgid "(non-fast-forward)"
 msgstr "(không-chuyển-tiếp-nhanh)"
 
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "không thể mở %s: %s\n"
-
 #: builtin/fetch.c:619
 #, c-format
 msgid "%s did not send all necessary objects\n"
@@ -6362,55 +6656,55 @@ msgstr "�ang kiểm tra kết nối"
 msgid "Checking object directories"
 msgstr "�ang kiểm tra các thư mục đối tượng"
 
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<các-tùy-ch�n>] [<đối-tượng>…]"
 
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
 msgid "show unreachable objects"
 msgstr "hiển thị các đối tượng không thể đ�c được"
 
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
 msgid "show dangling objects"
 msgstr "hiển thị các đối tượng không được quản lý"
 
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
 msgid "report tags"
 msgstr "báo cáo các thẻ"
 
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
 msgid "report root nodes"
 msgstr "báo cáo node gốc"
 
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
 msgid "make index objects head nodes"
 msgstr "tạo “index objects head nodes�"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
 msgid "make reflogs head nodes (default)"
 msgstr "tạo “reflogs head nodes� (mặc định)"
 
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
 msgid "also consider packs and alternate objects"
 msgstr "cũng cân nhắc đến các đối tượng gói và thay thế"
 
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
 msgid "check only connectivity"
 msgstr "chỉ kiểm tra kết nối"
 
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
 msgid "enable more strict checking"
 msgstr "cho phép kiểm tra hạn chế hơn"
 
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
 msgid "write dangling objects in .git/lost-found"
 msgstr "ghi các đối tượng không được quản lý trong .git/lost-found"
 
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
 msgid "show progress"
 msgstr "hiển thị quá trình"
 
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
 msgid "Checking objects"
 msgstr "�ang kiểm tra các đối tượng"
 
@@ -6515,217 +6809,217 @@ msgstr "không thể đ�c cây (%s)"
 msgid "unable to grep from object of type %s"
 msgstr "không thể thực hiện lệnh grep (l�c tìm) từ đối tượng thuộc kiểu %s"
 
-#: builtin/grep.c:558
+#: builtin/grep.c:560
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "chuyển đến “%c� cần một giá trị bằng số"
 
-#: builtin/grep.c:575
+#: builtin/grep.c:577
 #, c-format
 msgid "cannot open '%s'"
 msgstr "không mở được “%s�"
 
-#: builtin/grep.c:644
+#: builtin/grep.c:646
 msgid "search in index instead of in the work tree"
 msgstr "tìm trong bảng mục lục thay vì trong cây làm việc"
 
-#: builtin/grep.c:646
+#: builtin/grep.c:648
 msgid "find in contents not managed by git"
 msgstr "tìm trong nội dung không được quản lý bởi git"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:650
 msgid "search in both tracked and untracked files"
 msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết"
 
-#: builtin/grep.c:650
+#: builtin/grep.c:652
 msgid "ignore files specified via '.gitignore'"
 msgstr "các tập tin bị b� qua được chỉ định thông qua “.gitignore�"
 
-#: builtin/grep.c:653
+#: builtin/grep.c:655
 msgid "show non-matching lines"
 msgstr "hiển thị những dòng không khớp với mẫu"
 
-#: builtin/grep.c:655
+#: builtin/grep.c:657
 msgid "case insensitive matching"
 msgstr "phân biệt HOA/thư�ng"
 
-#: builtin/grep.c:657
+#: builtin/grep.c:659
 msgid "match patterns only at word boundaries"
 msgstr "chỉ khớp mẫu tại đư�ng ranh giới từ"
 
-#: builtin/grep.c:659
+#: builtin/grep.c:661
 msgid "process binary files as text"
 msgstr "xử lý tập tin nhị phân như là dạng văn bản thư�ng"
 
-#: builtin/grep.c:661
+#: builtin/grep.c:663
 msgid "don't match patterns in binary files"
 msgstr "không khớp mẫu trong các tập tin nhị phân"
 
-#: builtin/grep.c:664
+#: builtin/grep.c:666
 msgid "process binary files with textconv filters"
 msgstr "xử lý tập tin nhị phân với các bộ l�c “textconv�"
 
-#: builtin/grep.c:666
+#: builtin/grep.c:668
 msgid "descend at most <depth> levels"
 msgstr "hạ xuống ít nhất là mức <sâu>"
 
-#: builtin/grep.c:670
+#: builtin/grep.c:672
 msgid "use extended POSIX regular expressions"
 msgstr "dùng biểu thức chính qui POSIX có mở rộng"
 
-#: builtin/grep.c:673
+#: builtin/grep.c:675
 msgid "use basic POSIX regular expressions (default)"
 msgstr "sử dụng biểu thức chính quy kiểu POSIX (mặc định)"
 
-#: builtin/grep.c:676
+#: builtin/grep.c:678
 msgid "interpret patterns as fixed strings"
 msgstr "diễn dịch các mẫu như là chuỗi cố định"
 
-#: builtin/grep.c:679
+#: builtin/grep.c:681
 msgid "use Perl-compatible regular expressions"
 msgstr "sử dụng biểu thức chính quy tương thích Perl"
 
-#: builtin/grep.c:682
+#: builtin/grep.c:684
 msgid "show line numbers"
 msgstr "hiển thị số của dòng"
 
-#: builtin/grep.c:683
+#: builtin/grep.c:685
 msgid "don't show filenames"
 msgstr "không hiển thị tên tập tin"
 
-#: builtin/grep.c:684
+#: builtin/grep.c:686
 msgid "show filenames"
 msgstr "hiển thị các tên tập tin"
 
-#: builtin/grep.c:686
+#: builtin/grep.c:688
 msgid "show filenames relative to top directory"
 msgstr "hiển thị tên tập tin tương đối với thư mục đỉnh (top)"
 
-#: builtin/grep.c:688
+#: builtin/grep.c:690
 msgid "show only filenames instead of matching lines"
 msgstr "chỉ hiển thị tên tập tin thay vì những dòng khớp với mẫu"
 
-#: builtin/grep.c:690
+#: builtin/grep.c:692
 msgid "synonym for --files-with-matches"
 msgstr "đồng nghĩa với --files-with-matches"
 
-#: builtin/grep.c:693
+#: builtin/grep.c:695
 msgid "show only the names of files without match"
 msgstr "chỉ hiển thị tên cho những tập tin không khớp với mẫu"
 
-#: builtin/grep.c:695
+#: builtin/grep.c:697
 msgid "print NUL after filenames"
 msgstr "thêm NUL vào sau tên tập tin"
 
-#: builtin/grep.c:697
+#: builtin/grep.c:699
 msgid "show the number of matches instead of matching lines"
 msgstr "hiển thị số lượng khớp thay vì những dòng khớp với mẫu"
 
-#: builtin/grep.c:698
+#: builtin/grep.c:700
 msgid "highlight matches"
 msgstr "tô sáng phần khớp mẫu"
 
-#: builtin/grep.c:700
+#: builtin/grep.c:702
 msgid "print empty line between matches from different files"
 msgstr "hiển thị dòng trống giữa các lần khớp từ các tập tin khác biệt"
 
-#: builtin/grep.c:702
+#: builtin/grep.c:704
 msgid "show filename only once above matches from same file"
 msgstr ""
 "hiển thị tên tập tin một lần phía trên các lần khớp từ cùng một tập tin"
 
-#: builtin/grep.c:705
+#: builtin/grep.c:707
 msgid "show <n> context lines before and after matches"
 msgstr "hiển thị <n> dòng nội dung phía trước và sau các lần khớp"
 
-#: builtin/grep.c:708
+#: builtin/grep.c:710
 msgid "show <n> context lines before matches"
 msgstr "hiển thị <n> dòng nội dung trước khớp"
 
-#: builtin/grep.c:710
+#: builtin/grep.c:712
 msgid "show <n> context lines after matches"
 msgstr "hiển thị <n> dòng nội dung sau khớp"
 
-#: builtin/grep.c:712
+#: builtin/grep.c:714
 msgid "use <n> worker threads"
 msgstr "dùng <n> tuyến trình làm việc"
 
-#: builtin/grep.c:713
+#: builtin/grep.c:715
 msgid "shortcut for -C NUM"
 msgstr "dạng viết tắt của -C S�"
 
-#: builtin/grep.c:716
+#: builtin/grep.c:718
 msgid "show a line with the function name before matches"
 msgstr "hiển thị dòng vói tên hàm trước các lần khớp"
 
-#: builtin/grep.c:718
+#: builtin/grep.c:720
 msgid "show the surrounding function"
 msgstr "hiển thị hàm bao quanh"
 
-#: builtin/grep.c:721
+#: builtin/grep.c:723
 msgid "read patterns from file"
 msgstr "đ�c mẫu từ tập-tin"
 
-#: builtin/grep.c:723
+#: builtin/grep.c:725
 msgid "match <pattern>"
 msgstr "match <mẫu>"
 
-#: builtin/grep.c:725
+#: builtin/grep.c:727
 msgid "combine patterns specified with -e"
 msgstr "tổ hợp mẫu được chỉ ra với tùy ch�n -e"
 
-#: builtin/grep.c:737
+#: builtin/grep.c:739
 msgid "indicate hit with exit status without output"
 msgstr "đưa ra gợi ý với trạng thái thoát mà không có kết xuất"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:741
 msgid "show only matches from files that match all patterns"
 msgstr "chỉ hiển thị những cái khớp từ tập tin mà nó khớp toàn bộ các mẫu"
 
-#: builtin/grep.c:741
+#: builtin/grep.c:743
 msgid "show parse tree for grep expression"
 msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep� (tìm kiếm)"
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "pager"
 msgstr "dàn trang"
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "show matching files in the pager"
 msgstr "hiển thị các tập tin khớp trong trang giấy"
 
-#: builtin/grep.c:748
+#: builtin/grep.c:750
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "cho phép g�i grep(1) (bị b� qua bởi lần dịch này)"
 
-#: builtin/grep.c:811
+#: builtin/grep.c:813
 msgid "no pattern given."
 msgstr "chưa chỉ ra mẫu."
 
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "số tuyến chỉ ra không hợp lệ (%d)"
 
-#: builtin/grep.c:873
+#: builtin/grep.c:875
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager chỉ làm việc trên cây-làm-việc"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:901
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached hay --untracked không được sử dụng với --no-index."
 
-#: builtin/grep.c:904
+#: builtin/grep.c:906
 msgid "--no-index or --untracked cannot be used with revs."
 msgstr ""
 "--no-index hay --untracked không được sử dụng cùng với các tùy ch�n liên "
 "quan đến revs."
 
-#: builtin/grep.c:907
+#: builtin/grep.c:909
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu dấu vết."
 
-#: builtin/grep.c:915
+#: builtin/grep.c:917
 msgid "both --cached and trees are given."
 msgstr "cả hai --cached và các cây phải được chỉ ra."
 
@@ -6814,8 +7108,8 @@ msgstr "phiên bản của emacsclient “%d� quá cũ (< 22)."
 
 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
 #, c-format
-msgid "failed to exec '%s': %s"
-msgstr "gặp lỗi khi thực thi “%s�: %s"
+msgid "failed to exec '%s'"
+msgstr "gặp lỗi khi thực thi “%s�"
 
 #: builtin/help.c:205
 #, c-format
@@ -7071,104 +7365,105 @@ msgstr "lộn xộn hơn cả điên rồ"
 
 #: builtin/index-pack.c:1253
 #, c-format
-msgid "completed with %d local objects"
-msgstr "đầy đủ với %d đối tượng nội bộ"
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "đầy đủ với %d đối tượng nội bộ"
 
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1265
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
-msgstr "Tổng kiểm tra tail không như mong đợi cho %s (đĩa h�ng?)"
+msgstr "Gặp tổng kiểm tra tail không cần cho %s (đĩa h�ng?)"
 
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "gói có %d delta chưa được giải quyết"
 
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1293
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "không thể xả nén đối tượng nối thêm (%d)"
 
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "đối tượng nội bộ %s bị h�ng"
 
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
 msgid "error while closing pack file"
 msgstr "gặp lỗi trong khi đóng tập tin gói"
 
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "không thể ghi tập tin giữ lại “%s�"
 
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "không thể đóng tập tin giữ lại đã được ghi “%s�"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
 msgid "cannot store pack file"
 msgstr "không thể lưu tập tin gói"
 
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
 msgid "cannot store index file"
 msgstr "không thể lưu trữ tập tin ghi mục lục"
 
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "sai pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "không hỗ trợ đa tuyến, b� qua %s"
 
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Không thể mở tập tin gói đã sẵn có “%s�"
 
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Không thể mở tập tin idx của gói cho “%s�"
 
-#: builtin/index-pack.c:1587
+#: builtin/index-pack.c:1589
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "không delta: %d đối tượng"
 
-#: builtin/index-pack.c:1594
+#: builtin/index-pack.c:1596
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "chi�u dài xích = %d: %lu đối tượng"
 
-#: builtin/index-pack.c:1624
+#: builtin/index-pack.c:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "tên tập tin tập tin gói “%s� không được kết thúc bằng đuôi “.pack�"
+
+#: builtin/index-pack.c:1638
 msgid "Cannot come back to cwd"
 msgstr "Không thể quay lại cwd"
 
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
 #, c-format
 msgid "bad %s"
 msgstr "%s sai"
 
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin không thể được dùng mà không có --stdin"
 
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "tên tập tin tập tin gói “%s� không được kết thúc bằng đuôi “.pack�"
-
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1731
 msgid "--verify with no packfile name given"
 msgstr "dùng tùy ch�n --verify mà không đưa ra tên packfile"
 
@@ -7207,27 +7502,27 @@ msgstr "không thể sao chép “%s� sang “%s�"
 msgid "ignoring template %s"
 msgstr "đang l� đi mẫu “%s�"
 
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
 #, c-format
 msgid "templates not found %s"
 msgstr "các mẫu không được tìm thấy %s"
 
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
 #, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr "không sao chép các mẫu của phiên bản sai định dạng %d từ “%s�"
+msgid "not copying templates from '%s': %s"
+msgstr "không sao chép các mẫu từ “%s�: %s"
 
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
 #, c-format
 msgid "%s already exists"
 msgstr "%s đã có từ trước rồi"
 
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "không thể xử lý (handle) tập tin kiểu %d"
 
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "không di chuyển được %s vào %s"
@@ -7235,24 +7530,24 @@ msgstr "không di chuyển được %s vào %s"
 #. TRANSLATORS: The first '%s' is either "Reinitialized
 #. existing" or "Initialized empty", the second " shared" or
 #. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
 #, c-format
 msgid "%s%s Git repository in %s%s\n"
 msgstr "%s%s kho Git trong %s%s\n"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Reinitialized existing"
 msgstr "Khởi tạo lại đã sẵn có rồi"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Initialized empty"
 msgstr "Khởi tạo trống rỗng"
 
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
 msgid " shared"
 msgstr " đã chia sẻ"
 
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -7260,25 +7555,25 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-"
 "quy�n>]] [thư-mục]"
 
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
 msgid "permissions"
 msgstr "các quy�n"
 
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "chỉ ra cái mà kho git được chia sẻ giữa nhi�u ngư�i dùng"
 
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "không thể mkdir (tạo thư mục): %s"
 
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "không thể chdir (chuyển đổi thư mục) sang %s"
 
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7287,7 +7582,7 @@ msgstr ""
 "%s (hoặc --work-tree=<thư-mục>) không cho phép không chỉ định %s (hoặc --git-"
 "dir=<thư-mục>)"
 
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "không thể truy cập cây (tree) làm việc “%s�"
@@ -7333,264 +7628,316 @@ msgstr "git show [<các-tùy-ch�n>] <đối-tượng>…"
 msgid "invalid --decorate option: %s"
 msgstr "tùy ch�n--decorate không hợp lệ: %s"
 
-#: builtin/log.c:131
+#: builtin/log.c:137
 msgid "suppress diff output"
 msgstr "chặn m�i kết xuất từ diff"
 
-#: builtin/log.c:132
+#: builtin/log.c:138
 msgid "show source"
 msgstr "hiển thị mã nguồn"
 
-#: builtin/log.c:133
+#: builtin/log.c:139
 msgid "Use mail map file"
 msgstr "Sử dụng tập tin ánh xạ thư"
 
-#: builtin/log.c:134
+#: builtin/log.c:140
 msgid "decorate options"
 msgstr "các tùy ch�n trang trí"
 
-#: builtin/log.c:137
+#: builtin/log.c:143
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Xử lý chỉ dòng vùng n,m trong tập tin, tính từ 1"
 
-#: builtin/log.c:233
+#: builtin/log.c:239
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Kết xuất cuối cùng: %d %s\n"
 
-#: builtin/log.c:465
+#: builtin/log.c:471
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: sai tập tin"
 
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
 #, c-format
 msgid "Could not read object %s"
 msgstr "Không thể đ�c đối tượng %s"
 
-#: builtin/log.c:596
+#: builtin/log.c:602
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Không nhận ra kiểu: %d"
 
-#: builtin/log.c:715
+#: builtin/log.c:722
 msgid "format.headers without value"
 msgstr "format.headers không có giá trị cụ thể"
 
-#: builtin/log.c:801
+#: builtin/log.c:812
 msgid "name of output directory is too long"
 msgstr "tên của thư mục kết xuất quá dài"
 
-#: builtin/log.c:816
+#: builtin/log.c:827
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Không thể mở tập tin miếng vá: %s"
 
-#: builtin/log.c:830
+#: builtin/log.c:841
 msgid "Need exactly one range."
 msgstr "Cần chính xác một vùng."
 
-#: builtin/log.c:840
+#: builtin/log.c:851
 msgid "Not a range."
 msgstr "Không phải là một vùng."
 
-#: builtin/log.c:946
+#: builtin/log.c:957
 msgid "Cover letter needs email format"
 msgstr "“Cover letter� cần cho định dạng thư"
 
-#: builtin/log.c:1025
+#: builtin/log.c:1036
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to điên rồ: %s"
 
-#: builtin/log.c:1053
+#: builtin/log.c:1064
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<các-tùy-ch�n>] [<kể-từ> | <vùng-xem-xét>]"
 
-#: builtin/log.c:1098
+#: builtin/log.c:1109
 msgid "Two output directories?"
 msgstr "Hai thư mục kết xuất?"
 
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "Không hiểu lần chuyển giao %s"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Gặp lỗi khi phân giải “%s� như là một tham chiếu hợp lệ."
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr "Không tìm thấy n�n hòa trộn chính xác."
+
+#: builtin/log.c:1235
+msgid ""
+"Failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually."
+msgstr ""
+"Gặp lỗi khi lấy thượng nguồn, nếu bạn muốn ghi lại lần chuyển giao n�n một\n"
+"cách tự động, vui lòng dùng \"git branch --set-upstream-to\" để theo dõi\n"
+"nhánh máy chủ. Hoặc là bạn có thể chỉ định lần chuyển giao n�n bằng\n"
+"\"--base=<base-commit-id>\" một cách thủ công."
+
+#: builtin/log.c:1255
+msgid "Failed to find exact merge base"
+msgstr "Gặp lỗi khi tìm n�n hòa trộn chính xác."
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr "lần chuyển giao n�n không là tổ tiên của danh sách điểm xét duyệt"
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr "lần chuyển giao n�n không được trong danh sách điểm xét duyệt"
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr "không thể lấy mã miếng vá"
+
+#: builtin/log.c:1377
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn"
 
-#: builtin/log.c:1217
+#: builtin/log.c:1380
 msgid "use [PATCH] even with multiple patches"
 msgstr "dùng [V�] ngay cả với các miếng vá phức tạp"
 
-#: builtin/log.c:1221
+#: builtin/log.c:1384
 msgid "print patches to standard out"
 msgstr "hiển thị miếng vá ra đầu ra chuẩn"
 
-#: builtin/log.c:1223
+#: builtin/log.c:1386
 msgid "generate a cover letter"
 msgstr "tạo bì thư"
 
-#: builtin/log.c:1225
+#: builtin/log.c:1388
 msgid "use simple number sequence for output file names"
 msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra"
 
-#: builtin/log.c:1226
+#: builtin/log.c:1389
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1227
+#: builtin/log.c:1390
 msgid "use <sfx> instead of '.patch'"
 msgstr "sử dụng <sfx> thay cho “.patch�"
 
-#: builtin/log.c:1229
+#: builtin/log.c:1392
 msgid "start numbering patches at <n> instead of 1"
 msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1"
 
-#: builtin/log.c:1231
+#: builtin/log.c:1394
 msgid "mark the series as Nth re-roll"
 msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll"
 
-#: builtin/log.c:1233
+#: builtin/log.c:1396
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Dùng [<ti�n-tố>] thay cho [V�]"
 
-#: builtin/log.c:1236
+#: builtin/log.c:1399
 msgid "store resulting files in <dir>"
 msgstr "lưu các tập tin kết quả trong <t.mục>"
 
-#: builtin/log.c:1239
+#: builtin/log.c:1402
 msgid "don't strip/add [PATCH]"
 msgstr "không strip/add [V�]"
 
-#: builtin/log.c:1242
+#: builtin/log.c:1405
 msgid "don't output binary diffs"
 msgstr "không kết xuất diff (những khác biệt) nhị phân"
 
-#: builtin/log.c:1244
+#: builtin/log.c:1407
 msgid "output all-zero hash in From header"
 msgstr "xuất m�i mã băm all-zero trong phần đầu From"
 
-#: builtin/log.c:1246
+#: builtin/log.c:1409
 msgid "don't include a patch matching a commit upstream"
 msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn"
 
-#: builtin/log.c:1248
+#: builtin/log.c:1411
 msgid "show patch format instead of default (patch + stat)"
 msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)"
 
-#: builtin/log.c:1250
+#: builtin/log.c:1413
 msgid "Messaging"
 msgstr "L�i nhắn"
 
-#: builtin/log.c:1251
+#: builtin/log.c:1414
 msgid "header"
 msgstr "đầu đ� thư"
 
-#: builtin/log.c:1252
+#: builtin/log.c:1415
 msgid "add email header"
 msgstr "thêm đầu đ� thư"
 
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
 msgid "email"
 msgstr "thư điện tử"
 
-#: builtin/log.c:1253
+#: builtin/log.c:1416
 msgid "add To: header"
 msgstr "thêm To: đầu đ� thư"
 
-#: builtin/log.c:1255
+#: builtin/log.c:1418
 msgid "add Cc: header"
 msgstr "thêm Cc: đầu đ� thư"
 
-#: builtin/log.c:1257
+#: builtin/log.c:1420
 msgid "ident"
 msgstr "thụt l�"
 
-#: builtin/log.c:1258
+#: builtin/log.c:1421
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "đặt “�ịa chỉ gửi� thành <thụ l�> (hoặc thụt l� ngư�i commit nếu b� quên)"
 
-#: builtin/log.c:1260
+#: builtin/log.c:1423
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1261
+#: builtin/log.c:1424
 msgid "make first mail a reply to <message-id>"
 msgstr "dùng thư đầu tiên để trả l�i <message-id>"
 
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
 msgid "boundary"
 msgstr "ranh giá»›i"
 
-#: builtin/log.c:1263
+#: builtin/log.c:1426
 msgid "attach the patch"
 msgstr "đính kèm miếng vá"
 
-#: builtin/log.c:1266
+#: builtin/log.c:1429
 msgid "inline the patch"
 msgstr "dùng miếng vá làm nội dung"
 
-#: builtin/log.c:1270
+#: builtin/log.c:1433
 msgid "enable message threading, styles: shallow, deep"
 msgstr "cho phép luồng l�i nhắn, kiểu: “shallow�, “deep�"
 
-#: builtin/log.c:1272
+#: builtin/log.c:1435
 msgid "signature"
 msgstr "chữ ký"
 
-#: builtin/log.c:1273
+#: builtin/log.c:1436
 msgid "add a signature"
 msgstr "thêm chữ ký"
 
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "lần_chuyển_giao_n�n"
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr "add trước hết đòi h�i thông tin cây tới sê-ri miếng vá"
+
+#: builtin/log.c:1440
 msgid "add a signature from a file"
 msgstr "thêm chữ ký từ một tập tin"
 
-#: builtin/log.c:1276
+#: builtin/log.c:1441
 msgid "don't print the patch filenames"
 msgstr "không hiển thị các tên tập tin của miếng vá"
 
-#: builtin/log.c:1365
+#: builtin/log.c:1531
 msgid "-n and -k are mutually exclusive."
 msgstr "-n và  -k loại từ lẫn nhau."
 
-#: builtin/log.c:1367
+#: builtin/log.c:1533
 msgid "--subject-prefix and -k are mutually exclusive."
 msgstr "--subject-prefix và -k xung khắc nhau."
 
-#: builtin/log.c:1375
+#: builtin/log.c:1541
 msgid "--name-only does not make sense"
 msgstr "--name-only không hợp lý"
 
-#: builtin/log.c:1377
+#: builtin/log.c:1543
 msgid "--name-status does not make sense"
 msgstr "--name-status không hợp lý"
 
-#: builtin/log.c:1379
+#: builtin/log.c:1545
 msgid "--check does not make sense"
 msgstr "--check không hợp lý"
 
-#: builtin/log.c:1407
+#: builtin/log.c:1573
 msgid "standard output, or directory, which one?"
 msgstr "đầu ra chuẩn, hay thư mục, ch�n cái nào?"
 
-#: builtin/log.c:1409
+#: builtin/log.c:1575
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Không thể tạo thư mục “%s�"
 
-#: builtin/log.c:1506
+#: builtin/log.c:1672
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "không thể đ�c tập tin chữ ký “%s�"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1743
 msgid "Failed to create output files"
 msgstr "Gặp lỗi khi tạo các tập tin kết xuất"
 
-#: builtin/log.c:1617
+#: builtin/log.c:1792
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]"
 
-#: builtin/log.c:1671
+#: builtin/log.c:1846
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7598,11 +7945,6 @@ msgstr ""
 "Không tìm thấy nhánh mạng được theo dõi, hãy chỉ định <thượng-nguồn> một "
 "cách thủ công.\n"
 
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr "Không hiểu lần chuyển giao %s"
-
 #: builtin/ls-files.c:378
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<các-tùy-ch�n>] [<tập-tin>…]"
@@ -7796,174 +8138,178 @@ msgstr "git merge [<các-tùy-ch�n>] <tin-nhắn> HEAD <commit>"
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:100
+#: builtin/merge.c:101
 msgid "switch `m' requires a value"
 msgstr "switch “m� yêu cầu một giá trị"
 
-#: builtin/merge.c:137
+#: builtin/merge.c:138
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Không tìm thấy chiến lược hòa trộn “%s�.\n"
 
-#: builtin/merge.c:138
+#: builtin/merge.c:139
 #, c-format
 msgid "Available strategies are:"
 msgstr "Các chiến lược sẵn sàng là:"
 
-#: builtin/merge.c:143
+#: builtin/merge.c:144
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Các chiến lược tùy chỉnh sẵn sàng là:"
 
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
 msgid "do not show a diffstat at the end of the merge"
 msgstr "không hiển thị thống kê khác biệt tại cuối của lần hòa trộn"
 
-#: builtin/merge.c:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
 msgid "show a diffstat at the end of the merge"
 msgstr "hiển thị thống kê khác biệt tại cuối của hòa trộn"
 
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
 msgid "(synonym to --stat)"
 msgstr "(đồng nghĩa với --stat)"
 
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn"
 
-#: builtin/merge.c:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
 msgid "create a single commit instead of doing a merge"
 msgstr "tạo một lần chuyển giao đưon thay vì thực hiện việc hòa trộn"
 
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "thực hiện chuyển giao nếu hòa trộn thành công (mặc định)"
 
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
 msgid "edit message before committing"
 msgstr "sửa chú thích trước khi chuyển giao"
 
-#: builtin/merge.c:207
+#: builtin/merge.c:208
 msgid "allow fast-forward (default)"
 msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
 
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
 msgid "abort if fast-forward is not possible"
 msgstr "b� qua nếu chuyển-tiếp-nhanh không thể được"
 
-#: builtin/merge.c:213
+#: builtin/merge.c:214
 msgid "Verify that the named commit has a valid GPG signature"
 msgstr "Thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không"
 
-#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
 #: builtin/revert.c:89
 msgid "strategy"
 msgstr "chiến lược"
 
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "merge strategy to use"
 msgstr "chiến lược hòa trộn sẽ dùng"
 
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
 msgid "option=value"
 msgstr "tùy_ch�n=giá_trị"
 
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
 msgid "option for selected merge strategy"
 msgstr "tùy ch�n cho chiến lược hòa trộn đã ch�n"
 
-#: builtin/merge.c:219
+#: builtin/merge.c:220
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 "hòa trộn ghi chú của lần chuyển giao (dành cho hòa trộn không-chuyển-tiếp-"
 "nhanh)"
 
-#: builtin/merge.c:223
+#: builtin/merge.c:224
 msgid "abort the current in-progress merge"
 msgstr "bãi b� quá trình hòa trộn hiện tại đang thực hiện"
 
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "cho phép hòa trộn lịch sử không liên quan"
+
+#: builtin/merge.c:254
 msgid "could not run stash."
 msgstr "không thể chạy stash."
 
-#: builtin/merge.c:256
+#: builtin/merge.c:259
 msgid "stash failed"
 msgstr "lệnh tạm cất gặp lỗi"
 
-#: builtin/merge.c:261
+#: builtin/merge.c:264
 #, c-format
 msgid "not a valid object: %s"
 msgstr "không phải là một đối tượng hợp lệ: %s"
 
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
 msgid "read-tree failed"
 msgstr "read-tree gặp lỗi"
 
-#: builtin/merge.c:327
+#: builtin/merge.c:330
 msgid " (nothing to squash)"
 msgstr " (không có gì để squash)"
 
-#: builtin/merge.c:340
+#: builtin/merge.c:343
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Squash commit -- không cập nhật HEAD\n"
 
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
 #, c-format
 msgid "Could not write to '%s'"
 msgstr "Không thể ghi vào “%s�"
 
-#: builtin/merge.c:372
+#: builtin/merge.c:375
 msgid "Writing SQUASH_MSG"
 msgstr "�ang ghi SQUASH_MSG"
 
-#: builtin/merge.c:374
+#: builtin/merge.c:377
 msgid "Finishing SQUASH_MSG"
 msgstr "Hoàn thành SQUASH_MSG"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:400
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Không có l�i chú thích hòa trộn -- nên không cập nhật HEAD\n"
 
-#: builtin/merge.c:448
+#: builtin/merge.c:451
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "“%s� không chỉ đến một lần chuyển giao nào cả"
 
-#: builtin/merge.c:538
+#: builtin/merge.c:541
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Chuá»—i branch.%s.mergeoptions sai: %s"
 
-#: builtin/merge.c:657
+#: builtin/merge.c:660
 msgid "Not handling anything other than two heads merge."
 msgstr "Không cầm nắm gì ngoài hai head hòa trộn"
 
-#: builtin/merge.c:671
+#: builtin/merge.c:674
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Không hiểu tùy ch�n cho merge-recursive: -X%s"
 
-#: builtin/merge.c:684
+#: builtin/merge.c:687
 #, c-format
 msgid "unable to write %s"
 msgstr "không thể ghi %s"
 
-#: builtin/merge.c:773
+#: builtin/merge.c:776
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Không thể đ�c từ “%s�"
 
-#: builtin/merge.c:782
+#: builtin/merge.c:785
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Vẫn chưa hòa trộn các lần chuyển giao; sử dụng lệnh “git commit� để hoàn tất "
 "việc hòa trộn.\n"
 
-#: builtin/merge.c:788
+#: builtin/merge.c:791
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -7981,55 +8327,55 @@ msgstr ""
 "rá»—ng\n"
 "sẽ hủy b� lần chuyển giao.\n"
 
-#: builtin/merge.c:812
+#: builtin/merge.c:815
 msgid "Empty commit message."
 msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng."
 
-#: builtin/merge.c:824
+#: builtin/merge.c:835
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Tuyệt v�i.\n"
 
-#: builtin/merge.c:879
+#: builtin/merge.c:890
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao kết "
 "quả.\n"
 
-#: builtin/merge.c:895
+#: builtin/merge.c:906
 #, c-format
 msgid "'%s' is not a commit"
 msgstr "%s không phải là một lần commit (chuyển giao)"
 
-#: builtin/merge.c:936
+#: builtin/merge.c:947
 msgid "No current branch."
 msgstr "không phải nhánh hiện hành"
 
-#: builtin/merge.c:938
+#: builtin/merge.c:949
 msgid "No remote for the current branch."
 msgstr "Không có máy chủ cho nhánh hiện hành."
 
-#: builtin/merge.c:940
+#: builtin/merge.c:951
 msgid "No default upstream defined for the current branch."
 msgstr "Không có thượng nguồn mặc định được định nghĩa cho nhánh hiện hành."
 
-#: builtin/merge.c:945
+#: builtin/merge.c:956
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Không nhánh mạng theo dõi cho %s từ %s"
 
-#: builtin/merge.c:1080
+#: builtin/merge.c:1091
 #, c-format
 msgid "could not close '%s'"
 msgstr "không thể đóng “%s�"
 
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 "Ở đây không có lần hòa trộn nào được hủy b� giữa chừng cả (thiếu MERGE_HEAD)."
 
-#: builtin/merge.c:1223
+#: builtin/merge.c:1235
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -8037,7 +8383,7 @@ msgstr ""
 "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại).\n"
 "Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
 
-#: builtin/merge.c:1230
+#: builtin/merge.c:1242
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -8045,103 +8391,107 @@ msgstr ""
 "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n"
 "Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
 
-#: builtin/merge.c:1233
+#: builtin/merge.c:1245
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)."
 
-#: builtin/merge.c:1242
+#: builtin/merge.c:1254
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Bạn không thể kết hợp --squash với --no-ff."
 
-#: builtin/merge.c:1250
+#: builtin/merge.c:1262
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Không chỉ ra lần chuyển giao và merge.defaultToUpstream chưa được đặt."
 
-#: builtin/merge.c:1267
+#: builtin/merge.c:1279
 msgid "Squash commit into empty head not supported yet"
 msgstr "Squash commit vào một head trống rỗng vẫn chưa được hỗ trợ"
 
-#: builtin/merge.c:1269
+#: builtin/merge.c:1281
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 "Chuyển giao không-chuyển-tiếp-nhanh không hợp lý ở trong một head trống rỗng"
 
-#: builtin/merge.c:1275
+#: builtin/merge.c:1286
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - không phải là một số thứ chúng tôi có thể hòa trộn"
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
 msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 "Không thể hòa trộn một cách đúng đắn một lần chuyển giao vào một head rỗng"
 
-#: builtin/merge.c:1332
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "Lần chuyển giao %s có một chữ ký GPG không đáng tin, được cho là bởi %s."
 
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Lần chuyển giao %s có một chữ ký GPG sai, được cho là bởi %s."
 
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Lần chuyển giao %s không có chữ ký GPG."
 
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Lần chuyển giao %s có một chữ ký GPG tốt bởi %s\n"
 
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr "từ chối hòa trộn lịch sử không liên quan"
+
+#: builtin/merge.c:1439
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "�ang cập nhật %s..%s\n"
 
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "�ang thử hòa trộn kiểu “trivial in-index�…\n"
 
-#: builtin/merge.c:1468
+#: builtin/merge.c:1483
 #, c-format
 msgid "Nope.\n"
 msgstr "Không.\n"
 
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
 msgid "Not possible to fast-forward, aborting."
 msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang b� qua."
 
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "�ang tua lại cây thành th�i xa xưa…\n"
 
-#: builtin/merge.c:1527
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "�ang thử chiến lược hòa trộn %s…\n"
 
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n"
 
-#: builtin/merge.c:1595
+#: builtin/merge.c:1610
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n"
 
-#: builtin/merge.c:1604
+#: builtin/merge.c:1619
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n"
 
-#: builtin/merge.c:1616
+#: builtin/merge.c:1631
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -8253,7 +8603,7 @@ msgstr "git mv [<các-tùy-ch�n>] <nguồn>… <đích>"
 msgid "Directory %s is in index and no submodule?"
 msgstr "Thư mục “%s� có ở trong chỉ mục mà không có mô-đun con?"
 
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Hãy đưa các thay đổi của bạn vào .gitmodules hay tạm cất chúng đi để xử lý"
@@ -8332,49 +8682,49 @@ msgstr "%s, nguồn=%s, đích=%s"
 msgid "Renaming %s to %s\n"
 msgstr "�ổi tên %s thành %s\n"
 
-#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "gặp lỗi khi đổi tên “%s�"
 
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<các-tùy-ch�n>] <commit>…"
 
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<các-tùy-ch�n>] --all"
 
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<các-tùy-ch�n>] --stdin"
 
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
 msgid "print only names (no SHA-1)"
 msgstr "chỉ hiển thị tên (không SHA-1)"
 
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
 msgid "only use tags to name the commits"
 msgstr "chỉ dùng các thẻ để đặt tên cho các lần chuyển giao"
 
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
 msgid "only use refs matching <pattern>"
 msgstr "chỉ sử dụng các tham chiếu khớp với <mẫu>"
 
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
 msgid "list all commits reachable from all refs"
 msgstr ""
 "liệt kê tất cả các lần chuyển giao có thể đ�c được từ tất cả các tham chiếu"
 
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
 msgid "read from stdin"
 msgstr "đ�c từ đầu vào tiêu chuẩn"
 
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
 msgid "allow to print `undefined` names (default)"
 msgstr "cho phép in các tên “chưa định nghĩa� (mặc định)"
 
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
 msgid "dereference tags in the input (internal use)"
 msgstr "bãi b� tham chiếu các thẻ trong đầu vào (dùng nội bộ)"
 
@@ -8521,24 +8871,16 @@ msgstr "không thể ghi đối tượng ghi chú (note)"
 msgid "The note contents have been left in %s"
 msgstr "Nội dung ghi chú còn lại %s"
 
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
 #, c-format
 msgid "cannot read '%s'"
 msgstr "không thể đ�c “%s�"
 
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "không thể mở hay đ�c “%s�"
 
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Gặp lỗi khi phân giải “%s� như là một tham chiếu hợp lệ."
-
 #: builtin/notes.c:256
 #, c-format
 msgid "Failed to read object '%s'."
@@ -8551,7 +8893,7 @@ msgstr "không thể đ�c dữ liệu ghi chú từ đối tượng không-blo
 
 #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
 msgid "too many parameters"
 msgstr "quá nhi�u đối số"
 
@@ -8598,7 +8940,7 @@ msgstr ""
 msgid "Overwriting existing notes for object %s\n"
 msgstr "�ang ghi đè lên ghi chú cũ cho đối tượng %s\n"
 
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "�ang gỡ b� ghi chú (note) cho đối tượng %s\n"
@@ -8638,15 +8980,15 @@ msgstr ""
 "Các tùy ch�n -m/-F/-c/-C đã cổ không còn dùng nữa cho lệnh con “edit�.\n"
 "Xin hãy sử dụng lệnh sau để thay thế: “git notes add -f -m/-F/-c/-C�.\n"
 
-#: builtin/notes.c:767
+#: builtin/notes.c:768
 msgid "General options"
 msgstr "Tùy ch�n chung"
 
-#: builtin/notes.c:769
+#: builtin/notes.c:770
 msgid "Merge options"
 msgstr "Tùy ch�n v� hòa trộn"
 
-#: builtin/notes.c:771
+#: builtin/notes.c:772
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -8654,51 +8996,51 @@ msgstr ""
 "phân giải các xung đột “notes� sử dụng chiến lược đã đưa ra (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "Committing unmerged notes"
 msgstr "Chuyển giao các note chưa được hòa trộn"
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 "các note cuối cùng được hòa trộn bởi các note chưa hòa trộn của lần chuyển "
 "giao"
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid "Aborting notes merge resolution"
 msgstr "Hủy b� phân giải ghi chú (note) hòa trộn"
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "abort notes merge"
 msgstr "b� qua hòa trộn các ghi chú (note)"
 
-#: builtin/notes.c:856
+#: builtin/notes.c:857
 #, c-format
 msgid "A notes merge into %s is already in-progress at %s"
 msgstr "Các ghi chú hòa trộn vào %s đã sẵn trong quá trình xử lý tại %s"
 
-#: builtin/notes.c:883
+#: builtin/notes.c:884
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "�ối tượng %s không có ghi chú (note)\n"
 
-#: builtin/notes.c:895
+#: builtin/notes.c:896
 msgid "attempt to remove non-existent note is not an error"
 msgstr "cố gắng gỡ b� một note chưa từng tồn tại không phải là một lỗi"
 
-#: builtin/notes.c:898
+#: builtin/notes.c:899
 msgid "read object names from the standard input"
 msgstr "đ�c tên đối tượng từ thiết bị nhập chuẩn"
 
-#: builtin/notes.c:979
+#: builtin/notes.c:980
 msgid "notes-ref"
 msgstr "notes-ref"
 
-#: builtin/notes.c:980
+#: builtin/notes.c:981
 msgid "use notes from <notes-ref>"
 msgstr "dùng “notes� từ <notes-ref>"
 
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Không hiểu câu lệnh con: %s"
@@ -8722,166 +9064,170 @@ msgstr ""
 msgid "deflate error (%d)"
 msgstr "lỗi giải nén (%d)"
 
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr "tắt ghi bitmap, các gói bị chia nh� bởi vì pack.packSizeLimit"
+
+#: builtin/pack-objects.c:776
 msgid "Writing objects"
 msgstr "�ang ghi lại các đối tượng"
 
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "tắt ghi bitmap, như vậy một số đối tượng sẽ không được đóng gói"
 
-#: builtin/pack-objects.c:2172
+#: builtin/pack-objects.c:2177
 msgid "Compressing objects"
 msgstr "�ang nén các đối tượng"
 
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
 #, c-format
 msgid "unsupported index version %s"
 msgstr "phiên bản mục lục không được hỗ trợ %s"
 
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2567
 #, c-format
 msgid "bad index version '%s'"
 msgstr "phiên bản mục lục sai “%s�"
 
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
 msgid "do not show progress meter"
 msgstr "không hiển thị bộ đo tiến trình"
 
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
 msgid "show progress meter"
 msgstr "hiển thị bộ đo tiến trình"
 
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
 msgid "show progress meter during object writing phase"
 msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng"
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2604
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện"
 
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2605
 msgid "version[,offset]"
 msgstr "phiên bản[,offset]"
 
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
 msgid "write the pack index file in the specified idx format version"
 msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho"
 
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2609
 msgid "maximum size of each output pack file"
 msgstr "kcíh thước tối đa cho tập tin gói được tạo"
 
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2611
 msgid "ignore borrowed objects from alternate object store"
 msgstr "b� qua các đối tượng vay mượn từ kho đối tượng thay thế"
 
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2613
 msgid "ignore packed objects"
 msgstr "b� qua các đối tượng đóng gói"
 
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
 msgid "limit pack window by objects"
 msgstr "giới hạn cửa sổ đóng gói theo đối tượng"
 
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2617
 msgid "limit pack window by memory in addition to object limit"
 msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng"
 
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2619
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "độ dài tối đa của chuỗi móc xích “delta� được phép trong gói kết quả"
 
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2621
 msgid "reuse existing deltas"
 msgstr "dùng lại các delta sẵn có"
 
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
 msgid "reuse existing objects"
 msgstr "dùng lại các đối tượng sẵn có"
 
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
 msgid "use OFS_DELTA objects"
 msgstr "dùng các đối tượng OFS_DELTA"
 
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
 msgid "use threads when searching for best delta matches"
 msgstr "sử dụng các tuyến trình khi tìm kiếm cho các mẫu khớp delta tốt nhất"
 
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2629
 msgid "do not create an empty pack output"
 msgstr "không thể tạo kết xuất gói trống rỗng"
 
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2631
 msgid "read revision arguments from standard input"
 msgstr " đ�c tham số “revision� từ thiết bị nhập chuẩn"
 
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
 msgid "limit the objects to those that are not yet packed"
 msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói"
 
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2636
 msgid "include objects reachable from any reference"
 msgstr "bao gồm các đối tượng có thể đ�c được từ bất kỳ tham chiếu nào"
 
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2639
 msgid "include objects referred by reflog entries"
 msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog"
 
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2642
 msgid "include objects referred to by the index"
 msgstr "bao gồm các đối tượng được tham chiếu bởi mục lục"
 
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2645
 msgid "output pack to stdout"
 msgstr "xuất gói ra đầu ra tiêu chuẩn"
 
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
 msgid "include tag objects that refer to objects to be packed"
 msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói"
 
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2649
 msgid "keep unreachable objects"
 msgstr "giữ lại các đối tượng không thể đ�c được"
 
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
 msgid "time"
 msgstr "th�i-gian"
 
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 "xả nén (gỡ kh�i gói) các đối tượng không thể đ�c được mới hơn <th�i-gian>"
 
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2654
 msgid "create thin packs"
 msgstr "tạo gói nhẹ"
 
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
 msgid "create packs suitable for shallow fetches"
 msgstr "tạo gói để phù hợp cho lấy v� nông (shallow)"
 
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2658
 msgid "ignore packs that have companion .keep file"
 msgstr "b� qua các gói mà nó có tập tin .keep đi kèm"
 
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2660
 msgid "pack compression level"
 msgstr "mức nén gói"
 
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
 msgid "do not hide commits by grafts"
 msgstr "không ẩn các lần chuyển giao bởi “grafts�"
 
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2664
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "dùng mục lục ánh xạ nếu có thể được để nâng cao tốc độ đếm đối tượng"
 
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2666
 msgid "write a bitmap index together with the pack index"
 msgstr "ghi một mục lục ánh xạ cùng với mục lục gói"
 
-#: builtin/pack-objects.c:2752
+#: builtin/pack-objects.c:2757
 msgid "Counting objects"
 msgstr "�ang đếm các đối tượng"
 
@@ -8909,15 +9255,15 @@ msgstr "�ang gỡ các đối tượng trùng lặp"
 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--expire <th�i-gian>] [--] [<head>…]"
 
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
 msgid "do not remove, show only"
 msgstr "không gỡ b�, chỉ hiển thị"
 
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
 msgid "report pruned objects"
 msgstr "báo cáo các đối tượng đã prune"
 
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
 msgid "expire objects older than <time>"
 msgstr "các đối tượng hết hạn cũ hơn khoảng <th�i gian>"
 
@@ -8929,50 +9275,54 @@ msgstr "không thể tỉa bớt trong một kho đối_tượng_vĩ_đại"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<các-tùy-ch�n>] [<kho-chứa> [<refspec>…]]"
 
-#: builtin/pull.c:117
+#: builtin/pull.c:120
 msgid "Options related to merging"
 msgstr "Các tùy ch�n liên quan đến hòa trộn"
 
-#: builtin/pull.c:120
+#: builtin/pull.c:123
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "các thay đổi hợp nhất bằng cải tổ thay vì hòa trộn"
 
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
 msgid "allow fast-forward"
 msgstr "cho phép chuyển-tiếp-nhanh"
 
-#: builtin/pull.c:150
+#: builtin/pull.c:153
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không"
 
-#: builtin/pull.c:164
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "tự động stash/stash pop tước và sau tu bổ (rebase)"
+
+#: builtin/pull.c:172
 msgid "Options related to fetching"
 msgstr "Các tùy ch�n liên quan đến lệnh lấy v�"
 
-#: builtin/pull.c:186
+#: builtin/pull.c:194
 msgid "number of submodules pulled in parallel"
 msgstr "số lượng mô-đun-con được đẩy lên đồng th�i"
 
-#: builtin/pull.c:275
+#: builtin/pull.c:283
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Giá trị không hợp lệ cho pull.ff: %s"
 
-#: builtin/pull.c:359
+#: builtin/pull.c:379
 msgid "Cannot pull with rebase: You have unstaged changes."
 msgstr ""
 "Không thể pull với cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
 
-#: builtin/pull.c:365
+#: builtin/pull.c:385
 msgid "Additionally, your index contains uncommitted changes."
 msgstr ""
 "Thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
 
-#: builtin/pull.c:367
+#: builtin/pull.c:387
 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
 msgstr "Không thể pull với cải tổ: Bạn có các thay đổi chưa được chuyển giao."
 
-#: builtin/pull.c:443
+#: builtin/pull.c:463
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -8980,14 +9330,14 @@ msgstr ""
 "Ở đây không có ứng cử nào để cải tổ lại trong số các tham chiếu mà bạn vừa "
 "lấy v�."
 
-#: builtin/pull.c:445
+#: builtin/pull.c:465
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Ở đây không có ứng cử nào để hòa trộn trong số các tham chiếu mà bạn vừa lấy "
 "v�."
 
-#: builtin/pull.c:446
+#: builtin/pull.c:466
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -8996,7 +9346,7 @@ msgstr ""
 "tá»±\n"
 "đại diện mà nó lại không khớp trên điểm cuối máy phục vụ."
 
-#: builtin/pull.c:449
+#: builtin/pull.c:469
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -9008,40 +9358,43 @@ msgstr ""
 "theo mặc định cho nhánh hiện tại của bạn, bạn phải chỉ định\n"
 "một nhánh trên dòng lệnh."
 
-#: builtin/pull.c:454
+#: builtin/pull.c:474 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Hiện tại bạn chẳng ở nhánh nào cả."
 
-#: builtin/pull.c:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Vui lòng chỉ định nhánh nào bạn muốn cải tổ lại."
 
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Vui lòng chỉ định nhánh nào bạn muốn hòa trộn vào."
 
-#: builtin/pull.c:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
 msgid "See git-pull(1) for details."
 msgstr "Xem git-pull(1) để biết thêm chi tiết."
 
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<máy chủ>"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<nhánh>"
+
+#: builtin/pull.c:489 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "Ở đây không có thông tin theo dõi cho nhánh hiện hành."
 
-#: builtin/pull.c:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
 msgid ""
-"If you wish to set tracking information for this branch you can do so with:\n"
-"\n"
-"    git branch --set-upstream-to=%s/<branch> %s\n"
+"If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
-"Nếu bạn muốn theo dõi thông tin cho nhánh này bạn có thể thực hiện bằng "
-"lệnh:\n"
-"\n"
-"    git branch --set-upstream-to=%s/<nhánh> %s\n"
-"\n"
+"Nếu bạn muốn theo dõi thông tin cho nhánh này bạn có thể thực hiện bằng lệnh:"
 
-#: builtin/pull.c:483
+#: builtin/pull.c:503
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -9050,13 +9403,17 @@ msgstr ""
 "Các đặc tả cấu hình của bạn để hòa trộn với tham chiếu “%s�\n"
 "từ máy dịch vụ, nhưng không có nhánh nào như thế được lấy v�."
 
-#: builtin/pull.c:841
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "tùy ch�n --[no-]autostash chỉ hợp lệ khi dùng với --rebase."
+
+#: builtin/pull.c:872
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 "�ang cập nhật một nhánh chưa được sinh ra với các thay đổi được thêm vào "
 "bảng mục lục."
 
-#: builtin/pull.c:870
+#: builtin/pull.c:900
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -9067,7 +9424,7 @@ msgstr ""
 "đang chuyển-tiếp-nhanh cây làm việc của bạn từ\n"
 "lần chuyển giaot %s."
 
-#: builtin/pull.c:875
+#: builtin/pull.c:905
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -9085,11 +9442,11 @@ msgstr ""
 "$ git reset --hard\n"
 "để khôi phục lại."
 
-#: builtin/pull.c:890
+#: builtin/pull.c:920
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Không thể hòa trộn nhi�u nhánh vào trong một head trống rỗng."
 
-#: builtin/pull.c:894
+#: builtin/pull.c:924
 msgid "Cannot rebase onto multiple branches."
 msgstr "Không thể thực hiện lệnh rebase (cải tổ) trên nhi�u nhánh."
 
@@ -9459,6 +9816,18 @@ msgstr "b� qua áp dụng bộ l�c lấy ra (checkout) thưa thớt"
 msgid "debug unpack-trees"
 msgstr "gỡ lỗi “unpack-trees�"
 
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <thư-mục-git>"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "im lặng"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "Bạn phải chỉ định thư mục."
+
 #: builtin/reflog.c:423
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
@@ -9780,173 +10149,175 @@ msgstr "* máy chủ %s"
 msgid "  Fetch URL: %s"
 msgstr "  URL để lấy v�: %s"
 
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
 msgid "(no URL)"
 msgstr "(không có URL)"
 
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in "  Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL để đẩy lên: %s"
 
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Nhánh HEAD: %s"
 
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  nhánh HEAD (HEAD máy chủ chưa rõ ràng, có lẽ là một trong số sau):\n"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1181
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Những nhánh trên máy chủ:%s"
 
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
 msgid " (status not queried)"
 msgstr " (trạng thái không được yêu cầu)"
 
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Những nhánh nội bộ đã được cấu hình cho lệnh “git pull�:"
 
-#: builtin/remote.c:1199
+#: builtin/remote.c:1201
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  refs nội bộ sẽ được phản chiếu bởi lệnh “git push�"
 
-#: builtin/remote.c:1206
+#: builtin/remote.c:1208
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Những tham chiếu nội bộ được cấu hình cho lệnh “git push�%s:"
 
-#: builtin/remote.c:1227
+#: builtin/remote.c:1229
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "đặt refs/remotes/<tên>/HEAD cho phù hợp với máy chủ"
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1231
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "xóa refs/remotes/<tên>/HEAD"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
 msgid "Cannot determine remote HEAD"
 msgstr "Không thể xác định được HEAD máy chủ"
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Nhi�u nhánh HEAD máy chủ. Hãy ch�n rõ ràng một:"
 
-#: builtin/remote.c:1256
+#: builtin/remote.c:1258
 #, c-format
 msgid "Could not delete %s"
 msgstr "Không thể xóa b� %s"
 
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Không phải là tham chiếu hợp lệ: %s"
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
 #, c-format
 msgid "Could not setup %s"
 msgstr "Không thể cài đặt %s"
 
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s sẽ trở thành không đầu (không được quản lý)!"
 
-#: builtin/remote.c:1285
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s đã trở thành không đầu (không được quản lý)!"
 
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
 #, c-format
 msgid "Pruning %s"
 msgstr "�ang xén bớt %s"
 
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [nên xén bớt] %s"
 
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [đã bị xén] %s"
 
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
 msgid "prune remotes after fetching"
 msgstr "cắt máy chủ sau khi lấy v�"
 
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Không có máy chủ nào có tên “%s�"
 
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
 msgid "add branch"
 msgstr "thêm nhánh"
 
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
 msgid "no remote specified"
 msgstr "chưa chỉ ra máy chủ nào"
 
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
 msgid "query push URLs rather than fetch URLs"
 msgstr "truy vấn đẩy URL thay vì lấy"
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1467
 msgid "return all URLs"
 msgstr "trả v� m�i URL"
 
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "không có URL nào được cấu hình cho nhánh “%s�"
 
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
 msgid "manipulate push URLs"
 msgstr "đẩy các “URL� bằng tay"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
 msgid "add URL"
 msgstr "thêm URL"
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
 msgid "delete URLs"
 msgstr "xóa URLs"
 
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete không hợp lý"
 
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Kiểu mẫu URL cũ không hợp lệ: %s"
 
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Không tìm thấy URL như vậy: %s"
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
 msgid "Will not delete all non-push URLs"
 msgstr "Sẽ không xóa những địa chỉ URL không-push"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 msgid "be verbose; must be placed before a subcommand"
 msgstr "chi tiết; phải được đặt trước một lệnh-con"
 
@@ -10450,12 +10821,6 @@ msgstr "cho phép gỡ b� đệ qui"
 msgid "exit with a zero status even if nothing matched"
 msgstr "thoát ra với trạng thái khác không thậm chí nếu không có gì khớp"
 
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-"Vui lòng đưa các thay đổi của bạn vào “.gitmodules� hay tạm cất chúng đi để "
-"xử lý"
-
 #: builtin/rm.c:335
 #, c-format
 msgid "not removing '%s' recursively without -r"
@@ -10662,84 +11027,184 @@ msgstr "giữ và xóa b� m�i dòng bắt đầu bằng ký tự ghi chú"
 msgid "prepend comment character and space to each line"
 msgstr "treo trước ký tự ghi chú và ký tự khoảng trắng cho từng dòng"
 
-#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "Không có tham chiếu nào như thế: %s"
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Cần tên tham chiếu dạng đầy đủ, nhưng lại nhận được %s"
+
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "không thể cắt b� một thành phần ra kh�i “%s� url"
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
 msgid "alternative anchor for relative paths"
 msgstr "điểm neo thay thế cho các đư�ng dẫn tương đối"
 
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper list [--prefix=<đư�ng/dẫn>] [<đư�ng/dẫn>…]"
+msgstr "git submodule--helper list [--prefix=</đư�ng/dẫn>] [</đư�ng/dẫn>…]"
 
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "Không tìm thấy url cho đư�ng dẫn mô-đun-con “%s� trong .gitmodules"
+
+#: builtin/submodule--helper.c:366
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "Gặp lỗi khi đăng ký url cho đư�ng dẫn mô-đun-con “%s�"
+
+#: builtin/submodule--helper.c:370
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "Mô-đun-con “%s� (%s) được đăng ký cho đư�ng dẫn “%s�\n"
+
+#: builtin/submodule--helper.c:380
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "cảnh báo: chế độ lệnh cập nhật được gợi ý cho mô-đun-con “%s�\n"
+
+#: builtin/submodule--helper.c:387
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr "Gặp lỗi khi đăng ký chế độ cập nhật cho đư�ng dẫn mô-đun-con “%s�"
+
+#: builtin/submodule--helper.c:406
+msgid "Suppress output for initializing a submodule"
+msgstr "Chặn kết xuất cho khởi tạo một mô-đun-con"
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [</đư�ng/dẫn>]"
+
+#: builtin/submodule--helper.c:432
 msgid "git submodule--helper name <path>"
-msgstr "git submodule--helper name <đư�ng/dẫn>"
+msgstr "git submodule--helper name </đư�ng/dẫn>"
 
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 "Không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đư�ng dẫn "
 "“%s�"
 
-#: builtin/submodule--helper.c:164
+#: builtin/submodule--helper.c:489
 msgid "where the new submodule will be cloned to"
 msgstr "nhân bản mô-đun-con mới vào chỗ nào"
 
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:492
 msgid "name of the new submodule"
 msgstr "tên của mô-đun-con mới"
 
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
 msgid "url where to clone the submodule from"
 msgstr "url nơi mà nhân bản mô-đun-con từ đó"
 
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:501
 msgid "depth for shallow clones"
 msgstr "chi�u sâu lịch sử khi tạo bản sao"
 
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
 msgstr ""
-"git submodule--helper clone [--prefix=<đư�ng/dẫn>] [--quiet] [--reference "
-"<kho>] [--name <tên>] [--url <url>][--depth <đư�ng/dẫn>] [--] [<đư�ng/dẫn>…]"
+"git submodule--helper clone [--prefix=</đư�ng/dẫn>] [--quiet] [--reference "
+"<kho>] [--name <tên>] [--depth <sâu>] [--url <url>] [</đư�ng/dẫn>…]"
 
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "không thể tạo thư mục “%s�"
 
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "Nhân bản “%s� vào đư�ng dẫn mô-đun-con “%s� gặp lỗi"
 
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:550
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "không thể mở tập tin “%s�"
 
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
 #, c-format
 msgid "could not close file %s"
 msgstr "không thể đóng tập tin %s"
 
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "không thể lấy thư mục mô-đun-con cho “%s�"
 
-#: builtin/submodule--helper.c:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "�ư�ng dẫn mô-đun-con “%s� chưa được khởi tạo"
+
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Có lẽ bạn là bạn muốn dùng \"update --init\" phải không?"
+
+#: builtin/submodule--helper.c:639
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "B� qua các mô-đun-con chưa được hòa trộn %s"
+
+#: builtin/submodule--helper.c:660
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "B� qua mô-đun-con “%s�"
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "đư�ng dẫn đến cây làm việc"
+
+#: builtin/submodule--helper.c:771
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "đư�ng dẫn đến cây làm việc, chéo biên giới mô-đun-con lồng nhau"
+
+#: builtin/submodule--helper.c:775
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout hoặc không làm gì cả"
+
+#: builtin/submodule--helper.c:779
+msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr ""
-"lỗi nghiêm tr�ng: lệnh con submodule--helper phải được gói với một lệnh con"
+"Tạo một bản sao nông được cắt ngắn thành số lượng điểm xét duyệt đã cho"
+
+#: builtin/submodule--helper.c:782
+msgid "parallel jobs"
+msgstr "công việc đồng th�i"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "đừng in tiến trình nhân bản"
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr ""
+"git submodule--helper update_clone [--prefix=</đư�ng/dẫn>] [</đư�ng/dẫn>…]"
+
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr "giá trị cho  tham số cập nhật bị sai"
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "lệnh con submodule--helper phải được g�i với một lệnh con"
 
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:862
 #, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr "lỗi nghiêm tr�ng: “%s� không phải là lệnh con submodule--helper hợp lệ"
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "“%s� không phải là lệnh con submodule--helper hợp lệ"
 
 #: builtin/symbolic-ref.c:7
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10794,27 +11259,22 @@ msgstr ""
 msgid "git tag -v <tagname>..."
 msgstr "git tag -v <tên-thẻ>…"
 
-#: builtin/tag.c:80
+#: builtin/tag.c:81
 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr "tên thẻ quá dài: %.*s…"
 
-#: builtin/tag.c:85
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr "không tìm thấy tìm thấy thẻ “%s�."
 
-#: builtin/tag.c:100
+#: builtin/tag.c:101
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Thẻ đã bị xóa “%s� (từng là %s)\n"
 
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "không thể thẩm tra thẻ “%s�"
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
 #, c-format
 msgid ""
 "\n"
@@ -10827,7 +11287,7 @@ msgstr ""
 "  %s\n"
 "Những dòng được bắt đầu bằng “%c� sẽ được b� qua.\n"
 
-#: builtin/tag.c:126
+#: builtin/tag.c:121
 #, c-format
 msgid ""
 "\n"
@@ -10959,21 +11419,21 @@ msgstr "tùy ch�n --merged và --no-merged chỉ cho phép dùng với -l."
 msgid "only one -F or -m option is allowed."
 msgstr "chỉ có một tùy ch�n -F hoặc -m là được phép."
 
-#: builtin/tag.c:453
+#: builtin/tag.c:452
 msgid "too many params"
 msgstr "quá nhi�u đối số"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:458
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "“%s� không phải thẻ hợp lệ."
 
-#: builtin/tag.c:464
+#: builtin/tag.c:463
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "Thẻ “%s� đã tồn tại rồi"
 
-#: builtin/tag.c:489
+#: builtin/tag.c:491
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "�ã cập nhật thẻ “%s� (trước là %s)\n"
@@ -11227,7 +11687,7 @@ msgstr "git verify-commit [-v | --verbose] <lần_chuyển_giao>…"
 msgid "print commit contents"
 msgstr "hiển thị nội dung của lần chuyển giao"
 
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
 msgid "print raw gpg status output"
 msgstr "in kết xuất trạng thái gpg dạng thô"
 
@@ -11247,7 +11707,7 @@ msgstr "chỉ hiển thị thống kê"
 msgid "git verify-tag [-v | --verbose] <tag>..."
 msgstr "git verify-tag [-v | --verbose] <thẻ>…"
 
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
 msgid "print tag contents"
 msgstr "hiển thị nội dung của thẻ"
 
@@ -11263,68 +11723,72 @@ msgstr "git worktree prune [<các-tùy-ch�n>]"
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<các-tùy-ch�n>]"
 
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Gỡ b� cây làm việc/%s: không phải là thư mục hợp lệ"
 
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Gỡ b� cây làm việc/%s: không có tập tin gitdir"
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Gỡ b� cây làm việc/%s: không thể đ�c tập tin gitdir (%s)"
 
-#: builtin/worktree.c:61
+#: builtin/worktree.c:62
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Gỡ b� cây làm việc/%s: tập tin gitdir không hợp lệ"
 
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "Gỡ b� cây làm việc/%s: tập tin gitdir chỉ đến vị trí không tồn tại"
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:113
 #, c-format
-msgid "failed to remove: %s"
-msgstr "gặp lỗi khi gỡ b�: %s"
+msgid "failed to remove '%s'"
+msgstr "gặp lỗi khi gỡ b� “%s�"
 
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
 #, c-format
 msgid "'%s' already exists"
 msgstr "“%s� đã có từ trước rồi"
 
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "không thể tạo thư mục của “%s�"
 
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "�ang chuẩn bị %s (định danh %s)"
 
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "lấy ra <nhánh> ngay cả khi nó đã được lấy ra ở cây làm việc khác"
 
-#: builtin/worktree.c:319
+#: builtin/worktree.c:324
 msgid "create a new branch"
 msgstr "tạo nhánh mới"
 
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
 msgid "create or reset a branch"
 msgstr "tạo hay đặt lại một nhánh"
 
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
 msgid "detach HEAD at named commit"
 msgstr "r�i b� HEAD tại lần chuyển giao theo tên"
 
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "di chuyển cây làm việc mới"
+
+#: builtin/worktree.c:336
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "Các tùy ch�n -b, -B, và --detach loại từ lẫn nhau"
 
@@ -11344,7 +11808,7 @@ msgstr "ghi đối tượng cây (tree) cho <ti�n tố> thư mục con"
 msgid "only useful for debugging"
 msgstr "chỉ hữu ích khi cần gỡ lỗi"
 
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "in thông tin gỡ lỗi ra đầu ra lỗi tiêu chuẩn"
 
@@ -11358,7 +11822,7 @@ msgstr ""
 "hướng dẫn v� khái niệm. Xem “git help <lệnh>� hay “git help <khái-niệm>�\n"
 "để xem các đặc tả cho lệnh hay khái niệm cụ thể."
 
-#: http.c:321
+#: http.c:322
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "Chốt khóa công không được hỗ trợ với cURL < 7.44.0"
 
@@ -11488,7 +11952,7 @@ msgstr "im lặng hơn nữa"
 msgid "use <n> digits to display SHA-1s"
 msgstr "sử dụng <n> chữ số để hiển thị SHA-1s"
 
-#: rerere.h:38
+#: rerere.h:40
 msgid "update the index with reused conflict resolution if possible"
 msgstr "cập nhật bảng mục lục với phân giải xung đột dùng lại nếu được"
 
@@ -11704,16 +12168,16 @@ msgstr ""
 "�ể phục hồi lại thành nhánh nguyên thủy và dừng việc vá lại thì chạy \"git "
 "rebase --abort\"."
 
-#: git-rebase.sh:165
+#: git-rebase.sh:168
 msgid "Applied autostash."
 msgstr "�ã áp dụng autostash."
 
-#: git-rebase.sh:168
+#: git-rebase.sh:171
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "Không thể lưu $stash_sha1"
 
-#: git-rebase.sh:169
+#: git-rebase.sh:172
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 "Your changes are safe in the stash.\n"
@@ -11724,35 +12188,31 @@ msgstr ""
 "Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc "
 "nào.\n"
 
-#: git-rebase.sh:208
+#: git-rebase.sh:211
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Móc (hook) pre-rebase từ chối rebase."
 
-#: git-rebase.sh:213
+#: git-rebase.sh:216
 msgid "It looks like git-am is in progress. Cannot rebase."
 msgstr ""
 "Hình như đang trong quá trình thực hiện lệnh git-am. Không thể chạy lệnh "
 "rebase."
 
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "Tùy ch�n --exec phải được sử dụng cùng với tùy ch�n --interactive"
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
 msgid "No rebase in progress?"
 msgstr "Không có tiến trình rebase nào phải không?"
 
-#: git-rebase.sh:370
+#: git-rebase.sh:368
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "Hành động “--edit-todo� chỉ có thể dùng trong quá trình “rebase� (sửa lịch "
 "sử) tương tác."
 
-#: git-rebase.sh:377
+#: git-rebase.sh:375
 msgid "Cannot read HEAD"
 msgstr "Không thể đ�c HEAD"
 
-#: git-rebase.sh:380
+#: git-rebase.sh:378
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -11760,12 +12220,12 @@ msgstr ""
 "Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n"
 "đó đánh dấu chúng là cần xử lý sử dụng lệnh git add"
 
-#: git-rebase.sh:398
+#: git-rebase.sh:396
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "Không thể quay trở lại $head_name"
 
-#: git-rebase.sh:417
+#: git-rebase.sh:415
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -11786,64 +12246,64 @@ msgstr ""
 "và chạy TÔI lần nữa. TÔI  dừng lại trong trư�ng hợp bạn vẫn\n"
 "có một số thứ quý giá ở đây."
 
-#: git-rebase.sh:468
+#: git-rebase.sh:466
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "thượng nguồn không hợp lệ $upstream_name"
 
-#: git-rebase.sh:492
+#: git-rebase.sh:490
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: ở đây có nhi�u hơn một n�n móng hòa trộn"
 
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: ở đây không có n�n móng hòa trộn nào"
 
-#: git-rebase.sh:504
+#: git-rebase.sh:502
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "Không chỉ đến một lần chuyển giao không hợp lệ: $onto_name"
 
-#: git-rebase.sh:527
+#: git-rebase.sh:525
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "nghiêm tr�ng: không có nhánh như thế: $branch_name"
 
-#: git-rebase.sh:560
+#: git-rebase.sh:558
 msgid "Cannot autostash"
 msgstr "Không thể autostash"
 
-#: git-rebase.sh:565
+#: git-rebase.sh:563
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "�ã tạo autostash: $stash_abbrev"
 
-#: git-rebase.sh:569
+#: git-rebase.sh:567
 msgid "Please commit or stash them."
 msgstr "Xin hãy chuyển giao hoặc tạm cất (stash) chúng."
 
-#: git-rebase.sh:589
+#: git-rebase.sh:587
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi."
 
-#: git-rebase.sh:593
+#: git-rebase.sh:591
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi, lệnh rebase ép buộc."
 
-#: git-rebase.sh:604
+#: git-rebase.sh:602
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Thay đổi từ $mb thành $onto:"
 
-#: git-rebase.sh:613
+#: git-rebase.sh:611
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr "Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…"
 
-#: git-rebase.sh:623
+#: git-rebase.sh:621
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "Chuyển-tiếp-nhanh $branch_name thành $onto_name."
@@ -11989,29 +12449,24 @@ msgstr "Chưa chỉ ra tên của nhánh"
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(�ể phục hồi lại chúng hãy gõ \"git stash apply\")"
 
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "không thể tháo b� một thành phần ra kh�i “$remoteurl� url"
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "�ư�ng dẫn tương đối chỉ có thể dùng từ thư mục ở mức cao nhất của cây làm "
 "việc"
 
-#: git-submodule.sh:291
+#: git-submodule.sh:229
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr ""
 "repo URL: “$repo� phải là đư�ng dẫn tuyệt đối hoặc là bắt đầu bằng ./|../"
 
-#: git-submodule.sh:308
+#: git-submodule.sh:246
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "�$sm_path� thực sự đã tồn tại ở bảng mục lục rồi"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:250
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
@@ -12023,36 +12478,36 @@ msgstr ""
 "$sm_path\n"
 "Sử dụng -f nếu bạn thực sự muốn thêm nó vào."
 
-#: git-submodule.sh:330
+#: git-submodule.sh:268
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "�ang thêm repo có sẵn tại “$sm_path� vào bảng mục lục"
 
-#: git-submodule.sh:332
+#: git-submodule.sh:270
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "�$sm_path� đã tồn tại từ trước và không phải là một kho git hợp lệ"
 
-#: git-submodule.sh:340
+#: git-submodule.sh:278
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 "Thư mục git cho “$sm_name� được tìm thấy một cách cục bộ với các máy chủ:"
 
-#: git-submodule.sh:342
+#: git-submodule.sh:280
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from"
 msgstr "Nếu bạn muốn dùng lại thư mục git nội bộ này thay vì nhân bản từ nó"
 
-#: git-submodule.sh:344
+#: git-submodule.sh:282
 #, sh-format
 msgid ""
 "use the '--force' option. If the local git directory is not the correct repo"
 msgstr ""
 "dùng tùy ch�n “--force�. Nếu thư mục git nội bộ không phải là repo (kho) đúng"
 
-#: git-submodule.sh:345
+#: git-submodule.sh:283
 #, sh-format
 msgid ""
 "or you are unsure what this means choose another name with the '--name' "
@@ -12061,71 +12516,53 @@ msgstr ""
 "hay bạn không chắc chắn đi�u đó có nghĩa gì ch�n tên khác với tùy ch�n “--"
 "name�."
 
-#: git-submodule.sh:347
+#: git-submodule.sh:285
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr ""
 "Phục hồi sự hoạt động của thư mục git nội bộ cho mô-đun-con “$sm_name�."
 
-#: git-submodule.sh:359
+#: git-submodule.sh:297
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "Không thể lấy ra mô-đun-con “$sm_path�"
 
-#: git-submodule.sh:364
+#: git-submodule.sh:302
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Gặp lỗi khi thêm mô-đun-con “$sm_path�"
 
-#: git-submodule.sh:373
+#: git-submodule.sh:311
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun-con “$sm_path�"
 
-#: git-submodule.sh:417
-#, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "�ang vào “$prefix$displaypath�"
-
-#: git-submodule.sh:437
-#, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
-msgstr ""
-"Dừng lại tại “$prefix$displaypath�; script trả v� trạng thái khác không."
-
-#: git-submodule.sh:483
+#: git-submodule.sh:355
 #, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr ""
-"Không tìm thấy url cho đư�ng dẫn mô-đun-con “$displaypath� trong .gitmodules"
+msgid "Entering '$displaypath'"
+msgstr "�ang vào “$displaypath�"
 
-#: git-submodule.sh:492
+#: git-submodule.sh:375
 #, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr "Gặp lỗi khi đăng ký url cho đư�ng dẫn mô-đun-con “$displaypath�"
+msgid "Stopping at '$displaypath'; script returned non-zero status."
+msgstr "Dừng lại tại “$displaypath�; script trả v� trạng thái khác không."
 
-#: git-submodule.sh:494
+#: git-submodule.sh:448
 #, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr "Mô-đun-con “$name� ($url) được đăng ký cho đư�ng dẫn “$displaypath�"
-
-#: git-submodule.sh:511
-#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr ""
-"Gặp lỗi khi đăng ký chế độ cập nhật cho đư�ng dẫn mô-đun-con “$displaypath�"
+msgid "pathspec and --all are incompatible"
+msgstr "đặc tả đư�ng dẫn và --all xung khắc nhau"
 
-#: git-submodule.sh:549
+#: git-submodule.sh:453
 #, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr "Dùng “.� nếu bạn thực sự muốn gỡ b� m�i mô-đun-con"
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "Dùng “--all� nếu bạn thực sự muốn hủy khởi tạo m�i mô-đun-con"
 
-#: git-submodule.sh:566
+#: git-submodule.sh:470
 #, sh-format
 msgid "Submodule work tree '$displaypath' contains a .git directory"
 msgstr "Cây làm việc mô-đun-con “$displaypath� có chứa thư mục .git"
 
-#: git-submodule.sh:567
+#: git-submodule.sh:471
 #, sh-format
 msgid ""
 "(use 'rm -rf' if you really want to remove it including all of its history)"
@@ -12133,7 +12570,7 @@ msgstr ""
 "(dùng “rm -rf� nếu bạn thực sự muốn gỡ b� nó cùng với tất cả lịch sử của "
 "chúng)"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:477
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12142,141 +12579,178 @@ msgstr ""
 "Cây làm việc mô-đun-con “$displaypath� chứa các thay đổi nội bộ; hãy dùng “-"
 "f� để loại b� chúng đi"
 
-#: git-submodule.sh:576
+#: git-submodule.sh:480
 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr "�ã tạo thư mục “$displaypath�"
 
-#: git-submodule.sh:577
+#: git-submodule.sh:481
 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr "Không thể gỡ b� cây làm việc mô-đun-con “$displaypath�"
 
-#: git-submodule.sh:580
+#: git-submodule.sh:484
 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr "Không thể tạo thư mục mô-đun-con rỗng “$displaypath�"
 
-#: git-submodule.sh:589
+#: git-submodule.sh:493
 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr "Mô-đun-con “$name� ($url) được b� đăng ký cho đư�ng dẫn “$displaypath�"
 
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"�ư�ng dẫn mô-đun-con “$displaypath� chưa được khởi tạo.\n"
-"Có lẽ bạn muốn sử dụng lệnh “update --init�?"
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "Không tìm thấy điểm xét duyệt hiện hành trong đư�ng dẫn mô-đun-con "
 "“$displaypath�"
 
-#: git-submodule.sh:745
+#: git-submodule.sh:644
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Không thể lấy v� trong đư�ng dẫn mô-đun-con “$sm_path�"
 
-#: git-submodule.sh:768
+#: git-submodule.sh:667
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "Không thể lấy v� trong đư�ng dẫn mô-đun-con “$displaypath�"
 
-#: git-submodule.sh:788
+#: git-submodule.sh:680
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "Không thể lấy ra “$sha1� trong đư�ng dẫn mô-đun-con “$displaypath�"
 
-#: git-submodule.sh:789
+#: git-submodule.sh:681
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "�ư�ng dẫn mô-đun-con “$displaypath�: đã checkout “$sha1�"
 
-#: git-submodule.sh:793
+#: git-submodule.sh:685
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "Không thể cải tổ “$sha1� trong đư�ng dẫn mô-đun-con “$displaypath�"
 
-#: git-submodule.sh:794
+#: git-submodule.sh:686
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "�ư�ng dẫn mô-đun-con “$displaypath�: được rebase vào trong “$sha1�"
 
-#: git-submodule.sh:799
+#: git-submodule.sh:691
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Không thể hòa trộn (merge) “$sha1� trong đư�ng dẫn mô-đun-con “$displaypath�"
 
-#: git-submodule.sh:800
+#: git-submodule.sh:692
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "�ư�ng dẫn mô-đun-con “$displaypath�: được hòa trộn vào “$sha1�"
 
-#: git-submodule.sh:805
+#: git-submodule.sh:697
 #, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "Thực hiện không thành công lệnh “$command $sha1� trong đư�ng dẫn mô-đun-con "
-"“$prefix$sm_path�"
+"“$displaypath�"
 
-#: git-submodule.sh:806
+#: git-submodule.sh:698
 #, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "�ư�ng dẫn mô-đun-con “$prefix$sm_path�: “$command $sha1�"
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "�ư�ng dẫn mô-đun-con “$displaypath�: “$command $sha1�"
 
-#: git-submodule.sh:836
+#: git-submodule.sh:729
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Gặp lỗi khi đệ quy vào trong đư�ng dẫn mô-đun-con “$displaypath�"
 
-#: git-submodule.sh:944
+#: git-submodule.sh:837
 msgid "The --cached option cannot be used with the --files option"
 msgstr "Tùy ch�n --cached không thể dùng cùng với tùy ch�n --files"
 
-#: git-submodule.sh:996
+#: git-submodule.sh:889
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "chế độ không như mong ch� $mod_dst"
 
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Cảnh báo: $display_name không chứa lần chuyển giao $sha1_src"
 
-#: git-submodule.sh:1019
+#: git-submodule.sh:912
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Cảnh báo: $display_name không chứa lần chuyển giao $sha1_dst"
 
-#: git-submodule.sh:1022
+#: git-submodule.sh:915
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 "  Cảnh báo: $display_name không chứa những lần chuyển giao $sha1_src và "
 "$sha1_dst"
 
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
 msgid "blob"
 msgstr "blob"
 
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "Gặp lỗi khi đệ quy vào trong đư�ng dẫn mô-đun-con “$sm_path�"
 
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath�"
 
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "Xem git-${cmd}(1) để biết thêm chi tiết."
+
+#~ msgid "'%s': %s"
+#~ msgstr "“%s�: %s"
+
+#~ msgid "unable to access '%s': %s"
+#~ msgstr "không thể truy cập “%s�: %s"
+
+#~ msgid "could not open '%s' for reading: %s"
+#~ msgstr "không thể mở “%s� để đ�c: %s"
+
+#~ msgid "could not open '%s' for writing: %s"
+#~ msgstr "Không thể mở “%s� để ghi: %s"
+
+#~ msgid "    git branch -d %s\n"
+#~ msgstr "    git branch -d %s\n"
+
+#~ msgid "    git branch --set-upstream-to %s\n"
+#~ msgstr "    git branch --set-upstream-to %s\n"
+
+#~ msgid "cannot open %s: %s\n"
+#~ msgstr "không thể mở %s: %s\n"
+
+#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+#~ msgstr ""
+#~ "Vui lòng đưa các thay đổi của bạn vào “.gitmodules� hay tạm cất chúng đi "
+#~ "để xử lý"
+
+#~ msgid "could not verify the tag '%s'"
+#~ msgstr "không thể thẩm tra thẻ “%s�"
+
+#~ msgid "failed to remove: %s"
+#~ msgstr "gặp lỗi khi gỡ b�: %s"
+
+#~ msgid "The --exec option must be used with the --interactive option"
+#~ msgstr "Tùy ch�n --exec phải được sử dụng cùng với tùy ch�n --interactive"
+
+#~ msgid ""
+#~ "Submodule path '$displaypath' not initialized\n"
+#~ "Maybe you want to use 'update --init'?"
+#~ msgstr ""
+#~ "�ư�ng dẫn mô-đun-con “$displaypath� chưa được khởi tạo.\n"
+#~ "Có lẽ bạn muốn sử dụng lệnh “update --init�?"
+
 #~ msgid "Forward-port local commits to the updated upstream head"
 #~ msgstr ""
 #~ "Chuyển tiếp những lần chuyển giao nội bộ tới head thượng nguồn đã cập nhật"
@@ -12339,9 +12813,6 @@ msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath�"
 #~ msgid "Could not append '%s'"
 #~ msgstr "Không thể nối thêm “%s�"
 
-#~ msgid "Could not set '%s'"
-#~ msgstr "Không thể đặt “%s�"
-
 #~ msgid "unable to look up current user in the passwd file: %s"
 #~ msgstr "không tìm thấy ngư�i dùng hiện tại trong tập tin passwd: %s"
 
@@ -12689,13 +13160,6 @@ msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath�"
 #~ msgstr "các đư�ng dẫn được  ngăn cách bởi ký tự null"
 
 #~ msgid ""
-#~ "The following untracked files would NOT be saved but need to be removed "
-#~ "by stash save:"
-#~ msgstr ""
-#~ "Các tập tin chưa được theo dõi sau đây KHÔNG được ghi lại nhưng cần được "
-#~ "gỡ b� bởi việc ghi lại stash:"
-
-#~ msgid ""
 #~ "Aborting. Consider using either the --force or --include-untracked option."
 #~ msgstr ""
 #~ "Bãi b�. Cân nhắc dùng một trong hai tùy ch�n --force và --include-"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a6b06f9d39..36db9fe017 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -135,8 +135,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
-"PO-Revision-Date: 2016-03-16 00:18+0800\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"PO-Revision-Date: 2016-06-06 23:05+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 "Language: zh_CN\n"
@@ -158,7 +158,7 @@ msgstr ""
 "请在工作区改正文件，然�酌情使用 'git add/rm <文件>' 命令标记\n"
 "解决方案并�交。"
 
-#: advice.c:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "您尚未结�您的�并（存在 MERGE_HEAD）。"
 
@@ -201,7 +201,7 @@ msgstr "格�"
 msgid "archive format"
 msgstr "归档格�"
 
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
 msgid "prefix"
 msgstr "�缀"
 
@@ -209,9 +209,9 @@ msgstr "�缀"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "为归档中�个路径�加上�缀"
 
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547
-#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548
+#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
 #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
 #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
 msgid "file"
@@ -245,7 +245,8 @@ msgstr "压缩效果更好"
 msgid "list supported archive formats"
 msgstr "列出支�的归档格�"
 
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
 msgid "repo"
 msgstr "仓库"
 
@@ -392,11 +393,16 @@ msgstr "歧义的对象�：'%s'。"
 msgid "Not a valid branch point: '%s'."
 msgstr "无效的分支点：'%s'。"
 
-#: branch.c:344
+#: branch.c:345
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' 已�检出到 '%s'"
 
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "工作区 %s 的 HEAD 指�没有被更新"
+
 #: bundle.c:34
 #, c-format
 msgid "'%s' does not look like a v2 bundle file"
@@ -407,7 +413,7 @@ msgstr "'%s' ��是一个 v2 版本的包文件"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "未能识别的包头：%s%s (%d)"
 
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
 #, c-format
 msgid "could not open '%s'"
 msgstr "�能打开 '%s'"
@@ -416,10 +422,10 @@ msgstr "�能打开 '%s'"
 msgid "Repository lacks these prerequisite commits:"
 msgstr "仓库中缺少这些必备的�交："
 
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
 msgid "revision walk setup failed"
 msgstr "版本�历设置失败"
 
@@ -458,21 +464,21 @@ msgstr "rev-list 终止"
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "引用 '%s' 被 rev-list 选项排除"
 
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "未能识别的�数：%s"
 
-#: bundle.c:449
+#: bundle.c:451
 msgid "Refusing to create empty bundle."
 msgstr "�能创建空包。"
 
-#: bundle.c:459
+#: bundle.c:463
 #, c-format
 msgid "cannot create '%s'"
 msgstr "�能创建 '%s'"
 
-#: bundle.c:480
+#: bundle.c:491
 msgid "index-pack died"
 msgstr "index-pack 终止"
 
@@ -481,8 +487,8 @@ msgstr "index-pack 终止"
 msgid "invalid color value: %.*s"
 msgstr "无效的颜色值：%.*s"
 
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
 #, c-format
 msgid "could not parse %s"
 msgstr "�能解� %s"
@@ -516,21 +522,21 @@ msgstr "�置�� '%2$s' 的数字�值 '%1$s' 设置错误: %3$s"
 msgid "failed to expand user dir in: '%s'"
 msgstr "无法扩展 '%s' 中的用户目录"
 
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "错误的 zlib 压缩级别 %d"
 
-#: config.c:891
+#: config.c:890
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "无效的对象创建模�：%s"
 
-#: config.c:1220
+#: config.c:1228
 msgid "unable to parse command-line config"
 msgstr "无法解�命令行中的�置"
 
-#: config.c:1281
+#: config.c:1284
 msgid "unknown error occured while reading the configuration files"
 msgstr "在读��置文件时�到未知错误"
 
@@ -549,24 +555,27 @@ msgstr "在文件 '%2$s' 的第 %3$d 行�现错误的�置�� '%1$s'"
 msgid "%s has multiple values"
 msgstr "%s 有多个�值"
 
-#: config.c:2226
+#: config.c:2224
 #, c-format
-msgid "Could not set '%s' to '%s'"
+msgid "could not set '%s' to '%s'"
 msgstr "�能设置 '%s' 为 '%s'"
 
+#: config.c:2226
+#, c-format
+msgid "could not unset '%s'"
+msgstr "�能�消设置 '%s'"
+
 #: connected.c:69
 msgid "Could not run 'git rev-list'"
 msgstr "�能执行 'git rev-list'"
 
 #: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "无法写入 rev-list：%s"
+msgid "failed write to rev-list"
+msgstr "无法写入 rev-list"
 
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "无法关闭 rev-list 的标准输入：%s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
+msgstr "无法关闭 rev-list 的标准输入"
 
 #: date.c:95
 msgid "in the future"
@@ -641,28 +650,28 @@ msgstr[1] "%lu 年�"
 msgid "failed to read orderfile '%s'"
 msgstr "无法读�排�文件 '%s'"
 
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
 msgid "Performing inexact rename detection"
 msgstr "正在进行�精确的�命�检测"
 
 #  译者：注����导空格
-#: diff.c:115
+#: diff.c:116
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  无法解� dirstat 截止（cut-off）百分比 '%s'\n"
 
 #  译者：注����导空格
-#: diff.c:120
+#: diff.c:121
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  未知的 dirstat �数 '%s'\n"
 
-#: diff.c:215
+#: diff.c:225
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "�置�� 'diff.submodule' 未知的�值：'%s'"
 
-#: diff.c:267
+#: diff.c:277
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -671,16 +680,16 @@ msgstr ""
 "�现�置�� 'diff.dirstat' 中的错误：\n"
 "%s"
 
-#: diff.c:2997
+#: diff.c:3007
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "外部 diff 退出，�止在 %s"
 
-#: diff.c:3393
+#: diff.c:3405
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow �数��跟一个 pathspec"
 
-#: diff.c:3556
+#: diff.c:3568
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -689,20 +698,20 @@ msgstr ""
 "无法解� --dirstat/-X 选项的�数：\n"
 "%s"
 
-#: diff.c:3570
+#: diff.c:3582
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "无法解� --submodule 选项的�数：'%s'"
 
-#: dir.c:2004
+#: dir.c:1823
 msgid "failed to get kernel name and information"
 msgstr "无法获得内核�称和信�"
 
-#: dir.c:2123
+#: dir.c:1942
 msgid "Untracked cache is disabled on this system or location."
 msgstr "缓存未跟踪文件在本系统或�置中被�用。"
 
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
 msgid "could not run gpg."
 msgstr "�能执行 gpg。"
 
@@ -716,28 +725,28 @@ msgstr "gpg 无法为数�签�"
 
 #: gpg-interface.c:222
 #, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "�能创建临时文件 '%s'：%s"
+msgid "could not create temporary file '%s'"
+msgstr "�能创建临时文件 '%s'"
 
-#: gpg-interface.c:225
+#: gpg-interface.c:224
 #, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "无法将分离�签�写入 '%s'：%s"
+msgid "failed writing detached signature to '%s'"
+msgstr "无法将分离�签�写入 '%s'"
 
 #: grep.c:1718
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s'：无法读� %s"
 
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
 #, c-format
-msgid "'%s': %s"
-msgstr "'%s'：%s"
+msgid "failed to stat '%s'"
+msgstr "无法枚举 '%s' 状�"
 
 #: grep.c:1746
 #, c-format
-msgid "'%s': short read %s"
-msgstr "'%s'：读��完整 %s"
+msgid "'%s': short read"
+msgstr "'%s'：读��完整"
 
 #: help.c:205
 #, c-format
@@ -803,12 +812,35 @@ msgstr[1] ""
 msgid "%s: %s - %s"
 msgstr "%s：%s - %s"
 
+#: lockfile.c:152
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"无法创建 '%s.lock'：%s。\n"
+"\n"
+"似乎�外一个 git 进程在这个仓库中�行，例如：'git commit' 命令打\n"
+"开了一个编辑器。请确认所有进程都已�关闭然��试。如果�然报错，\n"
+"�能之�有一个 git 进程在这个仓库中异常退出：\n"
+"手动删除这个文件�继续。"
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "�能创建 '%s.lock'：%s"
+
 #: merge.c:41
 msgid "failed to read the cache"
 msgstr "无法读�缓存"
 
-#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
 msgid "unable to write new index file"
 msgstr "无法写新的索引文件"
 
@@ -855,7 +887,7 @@ msgstr "�能读�对象 %s '%s'"
 msgid "blob expected for %s '%s'"
 msgstr "%s '%s' 应为数�对象"
 
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
 #, c-format
 msgid "failed to open '%s'"
 msgstr "无法打开 '%s'"
@@ -990,7 +1022,7 @@ msgstr "略过 %s（已��过相��并）"
 msgid "Auto-merging %s"
 msgstr "自动�并 %s"
 
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
 msgid "submodule"
 msgstr "�模组"
 
@@ -1017,50 +1049,50 @@ msgstr "目录/文件"
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr "冲�（%1$s）：在 %3$s 中有一个�为 %2$s 的目录。以 %5$s 为�添加 %4$s"
 
-#: merge-recursive.c:1783
+#: merge-recursive.c:1781
 #, c-format
 msgid "Adding %s"
 msgstr "添加 %s"
 
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
 msgid "Fatal merge failure, shouldn't happen."
 msgstr "严�的�并错误，�应�生。"
 
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
 msgid "Already up-to-date!"
 msgstr "已�是最新的�"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "无法�并树 %s 和 %s"
 
-#: merge-recursive.c:1858
+#: merge-recursive.c:1856
 #, c-format
 msgid "Unprocessed path??? %s"
 msgstr "未处�的路径??? %s"
 
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
 msgid "Merging:"
 msgstr "�并："
 
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "�现 %u 个共�祖先："
 msgstr[1] "�现 %u 个共�祖先："
 
-#: merge-recursive.c:1956
+#: merge-recursive.c:1954
 msgid "merge returned no commit"
 msgstr "�并未返回�交"
 
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "�能解�对象 '%s'"
 
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
 msgid "Unable to write index."
 msgstr "�能写入索引。"
 
@@ -1090,29 +1122,29 @@ msgstr "�的 %s 值：'%s'"
 msgid "unable to parse object: %s"
 msgstr "�能解�对象：%s"
 
-#: parse-options.c:570
+#: parse-options.c:572
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:588
+#: parse-options.c:590
 #, c-format
 msgid "usage: %s"
 msgstr "用法：%s"
 
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
 #, c-format
 msgid "   or: %s"
 msgstr "  或：%s"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: parse-options.c:595
+#: parse-options.c:597
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:629
+#: parse-options.c:631
 msgid "-NUM"
 msgstr "-æ•°å­—"
 
@@ -1121,7 +1153,7 @@ msgstr "-æ•°å­—"
 msgid "malformed object name '%s'"
 msgstr "�法的对象� '%s'"
 
-#: path.c:752
+#: path.c:796
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "�能设置 %s 为组�写"
@@ -1188,7 +1220,7 @@ msgstr ""
 "没有为 :(exclude) 模��供�忽略的内容。也许您忘记了\n"
 "添加 ':/' 或 '.' ？"
 
-#: pretty.c:969
+#: pretty.c:971
 msgid "unable to parse --pretty format"
 msgstr "�能解� --pretty 格�"
 
@@ -1214,23 +1246,23 @@ msgstr ""
 "设置了 GIT_INDEX_VERSION，但是�值无效。\n"
 "使用版本 %i"
 
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "无法打开 '%s' 进行写入"
 
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "无法删除引用 %s：%s"
 
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2246
 #, c-format
 msgid "could not delete references: %s"
 msgstr "无法删除引用：%s"
 
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
 #, c-format
 msgid "could not remove reference %s"
 msgstr "无法删除引用 %s"
@@ -1369,93 +1401,93 @@ msgstr "格�：缺少 %%(end) 元素"
 msgid "malformed object name %s"
 msgstr "�法的对象� %s"
 
-#: remote.c:745
+#: remote.c:746
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "�能�时获� %s 和 %s 至 %s"
 
-#: remote.c:749
+#: remote.c:750
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s 通常跟踪 %s，而� %s"
 
-#: remote.c:753
+#: remote.c:754
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s �时跟踪 %s 和 %s"
 
-#: remote.c:761
+#: remote.c:762
 msgid "Internal error"
 msgstr "内部错误"
 
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
 msgid "HEAD does not point to a branch"
 msgstr "HEAD 没有指�一个分支"
 
-#: remote.c:1686
+#: remote.c:1687
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "没有此分支：'%s'"
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "尚未给分支 '%s' 设置上游"
 
-#: remote.c:1695
+#: remote.c:1696
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
 
-#: remote.c:1710
+#: remote.c:1711
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "推�目标 '%s' 至远程 '%s' 没有本地跟踪分支"
 
-#: remote.c:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "分支 '%s' 没有设置�推�的远程�务器"
 
-#: remote.c:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "� '%s' 推�引用规格未包� '%s'"
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "推�无目标（push.default 是 'nothing'）"
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "无法解� 'simple' 推�至一个�独的目标"
 
-#: remote.c:2073
+#: remote.c:2074
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "您的分支基于 '%s'，但此上游分支已��存在。\n"
 
-#: remote.c:2077
+#: remote.c:2078
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  （使用 \"git branch --unset-upstream\" �修�）\n"
 
-#: remote.c:2080
+#: remote.c:2081
 #, c-format
 msgid "Your branch is up-to-date with '%s'.\n"
 msgstr "您的分支与上游分支 '%s' 一致。\n"
 
-#: remote.c:2084
+#: remote.c:2085
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "您的分支领先 '%s' 共 %d 个�交。\n"
 msgstr[1] "您的分支领先 '%s' 共 %d 个�交。\n"
 
-#: remote.c:2090
+#: remote.c:2091
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  （使用 \"git push\" ��布您的本地�交）\n"
 
-#: remote.c:2093
+#: remote.c:2094
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -1464,11 +1496,11 @@ msgstr[0] "您的分支�� '%s' 共 %d 个�交，并且�以快进。\n"
 msgstr[1] "您的分支�� '%s' 共 %d 个�交，并且�以快进。\n"
 
 #  译者：注����导空格
-#: remote.c:2101
+#: remote.c:2102
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  （使用 \"git pull\" �更新您的本地分支）\n"
 
-#: remote.c:2104
+#: remote.c:2105
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -1484,20 +1516,20 @@ msgstr[1] ""
 "并且分别有 %d 和 %d 处��的�交。\n"
 
 #  译者：注����导空格
-#: remote.c:2114
+#: remote.c:2115
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  （使用 \"git pull\" ��并远程分支）\n"
 
-#: revision.c:2131
+#: revision.c:2142
 msgid "your current branch appears to be broken"
 msgstr "您的当�分支好�被��"
 
-#: revision.c:2134
+#: revision.c:2145
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "您的当�分支 '%s' 尚无任何�交"
 
-#: revision.c:2328
+#: revision.c:2339
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent 与 --bisect �兼容"
 
@@ -1545,7 +1577,7 @@ msgstr ""
 "冲�解决完毕�，用 'git add <路径>' 或 'git rm <路径>'\n"
 "对修正�的文件�标记，然�用 'git commit' �交"
 
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
 #, c-format
 msgid "Could not write to %s"
 msgstr "�能写入 %s"
@@ -1703,12 +1735,12 @@ msgstr "�试 \"git cherry-pick (--continue | --quit | --abort)\""
 msgid "Could not create sequencer directory %s"
 msgstr "�能创建�列目录 %s"
 
-#: sequencer.c:835 sequencer.c:917
+#: sequencer.c:835 sequencer.c:916
 #, c-format
 msgid "Error wrapping up %s."
 msgstr "错误收尾 %s。"
 
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
 msgid "no cherry-pick or revert in progress"
 msgstr "拣选或还原�作并未进行"
 
@@ -1720,63 +1752,72 @@ msgstr "�能解� HEAD"
 msgid "cannot abort from a branch yet to be born"
 msgstr "�能从尚未建立的分支终止"
 
-#: sequencer.c:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
 #, c-format
-msgid "cannot open %s: %s"
-msgstr "�能打开 %s：%s"
+msgid "cannot open %s"
+msgstr "�能打开 %s"
 
-#: sequencer.c:881
+#: sequencer.c:880
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "�能读� %s：%s"
 
-#: sequencer.c:882
+#: sequencer.c:881
 msgid "unexpected end of file"
 msgstr "�外的文件结�"
 
-#: sequencer.c:888
+#: sequencer.c:887
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "�存拣选�交�的 HEAD 文件 '%s' ��"
 
-#: sequencer.c:910
+#: sequencer.c:909
 #, c-format
 msgid "Could not format %s."
 msgstr "�能格�化 %s。"
 
-#: sequencer.c:1055
+#: sequencer.c:1054
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s：�能拣选一个%s"
 
-#: sequencer.c:1058
+#: sequencer.c:1057
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s：错误的版本"
 
-#: sequencer.c:1092
+#: sequencer.c:1091
 msgid "Can't revert as initial commit"
 msgstr "�能作为�始�交还原"
 
-#: sequencer.c:1093
+#: sequencer.c:1092
 msgid "Can't cherry-pick into empty head"
 msgstr "�能拣选到空分支"
 
-#: setup.c:246
+#: setup.c:248
 #, c-format
 msgid "failed to read %s"
 msgstr "无法读� %s"
 
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "期望 git 仓库版本 <= %d，�得到 %d"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "�现未知的仓库扩展："
+
 #: sha1_file.c:1080
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "�移�在包文件结�之�（��的 .idx？）"
 
-#: sha1_file.c:2459
+#: sha1_file.c:2458
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "�移�在 %s 的包索引开始之�（��的索引？）"
 
-#: sha1_file.c:2463
+#: sha1_file.c:2462
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "�移�越过了 %s 的包索引的结尾（被截断的索引？）"
@@ -1802,29 +1843,38 @@ msgstr ""
 "�能需�删除它们。用 \"git config advice.objectNameWarning false\"\n"
 "命令关闭本消�通知。"
 
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr "无法修改未�并的 .gitmodules，先解决�并冲�"
 
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "无法在 .gitmodules 中找到 path=%s 的�节"
 
-#: submodule.c:74
+#: submodule.c:76
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "�能更新 .gitmodules �目 %s"
 
-#: submodule.c:107
+#: submodule.c:109
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "无法移除 %s 的 .gitmodules �目"
 
-#: submodule.c:118
+#: submodule.c:120
 msgid "staging updated .gitmodules failed"
 msgstr "将更新� .gitmodules 添加暂存区失败"
 
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "submodule.fetchJobs ��许为负值"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "%s 的值无效"
+
 #: trailer.c:237
 #, c-format
 msgid "running trailer command '%s' failed"
@@ -1884,7 +1934,219 @@ msgstr "�能�命�临时文件为 %s"
 msgid "Could not read ref %s"
 msgstr "�能读�引用 %s"
 
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you can switch branches."
+msgstr ""
+"您对下列文件的本地修改将被检出�作覆盖：\n"
+"%%s请在切�分支��交您的修改或者�存进度。"
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被检出�作覆盖：\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you can merge."
+msgstr ""
+"您对下列文件的本地修改将被�并�作覆盖：\n"
+"%%s请在�并��交您的修改或者�存进度。"
+
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被�并�作覆盖：\n"
+"%%s"
+
+#: unpack-trees.c:74
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you can %s."
+msgstr ""
+"您对下列文件的本地修改将被 %s 覆盖：\n"
+"%%s请在 %s 之��交您的修改或者�存进度。"
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被 %s 覆盖：\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"更新如下目录将会丢失其中未跟踪的文件：\n"
+"%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出�作而被删除：\n"
+"%%s请在切�分支之�移动或删除。"
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出�作而被删除：\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为�并�作而被删除：\n"
+"%%s请在�并�移动或删除。"
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为�并�作而被删除：\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s �作而被删除：\n"
+"%%s请在 %s �移动或删除。"
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s �作而被删除：\n"
+"%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出�作而被覆盖：\n"
+"%%s请在切�分支�移动或删除。"
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出�作而被覆盖：\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为�并�作而被覆盖：\n"
+"%%s请在�并�移动或删除。"
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为�并�作而被覆盖：\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s �作而被覆盖：\n"
+"%%s请在 %s �移动或删除。"
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s �作而被覆盖：\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "�目 '%s' 和 '%s' ��。无法�并。"
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"无法更新稀�检出：如下�目�是最新：\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"工作区中下列文件将会因为稀�检出而被覆盖：\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"工作区中下列文件将会因为稀�检出而被删除：\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "终止中\n"
+
+#: unpack-trees.c:237
 msgid "Checking out files"
 msgstr "正在检出文件"
 
@@ -1922,205 +2184,201 @@ msgstr "无效的 '..' 路径片段"
 msgid "could not open '%s' for reading and writing"
 msgstr "无法打开 '%s' 进行读写"
 
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "无法打开 '%s' 进行写入"
 
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "无法打开 '%s' 进行读�"
 
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "�能访问 '%s'：%s"
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
 #, c-format
 msgid "unable to access '%s'"
 msgstr "�能访问 '%s'"
 
-#: wrapper.c:640
+#: wrapper.c:623
 msgid "unable to get current working directory"
 msgstr "�能获�当�工作目录"
 
-#: wrapper.c:667
+#: wrapper.c:650
 #, c-format
 msgid "could not open %s for writing"
 msgstr "�能写入 %s"
 
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
 #, c-format
 msgid "could not write to %s"
 msgstr "�能写入 %s"
 
-#: wrapper.c:684
+#: wrapper.c:667
 #, c-format
 msgid "could not close %s"
 msgstr "�能关闭 %s"
 
-#: wt-status.c:149
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "未�并的路径："
 
 #  译者：注����导空格
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  （使用 \"git reset %s <文件>...\" 以�消暂存）"
 
 #  译者：注����导空格
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  （使用 \"git rm --cached <文件>...\" 以�消暂存）"
 
 #  译者：注����导空格
-#: wt-status.c:182
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  （使用 \"git add <文件>...\" 标记解决方案）"
 
 #  译者：注����导空格
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr "  （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
 
 #  译者：注����导空格
-#: wt-status.c:186
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  （使用 \"git rm <文件>...\" 标记解决方案）"
 
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
 msgid "Changes to be committed:"
 msgstr "��交的�更："
 
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
 msgid "Changes not staged for commit:"
 msgstr "尚未暂存以备�交的�更："
 
 #  译者：注����导空格
-#: wt-status.c:219
+#: wt-status.c:220
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add <文件>...\" 更新��交的内容）"
 
 #  译者：注����导空格
-#: wt-status.c:221
+#: wt-status.c:222
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add/rm <文件>...\" 更新��交的内容）"
 
 #  译者：注����导空格
-#: wt-status.c:222
+#: wt-status.c:223
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr "  （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
 
 #  译者：注����导空格
-#: wt-status.c:224
+#: wt-status.c:225
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr "  （�交或丢弃�模组中未跟踪或修改的内容）"
 
 #  译者：注����导空格
-#: wt-status.c:236
+#: wt-status.c:237
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr "  （使用 \"git %s <文件>...\" 以包���交的内容）"
 
-#: wt-status.c:251
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "�方删除："
 
-#: wt-status.c:253
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "由我们添加："
 
-#: wt-status.c:255
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "由他们删除："
 
-#: wt-status.c:257
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "由他们添加："
 
-#: wt-status.c:259
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "由我们删除："
 
-#: wt-status.c:261
+#: wt-status.c:262
 msgid "both added:"
 msgstr "�方添加："
 
-#: wt-status.c:263
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "�方修改："
 
-#: wt-status.c:265
+#: wt-status.c:266
 #, c-format
 msgid "bug: unhandled unmerged status %x"
 msgstr "bug：无法处�的未�并状� %x"
 
-#: wt-status.c:273
+#: wt-status.c:274
 msgid "new file:"
 msgstr "新文件："
 
-#: wt-status.c:275
+#: wt-status.c:276
 msgid "copied:"
 msgstr "拷�："
 
-#: wt-status.c:277
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "删除："
 
-#: wt-status.c:279
+#: wt-status.c:280
 msgid "modified:"
 msgstr "修改："
 
-#: wt-status.c:281
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "�命�："
 
-#: wt-status.c:283
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "类型�更："
 
-#: wt-status.c:285
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "未知："
 
-#: wt-status.c:287
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "未�并："
 
 #  译者：末尾两个字节�能被删�，如果翻译为中文标点会出现�个汉字
-#: wt-status.c:369
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "新�交, "
 
 #  译者：末尾两个字节�能被删�，如果翻译为中文标点会出现�个汉字
-#: wt-status.c:371
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "修改的内容, "
 
 #  译者：末尾两个字节�能被删�，如果翻译为中文标点会出现�个汉字
-#: wt-status.c:373
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "未跟踪的内容, "
 
-#: wt-status.c:390
+#: wt-status.c:391
 #, c-format
 msgid "bug: unhandled diff status %c"
 msgstr "bug：无法处�的差异状� %c"
 
-#: wt-status.c:754
+#: wt-status.c:755
 msgid "Submodules changed but not updated:"
 msgstr "�模组已修改但尚未更新："
 
-#: wt-status.c:756
+#: wt-status.c:757
 msgid "Submodule changes to be committed:"
 msgstr "��交的�模组�更："
 
-#: wt-status.c:837
+#: wt-status.c:838
 msgid ""
 "Do not touch the line above.\n"
 "Everything below will be removed."
@@ -2128,44 +2386,44 @@ msgstr ""
 "��改动上�的一行。\n"
 "下�的所有内容�将被删除。"
 
-#: wt-status.c:948
+#: wt-status.c:949
 msgid "You have unmerged paths."
 msgstr "您有尚未�并的路径。"
 
 #  译者：注����导空格
-#: wt-status.c:951
+#: wt-status.c:952
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  （解决冲�并�行 \"git commit\"）"
 
-#: wt-status.c:954
+#: wt-status.c:956
 msgid "All conflicts fixed but you are still merging."
 msgstr "所有冲�已解决但您�处于�并中。"
 
 #  译者：注����导空格
-#: wt-status.c:957
+#: wt-status.c:959
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  （使用 \"git commit\" 结��并）"
 
-#: wt-status.c:967
+#: wt-status.c:969
 msgid "You are in the middle of an am session."
 msgstr "您正处于 am �作过程中。"
 
-#: wt-status.c:970
+#: wt-status.c:972
 msgid "The current patch is empty."
 msgstr "当�的补�为空。"
 
 #  译者：注����导空格
-#: wt-status.c:974
+#: wt-status.c:976
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  （解决冲�，然��行 \"git am --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:976
+#: wt-status.c:978
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  （使用 \"git am --skip\" 跳过此补�）"
 
 #  译者：注����导空格
-#: wt-status.c:978
+#: wt-status.c:980
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  （使用 \"git am --abort\" ��原有分支）"
 
@@ -2319,43 +2577,43 @@ msgstr "您在执行二分查找�作。"
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  （使用 \"git bisect reset\" 以回到原有分支）"
 
-#: wt-status.c:1438
+#: wt-status.c:1460
 msgid "On branch "
 msgstr "�于分支 "
 
-#: wt-status.c:1444
+#: wt-status.c:1466
 msgid "interactive rebase in progress; onto "
 msgstr "交互��基�作正在进行中；至 "
 
-#: wt-status.c:1446
+#: wt-status.c:1468
 msgid "rebase in progress; onto "
 msgstr "�基�作正在进行中；至 "
 
-#: wt-status.c:1451
+#: wt-status.c:1473
 msgid "HEAD detached at "
 msgstr "头指针分离于 "
 
-#: wt-status.c:1453
+#: wt-status.c:1475
 msgid "HEAD detached from "
 msgstr "头指针分离自 "
 
-#: wt-status.c:1456
+#: wt-status.c:1478
 msgid "Not currently on any branch."
 msgstr "当��在任何分支上。"
 
-#: wt-status.c:1474
+#: wt-status.c:1496
 msgid "Initial commit"
 msgstr "�始�交"
 
-#: wt-status.c:1488
+#: wt-status.c:1510
 msgid "Untracked files"
 msgstr "未跟踪的文件"
 
-#: wt-status.c:1490
+#: wt-status.c:1512
 msgid "Ignored files"
 msgstr "忽略的文件"
 
-#: wt-status.c:1494
+#: wt-status.c:1516
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2365,88 +2623,88 @@ msgstr ""
 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能�高速度，\n"
 "但您需��心��忘了添加新文件（�� 'git help status'）。"
 
-#: wt-status.c:1500
+#: wt-status.c:1522
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "未跟踪的文件没有列出%s"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: wt-status.c:1502
+#: wt-status.c:1524
 msgid " (use -u option to show untracked files)"
 msgstr "（使用 -u �数显示未跟踪的文件）"
 
-#: wt-status.c:1508
+#: wt-status.c:1530
 msgid "No changes"
 msgstr "没有修改"
 
-#: wt-status.c:1513
+#: wt-status.c:1535
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr "修改尚未加入�交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
 
-#: wt-status.c:1516
+#: wt-status.c:1538
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "修改尚未加入�交\n"
 
-#: wt-status.c:1519
+#: wt-status.c:1541
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr "�交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
 
-#: wt-status.c:1522
+#: wt-status.c:1544
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "�交为空，但是存在尚未跟踪的文件\n"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: wt-status.c:1525
+#: wt-status.c:1547
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "无文件��交（创建/拷�文件并使用 \"git add\" 建立跟踪）\n"
 
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
 #, c-format
 msgid "nothing to commit\n"
 msgstr "无文件��交\n"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: wt-status.c:1531
+#: wt-status.c:1553
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "无文件��交（使用 -u 显示未跟踪的文件）\n"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: wt-status.c:1535
+#: wt-status.c:1557
 #, c-format
 msgid "nothing to commit, working directory clean\n"
 msgstr "无文件��交，干净的工作区\n"
 
 #  译者：注����尾空格
-#: wt-status.c:1642
+#: wt-status.c:1664
 msgid "Initial commit on "
 msgstr "�始�交于 "
 
-#: wt-status.c:1646
+#: wt-status.c:1668
 msgid "HEAD (no branch)"
 msgstr "HEAD（�分支）"
 
-#: wt-status.c:1675
+#: wt-status.c:1697
 msgid "gone"
 msgstr "丢失"
 
 #  译者：注����尾空格
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
 msgid "behind "
 msgstr "�� "
 
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
 msgid "ahead "
 msgstr "领先 "
 
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "无法删除 '%s'"
@@ -2460,7 +2718,7 @@ msgstr "git add [<选项>] [--] <路径规格>..."
 msgid "unexpected diff status %c"
 msgstr "�外的差异状� %c"
 
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
 msgid "updating files failed"
 msgstr "更新文件失败"
 
@@ -2473,7 +2731,7 @@ msgstr "删除 '%s'\n"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "刷新索引之�尚未被暂存的�更："
 
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
 msgid "Could not read the index"
 msgstr "�能读�索引"
 
@@ -2509,14 +2767,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "下列路径根�您的一个 .gitignore 文件而被忽略：\n"
 
 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
 msgid "dry run"
 msgstr "演习"
 
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
 msgid "be verbose"
 msgstr "冗长输出"
 
@@ -2524,7 +2782,7 @@ msgstr "冗长输出"
 msgid "interactive picking"
 msgstr "交互�拣选"
 
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
 msgid "select hunks interactively"
 msgstr "交互�挑选数��"
 
@@ -2592,16 +2850,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "也许您想�执行 'git add .'？\n"
 
 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
 msgid "index file corrupt"
 msgstr "索引文件��"
 
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "无法写入新索引文件"
 
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
 #, c-format
 msgid "could not read '%s'"
 msgstr "�能读� '%s'"
@@ -2629,16 +2887,6 @@ msgstr "从 '%s' 拷�注解到 '%s' 时失败"
 msgid "fseek failed"
 msgstr "fseek 失败"
 
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "无法打开 '%s' 进行读�：%s"
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "无法打开 '%s' 进行写入：%s"
-
 #: builtin/am.c:788
 #, c-format
 msgid "could not parse patch '%s'"
@@ -2648,73 +2896,73 @@ msgstr "无法解�补� '%s'"
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "一次�能有一个 StGIT 补�队列被应用"
 
-#: builtin/am.c:901
+#: builtin/am.c:900
 msgid "invalid timestamp"
 msgstr "无效的时间戳"
 
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
 msgid "invalid Date line"
 msgstr "无效的日期行"
 
-#: builtin/am.c:909
+#: builtin/am.c:908
 msgid "invalid timezone offset"
 msgstr "无效的时区�移值"
 
-#: builtin/am.c:996
+#: builtin/am.c:995
 msgid "Patch format detection failed."
 msgstr "补�格�检测失败。"
 
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "无法创建目录 '%s'"
 
-#: builtin/am.c:1005
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "无法拆分补�。"
 
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
 msgid "unable to write index file"
 msgstr "无法写入索引文件"
 
-#: builtin/am.c:1188
+#: builtin/am.c:1187
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "当您解决这一问题，执行 \"%s --continue\"。"
 
-#: builtin/am.c:1189
+#: builtin/am.c:1188
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "如果您想�跳过这一补�，则执行 \"%s --skip\"。"
 
-#: builtin/am.c:1190
+#: builtin/am.c:1189
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "若��原至原始分支并�止补��作，执行 \"%s --abort\"。"
 
-#: builtin/am.c:1328
+#: builtin/am.c:1327
 msgid "Patch is empty. Was it split wrong?"
 msgstr "补�为空。是�是切分错误？"
 
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "包�无效的身份标识：%s"
 
-#: builtin/am.c:1429
+#: builtin/am.c:1428
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "�能解��交 %s"
 
-#: builtin/am.c:1631
+#: builtin/am.c:1630
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "仓库缺�必�的数�对象以进行三方�并。"
 
-#: builtin/am.c:1633
+#: builtin/am.c:1632
 msgid "Using index info to reconstruct a base tree..."
 msgstr "使用索引��建一个（三方�并的）基础目录树..."
 
-#: builtin/am.c:1652
+#: builtin/am.c:1651
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -2722,37 +2970,37 @@ msgstr ""
 "您是�曾手动编辑过您的补�？\n"
 "无法应用补�到索引中的数�对象上。"
 
-#: builtin/am.c:1658
+#: builtin/am.c:1657
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "回�到基础版本上打补��进行三方�并..."
 
-#: builtin/am.c:1673
+#: builtin/am.c:1672
 msgid "Failed to merge in the changes."
 msgstr "无法�并�更。"
 
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree 无法写入一树对象"
 
-#: builtin/am.c:1704
+#: builtin/am.c:1703
 msgid "applying to an empty history"
 msgstr "正应用到一个空历�上"
 
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
 msgid "failed to write commit object"
 msgstr "无法写�交对象"
 
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "无法继续：%s �存在。"
 
-#: builtin/am.c:1769
+#: builtin/am.c:1768
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr "标准输入没有和终端关�，�能进行交互��作。"
 
-#: builtin/am.c:1774
+#: builtin/am.c:1773
 msgid "Commit Body is:"
 msgstr "�交内容为："
 
@@ -2761,35 +3009,35 @@ msgstr "�交内容为："
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1784
+#: builtin/am.c:1783
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "应用？是[y]/�[n]/编辑[e]/查看补�[v]/应用所有[a]："
 
-#: builtin/am.c:1834
+#: builtin/am.c:1833
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "�索引：�能应用补�（�文件：%s）"
 
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
 #, c-format
 msgid "Applying: %.*s"
 msgstr "应用：%.*s"
 
-#: builtin/am.c:1885
+#: builtin/am.c:1884
 msgid "No changes -- Patch already applied."
 msgstr "没有�更 —— 补�已�应用过。"
 
-#: builtin/am.c:1893
+#: builtin/am.c:1892
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "打补�失败于 %s %.*s"
 
-#: builtin/am.c:1899
+#: builtin/am.c:1898
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "失败的补�文件副本�于：%s"
 
-#: builtin/am.c:1944
+#: builtin/am.c:1943
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -2799,7 +3047,7 @@ msgstr ""
 "如果没有什么�添加到暂存区的，则很�能是其它�交已�引入了相�的�更。\n"
 "您也许想�跳过这个补�。"
 
-#: builtin/am.c:1951
+#: builtin/am.c:1950
 msgid ""
 "You still have unmerged paths in your index.\n"
 "Did you forget to use 'git add'?"
@@ -2807,168 +3055,170 @@ msgstr ""
 "您的索引中�有未�并的路径。\n"
 "您是�忘了执行 'git add'？"
 
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
 #: builtin/reset.c:316
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "�能解�对象 '%s'。"
 
-#: builtin/am.c:2111
+#: builtin/am.c:2110
 msgid "failed to clean index"
 msgstr "无法清空索引"
 
-#: builtin/am.c:2145
+#: builtin/am.c:2144
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr "您好�在上一次 'am' 失败�移动了 HEAD。未回退至 ORIG_HEAD"
 
-#: builtin/am.c:2206
+#: builtin/am.c:2205
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "无效的 --patch-format 值：%s"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2238
 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
 msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
 
-#: builtin/am.c:2240
+#: builtin/am.c:2239
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<选项>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2246
+#: builtin/am.c:2245
 msgid "run interactively"
 msgstr "以交互�方��行"
 
-#: builtin/am.c:2248
+#: builtin/am.c:2247
 msgid "historical option -- no-op"
 msgstr "�的�数 —— 无作用"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2249
 msgid "allow fall back on 3way merging if needed"
 msgstr "如果必�，�许使用三方�并。"
 
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
 #: builtin/repack.c:171
 msgid "be quiet"
 msgstr "�默模�"
 
-#: builtin/am.c:2253
+#: builtin/am.c:2252
 msgid "add a Signed-off-by line to the commit message"
 msgstr "在�交说明中添加一个 Signed-off-by 签�"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2255
 msgid "recode into utf8 (default)"
 msgstr "使用 utf8 字符集（默认）"
 
-#: builtin/am.c:2258
+#: builtin/am.c:2257
 msgid "pass -k flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -k �数"
 
-#: builtin/am.c:2260
+#: builtin/am.c:2259
 msgid "pass -b flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -b �数"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2261
 msgid "pass -m flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -m �数"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2263
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "针对 mbox 格�，� git-mailsplit 传递 --keep-cr �数"
 
-#: builtin/am.c:2267
+#: builtin/am.c:2266
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "�� git-mailsplit 传递 --keep-cr �数，覆盖 am.keepcr 的设置"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "strip everything before a scissors line"
 msgstr "丢弃�切线�的所有内容"
 
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
 msgid "action"
 msgstr "动作"
 
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
 msgid "pass it through git-apply"
 msgstr "传递给 git-apply"
 
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
 msgid "root"
 msgstr "根目录"
 
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
 msgid "path"
 msgstr "路径"
 
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
-#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134
+#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182
 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
 #: parse-options.h:132 parse-options.h:134 parse-options.h:244
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
 msgid "num"
 msgstr "æ•°å­—"
 
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
 #: builtin/tag.c:372
 msgid "format"
 msgstr "格�"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "format the patch(es) are in"
 msgstr "补�的格�"
 
-#: builtin/am.c:2302
+#: builtin/am.c:2301
 msgid "override error message when patch failure occurs"
 msgstr "打补�失败时显示的错误信�"
 
-#: builtin/am.c:2304
+#: builtin/am.c:2303
 msgid "continue applying patches after resolving a conflict"
 msgstr "冲�解决�继续应用补�"
 
-#: builtin/am.c:2307
+#: builtin/am.c:2306
 msgid "synonyms for --continue"
 msgstr "和 --continue �义"
 
-#: builtin/am.c:2310
+#: builtin/am.c:2309
 msgid "skip the current patch"
 msgstr "跳过当�补�"
 
-#: builtin/am.c:2313
+#: builtin/am.c:2312
 msgid "restore the original branch and abort the patching operation."
 msgstr "��原始分支并终止打补��作。"
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 msgid "lie about committer date"
 msgstr "将作者日期作为�交日期"
 
-#: builtin/am.c:2319
+#: builtin/am.c:2318
 msgid "use current timestamp for author date"
 msgstr "用当�时间作为作者日期"
 
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2322
+#: builtin/am.c:2321
 msgid "GPG-sign commits"
 msgstr "使用 GPG 签��交"
 
-#: builtin/am.c:2325
+#: builtin/am.c:2324
 msgid "(internal use for git-rebase)"
 msgstr "（内部使用，用于 git-rebase）"
 
-#: builtin/am.c:2340
+#: builtin/am.c:2339
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -2976,16 +3226,16 @@ msgstr ""
 "�数 -b/--binary 已�很长时间��任何实质�作了，并且将被移除。\n"
 "请���使用它了。"
 
-#: builtin/am.c:2347
+#: builtin/am.c:2346
 msgid "failed to read the index"
 msgstr "无法读�索引"
 
-#: builtin/am.c:2362
+#: builtin/am.c:2361
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "之�的�基目录 %s �然存在，但��供了 mbox。"
 
-#: builtin/am.c:2386
+#: builtin/am.c:2385
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -2994,7 +3244,7 @@ msgstr ""
 "�现了错误的 %s 目录。\n"
 "使用 \"git am --abort\" 删除它。"
 
-#: builtin/am.c:2392
+#: builtin/am.c:2391
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "解决�作未进行，我们�会继续。"
 
@@ -3027,37 +3277,37 @@ msgstr "regexec 返回 %d，输入为：%s"
 msgid "unable to find filename in patch at line %d"
 msgstr "�能在补�的第 %d 行找到文件�"
 
-#: builtin/apply.c:940
+#: builtin/apply.c:937
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
 
-#: builtin/apply.c:944
+#: builtin/apply.c:942
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件��一致"
 
-#: builtin/apply.c:945
+#: builtin/apply.c:943
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件��一致"
 
-#: builtin/apply.c:952
+#: builtin/apply.c:949
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
 
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount：�外的行：%.*s"
 
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "第 %d 行的补�片段没有头信�：%.*s"
 
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -3068,77 +3318,77 @@ msgid_plural ""
 msgstr[0] "当移除 %d 个�导路径� git diff 头缺�文件�信�（第 %d 行）"
 msgstr[1] "当移除 %d 个�导路径� git diff 头缺�文件�信�（第 %d 行）"
 
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
 msgid "new file depends on old contents"
 msgstr "新文件�赖旧内容"
 
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
 msgid "deleted file still has contents"
 msgstr "删除的文件�有内容"
 
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "补�在第 %d 行��"
 
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "新文件 %s �赖旧内容"
 
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "删除的文件 %s �有内容"
 
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** 警告：文件 %s �为空文件但并未删除"
 
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "二进制补�在第 %d 行��：%.*s"
 
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "未能识别的二进制补��于第 %d 行"
 
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "补�文件的第 %d 行�有垃圾数�"
 
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "无法读�符�链接 %s"
 
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
 #, c-format
 msgid "unable to open or read %s"
 msgstr "�能打开或读� %s"
 
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "无效的行首字符：'%c'"
 
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "� #%d �功应用于 %d（�移 %d 行）"
 msgstr[1] "� #%d �功应用于 %d（�移 %d 行）"
 
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "上下文�少到（%ld/%ld）以在第 %d 行应用补�片段"
 
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -3147,319 +3397,329 @@ msgstr ""
 "当查询：\n"
 "%.*s"
 
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "缺失 '%s' 的二进制补�数�"
 
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "二进制补�未应用到 '%s'"
 
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "到 '%s' 的二进制补�产生了�正确的结果（应为 %s，�为 %s）"
 
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "打补�失败：%s:%ld"
 
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
 #, c-format
 msgid "cannot checkout %s"
 msgstr "�能检出 %s"
 
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
 #, c-format
 msgid "read of %s failed"
 msgstr "读� %s 失败"
 
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "读��于符�链接中的 '%s'"
 
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "路径 %s 已�被�命�/删除"
 
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s：�存在于索引中"
 
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
 #, c-format
 msgid "%s: %s"
 msgstr "%s：%s"
 
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s：和索引�匹�"
 
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
 msgid "removal patch leaves file contents"
 msgstr "移除补��留下了文件内容"
 
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s：错误类型"
 
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s 的类型是 %o，应为 %o"
 
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
 #, c-format
 msgid "invalid path '%s'"
 msgstr "无效路径 '%s'"
 
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s：已�存在于索引中"
 
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s：已�存在于工作区中"
 
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "%2$s 的新模�（%1$o）和旧模�（%3$o）�匹�"
 
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "%2$s 的新模�（%1$o）和 %4$s 的旧模�（%3$o）�匹�"
 
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "�影�的文件 '%s' �于符�链接中"
 
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s：补�未应用"
 
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
 #, c-format
 msgid "Checking patch %s..."
 msgstr "检查补� %s..."
 
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "对路径 '%s' 的 make_cache_entry �作失败"
 
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "�能从索引中移除 %s"
 
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "�模组 %s ��的补�"
 
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "�能枚举新建文件 '%s' 的状�"
 
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "�能为新建文件 %s 创建�端存储"
 
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "无法为 %s 添加缓存�目"
 
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
 #, c-format
 msgid "closing file '%s'"
 msgstr "关闭文件 '%s'"
 
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "�能写文件 '%s' �� %o"
 
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "�功应用补� %s。"
 
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
 msgid "internal error"
 msgstr "内部错误"
 
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "应用 %%s 个补�，其中 %d 个被拒�..."
 msgstr[1] "应用 %%s 个补�，其中 %d 个被拒�..."
 
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "截短 .rej 文件�为 %.*s.rej"
 
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "�能打开 %s：%s"
+
+#: builtin/apply.c:4298
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "第 #%d 个片段�功应用。"
 
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "拒�第 #%d 个片段。"
 
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "略过补� '%s'。"
+
+#: builtin/apply.c:4395
 msgid "unrecognized input"
 msgstr "未能识别的输入"
 
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
 msgid "unable to read index file"
 msgstr "无法读�索引文件"
 
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
 msgid "don't apply changes matching the given path"
 msgstr "��应用与给出路径�匹�的�更"
 
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
 msgid "apply changes matching the given path"
 msgstr "应用与给出路径�匹�的�更"
 
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "从传统的 diff 路径中移除指定数�的�导斜线"
 
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
 msgid "ignore additions made by the patch"
 msgstr "忽略补�中的添加的文件"
 
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "�应用补�，而是显示输入的差异统计（diffstat）"
 
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "以�进制数显示添加和删除的行数"
 
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "�应用补�，而是显示输入的概�"
 
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "�应用补�，而是查看补�是��应用"
 
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
 msgid "make sure the patch is applicable to the current index"
 msgstr "确认补��以应用到当�索引"
 
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
 msgid "apply a patch without touching the working tree"
 msgstr "应用补�而�修改工作区"
 
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
 msgid "accept a patch that touches outside the working area"
 msgstr "接�修改工作区之外文件的补�"
 
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "还应用此补�（与 --stat/--summary/--check 选项�时使用）"
 
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "如果一个补��能应用则�试三方�并"
 
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
 msgid "build a temporary index based on embedded index information"
 msgstr "创建一个临时索引基于嵌入的索引信�"
 
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
 msgid "paths are separated with NUL character"
 msgstr "路径以 NUL 字符分隔"
 
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
 msgid "ensure at least <n> lines of context match"
 msgstr "确�至少匹� <n> 行上下文"
 
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "检查新增和修改的行中间的空白字符滥用"
 
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
 msgid "ignore changes in whitespace when finding context"
 msgstr "查找上下文时忽略空白字符的�更"
 
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
 msgid "apply the patch in reverse"
 msgstr "��应用补�"
 
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
 msgid "don't expect at least one line of context"
 msgstr "无需至少一行上下文"
 
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "将拒�的补�片段�存在对应的 *.rej 文件中"
 
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
 msgid "allow overlapping hunks"
 msgstr "�许��的补�片段"
 
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "�许�正确的文件末尾�行符"
 
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
 msgid "do not trust the line counts in the hunk headers"
 msgstr "�信任补�片段的头信�中的行�"
 
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
 msgid "prepend <root> to all filenames"
 msgstr "为所有文件��添加 <根目录>"
 
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
 msgid "--3way outside a repository"
 msgstr "--3way 在一个仓库之外"
 
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
 msgid "--index outside a repository"
 msgstr "--index 在一个仓库之外"
 
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
 msgid "--cached outside a repository"
 msgstr "--cached 在一个仓库之外"
 
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
 #, c-format
 msgid "can't open patch '%s'"
 msgstr "�能打开补� '%s'"
 
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "抑制下�有 %d 个空白字符误用"
 msgstr[1] "抑制下�有 %d 个空白字符误用"
 
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
@@ -3525,99 +3785,99 @@ msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
 msgid "Blaming lines"
 msgstr "追踪代�行"
 
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
 msgid "Show blame entries as we find them, incrementally"
 msgstr "增��地显示�现的 blame �目"
 
-#: builtin/blame.c:2531
+#: builtin/blame.c:2532
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "边界�交显示空的 SHA-1（默认：关闭）"
 
-#: builtin/blame.c:2532
+#: builtin/blame.c:2533
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "�把根�交作为边界（默认：关闭）"
 
-#: builtin/blame.c:2533
+#: builtin/blame.c:2534
 msgid "Show work cost statistics"
 msgstr "显示命令消耗统计"
 
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
 msgid "Force progress reporting"
 msgstr "强制进度显示"
 
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
 msgid "Show output score for blame entries"
 msgstr "显示判断 blame �目�移的得分诊断信�"
 
-#: builtin/blame.c:2536
+#: builtin/blame.c:2537
 msgid "Show original filename (Default: auto)"
 msgstr "显示原始文件�（默认：自动）"
 
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
 msgid "Show original linenumber (Default: off)"
 msgstr "显示原始的行�（默认：关闭）"
 
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
 msgid "Show in a format designed for machine consumption"
 msgstr "显示为一个适�机器读�的格�"
 
-#: builtin/blame.c:2539
+#: builtin/blame.c:2540
 msgid "Show porcelain format with per-line commit information"
 msgstr "为�一行显示机器适用的�交信�"
 
-#: builtin/blame.c:2540
+#: builtin/blame.c:2541
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "使用和 git-annotate 相�的输出模�（默认：关闭）"
 
-#: builtin/blame.c:2541
+#: builtin/blame.c:2542
 msgid "Show raw timestamp (Default: off)"
 msgstr "显示原始时间戳（默认：关闭）"
 
-#: builtin/blame.c:2542
+#: builtin/blame.c:2543
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "显示长的 SHA1 �交�（默认：关闭）"
 
-#: builtin/blame.c:2543
+#: builtin/blame.c:2544
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "��作者�字和时间戳（默认：关闭）"
 
-#: builtin/blame.c:2544
+#: builtin/blame.c:2545
 msgid "Show author email instead of name (Default: off)"
 msgstr "显示作者的邮箱而�是�字（默认：关闭）"
 
-#: builtin/blame.c:2545
+#: builtin/blame.c:2546
 msgid "Ignore whitespace differences"
 msgstr "忽略空白差异"
 
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
 msgid "Spend extra cycles to find better match"
 msgstr "花费�外的循环�找到更好的匹�"
 
-#: builtin/blame.c:2547
+#: builtin/blame.c:2548
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "使用�自 <文件> 的修订集而�是调用 git-rev-list"
 
-#: builtin/blame.c:2548
+#: builtin/blame.c:2549
 msgid "Use <file>'s contents as the final image"
 msgstr "使用 <文件> 的内容作为最终的图片"
 
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
 msgid "score"
 msgstr "得分"
 
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
 msgid "Find line copies within and across files"
 msgstr "找到文件内�跨文件的行拷�"
 
-#: builtin/blame.c:2550
+#: builtin/blame.c:2551
 msgid "Find line movements within and across files"
 msgstr "找到文件内�跨文件的行移动"
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
 msgid "Process only line range n,m, counting from 1"
 msgstr "�处�行范围在 n 和 m 之间的，从 1 开始"
 
@@ -3627,32 +3887,32 @@ msgstr "�处�行范围在 n 和 m 之间的，从 1 开始"
 #. takes 22 places, is the longest among various forms of
 #. relative timestamps, but your language may need more or
 #. fewer display columns.
-#: builtin/blame.c:2640
+#: builtin/blame.c:2641
 msgid "4 years, 11 months ago"
 msgstr "4 年 11 个月�"
 
-#: builtin/branch.c:25
+#: builtin/branch.c:26
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
 
-#: builtin/branch.c:26
+#: builtin/branch.c:27
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr "git branch [<选项>] [-l] [-f] <分支�> [<起始点>]"
 
-#: builtin/branch.c:27
+#: builtin/branch.c:28
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<选项>] [-r] (-d | -D) <分支�>..."
 
-#: builtin/branch.c:28
+#: builtin/branch.c:29
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
 
-#: builtin/branch.c:29
+#: builtin/branch.c:30
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
 
 #  译者：��原�行格�，在输出时 %s 的替代内容会让字符串�长
-#: builtin/branch.c:142
+#: builtin/branch.c:143
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -3662,7 +3922,7 @@ msgstr ""
 "         '%s'，但未�并到 HEAD。"
 
 #  译者：��原�行格�，在输出时 %s 的替代内容会让字符串�长
-#: builtin/branch.c:146
+#: builtin/branch.c:147
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -3671,12 +3931,12 @@ msgstr ""
 "并未删除分支 '%s'， 虽然它已��并到 HEAD，\n"
 "         然而�尚未被�并到分支 '%s' 。"
 
-#: builtin/branch.c:160
+#: builtin/branch.c:161
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "无法查询 '%s' 指�的�交对象"
 
-#: builtin/branch.c:164
+#: builtin/branch.c:165
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -3685,335 +3945,356 @@ msgstr ""
 "分支 '%s' 没有完全�并。\n"
 "如果您确认�删除它，执行 'git branch -D %s'。"
 
-#: builtin/branch.c:177
+#: builtin/branch.c:178
 msgid "Update of config-file failed"
 msgstr "无法更新 config 文件"
 
-#: builtin/branch.c:205
+#: builtin/branch.c:206
 msgid "cannot use -a with -d"
 msgstr "�能将 -a 和 -d �时使用"
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "Couldn't look up commit object for HEAD"
 msgstr "无法查询 HEAD 指�的�交对象"
 
-#: builtin/branch.c:219
+#: builtin/branch.c:226
 #, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "无法删除您当�所在的分支 '%s'。"
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
 
-#: builtin/branch.c:235
+#: builtin/branch.c:241
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "未能找到远程跟踪分支 '%s'。"
 
-#: builtin/branch.c:236
+#: builtin/branch.c:242
 #, c-format
 msgid "branch '%s' not found."
 msgstr "分支 '%s' 未�现。"
 
-#: builtin/branch.c:251
+#: builtin/branch.c:257
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "无法删除远程跟踪分支 '%s'"
 
-#: builtin/branch.c:252
+#: builtin/branch.c:258
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "无法删除分支 '%s'"
 
-#: builtin/branch.c:259
+#: builtin/branch.c:265
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
 
-#: builtin/branch.c:260
+#: builtin/branch.c:266
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "已删除分支 %s（曾为 %s）。\n"
 
-#: builtin/branch.c:303
+#: builtin/branch.c:309
 #, c-format
 msgid "[%s: gone]"
 msgstr "[%s: 丢失]"
 
-#: builtin/branch.c:308
+#: builtin/branch.c:314
 #, c-format
 msgid "[%s]"
 msgstr "[%s]"
 
-#: builtin/branch.c:313
+#: builtin/branch.c:319
 #, c-format
 msgid "[%s: behind %d]"
 msgstr "[%s：�� %d]"
 
-#: builtin/branch.c:315
+#: builtin/branch.c:321
 #, c-format
 msgid "[behind %d]"
 msgstr "[�� %d]"
 
-#: builtin/branch.c:319
+#: builtin/branch.c:325
 #, c-format
 msgid "[%s: ahead %d]"
 msgstr "[%s：领先 %d]"
 
-#: builtin/branch.c:321
+#: builtin/branch.c:327
 #, c-format
 msgid "[ahead %d]"
 msgstr "[领先 %d]"
 
-#: builtin/branch.c:324
+#: builtin/branch.c:330
 #, c-format
 msgid "[%s: ahead %d, behind %d]"
 msgstr "[%s：领先 %d，�� %d]"
 
-#: builtin/branch.c:327
+#: builtin/branch.c:333
 #, c-format
 msgid "[ahead %d, behind %d]"
 msgstr "[领先 %d，�� %d]"
 
-#: builtin/branch.c:340
+#: builtin/branch.c:346
 msgid " **** invalid ref ****"
 msgstr " **** 无效引用 ****"
 
-#: builtin/branch.c:366
+#: builtin/branch.c:372
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "（�分支，正�基 %s）"
 
-#: builtin/branch.c:369
+#: builtin/branch.c:375
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "（�分支，二分查找开始于 %s）"
 
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "（头指针分离于 %s）"
 
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "（头指针分离自 %s）"
 
-#: builtin/branch.c:382
+#: builtin/branch.c:390
 msgid "(no branch)"
 msgstr "（�分支）"
 
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "分支 %s 正被�基到 %s"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "分支 %s 正被二分查找于 %s"
+
+#: builtin/branch.c:560
 msgid "cannot rename the current branch while not on any."
 msgstr "无法�命�当�分支因为�处于任何分支上。"
 
-#: builtin/branch.c:534
+#: builtin/branch.c:570
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "无效的分支�：'%s'"
 
-#: builtin/branch.c:549
+#: builtin/branch.c:587
 msgid "Branch rename failed"
 msgstr "分支�命�失败"
 
-#: builtin/branch.c:553
+#: builtin/branch.c:591
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "�命�掉一个错误命�的旧分支 '%s'"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:594
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "分支�命�为 %s，但 HEAD 没有更新�"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:601
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "分支被�命�，但更新 config 文件失败"
 
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "�能写分支�述模版：%s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "�能写分支�述模版"
 
-#: builtin/branch.c:615
+#: builtin/branch.c:651
 msgid "Generic options"
 msgstr "通用选项"
 
-#: builtin/branch.c:617
+#: builtin/branch.c:653
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "显示哈希值和主题，若�数出现两次则显示上游分支"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:654
 msgid "suppress informational messages"
 msgstr "�显示信�"
 
-#: builtin/branch.c:619
+#: builtin/branch.c:655
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "设置跟踪模�（�� git-pull(1)）"
 
-#: builtin/branch.c:621
+#: builtin/branch.c:657
 msgid "change upstream info"
 msgstr "改�上游信�"
 
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "上游"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "改�上游信�"
+
+#: builtin/branch.c:661
 msgid "use colored output"
 msgstr "使用彩色输出"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:662
 msgid "act on remote-tracking branches"
 msgstr "作用于远程跟踪分支"
 
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
 msgid "print only branches that contain the commit"
 msgstr "�打�包�该�交的分支"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:668
 msgid "Specific git-branch actions:"
 msgstr "具体的 git-branch 动作："
 
-#: builtin/branch.c:633
+#: builtin/branch.c:669
 msgid "list both remote-tracking and local branches"
 msgstr "列出远程跟踪�本地分支"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:671
 msgid "delete fully merged branch"
 msgstr "删除完全�并的分支"
 
-#: builtin/branch.c:636
+#: builtin/branch.c:672
 msgid "delete branch (even if not merged)"
 msgstr "删除分支（�使没有�并）"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:673
 msgid "move/rename a branch and its reflog"
 msgstr "移动/�命�一个分支，以�它的引用日志"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:674
 msgid "move/rename a branch, even if target exists"
 msgstr "移动/�命�一个分支，�使目标已存在"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:675
 msgid "list branch names"
 msgstr "列出分支�"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:676
 msgid "create the branch's reflog"
 msgstr "创建分支的引用日志"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:678
 msgid "edit the description for the branch"
 msgstr "标记分支的�述"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:679
 msgid "force creation, move/rename, deletion"
 msgstr "强制创建�移动/�命��删除"
 
-#: builtin/branch.c:644
+#: builtin/branch.c:680
 msgid "print only branches that are merged"
 msgstr "�打�已��并的分支"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:681
 msgid "print only branches that are not merged"
 msgstr "�打�尚未�并的分支"
 
-#: builtin/branch.c:646
+#: builtin/branch.c:682
 msgid "list branches in columns"
 msgstr "以列的方�显示分支"
 
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
 msgid "key"
 msgstr "key"
 
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
 msgid "field name to sort on"
 msgstr "排�的字段�"
 
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
 #: builtin/tag.c:369
 msgid "object"
 msgstr "对象"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:687
 msgid "print only branches of the object"
 msgstr "�打�指�该对象的分支"
 
-#: builtin/branch.c:669
+#: builtin/branch.c:705
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "无法将 HEAD 解�为有效引用。"
 
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD 没有�于 /refs/heads 之下�"
 
-#: builtin/branch.c:693
+#: builtin/branch.c:729
 msgid "--column and --verbose are incompatible"
 msgstr "--column 和 --verbose �兼容"
 
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
 msgid "branch name required"
 msgstr "必须�供分支�"
 
-#: builtin/branch.c:722
+#: builtin/branch.c:758
 msgid "Cannot give description to detached HEAD"
 msgstr "�能�分离头指针�供�述"
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 msgid "cannot edit description of more than one branch"
 msgstr "�能为一个以上的分支编辑�述"
 
-#: builtin/branch.c:734
+#: builtin/branch.c:770
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "分支 '%s' 尚无�交。"
 
-#: builtin/branch.c:737
+#: builtin/branch.c:773
 #, c-format
 msgid "No branch named '%s'."
 msgstr "没有分支 '%s'。"
 
-#: builtin/branch.c:752
+#: builtin/branch.c:788
 msgid "too many branches for a rename operation"
 msgstr "为�命��作�供了太多的分支�"
 
-#: builtin/branch.c:757
+#: builtin/branch.c:793
 msgid "too many branches to set new upstream"
 msgstr "为设置新上游�供了太多的分支�"
 
-#: builtin/branch.c:761
+#: builtin/branch.c:797
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指�任何分支。"
 
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
 #, c-format
 msgid "no such branch '%s'"
 msgstr "没有此分支 '%s'"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:804
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "分支 '%s' �存在"
 
-#: builtin/branch.c:780
+#: builtin/branch.c:816
 msgid "too many branches to unset upstream"
 msgstr "为�消上游设置�作�供了太多的分支�"
 
-#: builtin/branch.c:784
+#: builtin/branch.c:820
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr "无法�消 HEAD 的上游设置因为它没有指�一个分支"
 
-#: builtin/branch.c:790
+#: builtin/branch.c:826
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "分支 '%s' 没有上游信�"
 
-#: builtin/branch.c:804
+#: builtin/branch.c:840
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "手工创建 'HEAD' 没有�义"
 
-#: builtin/branch.c:810
+#: builtin/branch.c:846
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr "'git branch' 的 -a 和 -r 选项带一个分支��数没有�义"
 
-#: builtin/branch.c:813
+#: builtin/branch.c:849
 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -4021,7 +4302,7 @@ msgid ""
 msgstr ""
 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
 
-#: builtin/branch.c:830
+#: builtin/branch.c:866
 #, c-format
 msgid ""
 "\n"
@@ -4032,16 +4313,6 @@ msgstr ""
 "如果你想用 '%s' 跟踪 '%s', 这么�：\n"
 "\n"
 
-#: builtin/branch.c:831
-#, c-format
-msgid "    git branch -d %s\n"
-msgstr "    git branch -d %s\n"
-
-#: builtin/branch.c:832
-#, c-format
-msgid "    git branch --set-upstream-to %s\n"
-msgstr "    git branch --set-upstream-to %s\n"
-
 #: builtin/bundle.c:51
 #, c-format
 msgid "%s is okay\n"
@@ -4139,7 +4410,7 @@ msgstr "从标准输入读出文件�"
 msgid "terminate input and output records by a NUL character"
 msgstr "输入和输出的记录使用 NUL 字符终结"
 
-#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
 msgid "suppress progress reporting"
 msgstr "�显示进度报告"
 
@@ -4229,8 +4500,9 @@ msgid "write the content to temporary files"
 msgstr "将内容写入临时文件"
 
 #: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
 msgid "string"
 msgstr "字符串"
 
@@ -4280,80 +4552,80 @@ msgstr "path '%s'：无法�并"
 msgid "Unable to add merge result for '%s'"
 msgstr "无法为 '%s' 添加�并结果"
 
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' �能在更新路径时使用"
 
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' �能和 %s �时使用"
 
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "�能�时更新路径并切�到分支'%s'。"
 
-#: builtin/checkout.c:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
 msgid "corrupt index file"
 msgstr "��的索引文件"
 
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "路径 '%s' 未�并"
 
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
 msgid "you need to resolve your current index first"
 msgstr "您需�先解决当�索引的冲�"
 
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "�能对 '%s' 执行 reflog �作：%s\n"
 
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
 msgid "HEAD is now at"
 msgstr "HEAD 目��于"
 
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
 msgid "unable to update HEAD"
 msgstr "�能更新 HEAD"
 
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "�置分支 '%s'\n"
 
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "已��于 '%s'\n"
 
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "切�并�置分支 '%s'\n"
 
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "切�到一个新分支 '%s'\n"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "切�到分支 '%s'\n"
 
 #  译者：注����导空格
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... �其它 %d 个。\n"
 
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -4374,7 +4646,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4401,150 +4673,150 @@ msgstr[1] ""
 " git branch <新分支�> %s\n"
 "\n"
 
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
 msgid "internal error in revision walk"
 msgstr "在版本�历时�到内部错误"
 
-#: builtin/checkout.c:797
+#: builtin/checkout.c:796
 msgid "Previous HEAD position was"
 msgstr "之�的 HEAD �置是"
 
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
 msgid "You are on a branch yet to be born"
 msgstr "您�于一个尚未�始化的分支"
 
-#: builtin/checkout.c:969
+#: builtin/checkout.c:968
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "��一个引用，�给出了 %d 个"
 
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
 #, c-format
 msgid "invalid reference: %s"
 msgstr "无效引用：%s"
 
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "引用�是一个树：%s"
 
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1076
 msgid "paths cannot be used with switching branches"
 msgstr "路径�能和切�分支�时使用"
 
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' �能和切�分支�时使用"
 
-#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' �能和 '%s' �时使用"
 
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "�能切�分支到一个��交 '%s'"
 
-#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
 msgid "branch"
 msgstr "分支"
 
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
 msgid "create and checkout a new branch"
 msgstr "创建并检出一个新的分支"
 
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
 msgid "create/reset and checkout a branch"
 msgstr "创建/�置并检出一个分支"
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
 msgid "create reflog for new branch"
 msgstr "为新的分支创建引用日志"
 
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
 msgid "detach the HEAD at named commit"
 msgstr "�为指�该�交的分离头指针"
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
 msgid "set upstream info for new branch"
 msgstr "为新的分支设置上游信�"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new-branch"
 msgstr "新分支"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
 msgid "new unparented branch"
 msgstr "新的没有父�交的分支"
 
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
 msgid "checkout our version for unmerged files"
 msgstr "对尚未�并的文件检出我们的版本"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
 msgid "checkout their version for unmerged files"
 msgstr "对尚未�并的文件检出他们的版本"
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
 msgid "force checkout (throw away local modifications)"
 msgstr "强制检出（丢弃本地修改）"
 
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1150
 msgid "perform a 3-way merge with the new branch"
 msgstr "和新的分支执行三方�并"
 
-#: builtin/checkout.c:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
 msgid "update ignored files (default)"
 msgstr "更新忽略的文件（默认）"
 
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
 msgid "style"
 msgstr "风格"
 
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
 msgid "conflict style (merge or diff3)"
 msgstr "冲�输出风格（merge 或 diff3）"
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "对路径��稀�检出的�制"
 
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "二次猜测'git checkout <无此分支>'"
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
 msgid "do not check if another worktree is holding the given ref"
 msgstr "�检查指定的引用是�被其他工作区所�用"
 
-#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
 #: builtin/send-pack.c:168
 msgid "force progress reporting"
 msgstr "强制显示进度报告"
 
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b�-B 和 --orphan 是互斥的"
 
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1209
 msgid "--track needs a branch name"
 msgstr "--track 需�一个分支�"
 
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
 msgid "Missing branch name; try -b"
 msgstr "缺少分支�；�试 -b"
 
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
 msgid "invalid path specification"
 msgstr "无效的路径规格"
 
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
 #, c-format
 msgid ""
 "Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4553,12 +4825,12 @@ msgstr ""
 "�能�时更新路径并切�到分支'%s'。\n"
 "您是想�检出 '%s' 但其未能解�为�交么？"
 
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout：--detach �能接收路径�数 '%s'"
 
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1266
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -4709,8 +4981,8 @@ msgstr "交互�清除"
 msgid "remove whole directories"
 msgstr "删除整个目录"
 
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
 msgid "pattern"
 msgstr "模�"
 
@@ -4748,104 +5020,113 @@ msgstr ""
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
 
-#: builtin/clone.c:60
+#: builtin/clone.c:62
 msgid "don't create a checkout"
 msgstr "�创建一个检出"
 
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
 msgid "create a bare repository"
 msgstr "创建一个纯仓库"
 
-#: builtin/clone.c:65
+#: builtin/clone.c:67
 msgid "create a mirror repository (implies bare)"
 msgstr "创建一个镜�仓库（也是纯仓库）"
 
-#: builtin/clone.c:67
+#: builtin/clone.c:69
 msgid "to clone from a local repository"
 msgstr "从本地仓库克隆"
 
-#: builtin/clone.c:69
+#: builtin/clone.c:71
 msgid "don't use local hardlinks, always copy"
 msgstr "�使用本地硬链接，始终�制"
 
-#: builtin/clone.c:71
+#: builtin/clone.c:73
 msgid "setup as shared repository"
 msgstr "设置为共享仓库"
 
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
 msgid "initialize submodules in the clone"
 msgstr "在克隆时�始化�模组"
 
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "并�克隆的�模组的数�"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
 msgid "template-directory"
 msgstr "模�目录"
 
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
 msgid "directory from which templates will be used"
 msgstr "模�目录将被使用"
 
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
 msgid "reference repository"
 msgstr "�考仓库"
 
-#: builtin/clone.c:81
+#: builtin/clone.c:85
 msgid "use --reference only while cloning"
 msgstr "仅在克隆时�考 --reference 指�的本地仓库"
 
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
 msgid "name"
 msgstr "�称"
 
-#: builtin/clone.c:83
+#: builtin/clone.c:87
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "使用 <�称> 而�是 'origin' 去跟踪上游"
 
-#: builtin/clone.c:85
+#: builtin/clone.c:89
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "检出 <分支> 而�是远程 HEAD"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:91
 msgid "path to git-upload-pack on the remote"
 msgstr "远程 git-upload-pack 路径"
 
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
-#: builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667
+#: builtin/pull.c:201
 msgid "depth"
 msgstr "深度"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:93
 msgid "create a shallow clone of that depth"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:95
 msgid "clone only one branch, HEAD or --branch"
 msgstr "�克隆一个分支�HEAD 或 --branch"
 
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "�模组将以浅下载模�克隆"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
 msgid "gitdir"
 msgstr "git目录"
 
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
 msgid "separate git dir from working tree"
 msgstr "git目录和工作区分离"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:100
 msgid "key=value"
 msgstr "key=value"
 
-#: builtin/clone.c:95
+#: builtin/clone.c:101
 msgid "set config inside the new repository"
 msgstr "在新仓库中设置�置信�"
 
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
 msgid "use IPv4 addresses only"
 msgstr "�使用 IPv4 地�"
 
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
 msgid "use IPv6 addresses only"
 msgstr "�使用 IPv6 地�"
 
-#: builtin/clone.c:239
+#: builtin/clone.c:241
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -4853,57 +5134,52 @@ msgstr ""
 "无法猜到目录�。\n"
 "请在命令行指定一个目录"
 
-#: builtin/clone.c:305
+#: builtin/clone.c:307
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "尚�支�将�考仓库 '%s' 作为一个链接检出。"
 
-#: builtin/clone.c:307
+#: builtin/clone.c:309
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "�考仓库 '%s' �是一个本地仓库。"
 
-#: builtin/clone.c:312
+#: builtin/clone.c:314
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "�考仓库 '%s' 是一个浅克隆"
 
-#: builtin/clone.c:315
+#: builtin/clone.c:317
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "�考仓库 '%s' 已被�接"
 
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "无法枚举 '%s' 状�"
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s 存在且�是一个目录"
 
-#: builtin/clone.c:396
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "无法枚举 %s 状�\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "无法创建链接 '%s'"
 
-#: builtin/clone.c:422
+#: builtin/clone.c:424
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "无法拷�文件至 '%s'"
 
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
 #, c-format
 msgid "done.\n"
 msgstr "完�。\n"
 
-#: builtin/clone.c:459
+#: builtin/clone.c:461
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -4913,126 +5189,126 @@ msgstr ""
 "您�以通过 'git status' 检查哪些已被检出，然�使用命令\n"
 "'git checkout -f HEAD' �试\n"
 
-#: builtin/clone.c:536
+#: builtin/clone.c:538
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "�能�现�克隆的远程分支 %s。"
 
-#: builtin/clone.c:626
+#: builtin/clone.c:628
 #, c-format
 msgid "Checking connectivity... "
 msgstr "检查连接... "
 
-#: builtin/clone.c:629
+#: builtin/clone.c:631
 msgid "remote did not send all necessary objects"
 msgstr "远程没有��所有必须的对象"
 
-#: builtin/clone.c:647
+#: builtin/clone.c:649
 #, c-format
 msgid "unable to update %s"
 msgstr "�能更新 %s"
 
-#: builtin/clone.c:696
+#: builtin/clone.c:698
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "远程 HEAD 指�一个�存在的引用，无法检出。\n"
 
-#: builtin/clone.c:727
+#: builtin/clone.c:729
 msgid "unable to checkout working tree"
 msgstr "�能检出工作区"
 
-#: builtin/clone.c:753
+#: builtin/clone.c:767
 msgid "unable to write parameters to config file"
 msgstr "无法将�数写入�置文件"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:830
 msgid "cannot repack to clean up"
 msgstr "无法执行 repack �清�"
 
-#: builtin/clone.c:818
+#: builtin/clone.c:832
 msgid "cannot unlink temporary alternates file"
 msgstr "无法删除临时的 alternates 文件"
 
-#: builtin/clone.c:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
 msgid "Too many arguments."
 msgstr "太多�数。"
 
-#: builtin/clone.c:854
+#: builtin/clone.c:868
 msgid "You must specify a repository to clone."
 msgstr "您必须指定一个仓库�克隆。"
 
-#: builtin/clone.c:865
+#: builtin/clone.c:879
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "--bare 和 --origin %s 选项�兼容。"
 
-#: builtin/clone.c:868
+#: builtin/clone.c:882
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare 和 --separate-git-dir 选项�兼容。"
 
-#: builtin/clone.c:881
+#: builtin/clone.c:895
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "仓库 '%s' �存在"
 
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "深度 %s �是一个正数"
 
-#: builtin/clone.c:897
+#: builtin/clone.c:911
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "目标路径 '%s' 已�存在，并且�是一个空目录。"
 
-#: builtin/clone.c:907
+#: builtin/clone.c:921
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "工作区 '%s' 已�存在。"
 
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "�能为 '%s' 创建先导目录"
 
-#: builtin/clone.c:925
+#: builtin/clone.c:939
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "�能创建工作区目录 '%s'"
 
-#: builtin/clone.c:943
+#: builtin/clone.c:957
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "克隆到纯仓库 '%s'...\n"
 
-#: builtin/clone.c:945
+#: builtin/clone.c:959
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "正克隆到 '%s'...\n"
 
-#: builtin/clone.c:984
+#: builtin/clone.c:998
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth 在本地克隆被忽略，改为 file:// �议试试。"
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1001
 msgid "source repository is shallow, ignoring --local"
 msgstr "�仓库是浅克隆，忽略 --local"
 
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
 msgid "--local is ignored"
 msgstr "--local 被忽略"
 
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "�知�如何克隆 %s"
 
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "远程分支 %s 在上游 %s 未�现"
 
-#: builtin/clone.c:1056
+#: builtin/clone.c:1070
 msgid "You appear to have cloned an empty repository."
 msgstr "您似乎克隆了一个空仓库。"
 
@@ -5166,103 +5442,103 @@ msgstr ""
 "然�执行 \"git cherry-pick --continue\" 继续对其余�交执行拣选\n"
 "�作。\n"
 
-#: builtin/commit.c:305
+#: builtin/commit.c:307
 msgid "failed to unpack HEAD tree object"
 msgstr "无法解包 HEAD 树对象"
 
-#: builtin/commit.c:346
+#: builtin/commit.c:348
 msgid "unable to create temporary index"
 msgstr "�能创建临时索引"
 
-#: builtin/commit.c:352
+#: builtin/commit.c:354
 msgid "interactive add failed"
 msgstr "交互�添加失败"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:367
 msgid "unable to update temporary index"
 msgstr "无法更新临时索引"
 
-#: builtin/commit.c:367
+#: builtin/commit.c:369
 msgid "Failed to update main cache tree"
 msgstr "�能更新树的主缓存"
 
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
 msgid "unable to write new_index file"
 msgstr "无法写 new_index 文件"
 
-#: builtin/commit.c:445
+#: builtin/commit.c:447
 msgid "cannot do a partial commit during a merge."
 msgstr "在�并过程中�能�部分�交。"
 
-#: builtin/commit.c:447
+#: builtin/commit.c:449
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "在拣选过程中�能�部分�交。"
 
-#: builtin/commit.c:456
+#: builtin/commit.c:458
 msgid "cannot read the index"
 msgstr "无法读�索引"
 
-#: builtin/commit.c:475
+#: builtin/commit.c:477
 msgid "unable to write temporary index file"
 msgstr "无法写临时索引文件"
 
-#: builtin/commit.c:580
+#: builtin/commit.c:582
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "�交 '%s' 缺少作者信�"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:584
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "�交 '%s' 有�法的作者信�"
 
-#: builtin/commit.c:601
+#: builtin/commit.c:603
 msgid "malformed --author parameter"
 msgstr "�法的 --author �数"
 
-#: builtin/commit.c:609
+#: builtin/commit.c:611
 #, c-format
 msgid "invalid date format: %s"
 msgstr "无效的日期格�：%s"
 
-#: builtin/commit.c:653
+#: builtin/commit.c:655
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr "无法选择一个未被当��交说明使用的注释字符"
 
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "�能查询�交 %s"
 
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "（正从标准输入中读�日志信�）\n"
 
-#: builtin/commit.c:704
+#: builtin/commit.c:706
 msgid "could not read log from standard input"
 msgstr "�能从标准输入中读�日志信�"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:710
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "�能读�日志文件 '%s'"
 
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "�能读� MERGE_MSG"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
 msgid "could not read SQUASH_MSG"
 msgstr "�能读� SQUASH_MSG"
 
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "�能读� MERGE_MSG"
+
+#: builtin/commit.c:796
 msgid "could not write commit template"
 msgstr "�能写�交模版"
 
-#: builtin/commit.c:803
+#: builtin/commit.c:814
 #, c-format
 msgid ""
 "\n"
@@ -5276,7 +5552,7 @@ msgstr ""
 "\t%s\n"
 "然��试。\n"
 
-#: builtin/commit.c:808
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -5290,7 +5566,7 @@ msgstr ""
 "\t%s\n"
 "然��试。\n"
 
-#: builtin/commit.c:821
+#: builtin/commit.c:832
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5299,7 +5575,7 @@ msgstr ""
 "请为您的�更输入�交说明。以 '%c' 开始的行将被忽略，而一个空的�交\n"
 "说明将会终止�交。\n"
 
-#: builtin/commit.c:828
+#: builtin/commit.c:839
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5310,346 +5586,346 @@ msgstr ""
 "也�以删除它们。一个空的�交说明将会终止�交。\n"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: builtin/commit.c:848
+#: builtin/commit.c:859
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s作者：  %.*s <%.*s>"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: builtin/commit.c:856
+#: builtin/commit.c:867
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%s日期：  %s"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: builtin/commit.c:863
+#: builtin/commit.c:874
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%s�交者：%.*s <%.*s>"
 
-#: builtin/commit.c:881
+#: builtin/commit.c:892
 msgid "Cannot read index"
 msgstr "无法读�索引"
 
-#: builtin/commit.c:938
+#: builtin/commit.c:949
 msgid "Error building trees"
 msgstr "无法创建树对象"
 
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "请使用 -m 或 -F 选项�供�交说明。\n"
 
-#: builtin/commit.c:1055
+#: builtin/commit.c:1066
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr "--author '%s' �是 'Name <email>' 格�，且未能在现有作者中找到匹�"
 
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "无效的未追踪文件�数 '%s'"
 
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
 msgid "--long and -z are incompatible"
 msgstr "--long 和 -z 选项�兼容"
 
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "�时使用 --reset-author 和 --author 没有�义"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1157
 msgid "You have nothing to amend."
 msgstr "您没有�修补的�交。"
 
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "您正处于一个�并过程中 -- 无法修补�交。"
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1162
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "您正处于一个拣选过程中 -- 无法修补�交。"
 
-#: builtin/commit.c:1154
+#: builtin/commit.c:1165
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "选项 --squash 和 --fixup �能�时使用"
 
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "�能用一个 -c/-C/-F/--fixup 选项。"
 
-#: builtin/commit.c:1166
+#: builtin/commit.c:1177
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "选项 -m �能和 -c/-C/-F/--fixup �时使用。"
 
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author �能和 -C�-c 或 --amend �时使用。"
 
-#: builtin/commit.c:1191
+#: builtin/commit.c:1202
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "�能用一个 --include/--only/--all/--interactive/--patch 选项。"
 
-#: builtin/commit.c:1193
+#: builtin/commit.c:1204
 msgid "No paths with --include/--only does not make sense."
 msgstr "�数 --include/--only �跟路径没有�义。"
 
-#: builtin/commit.c:1195
+#: builtin/commit.c:1206
 msgid "Clever... amending the last one with dirty index."
 msgstr "�明... 用�索引修补最�一个�交。"
 
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."
 
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "无效的清�模� %s"
 
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
 msgid "Paths with -a does not make sense."
 msgstr "路径和 -a 选项�时使用没有�义。"
 
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
 msgid "show status concisely"
 msgstr "以简�的格�显示状�"
 
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
 msgid "show branch information"
 msgstr "显示分支信�"
 
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
 msgid "machine-readable output"
 msgstr "机器�读的输出"
 
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
 msgid "show status in long format (default)"
 msgstr "以长格�显示状�（默认）"
 
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
 msgid "terminate entries with NUL"
 msgstr "�目以 NUL 字符结尾"
 
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
 #: builtin/fast-export.c:984 builtin/tag.c:353
 msgid "mode"
 msgstr "模�"
 
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "显示未跟踪的文件，“模��的�选�数：all�normal�no。（默认：all）"
 
-#: builtin/commit.c:1340
+#: builtin/commit.c:1351
 msgid "show ignored files"
 msgstr "显示忽略的文件"
 
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
 msgid "when"
 msgstr "何时"
 
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 "忽略�模组的更改，“何时�的�选�数：all�dirty�untracked。（默认：all）"
 
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
 msgid "list untracked files in columns"
 msgstr "以列的方�显示未跟踪的文件"
 
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
 msgid "couldn't look up newly created commit"
 msgstr "无法找到新创建的�交"
 
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
 msgid "could not parse newly created commit"
 msgstr "�能解�新创建的�交"
 
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
 msgid "detached HEAD"
 msgstr "分离头指针"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
 msgid " (root-commit)"
 msgstr "（根�交）"
 
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
 msgid "suppress summary after successful commit"
 msgstr "�交�功��显示概述信�"
 
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
 msgid "show diff in commit message template"
 msgstr "在�交说明模�里显示差异"
 
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
 msgid "Commit message options"
 msgstr "�交说明选项"
 
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
 msgid "read message from file"
 msgstr "从文件中读��交说明"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "author"
 msgstr "作者"
 
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
 msgid "override author for commit"
 msgstr "�交时覆盖作者"
 
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
 msgid "date"
 msgstr "日期"
 
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
 msgid "override date for commit"
 msgstr "�交时覆盖日期"
 
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
 #: builtin/notes.c:558 builtin/tag.c:349
 msgid "message"
 msgstr "说明"
 
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
 msgid "commit message"
 msgstr "�交说明"
 
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
 msgid "commit"
 msgstr "�交"
 
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
 msgid "reuse and edit message from specified commit"
 msgstr "�用并编辑指定�交的�交说明"
 
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
 msgid "reuse message from specified commit"
 msgstr "�用指定�交的�交说明"
 
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr "使用 autosquash 格�的�交说明用以修正指定的�交"
 
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "使用 autosquash 格�的�交说明用以压缩至指定的�交"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1603
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "现在将该�交的作者改为我（和 -C/-c/--amend �数共用）"
 
-#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
 msgid "add Signed-off-by:"
 msgstr "添加 Signed-off-by: 签�"
 
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
 msgid "use specified template file"
 msgstr "使用指定的模�文件"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
 msgid "force edit of commit"
 msgstr "强制编辑�交"
 
 #  译者：�选值，�能翻译（或是原文中笔误，应为 mode）
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
 msgid "default"
 msgstr "default"
 
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
 msgid "how to strip spaces and #comments from message"
 msgstr "设置如何删除�交说明里的空格和#注释"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
 msgid "include status in commit message template"
 msgstr "在�交说明模�里包�状�信�"
 
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
 #: builtin/revert.c:93
 msgid "GPG sign commit"
 msgstr "GPG �交签�"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
 msgid "Commit contents options"
 msgstr "�交内容选项"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
 msgid "commit all changed files"
 msgstr "�交所有改动的文件"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
 msgid "add specified files to index for commit"
 msgstr "添加指定的文件到索引区等待�交"
 
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
 msgid "interactively add files"
 msgstr "交互�添加文件"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
 msgid "interactively add changes"
 msgstr "交互�添加�更"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
 msgid "commit only specified files"
 msgstr "��交指定的文件"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
 msgid "bypass pre-commit hook"
 msgstr "绕过 pre-commit 钩�"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
 msgid "show what would be committed"
 msgstr "显示将��交的内容"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
 msgid "amend previous commit"
 msgstr "修改先�的�交"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
 msgid "bypass post-rewrite hook"
 msgstr "绕过 post-rewrite 钩�"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
 msgid "ok to record an empty change"
 msgstr "�许一个空�交"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
 msgid "ok to record a change with an empty message"
 msgstr "�许空的�交说明"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
 msgid "could not parse HEAD commit"
 msgstr "�能解� HEAD �交"
 
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "��的 MERGE_HEAD 文件（%s）"
 
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
 msgid "could not read MERGE_MODE"
 msgstr "�能读� MERGE_MODE"
 
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "�能读��交说明：%s"
 
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "终止�交；您未更改�自模版的�交说明。\n"
 
-#: builtin/commit.c:1740
+#: builtin/commit.c:1760
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "终止�交因为�交说明为空。\n"
 
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -5794,7 +6070,7 @@ msgstr "显示�置的��（文件�标准输入�数�对象，或命令
 msgid "unable to parse default color value"
 msgstr "�能解�默认颜色值"
 
-#: builtin/config.c:469
+#: builtin/config.c:472
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -5809,7 +6085,7 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:614
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "�能创建�置文件 %s"
@@ -5845,7 +6121,7 @@ msgstr "附注标签 %s 没有嵌入�称"
 msgid "tag '%s' is really '%s' here"
 msgstr "标签 '%s' 的确是在 '%s'"
 
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "�是一个有效的对象� %s"
@@ -5938,7 +6214,7 @@ msgstr "考虑最近 <n> 个标签（默认：10）"
 msgid "only consider tags matching <pattern>"
 msgstr "�考虑匹� <模�> 的标签"
 
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
 msgid "show abbreviated commit object as fallback"
 msgstr "显示简写的�交�作为�备"
 
@@ -5972,21 +6248,21 @@ msgstr "'%s'：�是一个正规文件或符�链接"
 msgid "invalid option: %s"
 msgstr "无效选项：%s"
 
-#: builtin/diff.c:358
+#: builtin/diff.c:360
 msgid "Not a git repository"
 msgstr "�是一个 git 仓库"
 
-#: builtin/diff.c:401
+#: builtin/diff.c:403
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "�供了无效对象 '%s'。"
 
-#: builtin/diff.c:410
+#: builtin/diff.c:412
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "�供了超过两个数�对象：'%s'"
 
-#: builtin/diff.c:417
+#: builtin/diff.c:419
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "无法处�的对象 '%s'。"
@@ -6059,19 +6335,19 @@ msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<选项>]"
 
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
 msgid "fetch from all remotes"
 msgstr "从所有的远程抓�"
 
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "追加到 .git/FETCH_HEAD 而�是覆盖它"
 
-#: builtin/fetch.c:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
 msgid "path to upload pack on remote end"
 msgstr "上传包到远程的路径"
 
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
 msgid "force overwrite of local branch"
 msgstr "强制覆盖本地分支"
 
@@ -6079,7 +6355,7 @@ msgstr "强制覆盖本地分支"
 msgid "fetch from multiple remotes"
 msgstr "从多个远程抓�"
 
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
 msgid "fetch all tags and associated objects"
 msgstr "抓�所有的标签和关�对象"
 
@@ -6091,20 +6367,20 @@ msgstr "�抓�任何标签(--no-tags)"
 msgid "number of submodules fetched in parallel"
 msgstr "�模组获�的并�数"
 
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "清除远程已��存在的分支的跟踪分支"
 
 #  译者：�选值，�能翻译
-#: builtin/fetch.c:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
 msgid "control recursive fetching of submodules"
 msgstr "控制�模组的递归抓�"
 
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
 msgid "keep downloaded pack"
 msgstr "��下载包"
 
@@ -6112,15 +6388,15 @@ msgstr "��下载包"
 msgid "allow updating of HEAD ref"
 msgstr "�许更新 HEAD 引用"
 
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
 msgid "deepen history of shallow clone"
 msgstr "深化浅克隆的历�"
 
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
 msgid "convert to a complete repository"
 msgstr "转�为一个完整的仓库"
 
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
 msgid "dir"
 msgstr "目录"
 
@@ -6132,15 +6408,15 @@ msgstr "在�模组路径输出的��加上此目录"
 msgid "default mode for recursion"
 msgstr "递归的默认模�"
 
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
 msgid "accept refs that update .git/shallow"
 msgstr "接�更新 .git/shallow 的引用"
 
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
 msgid "refmap"
 msgstr "引用映射"
 
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
 msgid "specify fetch refmap"
 msgstr "指定获��作的引用映射"
 
@@ -6199,11 +6475,6 @@ msgstr "强制更新"
 msgid "(non-fast-forward)"
 msgstr "（�快进�）"
 
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "无法打开 %s：%s\n"
-
 #: builtin/fetch.c:619
 #, c-format
 msgid "%s did not send all necessary objects\n"
@@ -6402,55 +6673,55 @@ msgstr "检查连接中"
 msgid "Checking object directories"
 msgstr "检查对象目录中"
 
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<选项>] [<对象>...]"
 
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
 msgid "show unreachable objects"
 msgstr "显示��达的对象"
 
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
 msgid "show dangling objects"
 msgstr "显示摇摆的对象"
 
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
 msgid "report tags"
 msgstr "报告标签"
 
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
 msgid "report root nodes"
 msgstr "报告根节点"
 
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
 msgid "make index objects head nodes"
 msgstr "将索引亦作为检查的头节点"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
 msgid "make reflogs head nodes (default)"
 msgstr "将引用日志作为检查的头节点（默认）"
 
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
 msgid "also consider packs and alternate objects"
 msgstr "也考虑包和备用对象"
 
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
 msgid "check only connectivity"
 msgstr "仅检查连通性"
 
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
 msgid "enable more strict checking"
 msgstr "�用更严格的检查"
 
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
 msgid "write dangling objects in .git/lost-found"
 msgstr "将摇摆对象写入 .git/lost-found 中"
 
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
 msgid "show progress"
 msgstr "显示进度"
 
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
 msgid "Checking objects"
 msgstr "检查对象中"
 
@@ -6549,215 +6820,215 @@ msgstr "无法读�树（%s）"
 msgid "unable to grep from object of type %s"
 msgstr "无法抓��自于 %s 类型的对象"
 
-#: builtin/grep.c:558
+#: builtin/grep.c:560
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "开关 `%c' 期望一个数字值"
 
-#: builtin/grep.c:575
+#: builtin/grep.c:577
 #, c-format
 msgid "cannot open '%s'"
 msgstr "�能打开 '%s'"
 
-#: builtin/grep.c:644
+#: builtin/grep.c:646
 msgid "search in index instead of in the work tree"
 msgstr "在索引区�索而�是在工作区"
 
-#: builtin/grep.c:646
+#: builtin/grep.c:648
 msgid "find in contents not managed by git"
 msgstr "在未被 git 管�的内容中查找"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: builtin/grep.c:648
+#: builtin/grep.c:650
 msgid "search in both tracked and untracked files"
 msgstr "在跟踪和未跟踪的文件中�索"
 
-#: builtin/grep.c:650
+#: builtin/grep.c:652
 msgid "ignore files specified via '.gitignore'"
 msgstr "忽略 '.gitignore' 包�的文件"
 
-#: builtin/grep.c:653
+#: builtin/grep.c:655
 msgid "show non-matching lines"
 msgstr "显示未匹�的行"
 
-#: builtin/grep.c:655
+#: builtin/grep.c:657
 msgid "case insensitive matching"
 msgstr "�区分大�写匹�"
 
-#: builtin/grep.c:657
+#: builtin/grep.c:659
 msgid "match patterns only at word boundaries"
 msgstr "�在��边界匹�模�"
 
-#: builtin/grep.c:659
+#: builtin/grep.c:661
 msgid "process binary files as text"
 msgstr "把二进制文件当�文本处�"
 
-#: builtin/grep.c:661
+#: builtin/grep.c:663
 msgid "don't match patterns in binary files"
 msgstr "�在二进制文件中匹�模�"
 
-#: builtin/grep.c:664
+#: builtin/grep.c:666
 msgid "process binary files with textconv filters"
 msgstr "用 textconv 过滤器处�二进制文件"
 
-#: builtin/grep.c:666
+#: builtin/grep.c:668
 msgid "descend at most <depth> levels"
 msgstr "最多以指定的深度�下寻找"
 
-#: builtin/grep.c:670
+#: builtin/grep.c:672
 msgid "use extended POSIX regular expressions"
 msgstr "使用扩展的 POSIX 正则表达�"
 
-#: builtin/grep.c:673
+#: builtin/grep.c:675
 msgid "use basic POSIX regular expressions (default)"
 msgstr "使用基本的 POSIX 正则表达�（默认）"
 
-#: builtin/grep.c:676
+#: builtin/grep.c:678
 msgid "interpret patterns as fixed strings"
 msgstr "把模�解�为固定的字符串"
 
-#: builtin/grep.c:679
+#: builtin/grep.c:681
 msgid "use Perl-compatible regular expressions"
 msgstr "使用 Perl 兼容的正则表达�"
 
-#: builtin/grep.c:682
+#: builtin/grep.c:684
 msgid "show line numbers"
 msgstr "显示行�"
 
-#: builtin/grep.c:683
+#: builtin/grep.c:685
 msgid "don't show filenames"
 msgstr "�显示文件�"
 
-#: builtin/grep.c:684
+#: builtin/grep.c:686
 msgid "show filenames"
 msgstr "显示文件�"
 
-#: builtin/grep.c:686
+#: builtin/grep.c:688
 msgid "show filenames relative to top directory"
 msgstr "显示相对于顶级目录的文件�"
 
-#: builtin/grep.c:688
+#: builtin/grep.c:690
 msgid "show only filenames instead of matching lines"
 msgstr "�显示文件�而�显示匹�的行"
 
-#: builtin/grep.c:690
+#: builtin/grep.c:692
 msgid "synonym for --files-with-matches"
 msgstr "和 --files-with-matches �义"
 
-#: builtin/grep.c:693
+#: builtin/grep.c:695
 msgid "show only the names of files without match"
 msgstr "�显示未匹�的文件�"
 
-#: builtin/grep.c:695
+#: builtin/grep.c:697
 msgid "print NUL after filenames"
 msgstr "在文件��输出 NUL 字符"
 
-#: builtin/grep.c:697
+#: builtin/grep.c:699
 msgid "show the number of matches instead of matching lines"
 msgstr "显示总匹�行数，而�显示匹�的行"
 
-#: builtin/grep.c:698
+#: builtin/grep.c:700
 msgid "highlight matches"
 msgstr "高亮显示匹�项"
 
-#: builtin/grep.c:700
+#: builtin/grep.c:702
 msgid "print empty line between matches from different files"
 msgstr "在��文件的匹�项之间打�空行"
 
-#: builtin/grep.c:702
+#: builtin/grep.c:704
 msgid "show filename only once above matches from same file"
 msgstr "�在�一文件的匹�项的上�显示一次文件�"
 
-#: builtin/grep.c:705
+#: builtin/grep.c:707
 msgid "show <n> context lines before and after matches"
 msgstr "显示匹�项��的 <n> 行上下文"
 
-#: builtin/grep.c:708
+#: builtin/grep.c:710
 msgid "show <n> context lines before matches"
 msgstr "显示匹�项� <n> 行上下文"
 
-#: builtin/grep.c:710
+#: builtin/grep.c:712
 msgid "show <n> context lines after matches"
 msgstr "显示匹�项� <n> 行上下文"
 
-#: builtin/grep.c:712
+#: builtin/grep.c:714
 msgid "use <n> worker threads"
 msgstr "使用 <n> 个工作线程"
 
-#: builtin/grep.c:713
+#: builtin/grep.c:715
 msgid "shortcut for -C NUM"
 msgstr "快�键 -C 数字"
 
-#: builtin/grep.c:716
+#: builtin/grep.c:718
 msgid "show a line with the function name before matches"
 msgstr "在匹�的��显示一行函数�"
 
-#: builtin/grep.c:718
+#: builtin/grep.c:720
 msgid "show the surrounding function"
 msgstr "显示所在函数的��内容"
 
-#: builtin/grep.c:721
+#: builtin/grep.c:723
 msgid "read patterns from file"
 msgstr "从文件读�模�"
 
-#: builtin/grep.c:723
+#: builtin/grep.c:725
 msgid "match <pattern>"
 msgstr "匹� <模�>"
 
-#: builtin/grep.c:725
+#: builtin/grep.c:727
 msgid "combine patterns specified with -e"
 msgstr "组�用 -e �数设定的模�"
 
-#: builtin/grep.c:737
+#: builtin/grep.c:739
 msgid "indicate hit with exit status without output"
 msgstr "�输出，而用退出�标识命中状�"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:741
 msgid "show only matches from files that match all patterns"
 msgstr "�显示匹�所有模�的文件中的匹�"
 
-#: builtin/grep.c:741
+#: builtin/grep.c:743
 msgid "show parse tree for grep expression"
 msgstr "显示 grep 表达�的解�树"
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "pager"
 msgstr "分页"
 
-#: builtin/grep.c:745
+#: builtin/grep.c:747
 msgid "show matching files in the pager"
 msgstr "分页显示匹�的文件"
 
-#: builtin/grep.c:748
+#: builtin/grep.c:750
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "�许调用 grep(1)（本次构建忽略）"
 
-#: builtin/grep.c:811
+#: builtin/grep.c:813
 msgid "no pattern given."
 msgstr "未�供模�匹�。"
 
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "指定的线程数无效（%d）"
 
-#: builtin/grep.c:873
+#: builtin/grep.c:875
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager 仅用于工作区"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:901
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached 或 --untracked �能与 --no-index �时使用。"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:906
 msgid "--no-index or --untracked cannot be used with revs."
 msgstr "--no-index 或 --untracked �能和版本�时使用。"
 
-#: builtin/grep.c:907
+#: builtin/grep.c:909
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard �能用于已跟踪内容。"
 
-#: builtin/grep.c:915
+#: builtin/grep.c:917
 msgid "both --cached and trees are given."
 msgstr "�时给出了 --cached 和树对象。"
 
@@ -6846,8 +7117,8 @@ msgstr "emacsclient 版本 '%d' 太�（< 22）。"
 
 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
 #, c-format
-msgid "failed to exec '%s': %s"
-msgstr "无法执行 '%s'：%s"
+msgid "failed to exec '%s'"
+msgstr "无法执行 '%s'"
 
 #: builtin/help.c:205
 #, c-format
@@ -7105,107 +7376,109 @@ msgstr "���喻"
 
 #: builtin/index-pack.c:1253
 #, c-format
-msgid "completed with %d local objects"
-msgstr "完� %d 个本地对象"
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "完� %d 个本地对象"
+msgstr[1] "完� %d 个本地对象"
 
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1265
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "对 %s 的尾部校验出现�外（�盘��？）"
 
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "包有 %d 个未解决的 delta"
 msgstr[1] "包有 %d 个未解决的 delta"
 
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1293
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "�能压缩附加对象（%d）"
 
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "本地对象 %s 已��"
 
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
 msgid "error while closing pack file"
 msgstr "关闭包文件时出错"
 
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "无法写�留文件 '%s'"
 
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "无法关闭�留文件 '%s'"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
 msgid "cannot store pack file"
 msgstr "无法存储包文件"
 
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
 msgid "cannot store index file"
 msgstr "无法存储索引文件"
 
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "�的 pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "没有线程支�，忽略 %s"
 
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "无法打开现存包文件 '%s'"
 
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "无法为 %s 打开包索引文件"
 
-#: builtin/index-pack.c:1587
+#: builtin/index-pack.c:1589
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "� delta：%d 个对象"
 msgstr[1] "� delta：%d 个对象"
 
-#: builtin/index-pack.c:1594
+#: builtin/index-pack.c:1596
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "链长 = %d: %lu 对象"
 msgstr[1] "链长 = %d: %lu 对象"
 
-#: builtin/index-pack.c:1624
+#: builtin/index-pack.c:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "包文件� '%s' 没有以 '.pack' 结尾"
+
+#: builtin/index-pack.c:1638
 msgid "Cannot come back to cwd"
 msgstr "无法返回当�工作目录"
 
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
 #, c-format
 msgid "bad %s"
 msgstr "错误选项 %s"
 
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin �能和 --stdin �时使用"
 
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "包文件� '%s' 没有以 '.pack' 结尾"
-
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1731
 msgid "--verify with no packfile name given"
 msgstr "--verify 没有�供包文件��数"
 
@@ -7244,27 +7517,27 @@ msgstr "�能拷� '%s' 至 '%s'"
 msgid "ignoring template %s"
 msgstr "忽略模版 %s"
 
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
 #, c-format
 msgid "templates not found %s"
 msgstr "模版未找到 %s"
 
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
 #, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr "没有从 '%2$s' �制带有错误版本 %1$d 的模版"
+msgid "not copying templates from '%s': %s"
+msgstr "没有从 '%s' �制模版：%s"
 
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
 #, c-format
 msgid "%s already exists"
 msgstr "%s 已�存在"
 
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "�能处� %d 类型的文件"
 
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "�能移动 %s 至 %s"
@@ -7272,25 +7545,25 @@ msgstr "�能移动 %s 至 %s"
 #. TRANSLATORS: The first '%s' is either "Reinitialized
 #. existing" or "Initialized empty", the second " shared" or
 #. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
 #, c-format
 msgid "%s%s Git repository in %s%s\n"
 msgstr "%s%s Git 仓库于 %s%s\n"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Reinitialized existing"
 msgstr "�新�始化现存的"
 
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
 msgid "Initialized empty"
 msgstr "�始化空的"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
 msgid " shared"
 msgstr "共享"
 
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -7298,32 +7571,32 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<模�目录>] [--shared[=<��>]] "
 "[<目录>]"
 
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
 msgid "permissions"
 msgstr "��"
 
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "指定 git 仓库是多个用户之间共享的"
 
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "�能创建目录 %s"
 
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "�能切�目录到 %s"
 
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr "��许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
 
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "�能访问工作区 '%s'"
@@ -7369,273 +7642,319 @@ msgstr "git show [<选项>] <对象>..."
 msgid "invalid --decorate option: %s"
 msgstr "无效的 --decorate 选项：%s"
 
-#: builtin/log.c:131
+#: builtin/log.c:137
 msgid "suppress diff output"
 msgstr "�显示差异输出"
 
-#: builtin/log.c:132
+#: builtin/log.c:138
 msgid "show source"
 msgstr "显示�"
 
-#: builtin/log.c:133
+#: builtin/log.c:139
 msgid "Use mail map file"
 msgstr "使用邮件映射文件"
 
-#: builtin/log.c:134
+#: builtin/log.c:140
 msgid "decorate options"
 msgstr "修饰选项"
 
-#: builtin/log.c:137
+#: builtin/log.c:143
 msgid "Process line range n,m in file, counting from 1"
 msgstr "处�文件中第 n 到 m 之间的行，从 1 开始"
 
-#: builtin/log.c:233
+#: builtin/log.c:239
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "最终输出：%d %s\n"
 
-#: builtin/log.c:465
+#: builtin/log.c:471
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ��的文件"
 
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
 #, c-format
 msgid "Could not read object %s"
 msgstr "�能读�对象 %s"
 
-#: builtin/log.c:596
+#: builtin/log.c:602
 #, c-format
 msgid "Unknown type: %d"
 msgstr "未知类型：%d"
 
-#: builtin/log.c:715
+#: builtin/log.c:722
 msgid "format.headers without value"
 msgstr "format.headers 没有值"
 
-#: builtin/log.c:801
+#: builtin/log.c:812
 msgid "name of output directory is too long"
 msgstr "输出目录�太长"
 
-#: builtin/log.c:816
+#: builtin/log.c:827
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "无法打开补�文件 %s"
 
-#: builtin/log.c:830
+#: builtin/log.c:841
 msgid "Need exactly one range."
 msgstr "�需�一个范围。"
 
-#: builtin/log.c:840
+#: builtin/log.c:851
 msgid "Not a range."
 msgstr "�是一个范围。"
 
-#: builtin/log.c:946
+#: builtin/log.c:957
 msgid "Cover letter needs email format"
 msgstr "信�需�邮件地�格�"
 
-#: builtin/log.c:1025
+#: builtin/log.c:1036
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "�正常的 in-reply-to：%s"
 
-#: builtin/log.c:1053
+#: builtin/log.c:1064
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
 
-#: builtin/log.c:1098
+#: builtin/log.c:1109
 msgid "Two output directories?"
 msgstr "两个输出目录？"
 
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "未知�交 %s"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "无法解� '%s' 为一个有效引用。"
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr "�能找到准确的�并基线。"
+
+#: builtin/log.c:1235
+msgid ""
+"Failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually."
+msgstr ""
+"无法得到上游地�，如果你想自动记录基线�交，请使用命令\n"
+"git branch --set-upstream-to �跟踪一个远程分支。或者你�以通过\n"
+"�数 --base=<base-commit-id> 手动指定一个基线�交。"
+
+#: builtin/log.c:1255
+msgid "Failed to find exact merge base"
+msgstr "无法找到准确的�并基线"
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr "基线�交应该是版本列表的祖先"
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr "基线�交�应该出现在版本列表中"
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr "无法得到补� id"
+
+#: builtin/log.c:1377
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "使用 [PATCH n/m]，�使�有一个补�"
 
-#: builtin/log.c:1217
+#: builtin/log.c:1380
 msgid "use [PATCH] even with multiple patches"
 msgstr "使用 [PATCH]，�使有多个补�"
 
-#: builtin/log.c:1221
+#: builtin/log.c:1384
 msgid "print patches to standard out"
 msgstr "打�补�到标准输出"
 
-#: builtin/log.c:1223
+#: builtin/log.c:1386
 msgid "generate a cover letter"
 msgstr "生�一�附信"
 
-#: builtin/log.c:1225
+#: builtin/log.c:1388
 msgid "use simple number sequence for output file names"
 msgstr "使用简�的数字�列作为输出文件�"
 
-#: builtin/log.c:1226
+#: builtin/log.c:1389
 msgid "sfx"
 msgstr "�缀"
 
-#: builtin/log.c:1227
+#: builtin/log.c:1390
 msgid "use <sfx> instead of '.patch'"
 msgstr "使用 <�缀> 代替 '.patch'"
 
-#: builtin/log.c:1229
+#: builtin/log.c:1392
 msgid "start numbering patches at <n> instead of 1"
 msgstr "补�以 <n> 开始编�，而�是1"
 
-#: builtin/log.c:1231
+#: builtin/log.c:1394
 msgid "mark the series as Nth re-roll"
 msgstr "标记补�系列是第几次�制"
 
-#: builtin/log.c:1233
+#: builtin/log.c:1396
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "使用 [<�缀>] 代替 [PATCH]"
 
-#: builtin/log.c:1236
+#: builtin/log.c:1399
 msgid "store resulting files in <dir>"
 msgstr "把结果文件存储在 <目录>"
 
-#: builtin/log.c:1239
+#: builtin/log.c:1402
 msgid "don't strip/add [PATCH]"
 msgstr "�删除/添加 [PATCH]"
 
-#: builtin/log.c:1242
+#: builtin/log.c:1405
 msgid "don't output binary diffs"
 msgstr "�输出二进制差异"
 
-#: builtin/log.c:1244
+#: builtin/log.c:1407
 msgid "output all-zero hash in From header"
 msgstr "在 From 头信�中输出全为零的哈希值"
 
-#: builtin/log.c:1246
+#: builtin/log.c:1409
 msgid "don't include a patch matching a commit upstream"
 msgstr "�包�已在上游�交中的补�"
 
-#: builtin/log.c:1248
+#: builtin/log.c:1411
 msgid "show patch format instead of default (patch + stat)"
 msgstr "显示纯补�格�而�默认的（补�+状�）"
 
-#: builtin/log.c:1250
+#: builtin/log.c:1413
 msgid "Messaging"
 msgstr "邮件��"
 
-#: builtin/log.c:1251
+#: builtin/log.c:1414
 msgid "header"
 msgstr "header"
 
-#: builtin/log.c:1252
+#: builtin/log.c:1415
 msgid "add email header"
 msgstr "添加邮件头"
 
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
 msgid "email"
 msgstr "邮件地�"
 
-#: builtin/log.c:1253
+#: builtin/log.c:1416
 msgid "add To: header"
 msgstr "添加收件人"
 
-#: builtin/log.c:1255
+#: builtin/log.c:1418
 msgid "add Cc: header"
 msgstr "添加抄�"
 
-#: builtin/log.c:1257
+#: builtin/log.c:1420
 msgid "ident"
 msgstr "标识"
 
-#: builtin/log.c:1258
+#: builtin/log.c:1421
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "将 From 地�设置为 <标识>（如若��供，则用�交者 ID �为地�）"
 
-#: builtin/log.c:1260
+#: builtin/log.c:1423
 msgid "message-id"
 msgstr "邮件标识"
 
-#: builtin/log.c:1261
+#: builtin/log.c:1424
 msgid "make first mail a reply to <message-id>"
 msgstr "使第一�邮件作为对 <邮件标识> 的回�"
 
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
 msgid "boundary"
 msgstr "边界"
 
-#: builtin/log.c:1263
+#: builtin/log.c:1426
 msgid "attach the patch"
 msgstr "附件方�添加补�"
 
-#: builtin/log.c:1266
+#: builtin/log.c:1429
 msgid "inline the patch"
 msgstr "内�显示补�"
 
-#: builtin/log.c:1270
+#: builtin/log.c:1433
 msgid "enable message threading, styles: shallow, deep"
 msgstr "�用邮件线索，风格：浅，深"
 
-#: builtin/log.c:1272
+#: builtin/log.c:1435
 msgid "signature"
 msgstr "签�"
 
-#: builtin/log.c:1273
+#: builtin/log.c:1436
 msgid "add a signature"
 msgstr "添加一个签�"
 
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "基线�交"
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr "为补�列表添加�置树信�"
+
+#: builtin/log.c:1440
 msgid "add a signature from a file"
 msgstr "从文件添加一个签�"
 
-#: builtin/log.c:1276
+#: builtin/log.c:1441
 msgid "don't print the patch filenames"
 msgstr "��打�补�文件�"
 
-#: builtin/log.c:1365
+#: builtin/log.c:1531
 msgid "-n and -k are mutually exclusive."
 msgstr "-n 和 -k 互斥。"
 
-#: builtin/log.c:1367
+#: builtin/log.c:1533
 msgid "--subject-prefix and -k are mutually exclusive."
 msgstr "--subject-prefix 和 -k 互斥。"
 
-#: builtin/log.c:1375
+#: builtin/log.c:1541
 msgid "--name-only does not make sense"
 msgstr "--name-only 无�义"
 
-#: builtin/log.c:1377
+#: builtin/log.c:1543
 msgid "--name-status does not make sense"
 msgstr "--name-status 无�义"
 
-#: builtin/log.c:1379
+#: builtin/log.c:1545
 msgid "--check does not make sense"
 msgstr "--check 无�义"
 
-#: builtin/log.c:1407
+#: builtin/log.c:1573
 msgid "standard output, or directory, which one?"
 msgstr "标准输出或目录，哪一个？"
 
-#: builtin/log.c:1409
+#: builtin/log.c:1575
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "�能创建目录 '%s'"
 
-#: builtin/log.c:1506
+#: builtin/log.c:1672
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "无法读�签�文件 '%s'"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1743
 msgid "Failed to create output files"
 msgstr "无法创建输出文件"
 
-#: builtin/log.c:1617
+#: builtin/log.c:1792
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<上游> [<头> [<�制>]]]"
 
-#: builtin/log.c:1671
+#: builtin/log.c:1846
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr "�能找到跟踪的远程分支，请手工指定 <上游>。\n"
 
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr "未知�交 %s"
-
 #: builtin/ls-files.c:378
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<选项>] [<文件>...]"
@@ -7826,171 +8145,175 @@ msgstr "git merge [<选项>] <说明> HEAD <�交>"
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:100
+#: builtin/merge.c:101
 msgid "switch `m' requires a value"
 msgstr "开关 `m' 需�一个值"
 
-#: builtin/merge.c:137
+#: builtin/merge.c:138
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "�能找到�并策略 '%s'。\n"
 
-#: builtin/merge.c:138
+#: builtin/merge.c:139
 #, c-format
 msgid "Available strategies are:"
 msgstr "�用的策略有："
 
-#: builtin/merge.c:143
+#: builtin/merge.c:144
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "�用的自定义策略有："
 
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
 msgid "do not show a diffstat at the end of the merge"
 msgstr "在�并的最��显示差异统计"
 
-#: builtin/merge.c:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
 msgid "show a diffstat at the end of the merge"
 msgstr "在�并的最�显示差异统计"
 
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
 msgid "(synonym to --stat)"
 msgstr "（和 --stat �义）"
 
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "在�并�交信�中添加（最多 <n> �）精简�交记录"
 
-#: builtin/merge.c:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
 msgid "create a single commit instead of doing a merge"
 msgstr "创建一个�独的�交而�是�一次�并"
 
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "如果�并�功，执行一次�交（默认）"
 
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
 msgid "edit message before committing"
 msgstr "在�交�编辑�交说明"
 
-#: builtin/merge.c:207
+#: builtin/merge.c:208
 msgid "allow fast-forward (default)"
 msgstr "�许快进（默认）"
 
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
 msgid "abort if fast-forward is not possible"
 msgstr "如果�能快进就放弃�并"
 
-#: builtin/merge.c:213
+#: builtin/merge.c:214
 msgid "Verify that the named commit has a valid GPG signature"
 msgstr "验�指定的�交是�包�一个有效的 GPG 签�"
 
-#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
 #: builtin/revert.c:89
 msgid "strategy"
 msgstr "ç­–ç•¥"
 
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "merge strategy to use"
 msgstr "�使用的�并策略"
 
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
 msgid "option=value"
 msgstr "option=value"
 
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
 msgid "option for selected merge strategy"
 msgstr "所选的�并策略的选项"
 
-#: builtin/merge.c:219
+#: builtin/merge.c:220
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "�并的�交说明（针对�快进��并）"
 
-#: builtin/merge.c:223
+#: builtin/merge.c:224
 msgid "abort the current in-progress merge"
 msgstr "放弃当�正在进行的�并"
 
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "�许�并�相关的历�"
+
+#: builtin/merge.c:254
 msgid "could not run stash."
 msgstr "�能进行进度�存。"
 
-#: builtin/merge.c:256
+#: builtin/merge.c:259
 msgid "stash failed"
 msgstr "进度�存失败"
 
-#: builtin/merge.c:261
+#: builtin/merge.c:264
 #, c-format
 msgid "not a valid object: %s"
 msgstr "�是一个有效对象：%s"
 
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
 msgid "read-tree failed"
 msgstr "读�树失败"
 
 #  译者：注����导空格
-#: builtin/merge.c:327
+#: builtin/merge.c:330
 msgid " (nothing to squash)"
 msgstr " （无�压缩）"
 
-#: builtin/merge.c:340
+#: builtin/merge.c:343
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "压缩�交 -- 未更新 HEAD\n"
 
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
 #, c-format
 msgid "Could not write to '%s'"
 msgstr "�能写入 '%s'"
 
-#: builtin/merge.c:372
+#: builtin/merge.c:375
 msgid "Writing SQUASH_MSG"
 msgstr "写入 SQUASH_MSG"
 
-#: builtin/merge.c:374
+#: builtin/merge.c:377
 msgid "Finishing SQUASH_MSG"
 msgstr "完� SQUASH_MSG"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:400
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "无�并信� -- 未更新 HEAD\n"
 
-#: builtin/merge.c:448
+#: builtin/merge.c:451
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' 没有指�一个�交"
 
-#: builtin/merge.c:538
+#: builtin/merge.c:541
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "�的 branch.%s.mergeoptions 字符串：%s"
 
-#: builtin/merge.c:657
+#: builtin/merge.c:660
 msgid "Not handling anything other than two heads merge."
 msgstr "�能处�两个头�并之外的任何�作。"
 
-#: builtin/merge.c:671
+#: builtin/merge.c:674
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "merge-recursive 的未知选项：-X%s"
 
-#: builtin/merge.c:684
+#: builtin/merge.c:687
 #, c-format
 msgid "unable to write %s"
 msgstr "�能写 %s"
 
-#: builtin/merge.c:773
+#: builtin/merge.c:776
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "�能从 '%s' 读�"
 
-#: builtin/merge.c:782
+#: builtin/merge.c:785
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr "未�交�并，使用 'git commit' 完�此次�并。\n"
 
-#: builtin/merge.c:788
+#: builtin/merge.c:791
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -8004,52 +8327,52 @@ msgstr ""
 "\n"
 "以 '%c' 开头的行将被忽略，而且空�交说明将会终止�交。\n"
 
-#: builtin/merge.c:812
+#: builtin/merge.c:815
 msgid "Empty commit message."
 msgstr "空�交信�。"
 
-#: builtin/merge.c:824
+#: builtin/merge.c:835
 #, c-format
 msgid "Wonderful.\n"
 msgstr "太棒了。\n"
 
-#: builtin/merge.c:879
+#: builtin/merge.c:890
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "自动�并失败，修正冲�然��交修正的结果。\n"
 
-#: builtin/merge.c:895
+#: builtin/merge.c:906
 #, c-format
 msgid "'%s' is not a commit"
 msgstr "'%s' �是一个�交"
 
-#: builtin/merge.c:936
+#: builtin/merge.c:947
 msgid "No current branch."
 msgstr "没有当�分支。"
 
-#: builtin/merge.c:938
+#: builtin/merge.c:949
 msgid "No remote for the current branch."
 msgstr "当�分支没有对应的远程仓库。"
 
-#: builtin/merge.c:940
+#: builtin/merge.c:951
 msgid "No default upstream defined for the current branch."
 msgstr "当�分支没有定义默认的上游分支。"
 
-#: builtin/merge.c:945
+#: builtin/merge.c:956
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "对于 %s 没有�自 %s 的远程跟踪分支"
 
-#: builtin/merge.c:1080
+#: builtin/merge.c:1091
 #, c-format
 msgid "could not close '%s'"
 msgstr "�能关闭 '%s'"
 
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "没有�终止的�并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c:1223
+#: builtin/merge.c:1235
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -8057,7 +8380,7 @@ msgstr ""
 "您尚未结�您的�并（存在 MERGE_HEAD）。\n"
 "请在�并�先�交您的修改。"
 
-#: builtin/merge.c:1230
+#: builtin/merge.c:1242
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -8065,100 +8388,104 @@ msgstr ""
 "您尚未结�您的拣选（存在 CHERRY_PICK_HEAD）。\n"
 "请在�并�先�交您的修改。"
 
-#: builtin/merge.c:1233
+#: builtin/merge.c:1245
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "您尚未结�您的拣选（存在 CHERRY_PICK_HEAD）。"
 
-#: builtin/merge.c:1242
+#: builtin/merge.c:1254
 msgid "You cannot combine --squash with --no-ff."
 msgstr "您�能将 --squash 与 --no-ff �时使用。"
 
-#: builtin/merge.c:1250
+#: builtin/merge.c:1262
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "未指定�交并且 merge.defaultToUpstream 未设置。"
 
-#: builtin/merge.c:1267
+#: builtin/merge.c:1279
 msgid "Squash commit into empty head not supported yet"
 msgstr "尚�支�到空分支的压缩�交"
 
-#: builtin/merge.c:1269
+#: builtin/merge.c:1281
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "到空分支的�快进��交没有�义"
 
-#: builtin/merge.c:1275
+#: builtin/merge.c:1286
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - �能被�并"
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
 msgid "Can merge only exactly one commit into empty head"
 msgstr "�能将一个�交�并到空分支上"
 
-#: builtin/merge.c:1332
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "�交 %s 有一个��信的声称�自 %s 的 GPG 签�。"
 
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "�交 %s 有一个错误的声称�自 %s 的 GPG 签�。"
 
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "�交 %s 没有一个 GPG 签�。"
 
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "�交 %s 有一个�自 %s 的好的 GPG 签�。\n"
 
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr "拒��并无关的历�"
+
+#: builtin/merge.c:1439
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "æ›´æ–° %s..%s\n"
 
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "�试�常�的索引内�并...\n"
 
-#: builtin/merge.c:1468
+#: builtin/merge.c:1483
 #, c-format
 msgid "Nope.\n"
 msgstr "无。\n"
 
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
 msgid "Not possible to fast-forward, aborting."
 msgstr "无法快进，终止。"
 
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "将树回滚至原始状�...\n"
 
-#: builtin/merge.c:1527
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "�试�并策略 %s...\n"
 
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "没有�并策略处�此�并。\n"
 
-#: builtin/merge.c:1595
+#: builtin/merge.c:1610
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "使用策略 %s �并失败。\n"
 
-#: builtin/merge.c:1604
+#: builtin/merge.c:1619
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "使用 %s 以准备手工解决。\n"
 
-#: builtin/merge.c:1616
+#: builtin/merge.c:1631
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "自动�并进展顺利，按�求在�交��止\n"
@@ -8268,7 +8595,7 @@ msgstr "git mv [<选项>] <�>... <目标>"
 msgid "Directory %s is in index and no submodule?"
 msgstr "目录 %s 在索引中并且�是�模组？"
 
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr "请将您的修改暂存到 .gitmodules 中或�存进度��继续"
 
@@ -8346,48 +8673,48 @@ msgstr "%s，�=%s，目标=%s"
 msgid "Renaming %s to %s\n"
 msgstr "�命� %s 至 %s\n"
 
-#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "�命� '%s' 失败"
 
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<选项>] <�交>..."
 
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<选项>] --all"
 
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<选项>] --stdin"
 
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
 msgid "print only names (no SHA-1)"
 msgstr "�打��称（无 SHA-1）"
 
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
 msgid "only use tags to name the commits"
 msgstr "�使用标签�命��交"
 
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
 msgid "only use refs matching <pattern>"
 msgstr "�使用和 <模�> 相匹�的引用"
 
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
 msgid "list all commits reachable from all refs"
 msgstr "列出�以从所有引用访问的�交"
 
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
 msgid "read from stdin"
 msgstr "从标准输入读�"
 
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
 msgid "allow to print `undefined` names (default)"
 msgstr "�许打� `未定义` 的�称（默认）"
 
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
 msgid "dereference tags in the input (internal use)"
 msgstr "��解�输入中的标签（内部使用）"
 
@@ -8532,24 +8859,16 @@ msgstr "�能写注解对象"
 msgid "The note contents have been left in %s"
 msgstr "注解内容被留在 %s 中"
 
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
 #, c-format
 msgid "cannot read '%s'"
 msgstr "�能读� '%s'"
 
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "�能打开或读� '%s'"
 
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "无法解� '%s' 为一个有效引用。"
-
 #: builtin/notes.c:256
 #, c-format
 msgid "Failed to read object '%s'."
@@ -8562,7 +8881,7 @@ msgstr "�能从�数�对象 '%s' 中读�注解数�"
 
 #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
 msgid "too many parameters"
 msgstr "�数太多"
 
@@ -8607,7 +8926,7 @@ msgstr "ä¸�能添加注解。å�‘现对象 %s 已存在注解。使用 '-f' 覆ç›
 msgid "Overwriting existing notes for object %s\n"
 msgstr "覆盖对象 %s 现存注解\n"
 
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "删除对象 %s 的注解\n"
@@ -8645,63 +8964,63 @@ msgstr ""
 "�命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
 "请�用 'git notes add -f -m/-F/-c/-C'。\n"
 
-#: builtin/notes.c:767
+#: builtin/notes.c:768
 msgid "General options"
 msgstr "通用选项"
 
-#: builtin/notes.c:769
+#: builtin/notes.c:770
 msgid "Merge options"
 msgstr "�并选项"
 
-#: builtin/notes.c:771
+#: builtin/notes.c:772
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgstr "使用指定的策略解决注解冲� (manual/ours/theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "Committing unmerged notes"
 msgstr "�交未�并的注解"
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "通过�交未�并的注解�完�注解�并"
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid "Aborting notes merge resolution"
 msgstr "中止注解�并的方案"
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "abort notes merge"
 msgstr "中止注解�并"
 
-#: builtin/notes.c:856
+#: builtin/notes.c:857
 #, c-format
 msgid "A notes merge into %s is already in-progress at %s"
 msgstr "一个到 %s 的注解�并已�在 %s 执行中"
 
-#: builtin/notes.c:883
+#: builtin/notes.c:884
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "对象 %s 没有注解\n"
 
-#: builtin/notes.c:895
+#: builtin/notes.c:896
 msgid "attempt to remove non-existent note is not an error"
 msgstr "�试删除�存在的注解�是一个错误"
 
-#: builtin/notes.c:898
+#: builtin/notes.c:899
 msgid "read object names from the standard input"
 msgstr "从标准输入读�对象�称"
 
-#: builtin/notes.c:979
+#: builtin/notes.c:980
 msgid "notes-ref"
 msgstr "注解引用"
 
-#: builtin/notes.c:980
+#: builtin/notes.c:981
 msgid "use notes from <notes-ref>"
 msgstr "从 <注解引用> 使用注解"
 
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "未知�命令：%s"
@@ -8721,165 +9040,169 @@ msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象
 msgid "deflate error (%d)"
 msgstr "压缩错误 (%d)"
 
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr "�用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
+
+#: builtin/pack-objects.c:776
 msgid "Writing objects"
 msgstr "写入对象中"
 
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "�用 bitmap 写入，因为一些对象将�会被打包"
 
-#: builtin/pack-objects.c:2172
+#: builtin/pack-objects.c:2177
 msgid "Compressing objects"
 msgstr "压缩对象中"
 
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
 #, c-format
 msgid "unsupported index version %s"
 msgstr "�支�的索引版本 %s"
 
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2567
 #, c-format
 msgid "bad index version '%s'"
 msgstr "�的索引版本 '%s'"
 
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
 msgid "do not show progress meter"
 msgstr "�显示进度表"
 
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
 msgid "show progress meter"
 msgstr "显示进度表"
 
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
 msgid "show progress meter during object writing phase"
 msgstr "在对象写入阶段显示进度表"
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2604
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "当进度表显示时类似于 --all-progress"
 
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2605
 msgid "version[,offset]"
 msgstr "版本[,�移]"
 
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
 msgid "write the pack index file in the specified idx format version"
 msgstr "用指定的 idx 格�版本�写包索引文件"
 
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2609
 msgid "maximum size of each output pack file"
 msgstr "�个输出包的最大尺寸"
 
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2611
 msgid "ignore borrowed objects from alternate object store"
 msgstr "忽略从备用对象存储里借用对象"
 
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2613
 msgid "ignore packed objects"
 msgstr "忽略包对象"
 
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
 msgid "limit pack window by objects"
 msgstr "�制打包窗�的对象数"
 
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2617
 msgid "limit pack window by memory in addition to object limit"
 msgstr "除对象数��制外设置打包窗�的内存�制"
 
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2619
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "打包�许的 delta 链的最大长度"
 
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2621
 msgid "reuse existing deltas"
 msgstr "�用已存在的 deltas"
 
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
 msgid "reuse existing objects"
 msgstr "�用已存在的对象"
 
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
 msgid "use OFS_DELTA objects"
 msgstr "使用 OFS_DELTA 对象"
 
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
 msgid "use threads when searching for best delta matches"
 msgstr "使用线程查询最佳 delta 匹�"
 
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2629
 msgid "do not create an empty pack output"
 msgstr "�创建空的包输出"
 
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2631
 msgid "read revision arguments from standard input"
 msgstr "从标准输入读�版本��数"
 
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
 msgid "limit the objects to those that are not yet packed"
 msgstr "�制那些尚未打包的对象"
 
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2636
 msgid "include objects reachable from any reference"
 msgstr "包括�以从任何引用访问到的对象"
 
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2639
 msgid "include objects referred by reflog entries"
 msgstr "包括被引用日志引用到的对象"
 
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2642
 msgid "include objects referred to by the index"
 msgstr "包括被索引引用到的对象"
 
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2645
 msgid "output pack to stdout"
 msgstr "输出包到标准输出"
 
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
 msgid "include tag objects that refer to objects to be packed"
 msgstr "包括那些引用了待打包对象的标签对象"
 
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2649
 msgid "keep unreachable objects"
 msgstr "维���达的对象"
 
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
 msgid "time"
 msgstr "时间"
 
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
 msgid "unpack unreachable objects newer than <time>"
 msgstr "将比给定 <时间> 新的无法访问的对象解包"
 
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2654
 msgid "create thin packs"
 msgstr "创建精简包"
 
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
 msgid "create packs suitable for shallow fetches"
 msgstr "创建适�浅克隆仓库获�的包"
 
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2658
 msgid "ignore packs that have companion .keep file"
 msgstr "忽略�有 .keep 文件的包"
 
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2660
 msgid "pack compression level"
 msgstr "打包压缩级别"
 
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
 msgid "do not hide commits by grafts"
 msgstr "显示被�接��的�交"
 
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2664
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "使用 bitmap 索引（如果有的�）以�高对象计数时的速度"
 
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2666
 msgid "write a bitmap index together with the pack index"
 msgstr "在建立包索引的�时创建 bitmap 索引"
 
-#: builtin/pack-objects.c:2752
+#: builtin/pack-objects.c:2757
 msgid "Counting objects"
 msgstr "对象计数中"
 
@@ -8907,15 +9230,15 @@ msgstr "正在删除��对象"
 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
 
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
 msgid "do not remove, show only"
 msgstr "�删除，�显示"
 
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
 msgid "report pruned objects"
 msgstr "报告清除的对象"
 
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
 msgid "expire objects older than <time>"
 msgstr "使早于给定时间的对象过期"
 
@@ -8927,65 +9250,69 @@ msgstr "�能在��仓库中执行清��作"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/pull.c:117
+#: builtin/pull.c:120
 msgid "Options related to merging"
 msgstr "和�并相关的选项"
 
-#: builtin/pull.c:120
+#: builtin/pull.c:123
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "使用�基�作�代�并�作以�入修改"
 
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
 msgid "allow fast-forward"
 msgstr "�许快进�"
 
-#: builtin/pull.c:150
+#: builtin/pull.c:153
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "验�指定的�交是�包�一个有效的 GPG 签�"
 
-#: builtin/pull.c:164
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "自动在�基�作��执行 stash/stash pop"
+
+#: builtin/pull.c:172
 msgid "Options related to fetching"
 msgstr "和获�相关的�数"
 
-#: builtin/pull.c:186
+#: builtin/pull.c:194
 msgid "number of submodules pulled in parallel"
 msgstr "并�拉�的�模组的数�"
 
-#: builtin/pull.c:275
+#: builtin/pull.c:283
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "pull.ff 的�值无效：%s"
 
-#: builtin/pull.c:359
+#: builtin/pull.c:379
 msgid "Cannot pull with rebase: You have unstaged changes."
 msgstr "无法通过�基方�拉�：您有未暂存的�更。"
 
-#: builtin/pull.c:365
+#: builtin/pull.c:385
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "而且您的索引中包�未�交的�更。"
 
-#: builtin/pull.c:367
+#: builtin/pull.c:387
 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
 msgstr "无法通过�基方�拉�：您的索引中包�未�交的�更。"
 
-#: builtin/pull.c:443
+#: builtin/pull.c:463
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "在您刚刚获�到的引用中没有�基�作的候选。"
 
-#: builtin/pull.c:445
+#: builtin/pull.c:465
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "在您刚刚获�到的引用中没有�并�作的候选。"
 
-#: builtin/pull.c:446
+#: builtin/pull.c:466
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr "通常这�味�您�供了一个通�符引用规格但未能和远端匹�。"
 
-#: builtin/pull.c:449
+#: builtin/pull.c:469
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -8995,38 +9322,42 @@ msgstr ""
 "您�求从远程 '%s' 拉�，但是未指定一个分支。因为这�是当�\n"
 "分支默认的远程仓库，您必须在命令行中指定一个分支�。"
 
-#: builtin/pull.c:454
+#: builtin/pull.c:474 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "您当��在一个分支上。"
 
-#: builtin/pull.c:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "请指定您��基到哪一个分支。"
 
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "请指定您��并哪一个分支。"
 
-#: builtin/pull.c:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
 msgid "See git-pull(1) for details."
 msgstr "详� git-pull(1)。"
 
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<远程>"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<分支>"
+
+#: builtin/pull.c:489 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "当�分支没有跟踪信�。"
 
-#: builtin/pull.c:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
 msgid ""
-"If you wish to set tracking information for this branch you can do so with:\n"
-"\n"
-"    git branch --set-upstream-to=%s/<branch> %s\n"
-msgstr ""
-"如果您想�为此分支创建跟踪信�，您�以执行：\n"
-"\n"
-"    git branch --set-upstream-to=%s/<branch> %s\n"
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr "如果您想�为此分支创建跟踪信�，您�以执行："
 
-#: builtin/pull.c:483
+#: builtin/pull.c:503
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -9035,11 +9366,15 @@ msgstr ""
 "您的�置中指定��并远程的引用 '%s'，\n"
 "但是没有获�到这个引用。"
 
-#: builtin/pull.c:841
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "--[no-]autostash 选项�在使用 --rebase 时有效。"
+
+#: builtin/pull.c:872
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "更新尚未诞生的分支，�更添加至索引。"
 
-#: builtin/pull.c:870
+#: builtin/pull.c:900
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -9049,7 +9384,7 @@ msgstr ""
 "fetch 更新了当�的分支。快进您的工作区\n"
 "至�交 %s。"
 
-#: builtin/pull.c:875
+#: builtin/pull.c:905
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -9066,11 +9401,11 @@ msgstr ""
 "$ git reset --hard\n"
 "��之�的状�。"
 
-#: builtin/pull.c:890
+#: builtin/pull.c:920
 msgid "Cannot merge multiple branches into empty head."
 msgstr "无法将多个分支�并到空分支。"
 
-#: builtin/pull.c:894
+#: builtin/pull.c:924
 msgid "Cannot rebase onto multiple branches."
 msgstr "无法�基到多个分支。"
 
@@ -9420,6 +9755,18 @@ msgstr "跳过应用稀�检出过滤器"
 msgid "debug unpack-trees"
 msgstr "调试 unpack-trees"
 
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <git-dir>"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "�默模�"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "您必须指定一个目录。"
+
 #: builtin/reflog.c:423
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
@@ -9738,27 +10085,29 @@ msgstr "* 远程 %s"
 msgid "  Fetch URL: %s"
 msgstr "  获�地�：%s"
 
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
 msgid "(no URL)"
 msgstr "(æ—  URL)"
 
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in "  Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  推�地�：%s"
 
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD 分支：%s"
 
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD 分支（远程 HEAD 模糊，�能是下列中的一个）：\n"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1181
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
@@ -9766,151 +10115,151 @@ msgstr[0] "  远程分支：%s"
 msgstr[1] "  远程分支：%s"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
 msgid " (status not queried)"
 msgstr "（状�未查询）"
 
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  为 'git pull' �置的本地分支："
 msgstr[1] "  为 'git pull' �置的本地分支："
 
-#: builtin/remote.c:1199
+#: builtin/remote.c:1201
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  本地引用将在 'git push' 时被镜�"
 
-#: builtin/remote.c:1206
+#: builtin/remote.c:1208
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  为 'git push' �置的本地引用%s："
 msgstr[1] "  为 'git push' �置的本地引用%s："
 
-#: builtin/remote.c:1227
+#: builtin/remote.c:1229
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "根�远程设置 refs/remotes/<�称>/HEAD"
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1231
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "删除 refs/remotes/<�称>/HEAD"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
 msgid "Cannot determine remote HEAD"
 msgstr "无法确定远程 HEAD"
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
 
-#: builtin/remote.c:1256
+#: builtin/remote.c:1258
 #, c-format
 msgid "Could not delete %s"
 msgstr "无法删除 %s"
 
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "�是一个有效引用：%s"
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
 #, c-format
 msgid "Could not setup %s"
 msgstr "�能设置 %s"
 
 #  译者：注����导空格
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s 将�为摇摆状��"
 
 #  译者：注����导空格
-#: builtin/remote.c:1285
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s 已�为摇摆状��"
 
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
 #, c-format
 msgid "Pruning %s"
 msgstr "修剪 %s"
 
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [将删除] %s"
 
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [已删除] %s"
 
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
 msgid "prune remotes after fetching"
 msgstr "抓��清除远程"
 
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
 #, c-format
 msgid "No such remote '%s'"
 msgstr "没有此远程 '%s'"
 
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
 msgid "add branch"
 msgstr "添加分支"
 
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
 msgid "no remote specified"
 msgstr "未指定远程"
 
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
 msgid "query push URLs rather than fetch URLs"
 msgstr "查询推� URL 地�，而�获� URL 地�"
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1467
 msgid "return all URLs"
 msgstr "返回所有 URL 地�"
 
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "没有给远程仓库 '%s' 设定 URL"
 
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
 msgid "manipulate push URLs"
 msgstr "�作推� URLS"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
 msgid "add URL"
 msgstr "添加 URL"
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
 msgid "delete URLs"
 msgstr "删除 URLS"
 
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete 无�义"
 
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "无效的旧 URL 匹�模版：%s"
 
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
 #, c-format
 msgid "No such URL found: %s"
 msgstr "未找到此 URL：%s"
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
 msgid "Will not delete all non-push URLs"
 msgstr "将�会删除所有�推� URL 地�"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 msgid "be verbose; must be placed before a subcommand"
 msgstr "冗长输出；必须置于�命令之�"
 
@@ -10410,10 +10759,6 @@ msgstr "�许递归删除"
 msgid "exit with a zero status even if nothing matched"
 msgstr "�使没有匹�，也以零状�退出"
 
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr "请将您的修改缓存到 .gitmodules 中或�存进度��继续"
-
 #: builtin/rm.c:335
 #, c-format
 msgid "not removing '%s' recursively without -r"
@@ -10615,81 +10960,179 @@ msgstr "跳过和移除所有的注释行"
 msgid "prepend comment character and space to each line"
 msgstr "为�一行的行首添加注释符和空格"
 
-#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "没有这样的引用：%s"
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "期望一个完整的引用�称，�得到 %s"
+
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "无法从 url '%s' 剥离一个组件"
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
 msgid "alternative anchor for relative paths"
 msgstr "相对路径的替代锚记（anchor）"
 
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
 
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "在 .gitmodules 中未找到�模组 '%s' 的 url"
+
+#: builtin/submodule--helper.c:366
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "无法为�模组 '%s' 注册 url"
+
+#: builtin/submodule--helper.c:370
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "�模组 '%s'（%s）未对路径 '%s' 注册\n"
+
+#
+#: builtin/submodule--helper.c:380
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "警告：建议�模组 '%s' 使用命令更新模�\n"
+
+#: builtin/submodule--helper.c:387
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr "无法为�模组 '%s' 注册更新模�"
+
+#: builtin/submodule--helper.c:406
+msgid "Suppress output for initializing a submodule"
+msgstr "�始化�模组时抑制输出"
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<路径>]"
+
+#: builtin/submodule--helper.c:432
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <路径>"
 
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "在 .gitmodules 中没有�现路径 '%s' 的�模组映射"
 
-#: builtin/submodule--helper.c:164
+#: builtin/submodule--helper.c:489
 msgid "where the new submodule will be cloned to"
 msgstr "新的�模组将�克隆的路径"
 
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:492
 msgid "name of the new submodule"
 msgstr "新�模组的�称"
 
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
 msgid "url where to clone the submodule from"
 msgstr "克隆�模组的 url 地�"
 
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:501
 msgid "depth for shallow clones"
 msgstr "浅克隆的深度"
 
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
-msgstr ""
-"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
-"[--name <�字>] [--url <地�>][--depth <深度>] [--] [<路径>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] [--name <�字>] [--depth <深度>] --url <url> --path <路径>"
 
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "�能创建目录 '%s'"
 
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "无法克隆 '%s' 到�模组路径 '%s'"
 
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:550
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "无法打开文件 '%s'"
 
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
 #, c-format
 msgid "could not close file %s"
 msgstr "无法关闭文件 %s"
 
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "无法得到 '%s' 的�模组目录"
 
-#: builtin/submodule--helper.c:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
-msgstr "严�错误：submodule-helper �命令必须由�外的�命令调用"
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "�模组 '%s' 尚未�始化"
 
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr "也许您想�执行 'update --init'？"
+
+#: builtin/submodule--helper.c:639
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "略过未�并的�模组 %s"
+
+#: builtin/submodule--helper.c:660
 #, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr "严�错误：'%s' �是一个有效的 submodule--helper �命令"
+msgid "Skipping submodule '%s'"
+msgstr "略过�模组 '%s'"
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "到工作区的路径"
+
+#: builtin/submodule--helper.c:771
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "工作区中的路径，递归嵌套�模组"
+
+#: builtin/submodule--helper.c:775
+msgid "rebase, merge, checkout or none"
+msgstr "rebase�merge�checkout 或 none"
+
+#: builtin/submodule--helper.c:779
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "创建一个指定深度的浅克隆"
+
+#: builtin/submodule--helper.c:782
+msgid "parallel jobs"
+msgstr "并�任务"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "��输出克隆进度"
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
+
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr "update �数�值错误"
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "submodule-helper �命令必须由�外的�命令调用"
+
+#: builtin/submodule--helper.c:862
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s' �是一个有效的 submodule--helper �命令"
 
 #: builtin/symbolic-ref.c:7
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10742,27 +11185,22 @@ msgstr ""
 msgid "git tag -v <tagname>..."
 msgstr "git tag -v <标签�>..."
 
-#: builtin/tag.c:80
+#: builtin/tag.c:81
 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr "标签�称太长：%.*s..."
 
-#: builtin/tag.c:85
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr "未�现标签 '%s'。"
 
-#: builtin/tag.c:100
+#: builtin/tag.c:101
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "已删除标签 '%s'（曾为 %s）\n"
 
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "�能校验该标签 '%s'"
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
 #, c-format
 msgid ""
 "\n"
@@ -10775,7 +11213,7 @@ msgstr ""
 "  %s\n"
 "以 '%c' 开头的行将被忽略。\n"
 
-#: builtin/tag.c:126
+#: builtin/tag.c:121
 #, c-format
 msgid ""
 "\n"
@@ -10906,21 +11344,21 @@ msgstr "选项 --merged 和 --no-merged �能和 -l 共用"
 msgid "only one -F or -m option is allowed."
 msgstr "��许一个 -F 或 -m 选项。"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:452
 msgid "too many params"
 msgstr "太多�数"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:458
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' �是一个有效的标签�称。"
 
-#: builtin/tag.c:464
+#: builtin/tag.c:463
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "标签 '%s' 已存在"
 
-#: builtin/tag.c:489
+#: builtin/tag.c:491
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "已更新标签 '%s'（曾为 %s）\n"
@@ -11168,7 +11606,7 @@ msgstr "git verify-commit [-v | --verbose] <�交>..."
 msgid "print commit contents"
 msgstr "打��交内容"
 
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
 msgid "print raw gpg status output"
 msgstr "打�原始 gpg 状�输出"
 
@@ -11188,7 +11626,7 @@ msgstr "�显示统计"
 msgid "git verify-tag [-v | --verbose] <tag>..."
 msgstr "git verify-tag [-v | --verbose] <标签>..."
 
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
 msgid "print tag contents"
 msgstr "打�标签内容"
 
@@ -11204,68 +11642,72 @@ msgstr "git worktree prune [<选项>]"
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<选项>]"
 
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "删除工作区/%s：�是一个有效的目录"
 
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "删除 worktrees/%s：gitdir 文件�存在"
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "删除 worktrees/%s：无法读� gitdir 文件 (%s)"
 
-#: builtin/worktree.c:61
+#: builtin/worktree.c:62
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "删除 worktrees/%s：无效的 gitdir 文件"
 
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "删除 worktrees/%s：gitdir 文件的指��存在"
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:113
 #, c-format
-msgid "failed to remove: %s"
-msgstr "无法删除：%s"
+msgid "failed to remove '%s'"
+msgstr "无法删除 '%s'"
 
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' 已�存在"
 
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "�能创建目录 '%s'"
 
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "准备 %s （标识符 %s）"
 
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "检出分支 <branch> �使已�被检出到其它工作区"
 
-#: builtin/worktree.c:319
+#: builtin/worktree.c:324
 msgid "create a new branch"
 msgstr "创建一个新分支"
 
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
 msgid "create or reset a branch"
 msgstr "创建或�置一个分支"
 
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
 msgid "detach HEAD at named commit"
 msgstr "HEAD 从指定的�交分离"
 
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "生�新的工作区"
+
+#: builtin/worktree.c:336
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b�-B 和 --detach 是互斥的"
 
@@ -11285,7 +11727,7 @@ msgstr "将 <�缀> �目录内容写到一个树对象"
 msgid "only useful for debugging"
 msgstr "�对调试有用"
 
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "调试信�输出到标准错误"
 
@@ -11299,7 +11741,7 @@ msgstr ""
 "查看 'git help <命令>' 或 'git help <概念>' 以获�给定�命令或概念的\n"
 "帮助。"
 
-#: http.c:321
+#: http.c:322
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "�支�公钥文件�定，因为 cURL < 7.44.0"
 
@@ -11427,7 +11869,7 @@ msgstr "更加安�"
 msgid "use <n> digits to display SHA-1s"
 msgstr "用 <n> �数字显示 SHA-1 哈希值"
 
-#: rerere.h:38
+#: rerere.h:40
 msgid "update the index with reused conflict resolution if possible"
 msgstr "如果�能，�用冲�解决更新索引"
 
@@ -11638,16 +12080,16 @@ msgstr ""
 "如果您想跳过此补�，则执行 \"git rebase --skip\"。\n"
 "���原分支并�止�基，执行 \"git rebase --abort\"。"
 
-#: git-rebase.sh:165
+#: git-rebase.sh:168
 msgid "Applied autostash."
 msgstr "�功应用 autostash。"
 
-#: git-rebase.sh:168
+#: git-rebase.sh:171
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "无法�存 $stash_sha1"
 
-#: git-rebase.sh:169
+#: git-rebase.sh:172
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 "Your changes are safe in the stash.\n"
@@ -11657,31 +12099,27 @@ msgstr ""
 "您的修改安全地�存在 stash 中。\n"
 "您�以在任何时候�行 \"git stash pop\" 或 \"git stash drop\"。\n"
 
-#: git-rebase.sh:208
+#: git-rebase.sh:211
 msgid "The pre-rebase hook refused to rebase."
 msgstr "钩� pre-rebase 拒��基�作。"
 
-#: git-rebase.sh:213
+#: git-rebase.sh:216
 msgid "It looks like git-am is in progress. Cannot rebase."
 msgstr "似乎正处于在 git-am 的执行过程中。无法�基。"
 
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "选项 --exec 必须和选项 --interactive �时使用"
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
 msgid "No rebase in progress?"
 msgstr "没有正在进行的�基？"
 
-#: git-rebase.sh:370
+#: git-rebase.sh:368
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "动作 --edit-todo �能用在交互��基过程中。"
 
-#: git-rebase.sh:377
+#: git-rebase.sh:375
 msgid "Cannot read HEAD"
 msgstr "�能读� HEAD"
 
-#: git-rebase.sh:380
+#: git-rebase.sh:378
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -11689,12 +12127,12 @@ msgstr ""
 "您必须编辑所有的�并冲�，然�通过 git add\n"
 "命令将它们标记为已解决"
 
-#: git-rebase.sh:398
+#: git-rebase.sh:396
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "无法移回 $head_name"
 
-#: git-rebase.sh:417
+#: git-rebase.sh:415
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -11713,64 +12151,64 @@ msgstr ""
 "\t$cmd_clear_stale_rebase\n"
 "然���新执行�基�作。 为��丢失��数�，我已��止当��作。"
 
-#: git-rebase.sh:468
+#: git-rebase.sh:466
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "无效的上游 $upstream_name"
 
-#: git-rebase.sh:492
+#: git-rebase.sh:490
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: 有一个以上的�并基准"
 
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: 没有�并基准"
 
-#: git-rebase.sh:504
+#: git-rebase.sh:502
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "没有指�一个有效的�交：$onto_name"
 
-#: git-rebase.sh:527
+#: git-rebase.sh:525
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "严�错误：无此分支：$branch_name"
 
-#: git-rebase.sh:560
+#: git-rebase.sh:558
 msgid "Cannot autostash"
 msgstr "无法 autostash"
 
-#: git-rebase.sh:565
+#: git-rebase.sh:563
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "创建了 autostash: $stash_abbrev"
 
-#: git-rebase.sh:569
+#: git-rebase.sh:567
 msgid "Please commit or stash them."
 msgstr "请�交或为它们�存进度。"
 
-#: git-rebase.sh:589
+#: git-rebase.sh:587
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "当�分支 $branch_name 是最新的。"
 
-#: git-rebase.sh:593
+#: git-rebase.sh:591
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "当�分支 $branch_name 是最新的，强制�基。"
 
-#: git-rebase.sh:604
+#: git-rebase.sh:602
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "�更从 $mb 到 $onto："
 
-#: git-rebase.sh:613
+#: git-rebase.sh:611
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr "首先，回退分支以便在上��放您的工作..."
 
-#: git-rebase.sh:623
+#: git-rebase.sh:621
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "快进 $branch_name 至 $onto_name。"
@@ -11914,26 +12352,21 @@ msgstr "未指定分支�"
 msgid "(To restore them type \"git stash apply\")"
 msgstr "（为��数�输入 \"git stash apply\"）"
 
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "无法从 url '$remoteurl' 剥离一个组件"
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr "�能在工作区的顶级目录中使用相对路径"
 
-#: git-submodule.sh:291
+#: git-submodule.sh:229
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "仓库 URL：'$repo' 必须是�对路径或以 ./|../ 起始"
 
-#: git-submodule.sh:308
+#: git-submodule.sh:246
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path' 已�存在于索引中"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:250
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
@@ -11944,428 +12377,220 @@ msgstr ""
 "$sm_path\n"
 "如果您确实想添加它，使用 -f �数。"
 
-#: git-submodule.sh:330
+#: git-submodule.sh:268
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "添加�于 '$sm_path' 的现存仓库到索引"
 
-#: git-submodule.sh:332
+#: git-submodule.sh:270
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' 已存在且�是一个有效的 git 仓库"
 
-#: git-submodule.sh:340
+#: git-submodule.sh:278
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr "本地�现 '$sm_name' 的一个 git 目录，与其对应的远程仓库："
 
-#: git-submodule.sh:342
+#: git-submodule.sh:280
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from"
 msgstr "如果您想�用此本地 git 目录而�是�新克隆自"
 
-#: git-submodule.sh:344
+#: git-submodule.sh:282
 #, sh-format
 msgid ""
 "use the '--force' option. If the local git directory is not the correct repo"
 msgstr "使用 '--force' �数。如果本地 git 目录�是正确的仓库"
 
-#: git-submodule.sh:345
+#: git-submodule.sh:283
 #, sh-format
 msgid ""
 "or you are unsure what this means choose another name with the '--name' "
 "option."
 msgstr "或者您�确定其中�义使用 '--name' �数选择�外一个�称。"
 
-#: git-submodule.sh:347
+#: git-submodule.sh:285
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "激活本地 git 目录到�模组 '$sm_name'。"
 
-#: git-submodule.sh:359
+#: git-submodule.sh:297
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "�能检出�模组 '$sm_path'"
 
-#: git-submodule.sh:364
+#: git-submodule.sh:302
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "无法添加�模组 '$sm_path'"
 
-#: git-submodule.sh:373
+#: git-submodule.sh:311
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "无法注册�模组 '$sm_path'"
 
-#: git-submodule.sh:417
+#: git-submodule.sh:355
 #, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "正在进入 '$prefix$displaypath'"
+msgid "Entering '$displaypath'"
+msgstr "正在进入 '$displaypath'"
 
-#: git-submodule.sh:437
+#: git-submodule.sh:375
 #, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
-msgstr "�止于 '$prefix$displaypath'，脚本返回�零值。"
+msgid "Stopping at '$displaypath'; script returned non-zero status."
+msgstr "�止于 '$displaypath'；脚本返回�零值。"
 
-#: git-submodule.sh:483
+#: git-submodule.sh:448
 #, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr "在 .gitmodules 中未找到�模组路径 '$displaypath' 的 url"
+msgid "pathspec and --all are incompatible"
+msgstr "pathspec 和 --all �兼容"
 
-#: git-submodule.sh:492
+#: git-submodule.sh:453
 #, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr "无法为�模组路径 '$displaypath' 注册 url"
-
-#: git-submodule.sh:494
-#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr "�模组 '$name' ($url) 未对路径 '$displaypath' 注册"
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "如果您确实想�对所有�模组执行�消�始化，请使用 '--all'"
 
-#: git-submodule.sh:511
-#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr "无法为�模组路径 '$displaypath' 注册更新模�"
-
-#: git-submodule.sh:549
-#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr "使用 '.' 如果您真的想�对所有�模组�消�始化"
-
-#: git-submodule.sh:566
+#: git-submodule.sh:470
 #, sh-format
 msgid "Submodule work tree '$displaypath' contains a .git directory"
 msgstr "�模组工作区 '$displaypath' 包�一个 .git 目录"
 
-#: git-submodule.sh:567
+#: git-submodule.sh:471
 #, sh-format
 msgid ""
 "(use 'rm -rf' if you really want to remove it including all of its history)"
 msgstr "（使用 'rm -rf' 命令如果您真的想删除它�其全部历�）"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:477
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
 "discard them"
 msgstr "�模组工作区 '$displaypath' 包�本地修改；使用 '-f' 丢弃它们"
 
-#: git-submodule.sh:576
+#: git-submodule.sh:480
 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr "已清除目录 '$displaypath'"
 
-#: git-submodule.sh:577
+#: git-submodule.sh:481
 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr "无法移除�模组工作区 '$displaypath'"
 
-#: git-submodule.sh:580
+#: git-submodule.sh:484
 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr "�能创建空的�模组目录 '$displaypath'"
 
-#: git-submodule.sh:589
+#: git-submodule.sh:493
 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr "�模组 '$name' ($url) 未对路径 '$displaypath' 注册"
 
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"�模组路径 '$displaypath' 没有�始化\n"
-"也许您想用 'update --init'？"
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "无法在�模组路径 '$displaypath' 中找到当�版本"
 
-#: git-submodule.sh:745
+#: git-submodule.sh:644
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "无法在�模组路径 '$sm_path' 中获�"
 
-#: git-submodule.sh:768
+#: git-submodule.sh:667
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "无法在�模组路径 '$displaypath' 中获�"
 
-#: git-submodule.sh:788
+#: git-submodule.sh:680
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "无法在�模组路径 '$displaypath' 中检出 '$sha1'"
 
-#: git-submodule.sh:789
+#: git-submodule.sh:681
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "�模组路径 '$displaypath'：检出 '$sha1'"
 
-#: git-submodule.sh:793
+#: git-submodule.sh:685
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "无法在�模组路径 '$displaypath' 中�基 '$sha1'"
 
-#: git-submodule.sh:794
+#: git-submodule.sh:686
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "�模组路径 '$displaypath'：�基至 '$sha1'"
 
-#: git-submodule.sh:799
+#: git-submodule.sh:691
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "无法�并 '$sha1' 到�模组路径 '$displaypath' 中"
 
-#: git-submodule.sh:800
+#: git-submodule.sh:692
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "�模组路径 '$displaypath'：已�并入 '$sha1'"
 
-#: git-submodule.sh:805
+#: git-submodule.sh:697
 #, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
-msgstr "在�模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr "在�模组 '$displaypath' 中执行 '$command $sha1' 失败"
 
-#: git-submodule.sh:806
+#: git-submodule.sh:698
 #, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "�模组路径 '$prefix$sm_path': '$command $sha1'"
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "�模组 '$displaypath'：'$command $sha1'"
 
-#: git-submodule.sh:836
+#: git-submodule.sh:729
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "无法递归进�模组路径 '$displaypath'"
 
-#: git-submodule.sh:944
+#: git-submodule.sh:837
 msgid "The --cached option cannot be used with the --files option"
 msgstr "选项 --cached �能和选项 --files �时使用"
 
-#: git-submodule.sh:996
+#: git-submodule.sh:889
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "�外的模� $mod_dst"
 
 #  译者：注����导空格
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  警告：$display_name 未包��交 $sha1_src"
 
 #  译者：注����导空格
-#: git-submodule.sh:1019
+#: git-submodule.sh:912
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  警告：$display_name 未包��交 $sha1_dst"
 
 #  译者：注����导空格
-#: git-submodule.sh:1022
+#: git-submodule.sh:915
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr "  警告：$display_name 未包��交 $sha1_src 和 $sha1_dst"
 
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
 msgid "blob"
 msgstr "数�对象"
 
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "无法递归进�模组路径 '$sm_path'"
 
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "为 '$displaypath' �步�模组 url"
 
-#~ msgid "Forward-port local commits to the updated upstream head"
-#~ msgstr "本地�交转移至更新�的上游分支中"
-
-#~ msgid "unable to parse format"
-#~ msgstr "�能解�格�"
-
-#~ msgid "improper format entered align:%s"
-#~ msgstr "输入了�正确的格� align:%s"
-
-#~ msgid "Could not set core.worktree in %s"
-#~ msgstr "�能在 %s 中设置 core.worktree"
-
-#  译者：字符串首行行首�添加“warning: �字串，故此首行�较其余行短
-#~ msgid ""
-#~ "push.default is unset; its implicit value has changed in\n"
-#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
-#~ "and maintain the traditional behavior, use:\n"
-#~ "\n"
-#~ "  git config --global push.default matching\n"
-#~ "\n"
-#~ "To squelch this message and adopt the new behavior now, use:\n"
-#~ "\n"
-#~ "  git config --global push.default simple\n"
-#~ "\n"
-#~ "When push.default is set to 'matching', git will push local branches\n"
-#~ "to the remote branches that already exist with the same name.\n"
-#~ "\n"
-#~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
-#~ "behavior, which only pushes the current branch to the corresponding\n"
-#~ "remote branch that 'git pull' uses to update the current branch.\n"
-#~ "\n"
-#~ "See 'git help config' and search for 'push.default' for further "
-#~ "information.\n"
-#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
-#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
-#~ msgstr ""
-#~ "push.default 尚未设置，它的默认值在 Git 2.0 已从 'matching'\n"
-#~ "�更为 'simple'。若���显示本信�并��传统习惯，进行如下设置：\n"
-#~ "\n"
-#~ "  git config --global push.default matching\n"
-#~ "\n"
-#~ "若���显示本信�并从现在开始采用新的使用习惯，设置：\n"
-#~ "\n"
-#~ "  git config --global push.default simple\n"
-#~ "\n"
-#~ "当 push.default 设置为 'matching' �，git 将推�和远程��的所有\n"
-#~ "本地分支。\n"
-#~ "\n"
-#~ "从 Git 2.0 开始，Git 默认采用更为�守的 'simple' 模�，�推�当�\n"
-#~ "分支到远程关�的��分支，� 'git push' 推�当�分支。\n"
-#~ "\n"
-#~ "�� 'git help config' 并查找 'push.default' 以获�更多信�。\n"
-#~ "（'simple' 模�由 Git 1.7.11 版本引入。如果您有时�使用�版本的 Git，\n"
-#~ "为��兼容，请用 'current' 代替 'simple'）"
-
-#~ msgid "Could not append '%s'"
-#~ msgstr "�能追加 '%s'"
-
-#~ msgid "Could not set '%s'"
-#~ msgstr "�能设置 '%s'"
-
-#  译者：�选值，�能翻译
-#~ msgid "check|on-demand|no"
-#~ msgstr "check|on-demand|no"
-
-#~ msgid "Missing author: %s"
-#~ msgstr "缺少作者：%s"
-
-#~ msgid "Testing "
-#~ msgstr "正在测试 "
-
-#~ msgid "unable to look up current user in the passwd file: %s"
-#~ msgstr "无法在�令文件中查询到当�用户：%s"
-
-#~ msgid "no such user"
-#~ msgstr "无此用户"
-
-#~ msgid "show usage"
-#~ msgstr "显示用法"
-
-#~ msgid "branch '%s' does not point at a commit"
-#~ msgstr "分支 '%s' 未指�一个�交"
-
-#~ msgid "object '%s' does not point to a commit"
-#~ msgstr "对象 '%s' 没有指�一个�交"
-
-#~ msgid "print only merged branches"
-#~ msgstr "�打��并的分支"
-
-#~ msgid "--dissociate given, but there is no --reference"
-#~ msgstr "�供了�数 --dissociate，但未�供 --reference"
-
-#~ msgid "insanely long template name %s"
-#~ msgstr "太长的模版� %s"
-
-#~ msgid "insanely long symlink %s"
-#~ msgstr "太长的符�链接 %s"
-
-#~ msgid "insanely long template path %s"
-#~ msgstr "太长的模版路径 %s"
-
-#~ msgid "insane git directory %s"
-#~ msgstr "�正常的 git 目录 %s"
-
-#~ msgid "unsupported sort specification '%s'"
-#~ msgstr "�支�的排�规格 '%s'"
-
-#~ msgid "unsupported sort specification '%s' in variable '%s'"
-#~ msgstr "�支��� '%2$s' 的排�规格 '%1$s'"
-
-#~ msgid "switch 'points-at' requires an object"
-#~ msgstr "开关 'points-at' 需�一个对象"
-
-#~ msgid "sort tags"
-#~ msgstr "排�标签"
-
-#~ msgid "--sort and -n are incompatible"
-#~ msgstr "--sort 和 -n �兼容"
-
-#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-#~ msgstr "Gitdir '$a' 在�模组路径 '$b' 之下或相�"
-
-#~ msgid "false|true|preserve"
-#~ msgstr "false|true|preserve"
-
-#~ msgid "BUG: reopen a lockfile that is still open"
-#~ msgstr "BUG: �新打开一个�打开�的�文件"
-
-#~ msgid "BUG: reopen a lockfile that has been committed"
-#~ msgstr "BUG: �新打开一个已�交的�文件"
-
-#~ msgid "option %s does not accept negative form"
-#~ msgstr "选项 %s �接��定格�"
-
-#~ msgid "unable to parse value '%s' for option %s"
-#~ msgstr "�能解�选项 %1$s 的值 '%2$s'"
-
-#~ msgid "-b and -B are mutually exclusive"
-#~ msgstr "-b 和 -B 互斥"
-
-#~ msgid "You need to set your committer info first"
-#~ msgstr "您需�先设置你的�交者信�"
-
-#~ msgid ""
-#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
-#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
-#~ "To restore the original branch and stop patching, run \"$cmdline --abort"
-#~ "\"."
-#~ msgstr ""
-#~ "当您解决了此问题�，执行 \"$cmdline --continue\"。\n"
-#~ "如果您想跳过此补�，则执行 \"$cmdline --skip\"。\n"
-#~ "���原分支并�止打补�，执行 \"$cmdline --abort\"。"
-
-#~ msgid "Patch format $patch_format is not supported."
-#~ msgstr "�支� $patch_format 补�格�。"
-
-#~ msgid "Please make up your mind. --skip or --abort?"
-#~ msgstr "请下决心。--skip 或是 --abort ？"
-
-#~ msgid ""
-#~ "Patch is empty.  Was it split wrong?\n"
-#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
-#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
-#~ msgstr ""
-#~ "补�为空。是�是切分错误？\n"
-#~ "如果您想�跳过这个补�，执行 \"$cmdline --skip\"。\n"
-#~ "���原分支并�止打补�，执行 \"$cmdline --abort\"。"
-
-#~ msgid "Patch does not have a valid e-mail address."
-#~ msgstr "补�中没有一个有效的邮件地�。"
-
-#~ msgid "Applying: $FIRSTLINE"
-#~ msgstr "正应用：$FIRSTLINE"
-
-#~ msgid "Patch failed at $msgnum $FIRSTLINE"
-#~ msgstr "补�失败于 $msgnum $FIRSTLINE"
-
-#~ msgid ""
-#~ "Pull is not possible because you have unmerged files.\n"
-#~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
-#~ "as appropriate to mark resolution and make a commit."
-#~ msgstr ""
-#~ "Pull ��用，因为您尚有未�并的文件。请先在工作区改正文件，\n"
-#~ "然�酌情使用 'git add/rm <文件>' 标记解决方案，���交。"
-
-#~ msgid "Pull is not possible because you have unmerged files."
-#~ msgstr "Pull ��用，因为您尚有未�并的文件。"
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "详� git-${cmd}(1)。"
diff --git a/pretty.c b/pretty.c
index 92b2870a7e..9609afb510 100644
--- a/pretty.c
+++ b/pretty.c
@@ -16,6 +16,7 @@ static struct cmt_fmt_map {
 	const char *name;
 	enum cmit_fmt format;
 	int is_tformat;
+	int expand_tabs_in_log;
 	int is_alias;
 	const char *user_format;
 } *commit_formats;
@@ -87,13 +88,14 @@ static int git_pretty_formats_config(const char *var, const char *value, void *c
 static void setup_commit_formats(void)
 {
 	struct cmt_fmt_map builtin_formats[] = {
-		{ "raw",	CMIT_FMT_RAW,		0 },
-		{ "medium",	CMIT_FMT_MEDIUM,	0 },
-		{ "short",	CMIT_FMT_SHORT,		0 },
-		{ "email",	CMIT_FMT_EMAIL,		0 },
-		{ "fuller",	CMIT_FMT_FULLER,	0 },
-		{ "full",	CMIT_FMT_FULL,		0 },
-		{ "oneline",	CMIT_FMT_ONELINE,	1 }
+		{ "raw",	CMIT_FMT_RAW,		0,	0 },
+		{ "medium",	CMIT_FMT_MEDIUM,	0,	8 },
+		{ "short",	CMIT_FMT_SHORT,		0,	0 },
+		{ "email",	CMIT_FMT_EMAIL,		0,	0 },
+		{ "mboxrd",	CMIT_FMT_MBOXRD,	0,	0 },
+		{ "fuller",	CMIT_FMT_FULLER,	0,	8 },
+		{ "full",	CMIT_FMT_FULL,		0,	8 },
+		{ "oneline",	CMIT_FMT_ONELINE,	1,	0 }
 	};
 	commit_formats_len = ARRAY_SIZE(builtin_formats);
 	builtin_formats_len = commit_formats_len;
@@ -172,6 +174,7 @@ void get_commit_format(const char *arg, struct rev_info *rev)
 
 	rev->commit_format = commit_format->format;
 	rev->use_terminator = commit_format->is_tformat;
+	rev->expand_tabs_in_log_default = commit_format->expand_tabs_in_log;
 	if (commit_format->format == CMIT_FMT_USERFORMAT) {
 		save_user_format(rev, commit_format->user_format,
 				 commit_format->is_tformat);
@@ -442,7 +445,7 @@ void pp_user_info(struct pretty_print_context *pp,
 	if (pp->mailmap)
 		map_user(pp->mailmap, &mailbuf, &maillen, &namebuf, &namelen);
 
-	if (pp->fmt == CMIT_FMT_EMAIL) {
+	if (cmit_fmt_is_mail(pp->fmt)) {
 		if (pp->from_ident && ident_cmp(pp->from_ident, &ident)) {
 			struct strbuf buf = STRBUF_INIT;
 
@@ -492,6 +495,7 @@ void pp_user_info(struct pretty_print_context *pp,
 			    show_ident_date(&ident, &pp->date_mode));
 		break;
 	case CMIT_FMT_EMAIL:
+	case CMIT_FMT_MBOXRD:
 		strbuf_addf(sb, "Date: %s\n",
 			    show_ident_date(&ident, DATE_MODE(RFC2822)));
 		break;
@@ -505,7 +509,7 @@ void pp_user_info(struct pretty_print_context *pp,
 	}
 }
 
-static int is_empty_line(const char *line, int *len_p)
+static int is_blank_line(const char *line, int *len_p)
 {
 	int len = *len_p;
 	while (len && isspace(line[len - 1]))
@@ -514,14 +518,14 @@ static int is_empty_line(const char *line, int *len_p)
 	return !len;
 }
 
-static const char *skip_empty_lines(const char *msg)
+const char *skip_blank_lines(const char *msg)
 {
 	for (;;) {
 		int linelen = get_one_line(msg);
 		int ll = linelen;
 		if (!linelen)
 			break;
-		if (!is_empty_line(msg, &ll))
+		if (!is_blank_line(msg, &ll))
 			break;
 		msg += linelen;
 	}
@@ -533,7 +537,7 @@ static void add_merge_info(const struct pretty_print_context *pp,
 {
 	struct commit_list *parent = commit->parents;
 
-	if ((pp->fmt == CMIT_FMT_ONELINE) || (pp->fmt == CMIT_FMT_EMAIL) ||
+	if ((pp->fmt == CMIT_FMT_ONELINE) || (cmit_fmt_is_mail(pp->fmt)) ||
 	    !parent || !parent->next)
 		return;
 
@@ -873,7 +877,7 @@ const char *format_subject(struct strbuf *sb, const char *msg,
 		int linelen = get_one_line(line);
 
 		msg += linelen;
-		if (!linelen || is_empty_line(line, &linelen))
+		if (!linelen || is_blank_line(line, &linelen))
 			break;
 
 		if (!sb)
@@ -892,11 +896,11 @@ static void parse_commit_message(struct format_commit_context *c)
 	const char *msg = c->message + c->message_off;
 	const char *start = c->message;
 
-	msg = skip_empty_lines(msg);
+	msg = skip_blank_lines(msg);
 	c->subject_off = msg - start;
 
 	msg = format_subject(NULL, msg, NULL);
-	msg = skip_empty_lines(msg);
+	msg = skip_blank_lines(msg);
 	c->body_off = msg - start;
 
 	c->commit_message_parsed = 1;
@@ -1020,9 +1024,15 @@ static size_t parse_padding_placeholder(struct strbuf *sb,
 		int width;
 		if (!end || end == start)
 			return 0;
-		width = strtoul(start, &next, 10);
+		width = strtol(start, &next, 10);
 		if (next == start || width == 0)
 			return 0;
+		if (width < 0) {
+			if (to_column)
+				width += term_columns();
+			if (width < 0)
+				return 0;
+		}
 		c->padding = to_column ? -width : width;
 		c->flush_type = flush_type;
 
@@ -1061,7 +1071,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 	switch (placeholder[0]) {
 	case 'C':
 		if (starts_with(placeholder + 1, "(auto)")) {
-			c->auto_color = 1;
+			c->auto_color = want_color(c->pretty_ctx->color);
 			return 7; /* consumed 7 bytes, "C(auto)" */
 		} else {
 			int ret = parse_color(sb, placeholder, c);
@@ -1133,8 +1143,8 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 			strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_RESET));
 			return 1;
 		}
-		strbuf_addstr(sb, find_unique_abbrev(commit->object.oid.hash,
-						     c->pretty_ctx->abbrev));
+		strbuf_add_unique_abbrev(sb, commit->object.oid.hash,
+					 c->pretty_ctx->abbrev);
 		strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_RESET));
 		c->abbrev_commit_hash.len = sb->len - c->abbrev_commit_hash.off;
 		return 1;
@@ -1144,8 +1154,8 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 	case 't':		/* abbreviated tree hash */
 		if (add_again(sb, &c->abbrev_tree_hash))
 			return 1;
-		strbuf_addstr(sb, find_unique_abbrev(commit->tree->object.oid.hash,
-						     c->pretty_ctx->abbrev));
+		strbuf_add_unique_abbrev(sb, commit->tree->object.oid.hash,
+					 c->pretty_ctx->abbrev);
 		c->abbrev_tree_hash.len = sb->len - c->abbrev_tree_hash.off;
 		return 1;
 	case 'P':		/* parent hashes */
@@ -1161,9 +1171,8 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 		for (p = commit->parents; p; p = p->next) {
 			if (p != commit->parents)
 				strbuf_addch(sb, ' ');
-			strbuf_addstr(sb, find_unique_abbrev(
-					p->item->object.oid.hash,
-					c->pretty_ctx->abbrev));
+			strbuf_add_unique_abbrev(sb, p->item->object.oid.hash,
+						 c->pretty_ctx->abbrev);
 		}
 		c->abbrev_parent_hashes.len = sb->len -
 		                              c->abbrev_parent_hashes.off;
@@ -1297,6 +1306,7 @@ static size_t format_and_pad_commit(struct strbuf *sb, /* in UTF-8 */
 		if (!start)
 			start = sb->buf;
 		occupied = utf8_strnwidth(start, -1, 1);
+		occupied += c->pretty_ctx->graph_width;
 		padding = (-padding) - occupied;
 	}
 	while (1) {
@@ -1612,7 +1622,7 @@ void pp_title_line(struct pretty_print_context *pp,
 	if (pp->after_subject) {
 		strbuf_addstr(sb, pp->after_subject);
 	}
-	if (pp->fmt == CMIT_FMT_EMAIL) {
+	if (cmit_fmt_is_mail(pp->fmt)) {
 		strbuf_addch(sb, '\n');
 	}
 
@@ -1629,6 +1639,82 @@ void pp_title_line(struct pretty_print_context *pp,
 	strbuf_release(&title);
 }
 
+static int pp_utf8_width(const char *start, const char *end)
+{
+	int width = 0;
+	size_t remain = end - start;
+
+	while (remain) {
+		int n = utf8_width(&start, &remain);
+		if (n < 0 || !start)
+			return -1;
+		width += n;
+	}
+	return width;
+}
+
+static void strbuf_add_tabexpand(struct strbuf *sb, int tabwidth,
+				 const char *line, int linelen)
+{
+	const char *tab;
+
+	while ((tab = memchr(line, '\t', linelen)) != NULL) {
+		int width = pp_utf8_width(line, tab);
+
+		/*
+		 * If it wasn't well-formed utf8, or it
+		 * had characters with badly defined
+		 * width (control characters etc), just
+		 * give up on trying to align things.
+		 */
+		if (width < 0)
+			break;
+
+		/* Output the data .. */
+		strbuf_add(sb, line, tab - line);
+
+		/* .. and the de-tabified tab */
+		strbuf_addchars(sb, ' ', tabwidth - (width % tabwidth));
+
+		/* Skip over the printed part .. */
+		linelen -= tab + 1 - line;
+		line = tab + 1;
+	}
+
+	/*
+	 * Print out everything after the last tab without
+	 * worrying about width - there's nothing more to
+	 * align.
+	 */
+	strbuf_add(sb, line, linelen);
+}
+
+/*
+ * pp_handle_indent() prints out the intendation, and
+ * the whole line (without the final newline), after
+ * de-tabifying.
+ */
+static void pp_handle_indent(struct pretty_print_context *pp,
+			     struct strbuf *sb, int indent,
+			     const char *line, int linelen)
+{
+	strbuf_addchars(sb, ' ', indent);
+	if (pp->expand_tabs_in_log)
+		strbuf_add_tabexpand(sb, pp->expand_tabs_in_log, line, linelen);
+	else
+		strbuf_add(sb, line, linelen);
+}
+
+static int is_mboxrd_from(const char *line, int len)
+{
+	/*
+	 * a line matching /^From $/ here would only have len == 4
+	 * at this point because is_empty_line would've trimmed all
+	 * trailing space
+	 */
+	return len > 4 && starts_with(line + strspn(line, ">"), "From ");
+}
+
 void pp_remainder(struct pretty_print_context *pp,
 		  const char **msg_p,
 		  struct strbuf *sb,
@@ -1643,7 +1729,7 @@ void pp_remainder(struct pretty_print_context *pp,
 		if (!linelen)
 			break;
 
-		if (is_empty_line(line, &linelen)) {
+		if (is_blank_line(line, &linelen)) {
 			if (first)
 				continue;
 			if (pp->fmt == CMIT_FMT_SHORT)
@@ -1653,8 +1739,17 @@ void pp_remainder(struct pretty_print_context *pp,
 
 		strbuf_grow(sb, linelen + indent + 20);
 		if (indent)
-			strbuf_addchars(sb, ' ', indent);
-		strbuf_add(sb, line, linelen);
+			pp_handle_indent(pp, sb, indent, line, linelen);
+		else if (pp->expand_tabs_in_log)
+			strbuf_add_tabexpand(sb, pp->expand_tabs_in_log,
+					     line, linelen);
+		else {
+			if (pp->fmt == CMIT_FMT_MBOXRD &&
+					is_mboxrd_from(line, linelen))
+				strbuf_addch(sb, '>');
+
+			strbuf_add(sb, line, linelen);
+		}
 		strbuf_addch(sb, '\n');
 	}
 }
@@ -1678,14 +1773,14 @@ void pretty_print_commit(struct pretty_print_context *pp,
 	encoding = get_log_output_encoding();
 	msg = reencoded = logmsg_reencode(commit, NULL, encoding);
 
-	if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
+	if (pp->fmt == CMIT_FMT_ONELINE || cmit_fmt_is_mail(pp->fmt))
 		indent = 0;
 
 	/*
 	 * We need to check and emit Content-type: to mark it
 	 * as 8-bit if we haven't done so.
 	 */
-	if (pp->fmt == CMIT_FMT_EMAIL && need_8bit_cte == 0) {
+	if (cmit_fmt_is_mail(pp->fmt) && need_8bit_cte == 0) {
 		int i, ch, in_body;
 
 		for (in_body = i = 0; (ch = msg[i]); i++) {
@@ -1710,10 +1805,10 @@ void pretty_print_commit(struct pretty_print_context *pp,
 	}
 
 	/* Skip excess blank lines at the beginning of body, if any... */
-	msg = skip_empty_lines(msg);
+	msg = skip_blank_lines(msg);
 
 	/* These formats treat the title line specially. */
-	if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
+	if (pp->fmt == CMIT_FMT_ONELINE || cmit_fmt_is_mail(pp->fmt))
 		pp_title_line(pp, &msg, sb, encoding, need_8bit_cte);
 
 	beginning_of_body = sb->len;
@@ -1730,7 +1825,7 @@ void pretty_print_commit(struct pretty_print_context *pp,
 	 * format.  Make sure we did not strip the blank line
 	 * between the header and the body.
 	 */
-	if (pp->fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
+	if (cmit_fmt_is_mail(pp->fmt) && sb->len <= beginning_of_body)
 		strbuf_addch(sb, '\n');
 
 	unuse_commit_buffer(commit, reencoded);
diff --git a/quote.c b/quote.c
index fe884d2452..53b98a5b84 100644
--- a/quote.c
+++ b/quote.c
@@ -43,6 +43,19 @@ void sq_quote_buf(struct strbuf *dst, const char *src)
 	free(to_free);
 }
 
+void sq_quotef(struct strbuf *dst, const char *fmt, ...)
+{
+	struct strbuf src = STRBUF_INIT;
+
+	va_list ap;
+	va_start(ap, fmt);
+	strbuf_vaddf(&src, fmt, ap);
+	va_end(ap);
+
+	sq_quote_buf(dst, src.buf);
+	strbuf_release(&src);
+}
+
 void sq_quote_argv(struct strbuf *dst, const char** argv, size_t maxlen)
 {
 	int i;
@@ -440,3 +453,40 @@ void tcl_quote_buf(struct strbuf *sb, const char *src)
 	}
 	strbuf_addch(sb, '"');
 }
+
+void basic_regex_quote_buf(struct strbuf *sb, const char *src)
+{
+	char c;
+
+	if (*src == '^') {
+		/* only beginning '^' is special and needs quoting */
+		strbuf_addch(sb, '\\');
+		strbuf_addch(sb, *src++);
+	}
+	if (*src == '*')
+		/* beginning '*' is not special, no quoting */
+		strbuf_addch(sb, *src++);
+
+	while ((c = *src++)) {
+		switch (c) {
+		case '[':
+		case '.':
+		case '\\':
+		case '*':
+			strbuf_addch(sb, '\\');
+			strbuf_addch(sb, c);
+			break;
+
+		case '$':
+			/* only the end '$' is special and needs quoting */
+			if (*src == '\0')
+				strbuf_addch(sb, '\\');
+			strbuf_addch(sb, c);
+			break;
+
+		default:
+			strbuf_addch(sb, c);
+			break;
+		}
+	}
+}
diff --git a/quote.h b/quote.h
index 99e04d34bf..66f5644aa2 100644
--- a/quote.h
+++ b/quote.h
@@ -25,10 +25,13 @@ struct strbuf;
  * sq_quote_buf() writes to an existing buffer of specified size; it
  * will return the number of characters that would have been written
  * excluding the final null regardless of the buffer size.
+ *
+ * sq_quotef() quotes the entire formatted string as a single result.
  */
 
 extern void sq_quote_buf(struct strbuf *, const char *src);
 extern void sq_quote_argv(struct strbuf *, const char **argv, size_t maxlen);
+extern void sq_quotef(struct strbuf *, const char *fmt, ...);
 
 /* This unwraps what sq_quote() produces in place, but returns
  * NULL if the input does not look like what sq_quote would have
@@ -67,5 +70,6 @@ extern char *quote_path_relative(const char *in, const char *prefix,
 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);
 
 #endif
diff --git a/reachable.c b/reachable.c
index ed35201896..d0199cace4 100644
--- a/reachable.c
+++ b/reachable.c
@@ -119,8 +119,7 @@ static int add_recent_loose(const unsigned char *sha1,
 		 */
 		if (errno == ENOENT)
 			return 0;
-		return error("unable to stat %s: %s",
-			     sha1_to_hex(sha1), strerror(errno));
+		return error_errno("unable to stat %s", sha1_to_hex(sha1));
 	}
 
 	add_recent_object(sha1, st.st_mtime, data);
diff --git a/read-cache.c b/read-cache.c
index d9fb78bc55..491e52d120 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -19,9 +19,6 @@
 #include "split-index.h"
 #include "utf8.h"
 
-static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
-					       unsigned int options);
-
 /* Mask for the name length in ce_flags in the on-disk index */
 
 #define CE_NAMEMASK  (0x0fff)
@@ -630,7 +627,7 @@ void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
 	hashcpy(ce->sha1, sha1);
 }
 
-int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
+int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags, int force_mode)
 {
 	int size, namelen, was_same;
 	mode_t st_mode = st->st_mode;
@@ -659,7 +656,9 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
 	else
 		ce->ce_flags |= CE_INTENT_TO_ADD;
 
-	if (trust_executable_bit && has_symlinks)
+	if (S_ISREG(st_mode) && force_mode)
+		ce->ce_mode = create_ce_mode(force_mode);
+	else if (trust_executable_bit && has_symlinks)
 		ce->ce_mode = create_ce_mode(st_mode);
 	else {
 		/* If there is an existing entry, pick the mode bits and type
@@ -720,12 +719,13 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
 	return 0;
 }
 
-int add_file_to_index(struct index_state *istate, const char *path, int flags)
+int add_file_to_index(struct index_state *istate, const char *path,
+	int flags, int force_mode)
 {
 	struct stat st;
 	if (lstat(path, &st))
 		die_errno("unable to stat '%s'", path);
-	return add_to_index(istate, path, &st, flags);
+	return add_to_index(istate, path, &st, flags, force_mode);
 }
 
 struct cache_entry *make_cache_entry(unsigned int mode,
@@ -1254,7 +1254,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 	return has_errors;
 }
 
-static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
+struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
 					       unsigned int options)
 {
 	return refresh_cache_ent(&the_index, ce, options, NULL, NULL);
diff --git a/reflog-walk.c b/reflog-walk.c
index 0ebd1da5ce..a246af2767 100644
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -241,6 +241,12 @@ void fake_reflog_parent(struct reflog_walk_info *info, struct commit *commit)
 		logobj = parse_object(reflog->osha1);
 	} while (commit_reflog->recno && (logobj && logobj->type != OBJ_COMMIT));
 
+	if (!logobj && commit_reflog->recno >= 0 && is_null_sha1(reflog->osha1)) {
+		/* a root commit, but there are still more entries to show */
+		reflog = &commit_reflog->reflogs->items[commit_reflog->recno];
+		logobj = parse_object(reflog->nsha1);
+	}
+
 	if (!logobj || logobj->type != OBJ_COMMIT) {
 		commit_info->commit = NULL;
 		commit->parents = NULL;
diff --git a/refs.c b/refs.c
index b0e6ece6f4..b4e7cac7b2 100644
--- a/refs.c
+++ b/refs.c
@@ -120,25 +120,33 @@ int check_refname_format(const char *refname, int flags)
 
 int refname_is_safe(const char *refname)
 {
-	if (starts_with(refname, "refs/")) {
+	const char *rest;
+
+	if (skip_prefix(refname, "refs/", &rest)) {
 		char *buf;
 		int result;
+		size_t restlen = strlen(rest);
+
+		/* rest must not be empty, or start or end with "/" */
+		if (!restlen || *rest == '/' || rest[restlen - 1] == '/')
+			return 0;
 
-		buf = xmallocz(strlen(refname));
 		/*
 		 * Does the refname try to escape refs/?
 		 * For example: refs/foo/../bar is safe but refs/foo/../../bar
 		 * is not.
 		 */
-		result = !normalize_path_copy(buf, refname + strlen("refs/"));
+		buf = xmallocz(restlen);
+		result = !normalize_path_copy(buf, rest) && !strcmp(buf, rest);
 		free(buf);
 		return result;
 	}
-	while (*refname) {
+
+	do {
 		if (!isupper(*refname) && *refname != '_')
 			return 0;
 		refname++;
-	}
+	} while (*refname);
 	return 1;
 }
 
@@ -496,7 +504,7 @@ static int write_pseudoref(const char *pseudoref, const unsigned char *sha1,
 	filename = git_path("%s", pseudoref);
 	fd = hold_lock_file_for_update(&lock, filename, LOCK_DIE_ON_ERROR);
 	if (fd < 0) {
-		strbuf_addf(err, "Could not open '%s' for writing: %s",
+		strbuf_addf(err, "could not open '%s' for writing: %s",
 			    filename, strerror(errno));
 		return -1;
 	}
@@ -507,14 +515,14 @@ static int write_pseudoref(const char *pseudoref, const unsigned char *sha1,
 		if (read_ref(pseudoref, actual_old_sha1))
 			die("could not read ref '%s'", pseudoref);
 		if (hashcmp(actual_old_sha1, old_sha1)) {
-			strbuf_addf(err, "Unexpected sha1 when writing %s", pseudoref);
+			strbuf_addf(err, "unexpected sha1 when writing '%s'", pseudoref);
 			rollback_lock_file(&lock);
 			goto done;
 		}
 	}
 
 	if (write_in_full(fd, buf.buf, buf.len) != buf.len) {
-		strbuf_addf(err, "Could not write to '%s'", filename);
+		strbuf_addf(err, "could not write to '%s'", filename);
 		rollback_lock_file(&lock);
 		goto done;
 	}
@@ -758,13 +766,33 @@ void ref_transaction_free(struct ref_transaction *transaction)
 	free(transaction);
 }
 
-static struct ref_update *add_update(struct ref_transaction *transaction,
-				     const char *refname)
+struct ref_update *ref_transaction_add_update(
+		struct ref_transaction *transaction,
+		const char *refname, unsigned int flags,
+		const unsigned char *new_sha1,
+		const unsigned char *old_sha1,
+		const char *msg)
 {
 	struct ref_update *update;
+
+	if (transaction->state != REF_TRANSACTION_OPEN)
+		die("BUG: update called for transaction that is not open");
+
+	if ((flags & REF_ISPRUNING) && !(flags & REF_NODEREF))
+		die("BUG: REF_ISPRUNING set without REF_NODEREF");
+
 	FLEX_ALLOC_STR(update, refname, refname);
 	ALLOC_GROW(transaction->updates, transaction->nr + 1, transaction->alloc);
 	transaction->updates[transaction->nr++] = update;
+
+	update->flags = flags;
+
+	if (flags & REF_HAVE_NEW)
+		hashcpy(update->new_sha1, new_sha1);
+	if (flags & REF_HAVE_OLD)
+		hashcpy(update->old_sha1, old_sha1);
+	if (msg)
+		update->msg = xstrdup(msg);
 	return update;
 }
 
@@ -775,32 +803,20 @@ int ref_transaction_update(struct ref_transaction *transaction,
 			   unsigned int flags, const char *msg,
 			   struct strbuf *err)
 {
-	struct ref_update *update;
-
 	assert(err);
 
-	if (transaction->state != REF_TRANSACTION_OPEN)
-		die("BUG: update called for transaction that is not open");
-
-	if (new_sha1 && !is_null_sha1(new_sha1) &&
-	    check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
-		strbuf_addf(err, "refusing to update ref with bad name %s",
+	if ((new_sha1 && !is_null_sha1(new_sha1)) ?
+	    check_refname_format(refname, REFNAME_ALLOW_ONELEVEL) :
+	    !refname_is_safe(refname)) {
+		strbuf_addf(err, "refusing to update ref with bad name '%s'",
 			    refname);
 		return -1;
 	}
 
-	update = add_update(transaction, refname);
-	if (new_sha1) {
-		hashcpy(update->new_sha1, new_sha1);
-		flags |= REF_HAVE_NEW;
-	}
-	if (old_sha1) {
-		hashcpy(update->old_sha1, old_sha1);
-		flags |= REF_HAVE_OLD;
-	}
-	update->flags = flags;
-	if (msg)
-		update->msg = xstrdup(msg);
+	flags |= (new_sha1 ? REF_HAVE_NEW : 0) | (old_sha1 ? REF_HAVE_OLD : 0);
+
+	ref_transaction_add_update(transaction, refname, flags,
+				   new_sha1, old_sha1, msg);
 	return 0;
 }
 
@@ -906,7 +922,7 @@ char *shorten_unambiguous_ref(const char *refname, int strict)
 			/* -2 for strlen("%.*s") - strlen("%s"); +1 for NUL */
 			total_len += strlen(ref_rev_parse_rules[nr_rules]) - 2 + 1;
 
-		scanf_fmts = xmalloc(st_add(st_mult(nr_rules, sizeof(char *)), total_len));
+		scanf_fmts = xmalloc(st_add(st_mult(sizeof(char *), nr_rules), total_len));
 
 		offset = 0;
 		for (i = 0; i < nr_rules; i++) {
@@ -1080,3 +1096,172 @@ int rename_ref_available(const char *oldname, const char *newname)
 	strbuf_release(&err);
 	return ret;
 }
+
+int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+{
+	struct object_id oid;
+	int flag;
+
+	if (submodule) {
+		if (resolve_gitlink_ref(submodule, "HEAD", oid.hash) == 0)
+			return fn("HEAD", &oid, 0, cb_data);
+
+		return 0;
+	}
+
+	if (!read_ref_full("HEAD", RESOLVE_REF_READING, oid.hash, &flag))
+		return fn("HEAD", &oid, flag, cb_data);
+
+	return 0;
+}
+
+int head_ref(each_ref_fn fn, void *cb_data)
+{
+	return head_ref_submodule(NULL, fn, cb_data);
+}
+
+/*
+ * Call fn for each reference in the specified submodule for which the
+ * refname begins with prefix. If trim is non-zero, then trim that
+ * many characters off the beginning of each refname before passing
+ * the refname to fn. flags can be DO_FOR_EACH_INCLUDE_BROKEN to
+ * include broken references in the iteration. If fn ever returns a
+ * non-zero value, stop the iteration and return that value;
+ * otherwise, return 0.
+ */
+static int do_for_each_ref(const char *submodule, const char *prefix,
+			   each_ref_fn fn, int trim, int flags, void *cb_data)
+{
+	struct ref_iterator *iter;
+
+	iter = files_ref_iterator_begin(submodule, prefix, flags);
+	iter = prefix_ref_iterator_begin(iter, prefix, trim);
+
+	return do_for_each_ref_iterator(iter, fn, cb_data);
+}
+
+int for_each_ref(each_ref_fn fn, void *cb_data)
+{
+	return do_for_each_ref(NULL, "", fn, 0, 0, cb_data);
+}
+
+int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+{
+	return do_for_each_ref(submodule, "", fn, 0, 0, cb_data);
+}
+
+int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data)
+{
+	return do_for_each_ref(NULL, prefix, fn, strlen(prefix), 0, cb_data);
+}
+
+int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsigned int broken)
+{
+	unsigned int flag = 0;
+
+	if (broken)
+		flag = DO_FOR_EACH_INCLUDE_BROKEN;
+	return do_for_each_ref(NULL, prefix, fn, 0, flag, cb_data);
+}
+
+int for_each_ref_in_submodule(const char *submodule, const char *prefix,
+		each_ref_fn fn, void *cb_data)
+{
+	return do_for_each_ref(submodule, prefix, fn, strlen(prefix), 0, cb_data);
+}
+
+int for_each_replace_ref(each_ref_fn fn, void *cb_data)
+{
+	return do_for_each_ref(NULL, git_replace_ref_base, fn,
+			       strlen(git_replace_ref_base), 0, cb_data);
+}
+
+int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
+{
+	struct strbuf buf = STRBUF_INIT;
+	int ret;
+	strbuf_addf(&buf, "%srefs/", get_git_namespace());
+	ret = do_for_each_ref(NULL, buf.buf, fn, 0, 0, cb_data);
+	strbuf_release(&buf);
+	return ret;
+}
+
+int for_each_rawref(each_ref_fn fn, void *cb_data)
+{
+	return do_for_each_ref(NULL, "", fn, 0,
+			       DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
+}
+
+/* This function needs to return a meaningful errno on failure */
+const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
+			       unsigned char *sha1, int *flags)
+{
+	static struct strbuf sb_refname = STRBUF_INIT;
+	int unused_flags;
+	int symref_count;
+
+	if (!flags)
+		flags = &unused_flags;
+
+	*flags = 0;
+
+	if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
+		if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
+		    !refname_is_safe(refname)) {
+			errno = EINVAL;
+			return NULL;
+		}
+
+		/*
+		 * dwim_ref() uses REF_ISBROKEN to distinguish between
+		 * missing refs and refs that were present but invalid,
+		 * to complain about the latter to stderr.
+		 *
+		 * We don't know whether the ref exists, so don't set
+		 * REF_ISBROKEN yet.
+		 */
+		*flags |= REF_BAD_NAME;
+	}
+
+	for (symref_count = 0; symref_count < SYMREF_MAXDEPTH; symref_count++) {
+		unsigned int read_flags = 0;
+
+		if (read_raw_ref(refname, sha1, &sb_refname, &read_flags)) {
+			*flags |= read_flags;
+			if (errno != ENOENT || (resolve_flags & RESOLVE_REF_READING))
+				return NULL;
+			hashclr(sha1);
+			if (*flags & REF_BAD_NAME)
+				*flags |= REF_ISBROKEN;
+			return refname;
+		}
+
+		*flags |= read_flags;
+
+		if (!(read_flags & REF_ISSYMREF)) {
+			if (*flags & REF_BAD_NAME) {
+				hashclr(sha1);
+				*flags |= REF_ISBROKEN;
+			}
+			return refname;
+		}
+
+		refname = sb_refname.buf;
+		if (resolve_flags & RESOLVE_REF_NO_RECURSE) {
+			hashclr(sha1);
+			return refname;
+		}
+		if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
+			if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
+			    !refname_is_safe(refname)) {
+				errno = EINVAL;
+				return NULL;
+			}
+
+			*flags |= REF_ISBROKEN | REF_BAD_NAME;
+		}
+	}
+
+	errno = ELOOP;
+	return NULL;
+}
diff --git a/refs.h b/refs.h
index 9230d47142..1b02043758 100644
--- a/refs.h
+++ b/refs.h
@@ -52,19 +52,19 @@
 #define RESOLVE_REF_NO_RECURSE 0x02
 #define RESOLVE_REF_ALLOW_BAD_NAME 0x04
 
-extern const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
-				      unsigned char *sha1, int *flags);
+const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
+			       unsigned char *sha1, int *flags);
 
-extern char *resolve_refdup(const char *refname, int resolve_flags,
-			    unsigned char *sha1, int *flags);
+char *resolve_refdup(const char *refname, int resolve_flags,
+		     unsigned char *sha1, int *flags);
 
-extern int read_ref_full(const char *refname, int resolve_flags,
-			 unsigned char *sha1, int *flags);
-extern int read_ref(const char *refname, unsigned char *sha1);
+int read_ref_full(const char *refname, int resolve_flags,
+		  unsigned char *sha1, int *flags);
+int read_ref(const char *refname, unsigned char *sha1);
 
-extern int ref_exists(const char *refname);
+int ref_exists(const char *refname);
 
-extern int is_branch(const char *refname);
+int is_branch(const char *refname);
 
 /*
  * If refname is a non-symbolic reference that refers to a tag object,
@@ -74,24 +74,25 @@ extern int is_branch(const char *refname);
  * Symbolic references are considered unpeelable, even if they
  * ultimately resolve to a peelable tag.
  */
-extern int peel_ref(const char *refname, unsigned char *sha1);
+int peel_ref(const char *refname, unsigned char *sha1);
 
 /**
  * Resolve refname in the nested "gitlink" repository that is located
  * at path.  If the resolution is successful, return 0 and set sha1 to
  * the name of the object; otherwise, return a non-zero value.
  */
-extern int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *sha1);
+int resolve_gitlink_ref(const char *path, const char *refname,
+			unsigned char *sha1);
 
 /*
  * Return true iff abbrev_name is a possible abbreviation for
  * full_name according to the rules defined by ref_rev_parse_rules in
  * refs.c.
  */
-extern int refname_match(const char *abbrev_name, const char *full_name);
+int refname_match(const char *abbrev_name, const char *full_name);
 
-extern int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
-extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
+int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
+int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
 
 /*
  * A ref_transaction represents a collection of ref updates
@@ -140,7 +141,9 @@ extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
 struct ref_transaction;
 
 /*
- * Bit values set in the flags argument passed to each_ref_fn():
+ * Bit values set in the flags argument passed to each_ref_fn() and
+ * stored in ref_iterator::flags. Other bits are for internal use
+ * only:
  */
 
 /* Reference is a symbolic reference. */
@@ -182,38 +185,45 @@ typedef int each_ref_fn(const char *refname,
  * modifies the reference also returns a nonzero value to immediately
  * stop the iteration.
  */
-extern int head_ref(each_ref_fn fn, void *cb_data);
-extern int for_each_ref(each_ref_fn fn, void *cb_data);
-extern int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data);
-extern int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsigned int broken);
-extern int for_each_tag_ref(each_ref_fn fn, void *cb_data);
-extern int for_each_branch_ref(each_ref_fn fn, void *cb_data);
-extern int for_each_remote_ref(each_ref_fn fn, void *cb_data);
-extern int for_each_replace_ref(each_ref_fn fn, void *cb_data);
-extern int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data);
-extern int for_each_glob_ref_in(each_ref_fn fn, const char *pattern, const char *prefix, void *cb_data);
-
-extern int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
-extern int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
-extern int for_each_ref_in_submodule(const char *submodule, const char *prefix,
+int head_ref(each_ref_fn fn, void *cb_data);
+int for_each_ref(each_ref_fn fn, void *cb_data);
+int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data);
+int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
+			unsigned int broken);
+int for_each_tag_ref(each_ref_fn fn, void *cb_data);
+int for_each_branch_ref(each_ref_fn fn, void *cb_data);
+int for_each_remote_ref(each_ref_fn fn, void *cb_data);
+int for_each_replace_ref(each_ref_fn fn, void *cb_data);
+int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data);
+int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
+			 const char *prefix, void *cb_data);
+
+int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
+int for_each_ref_submodule(const char *submodule,
+			   each_ref_fn fn, void *cb_data);
+int for_each_ref_in_submodule(const char *submodule, const char *prefix,
 		each_ref_fn fn, void *cb_data);
-extern int for_each_tag_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
-extern int for_each_branch_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
-extern int for_each_remote_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
+int for_each_tag_ref_submodule(const char *submodule,
+			       each_ref_fn fn, void *cb_data);
+int for_each_branch_ref_submodule(const char *submodule,
+				  each_ref_fn fn, void *cb_data);
+int for_each_remote_ref_submodule(const char *submodule,
+				  each_ref_fn fn, void *cb_data);
 
-extern int head_ref_namespaced(each_ref_fn fn, void *cb_data);
-extern int for_each_namespaced_ref(each_ref_fn fn, void *cb_data);
+int head_ref_namespaced(each_ref_fn fn, void *cb_data);
+int for_each_namespaced_ref(each_ref_fn fn, void *cb_data);
 
 /* can be used to learn about broken ref and symref */
-extern int for_each_rawref(each_ref_fn fn, void *cb_data);
+int for_each_rawref(each_ref_fn fn, void *cb_data);
 
 static inline const char *has_glob_specials(const char *pattern)
 {
 	return strpbrk(pattern, "?*[");
 }
 
-extern void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname);
-extern void warn_dangling_symrefs(FILE *fp, const char *msg_fmt, const struct string_list *refnames);
+void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname);
+void warn_dangling_symrefs(FILE *fp, const char *msg_fmt,
+			   const struct string_list *refnames);
 
 /*
  * Flags for controlling behaviour of pack_refs()
@@ -245,13 +255,13 @@ int pack_refs(unsigned int flags);
 int safe_create_reflog(const char *refname, int force_create, struct strbuf *err);
 
 /** Reads log for the value of ref during at_time. **/
-extern int read_ref_at(const char *refname, unsigned int flags,
-		       unsigned long at_time, int cnt,
-		       unsigned char *sha1, char **msg,
-		       unsigned long *cutoff_time, int *cutoff_tz, int *cutoff_cnt);
+int read_ref_at(const char *refname, unsigned int flags,
+		unsigned long at_time, int cnt,
+		unsigned char *sha1, char **msg,
+		unsigned long *cutoff_time, int *cutoff_tz, int *cutoff_cnt);
 
 /** Check if a particular reflog exists */
-extern int reflog_exists(const char *refname);
+int reflog_exists(const char *refname);
 
 /*
  * Delete the specified reference. If old_sha1 is non-NULL, then
@@ -260,21 +270,26 @@ extern int reflog_exists(const char *refname);
  * exists, regardless of its old value. It is an error for old_sha1 to
  * be NULL_SHA1. flags is passed through to ref_transaction_delete().
  */
-extern int delete_ref(const char *refname, const unsigned char *old_sha1,
-		      unsigned int flags);
+int delete_ref(const char *refname, const unsigned char *old_sha1,
+	       unsigned int flags);
 
 /*
  * Delete the specified references. If there are any problems, emit
  * errors but attempt to keep going (i.e., the deletes are not done in
- * an all-or-nothing transaction).
+ * an all-or-nothing transaction). flags is passed through to
+ * ref_transaction_delete().
  */
-extern int delete_refs(struct string_list *refnames);
+int delete_refs(struct string_list *refnames, unsigned int flags);
 
 /** Delete a reflog */
-extern int delete_reflog(const char *refname);
+int delete_reflog(const char *refname);
 
 /* iterate over reflog entries */
-typedef int each_reflog_ent_fn(unsigned char *osha1, unsigned char *nsha1, const char *, unsigned long, int, const char *, void *);
+typedef int each_reflog_ent_fn(
+		unsigned char *old_sha1, unsigned char *new_sha1,
+		const char *committer, unsigned long timestamp,
+		int tz, const char *msg, void *cb_data);
+
 int for_each_reflog_ent(const char *refname, each_reflog_ent_fn fn, void *cb_data);
 int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void *cb_data);
 
@@ -282,7 +297,7 @@ int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void
  * Calls the specified function for each reflog file until it returns nonzero,
  * and returns the value
  */
-extern int for_each_reflog(each_ref_fn, void *);
+int for_each_reflog(each_ref_fn fn, void *cb_data);
 
 #define REFNAME_ALLOW_ONELEVEL 1
 #define REFNAME_REFSPEC_PATTERN 2
@@ -295,16 +310,16 @@ extern int for_each_reflog(each_ref_fn, void *);
  * allow a single "*" wildcard character in the refspec. No leading or
  * repeated slashes are accepted.
  */
-extern int check_refname_format(const char *refname, int flags);
+int check_refname_format(const char *refname, int flags);
 
-extern const char *prettify_refname(const char *refname);
+const char *prettify_refname(const char *refname);
 
-extern char *shorten_unambiguous_ref(const char *refname, int strict);
+char *shorten_unambiguous_ref(const char *refname, int strict);
 
 /** rename ref, return 0 on success **/
-extern int rename_ref(const char *oldref, const char *newref, const char *logmsg);
+int rename_ref(const char *oldref, const char *newref, const char *logmsg);
 
-extern int create_symref(const char *refname, const char *target, const char *logmsg);
+int create_symref(const char *refname, const char *target, const char *logmsg);
 
 /*
  * Update HEAD of the specified gitdir.
@@ -313,7 +328,7 @@ extern int create_symref(const char *refname, const char *target, const char *lo
  * $GIT_DIR points to.
  * Return 0 if successful, non-zero otherwise.
  * */
-extern int set_worktree_head_symref(const char *gitdir, const char *target);
+int set_worktree_head_symref(const char *gitdir, const char *target);
 
 enum action_on_err {
 	UPDATE_REFS_MSG_ON_ERR,
@@ -345,7 +360,7 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);
  *     msg -- a message describing the change (for the reflog).
  *
  *     err -- a strbuf for receiving a description of any error that
- *         might have occured.
+ *         might have occurred.
  *
  * The functions make internal copies of refname and msg, so the
  * caller retains ownership of these parameters.
@@ -463,7 +478,7 @@ int update_ref(const char *msg, const char *refname,
 	       const unsigned char *new_sha1, const unsigned char *old_sha1,
 	       unsigned int flags, enum action_on_err onerr);
 
-extern int parse_hide_refs_config(const char *var, const char *value, const char *);
+int parse_hide_refs_config(const char *var, const char *value, const char *);
 
 /*
  * Check whether a ref is hidden. If no namespace is set, both the first and
@@ -473,7 +488,7 @@ extern int parse_hide_refs_config(const char *var, const char *value, const char
  * the ref is outside that namespace, the first parameter is NULL. The second
  * parameter always points to the full ref name.
  */
-extern int ref_is_hidden(const char *, const char *);
+int ref_is_hidden(const char *, const char *);
 
 enum ref_type {
 	REF_TYPE_PER_WORKTREE,
@@ -522,11 +537,11 @@ typedef void reflog_expiry_cleanup_fn(void *cb_data);
  * enum expire_reflog_flags. The three function pointers are described
  * above. On success, return zero.
  */
-extern int reflog_expire(const char *refname, const unsigned char *sha1,
-			 unsigned int flags,
-			 reflog_expiry_prepare_fn prepare_fn,
-			 reflog_expiry_should_prune_fn should_prune_fn,
-			 reflog_expiry_cleanup_fn cleanup_fn,
-			 void *policy_cb_data);
+int reflog_expire(const char *refname, const unsigned char *sha1,
+		  unsigned int flags,
+		  reflog_expiry_prepare_fn prepare_fn,
+		  reflog_expiry_should_prune_fn should_prune_fn,
+		  reflog_expiry_cleanup_fn cleanup_fn,
+		  void *policy_cb_data);
 
 #endif /* REFS_H */
diff --git a/refs/files-backend.c b/refs/files-backend.c
index ea78ce9d90..12290d2496 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1,13 +1,14 @@
 #include "../cache.h"
 #include "../refs.h"
 #include "refs-internal.h"
+#include "../iterator.h"
+#include "../dir-iterator.h"
 #include "../lockfile.h"
 #include "../object.h"
 #include "../dir.h"
 
 struct ref_lock {
 	char *ref_name;
-	char *orig_ref_name;
 	struct lock_file *lk;
 	struct object_id old_oid;
 };
@@ -513,72 +514,37 @@ static void sort_ref_dir(struct ref_dir *dir)
 	dir->sorted = dir->nr = i;
 }
 
-/* Include broken references in a do_for_each_ref*() iteration: */
-#define DO_FOR_EACH_INCLUDE_BROKEN 0x01
-
 /*
- * Return true iff the reference described by entry can be resolved to
- * an object in the database.  Emit a warning if the referred-to
- * object does not exist.
+ * Return true if refname, which has the specified oid and flags, can
+ * be resolved to an object in the database. If the referred-to object
+ * does not exist, emit a warning and return false.
  */
-static int ref_resolves_to_object(struct ref_entry *entry)
+static int ref_resolves_to_object(const char *refname,
+				  const struct object_id *oid,
+				  unsigned int flags)
 {
-	if (entry->flag & REF_ISBROKEN)
+	if (flags & REF_ISBROKEN)
 		return 0;
-	if (!has_sha1_file(entry->u.value.oid.hash)) {
-		error("%s does not point to a valid object!", entry->name);
+	if (!has_sha1_file(oid->hash)) {
+		error("%s does not point to a valid object!", refname);
 		return 0;
 	}
 	return 1;
 }
 
 /*
- * current_ref is a performance hack: when iterating over references
- * using the for_each_ref*() functions, current_ref is set to the
- * current reference's entry before calling the callback function.  If
- * the callback function calls peel_ref(), then peel_ref() first
- * checks whether the reference to be peeled is the current reference
- * (it usually is) and if so, returns that reference's peeled version
- * if it is available.  This avoids a refname lookup in a common case.
- */
-static struct ref_entry *current_ref;
-
-typedef int each_ref_entry_fn(struct ref_entry *entry, void *cb_data);
-
-struct ref_entry_cb {
-	const char *base;
-	int trim;
-	int flags;
-	each_ref_fn *fn;
-	void *cb_data;
-};
-
-/*
- * Handle one reference in a do_for_each_ref*()-style iteration,
- * calling an each_ref_fn for each entry.
+ * Return true if the reference described by entry can be resolved to
+ * an object in the database; otherwise, emit a warning and return
+ * false.
  */
-static int do_one_ref(struct ref_entry *entry, void *cb_data)
+static int entry_resolves_to_object(struct ref_entry *entry)
 {
-	struct ref_entry_cb *data = cb_data;
-	struct ref_entry *old_current_ref;
-	int retval;
-
-	if (!starts_with(entry->name, data->base))
-		return 0;
-
-	if (!(data->flags & DO_FOR_EACH_INCLUDE_BROKEN) &&
-	      !ref_resolves_to_object(entry))
-		return 0;
-
-	/* Store the old value, in case this is a recursive call: */
-	old_current_ref = current_ref;
-	current_ref = entry;
-	retval = data->fn(entry->name + data->trim, &entry->u.value.oid,
-			  entry->flag, data->cb_data);
-	current_ref = old_current_ref;
-	return retval;
+	return ref_resolves_to_object(entry->name,
+				      &entry->u.value.oid, entry->flag);
 }
 
+typedef int each_ref_entry_fn(struct ref_entry *entry, void *cb_data);
+
 /*
  * Call fn for each reference in dir that has index in the range
  * offset <= index < dir->nr.  Recurse into subdirectories that are in
@@ -608,78 +574,6 @@ static int do_for_each_entry_in_dir(struct ref_dir *dir, int offset,
 }
 
 /*
- * Call fn for each reference in the union of dir1 and dir2, in order
- * by refname.  Recurse into subdirectories.  If a value entry appears
- * in both dir1 and dir2, then only process the version that is in
- * dir2.  The input dirs must already be sorted, but subdirs will be
- * sorted as needed.  fn is called for all references, including
- * broken ones.
- */
-static int do_for_each_entry_in_dirs(struct ref_dir *dir1,
-				     struct ref_dir *dir2,
-				     each_ref_entry_fn fn, void *cb_data)
-{
-	int retval;
-	int i1 = 0, i2 = 0;
-
-	assert(dir1->sorted == dir1->nr);
-	assert(dir2->sorted == dir2->nr);
-	while (1) {
-		struct ref_entry *e1, *e2;
-		int cmp;
-		if (i1 == dir1->nr) {
-			return do_for_each_entry_in_dir(dir2, i2, fn, cb_data);
-		}
-		if (i2 == dir2->nr) {
-			return do_for_each_entry_in_dir(dir1, i1, fn, cb_data);
-		}
-		e1 = dir1->entries[i1];
-		e2 = dir2->entries[i2];
-		cmp = strcmp(e1->name, e2->name);
-		if (cmp == 0) {
-			if ((e1->flag & REF_DIR) && (e2->flag & REF_DIR)) {
-				/* Both are directories; descend them in parallel. */
-				struct ref_dir *subdir1 = get_ref_dir(e1);
-				struct ref_dir *subdir2 = get_ref_dir(e2);
-				sort_ref_dir(subdir1);
-				sort_ref_dir(subdir2);
-				retval = do_for_each_entry_in_dirs(
-						subdir1, subdir2, fn, cb_data);
-				i1++;
-				i2++;
-			} else if (!(e1->flag & REF_DIR) && !(e2->flag & REF_DIR)) {
-				/* Both are references; ignore the one from dir1. */
-				retval = fn(e2, cb_data);
-				i1++;
-				i2++;
-			} else {
-				die("conflict between reference and directory: %s",
-				    e1->name);
-			}
-		} else {
-			struct ref_entry *e;
-			if (cmp < 0) {
-				e = e1;
-				i1++;
-			} else {
-				e = e2;
-				i2++;
-			}
-			if (e->flag & REF_DIR) {
-				struct ref_dir *subdir = get_ref_dir(e);
-				sort_ref_dir(subdir);
-				retval = do_for_each_entry_in_dir(
-						subdir, 0, fn, cb_data);
-			} else {
-				retval = fn(e, cb_data);
-			}
-		}
-		if (retval)
-			return retval;
-	}
-}
-
-/*
  * Load all of the refs from the dir into our in-memory cache. The hard work
  * of loading loose refs is done by get_ref_dir(), so we just need to recurse
  * through all of the sub-directories. We do not even need to care about
@@ -695,6 +589,153 @@ static void prime_ref_dir(struct ref_dir *dir)
 	}
 }
 
+/*
+ * A level in the reference hierarchy that is currently being iterated
+ * through.
+ */
+struct cache_ref_iterator_level {
+	/*
+	 * The ref_dir being iterated over at this level. The ref_dir
+	 * is sorted before being stored here.
+	 */
+	struct ref_dir *dir;
+
+	/*
+	 * The index of the current entry within dir (which might
+	 * itself be a directory). If index == -1, then the iteration
+	 * hasn't yet begun. If index == dir->nr, then the iteration
+	 * through this level is over.
+	 */
+	int index;
+};
+
+/*
+ * Represent an iteration through a ref_dir in the memory cache. The
+ * iteration recurses through subdirectories.
+ */
+struct cache_ref_iterator {
+	struct ref_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.
+	 */
+	size_t levels_nr;
+
+	/* The number of levels that have been allocated on the stack */
+	size_t levels_alloc;
+
+	/*
+	 * A stack of levels. levels[0] is the uppermost level that is
+	 * being iterated over in this iteration. (This is not
+	 * necessary the top level in the references hierarchy. If we
+	 * are iterating through a subtree, then levels[0] will hold
+	 * the ref_dir for that subtree, and subsequent levels will go
+	 * on from there.)
+	 */
+	struct cache_ref_iterator_level *levels;
+};
+
+static int cache_ref_iterator_advance(struct ref_iterator *ref_iterator)
+{
+	struct cache_ref_iterator *iter =
+		(struct cache_ref_iterator *)ref_iterator;
+
+	while (1) {
+		struct cache_ref_iterator_level *level =
+			&iter->levels[iter->levels_nr - 1];
+		struct ref_dir *dir = level->dir;
+		struct ref_entry *entry;
+
+		if (level->index == -1)
+			sort_ref_dir(dir);
+
+		if (++level->index == level->dir->nr) {
+			/* This level is exhausted; pop up a level */
+			if (--iter->levels_nr == 0)
+				return ref_iterator_abort(ref_iterator);
+
+			continue;
+		}
+
+		entry = dir->entries[level->index];
+
+		if (entry->flag & REF_DIR) {
+			/* push down a level */
+			ALLOC_GROW(iter->levels, iter->levels_nr + 1,
+				   iter->levels_alloc);
+
+			level = &iter->levels[iter->levels_nr++];
+			level->dir = get_ref_dir(entry);
+			level->index = -1;
+		} else {
+			iter->base.refname = entry->name;
+			iter->base.oid = &entry->u.value.oid;
+			iter->base.flags = entry->flag;
+			return ITER_OK;
+		}
+	}
+}
+
+static enum peel_status peel_entry(struct ref_entry *entry, int repeel);
+
+static int cache_ref_iterator_peel(struct ref_iterator *ref_iterator,
+				   struct object_id *peeled)
+{
+	struct cache_ref_iterator *iter =
+		(struct cache_ref_iterator *)ref_iterator;
+	struct cache_ref_iterator_level *level;
+	struct ref_entry *entry;
+
+	level = &iter->levels[iter->levels_nr - 1];
+
+	if (level->index == -1)
+		die("BUG: peel called before advance for cache iterator");
+
+	entry = level->dir->entries[level->index];
+
+	if (peel_entry(entry, 0))
+		return -1;
+	hashcpy(peeled->hash, entry->u.value.peeled.hash);
+	return 0;
+}
+
+static int cache_ref_iterator_abort(struct ref_iterator *ref_iterator)
+{
+	struct cache_ref_iterator *iter =
+		(struct cache_ref_iterator *)ref_iterator;
+
+	free(iter->levels);
+	base_ref_iterator_free(ref_iterator);
+	return ITER_DONE;
+}
+
+static struct ref_iterator_vtable cache_ref_iterator_vtable = {
+	cache_ref_iterator_advance,
+	cache_ref_iterator_peel,
+	cache_ref_iterator_abort
+};
+
+static struct ref_iterator *cache_ref_iterator_begin(struct ref_dir *dir)
+{
+	struct cache_ref_iterator *iter;
+	struct ref_iterator *ref_iterator;
+	struct cache_ref_iterator_level *level;
+
+	iter = xcalloc(1, sizeof(*iter));
+	ref_iterator = &iter->base;
+	base_ref_iterator_init(ref_iterator, &cache_ref_iterator_vtable);
+	ALLOC_GROW(iter->levels, 10, iter->levels_alloc);
+
+	iter->levels_nr = 1;
+	level = &iter->levels[0];
+	level->index = -1;
+	level->dir = dir;
+
+	return ref_iterator;
+}
+
 struct nonmatching_ref_data {
 	const struct string_list *skip;
 	const char *conflicting_refname;
@@ -958,15 +999,26 @@ static struct ref_cache *lookup_ref_cache(const char *submodule)
 
 /*
  * Return a pointer to a ref_cache for the specified submodule. For
- * the main repository, use submodule==NULL. The returned structure
- * will be allocated and initialized but not necessarily populated; it
- * should not be freed.
+ * the main repository, use submodule==NULL; such a call cannot fail.
+ * For a submodule, the submodule must exist and be a nonbare
+ * repository, otherwise return NULL.
+ *
+ * The returned structure will be allocated and initialized but not
+ * necessarily populated; it should not be freed.
  */
 static struct ref_cache *get_ref_cache(const char *submodule)
 {
 	struct ref_cache *refs = lookup_ref_cache(submodule);
-	if (!refs)
-		refs = create_ref_cache(submodule);
+
+	if (!refs) {
+		struct strbuf submodule_sb = STRBUF_INIT;
+
+		strbuf_addstr(&submodule_sb, submodule);
+		if (is_nonbare_repository_dir(&submodule_sb))
+			refs = create_ref_cache(submodule);
+		strbuf_release(&submodule_sb);
+	}
+
 	return refs;
 }
 
@@ -1272,8 +1324,6 @@ static struct ref_dir *get_loose_refs(struct ref_cache *refs)
 	return get_ref_dir(refs->loose);
 }
 
-/* We allow "recursive" symbolic refs. Only within reason, though */
-#define MAXDEPTH 5
 #define MAXREFLEN (1024)
 
 /*
@@ -1303,7 +1353,7 @@ static int resolve_gitlink_ref_recursive(struct ref_cache *refs,
 	char buffer[128], *p;
 	char *path;
 
-	if (recursion > MAXDEPTH || strlen(refname) > MAXREFLEN)
+	if (recursion > SYMREF_MAXDEPTH || strlen(refname) > MAXREFLEN)
 		return -1;
 	path = *refs->name
 		? git_pathdup_submodule(refs->name, "%s", refname)
@@ -1347,13 +1397,10 @@ int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *sh
 		return -1;
 
 	strbuf_add(&submodule, path, len);
-	refs = lookup_ref_cache(submodule.buf);
+	refs = get_ref_cache(submodule.buf);
 	if (!refs) {
-		if (!is_nonbare_repository_dir(&submodule)) {
-			strbuf_release(&submodule);
-			return -1;
-		}
-		refs = create_ref_cache(submodule.buf);
+		strbuf_release(&submodule);
+		return -1;
 	}
 	strbuf_release(&submodule);
 
@@ -1371,13 +1418,11 @@ static struct ref_entry *get_packed_ref(const char *refname)
 }
 
 /*
- * A loose ref file doesn't exist; check for a packed ref.  The
- * options are forwarded from resolve_safe_unsafe().
+ * A loose ref file doesn't exist; check for a packed ref.
  */
 static int resolve_missing_loose_ref(const char *refname,
-				     int resolve_flags,
 				     unsigned char *sha1,
-				     int *flags)
+				     unsigned int *flags)
 {
 	struct ref_entry *entry;
 
@@ -1388,205 +1433,373 @@ static int resolve_missing_loose_ref(const char *refname,
 	entry = get_packed_ref(refname);
 	if (entry) {
 		hashcpy(sha1, entry->u.value.oid.hash);
-		if (flags)
-			*flags |= REF_ISPACKED;
-		return 0;
-	}
-	/* The reference is not a packed reference, either. */
-	if (resolve_flags & RESOLVE_REF_READING) {
-		errno = ENOENT;
-		return -1;
-	} else {
-		hashclr(sha1);
+		*flags |= REF_ISPACKED;
 		return 0;
 	}
+	/* refname is not a packed reference. */
+	return -1;
 }
 
-/* This function needs to return a meaningful errno on failure */
-static const char *resolve_ref_1(const char *refname,
-				 int resolve_flags,
-				 unsigned char *sha1,
-				 int *flags,
-				 struct strbuf *sb_refname,
-				 struct strbuf *sb_path,
-				 struct strbuf *sb_contents)
+int read_raw_ref(const char *refname, unsigned char *sha1,
+		 struct strbuf *referent, unsigned int *type)
 {
-	int depth = MAXDEPTH;
-	int bad_name = 0;
+	struct strbuf sb_contents = STRBUF_INIT;
+	struct strbuf sb_path = STRBUF_INIT;
+	const char *path;
+	const char *buf;
+	struct stat st;
+	int fd;
+	int ret = -1;
+	int save_errno;
 
-	if (flags)
-		*flags = 0;
+	*type = 0;
+	strbuf_reset(&sb_path);
+	strbuf_git_path(&sb_path, "%s", refname);
+	path = sb_path.buf;
 
-	if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
-		if (flags)
-			*flags |= REF_BAD_NAME;
+stat_ref:
+	/*
+	 * We might have to loop back here to avoid a race
+	 * condition: first we lstat() the file, then we try
+	 * to read it as a link or as a file.  But if somebody
+	 * changes the type of the file (file <-> directory
+	 * <-> symlink) between the lstat() and reading, then
+	 * we don't want to report that as an error but rather
+	 * try again starting with the lstat().
+	 */
 
-		if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
-		    !refname_is_safe(refname)) {
-			errno = EINVAL;
-			return NULL;
+	if (lstat(path, &st) < 0) {
+		if (errno != ENOENT)
+			goto out;
+		if (resolve_missing_loose_ref(refname, sha1, type)) {
+			errno = ENOENT;
+			goto out;
 		}
-		/*
-		 * dwim_ref() uses REF_ISBROKEN to distinguish between
-		 * missing refs and refs that were present but invalid,
-		 * to complain about the latter to stderr.
-		 *
-		 * We don't know whether the ref exists, so don't set
-		 * REF_ISBROKEN yet.
-		 */
-		bad_name = 1;
+		ret = 0;
+		goto out;
 	}
-	for (;;) {
-		const char *path;
-		struct stat st;
-		char *buf;
-		int fd;
 
-		if (--depth < 0) {
-			errno = ELOOP;
-			return NULL;
+	/* Follow "normalized" - ie "refs/.." symlinks by hand */
+	if (S_ISLNK(st.st_mode)) {
+		strbuf_reset(&sb_contents);
+		if (strbuf_readlink(&sb_contents, path, 0) < 0) {
+			if (errno == ENOENT || errno == EINVAL)
+				/* inconsistent with lstat; retry */
+				goto stat_ref;
+			else
+				goto out;
 		}
+		if (starts_with(sb_contents.buf, "refs/") &&
+		    !check_refname_format(sb_contents.buf, 0)) {
+			strbuf_swap(&sb_contents, referent);
+			*type |= REF_ISSYMREF;
+			ret = 0;
+			goto out;
+		}
+	}
 
-		strbuf_reset(sb_path);
-		strbuf_git_path(sb_path, "%s", refname);
-		path = sb_path->buf;
-
+	/* Is it a directory? */
+	if (S_ISDIR(st.st_mode)) {
 		/*
-		 * We might have to loop back here to avoid a race
-		 * condition: first we lstat() the file, then we try
-		 * to read it as a link or as a file.  But if somebody
-		 * changes the type of the file (file <-> directory
-		 * <-> symlink) between the lstat() and reading, then
-		 * we don't want to report that as an error but rather
-		 * try again starting with the lstat().
+		 * Even though there is a directory where the loose
+		 * ref is supposed to be, there could still be a
+		 * packed ref:
 		 */
-	stat_ref:
-		if (lstat(path, &st) < 0) {
-			if (errno != ENOENT)
-				return NULL;
-			if (resolve_missing_loose_ref(refname, resolve_flags,
-						      sha1, flags))
-				return NULL;
-			if (bad_name) {
-				hashclr(sha1);
-				if (flags)
-					*flags |= REF_ISBROKEN;
-			}
-			return refname;
+		if (resolve_missing_loose_ref(refname, sha1, type)) {
+			errno = EISDIR;
+			goto out;
 		}
+		ret = 0;
+		goto out;
+	}
 
-		/* Follow "normalized" - ie "refs/.." symlinks by hand */
-		if (S_ISLNK(st.st_mode)) {
-			strbuf_reset(sb_contents);
-			if (strbuf_readlink(sb_contents, path, 0) < 0) {
-				if (errno == ENOENT || errno == EINVAL)
-					/* inconsistent with lstat; retry */
-					goto stat_ref;
-				else
-					return NULL;
-			}
-			if (starts_with(sb_contents->buf, "refs/") &&
-			    !check_refname_format(sb_contents->buf, 0)) {
-				strbuf_swap(sb_refname, sb_contents);
-				refname = sb_refname->buf;
-				if (flags)
-					*flags |= REF_ISSYMREF;
-				if (resolve_flags & RESOLVE_REF_NO_RECURSE) {
-					hashclr(sha1);
-					return refname;
-				}
-				continue;
-			}
-		}
+	/*
+	 * Anything else, just open it and try to use it as
+	 * a ref
+	 */
+	fd = open(path, O_RDONLY);
+	if (fd < 0) {
+		if (errno == ENOENT)
+			/* inconsistent with lstat; retry */
+			goto stat_ref;
+		else
+			goto out;
+	}
+	strbuf_reset(&sb_contents);
+	if (strbuf_read(&sb_contents, fd, 256) < 0) {
+		int save_errno = errno;
+		close(fd);
+		errno = save_errno;
+		goto out;
+	}
+	close(fd);
+	strbuf_rtrim(&sb_contents);
+	buf = sb_contents.buf;
+	if (starts_with(buf, "ref:")) {
+		buf += 4;
+		while (isspace(*buf))
+			buf++;
 
-		/* Is it a directory? */
-		if (S_ISDIR(st.st_mode)) {
-			errno = EISDIR;
-			return NULL;
-		}
+		strbuf_reset(referent);
+		strbuf_addstr(referent, buf);
+		*type |= REF_ISSYMREF;
+		ret = 0;
+		goto out;
+	}
+
+	/*
+	 * Please note that FETCH_HEAD has additional
+	 * data after the sha.
+	 */
+	if (get_sha1_hex(buf, sha1) ||
+	    (buf[40] != '\0' && !isspace(buf[40]))) {
+		*type |= REF_ISBROKEN;
+		errno = EINVAL;
+		goto out;
+	}
 
+	ret = 0;
+
+out:
+	save_errno = errno;
+	strbuf_release(&sb_path);
+	strbuf_release(&sb_contents);
+	errno = save_errno;
+	return ret;
+}
+
+static void unlock_ref(struct ref_lock *lock)
+{
+	/* Do not free lock->lk -- atexit() still looks at them */
+	if (lock->lk)
+		rollback_lock_file(lock->lk);
+	free(lock->ref_name);
+	free(lock);
+}
+
+/*
+ * Lock refname, without following symrefs, and set *lock_p to point
+ * at a newly-allocated lock object. Fill in lock->old_oid, referent,
+ * and type similarly to read_raw_ref().
+ *
+ * The caller must verify that refname is a "safe" reference name (in
+ * the sense of refname_is_safe()) before calling this function.
+ *
+ * If the reference doesn't already exist, verify that refname doesn't
+ * have a D/F conflict with any existing references. extras and skip
+ * are passed to verify_refname_available_dir() for this check.
+ *
+ * If mustexist is not set and the reference is not found or is
+ * broken, lock the reference anyway but clear sha1.
+ *
+ * Return 0 on success. On failure, write an error message to err and
+ * return TRANSACTION_NAME_CONFLICT or TRANSACTION_GENERIC_ERROR.
+ *
+ * Implementation note: This function is basically
+ *
+ *     lock reference
+ *     read_raw_ref()
+ *
+ * but it includes a lot more code to
+ * - Deal with possible races with other processes
+ * - Avoid calling verify_refname_available_dir() when it can be
+ *   avoided, namely if we were successfully able to read the ref
+ * - Generate informative error messages in the case of failure
+ */
+static int lock_raw_ref(const char *refname, int mustexist,
+			const struct string_list *extras,
+			const struct string_list *skip,
+			struct ref_lock **lock_p,
+			struct strbuf *referent,
+			unsigned int *type,
+			struct strbuf *err)
+{
+	struct ref_lock *lock;
+	struct strbuf ref_file = STRBUF_INIT;
+	int attempts_remaining = 3;
+	int ret = TRANSACTION_GENERIC_ERROR;
+
+	assert(err);
+	*type = 0;
+
+	/* First lock the file so it can't change out from under us. */
+
+	*lock_p = lock = xcalloc(1, sizeof(*lock));
+
+	lock->ref_name = xstrdup(refname);
+	strbuf_git_path(&ref_file, "%s", refname);
+
+retry:
+	switch (safe_create_leading_directories(ref_file.buf)) {
+	case SCLD_OK:
+		break; /* success */
+	case SCLD_EXISTS:
 		/*
-		 * Anything else, just open it and try to use it as
-		 * a ref
+		 * Suppose refname is "refs/foo/bar". We just failed
+		 * to create the containing directory, "refs/foo",
+		 * because there was a non-directory in the way. This
+		 * indicates a D/F conflict, probably because of
+		 * another reference such as "refs/foo". There is no
+		 * reason to expect this error to be transitory.
 		 */
-		fd = open(path, O_RDONLY);
-		if (fd < 0) {
-			if (errno == ENOENT)
-				/* inconsistent with lstat; retry */
-				goto stat_ref;
-			else
-				return NULL;
-		}
-		strbuf_reset(sb_contents);
-		if (strbuf_read(sb_contents, fd, 256) < 0) {
-			int save_errno = errno;
-			close(fd);
-			errno = save_errno;
-			return NULL;
+		if (verify_refname_available(refname, extras, skip, err)) {
+			if (mustexist) {
+				/*
+				 * To the user the relevant error is
+				 * that the "mustexist" reference is
+				 * missing:
+				 */
+				strbuf_reset(err);
+				strbuf_addf(err, "unable to resolve reference '%s'",
+					    refname);
+			} else {
+				/*
+				 * The error message set by
+				 * verify_refname_available_dir() is OK.
+				 */
+				ret = TRANSACTION_NAME_CONFLICT;
+			}
+		} else {
+			/*
+			 * The file that is in the way isn't a loose
+			 * reference. Report it as a low-level
+			 * failure.
+			 */
+			strbuf_addf(err, "unable to create lock file %s.lock; "
+				    "non-directory in the way",
+				    ref_file.buf);
 		}
-		close(fd);
-		strbuf_rtrim(sb_contents);
+		goto error_return;
+	case SCLD_VANISHED:
+		/* Maybe another process was tidying up. Try again. */
+		if (--attempts_remaining > 0)
+			goto retry;
+		/* fall through */
+	default:
+		strbuf_addf(err, "unable to create directory for %s",
+			    ref_file.buf);
+		goto error_return;
+	}
 
-		/*
-		 * Is it a symbolic ref?
-		 */
-		if (!starts_with(sb_contents->buf, "ref:")) {
+	if (!lock->lk)
+		lock->lk = xcalloc(1, sizeof(struct lock_file));
+
+	if (hold_lock_file_for_update(lock->lk, ref_file.buf, LOCK_NO_DEREF) < 0) {
+		if (errno == ENOENT && --attempts_remaining > 0) {
 			/*
-			 * Please note that FETCH_HEAD has a second
-			 * line containing other data.
+			 * Maybe somebody just deleted one of the
+			 * directories leading to ref_file.  Try
+			 * again:
 			 */
-			if (get_sha1_hex(sb_contents->buf, sha1) ||
-			    (sb_contents->buf[40] != '\0' && !isspace(sb_contents->buf[40]))) {
-				if (flags)
-					*flags |= REF_ISBROKEN;
-				errno = EINVAL;
-				return NULL;
+			goto retry;
+		} else {
+			unable_to_lock_message(ref_file.buf, errno, err);
+			goto error_return;
+		}
+	}
+
+	/*
+	 * Now we hold the lock and can read the reference without
+	 * fear that its value will change.
+	 */
+
+	if (read_raw_ref(refname, lock->old_oid.hash, referent, type)) {
+		if (errno == ENOENT) {
+			if (mustexist) {
+				/* Garden variety missing reference. */
+				strbuf_addf(err, "unable to resolve reference '%s'",
+					    refname);
+				goto error_return;
+			} else {
+				/*
+				 * Reference is missing, but that's OK. We
+				 * know that there is not a conflict with
+				 * another loose reference because
+				 * (supposing that we are trying to lock
+				 * reference "refs/foo/bar"):
+				 *
+				 * - We were successfully able to create
+				 *   the lockfile refs/foo/bar.lock, so we
+				 *   know there cannot be a loose reference
+				 *   named "refs/foo".
+				 *
+				 * - We got ENOENT and not EISDIR, so we
+				 *   know that there cannot be a loose
+				 *   reference named "refs/foo/bar/baz".
+				 */
 			}
-			if (bad_name) {
-				hashclr(sha1);
-				if (flags)
-					*flags |= REF_ISBROKEN;
+		} else if (errno == EISDIR) {
+			/*
+			 * There is a directory in the way. It might have
+			 * contained references that have been deleted. If
+			 * we don't require that the reference already
+			 * exists, try to remove the directory so that it
+			 * doesn't cause trouble when we want to rename the
+			 * lockfile into place later.
+			 */
+			if (mustexist) {
+				/* Garden variety missing reference. */
+				strbuf_addf(err, "unable to resolve reference '%s'",
+					    refname);
+				goto error_return;
+			} else if (remove_dir_recursively(&ref_file,
+							  REMOVE_DIR_EMPTY_ONLY)) {
+				if (verify_refname_available_dir(
+						    refname, extras, skip,
+						    get_loose_refs(&ref_cache),
+						    err)) {
+					/*
+					 * The error message set by
+					 * verify_refname_available() is OK.
+					 */
+					ret = TRANSACTION_NAME_CONFLICT;
+					goto error_return;
+				} else {
+					/*
+					 * We can't delete the directory,
+					 * but we also don't know of any
+					 * references that it should
+					 * contain.
+					 */
+					strbuf_addf(err, "there is a non-empty directory '%s' "
+						    "blocking reference '%s'",
+						    ref_file.buf, refname);
+					goto error_return;
+				}
 			}
-			return refname;
-		}
-		if (flags)
-			*flags |= REF_ISSYMREF;
-		buf = sb_contents->buf + 4;
-		while (isspace(*buf))
-			buf++;
-		strbuf_reset(sb_refname);
-		strbuf_addstr(sb_refname, buf);
-		refname = sb_refname->buf;
-		if (resolve_flags & RESOLVE_REF_NO_RECURSE) {
-			hashclr(sha1);
-			return refname;
+		} else if (errno == EINVAL && (*type & REF_ISBROKEN)) {
+			strbuf_addf(err, "unable to resolve reference '%s': "
+				    "reference broken", refname);
+			goto error_return;
+		} else {
+			strbuf_addf(err, "unable to resolve reference '%s': %s",
+				    refname, strerror(errno));
+			goto error_return;
 		}
-		if (check_refname_format(buf, REFNAME_ALLOW_ONELEVEL)) {
-			if (flags)
-				*flags |= REF_ISBROKEN;
-
-			if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
-			    !refname_is_safe(buf)) {
-				errno = EINVAL;
-				return NULL;
-			}
-			bad_name = 1;
+
+		/*
+		 * If the ref did not exist and we are creating it,
+		 * make sure there is no existing packed ref whose
+		 * name begins with our refname, nor a packed ref
+		 * whose name is a proper prefix of our refname.
+		 */
+		if (verify_refname_available_dir(
+				    refname, extras, skip,
+				    get_packed_refs(&ref_cache),
+				    err)) {
+			goto error_return;
 		}
 	}
-}
 
-const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
-			       unsigned char *sha1, int *flags)
-{
-	static struct strbuf sb_refname = STRBUF_INIT;
-	struct strbuf sb_contents = STRBUF_INIT;
-	struct strbuf sb_path = STRBUF_INIT;
-	const char *ret;
+	ret = 0;
+	goto out;
 
-	ret = resolve_ref_1(refname, resolve_flags, sha1, flags,
-			    &sb_refname, &sb_path, &sb_contents);
-	strbuf_release(&sb_path);
-	strbuf_release(&sb_contents);
+error_return:
+	unlock_ref(lock);
+	*lock_p = NULL;
+
+out:
+	strbuf_release(&ref_file);
 	return ret;
 }
 
@@ -1630,11 +1843,12 @@ int peel_ref(const char *refname, unsigned char *sha1)
 	int flag;
 	unsigned char base[20];
 
-	if (current_ref && (current_ref->name == refname
-			    || !strcmp(current_ref->name, refname))) {
-		if (peel_entry(current_ref, 0))
+	if (current_ref_iter && current_ref_iter->refname == refname) {
+		struct object_id peeled;
+
+		if (ref_iterator_peel(current_ref_iter, &peeled))
 			return -1;
-		hashcpy(sha1, current_ref->u.value.peeled.hash);
+		hashcpy(sha1, peeled.hash);
 		return 0;
 	}
 
@@ -1662,177 +1876,137 @@ int peel_ref(const char *refname, unsigned char *sha1)
 	return peel_object(base, sha1);
 }
 
-/*
- * Call fn for each reference in the specified ref_cache, omitting
- * references not in the containing_dir of base.  fn is called for all
- * references, including broken ones.  If fn ever returns a non-zero
- * value, stop the iteration and return that value; otherwise, return
- * 0.
- */
-static int do_for_each_entry(struct ref_cache *refs, const char *base,
-			     each_ref_entry_fn fn, void *cb_data)
-{
+struct files_ref_iterator {
+	struct ref_iterator base;
+
 	struct packed_ref_cache *packed_ref_cache;
-	struct ref_dir *loose_dir;
-	struct ref_dir *packed_dir;
-	int retval = 0;
+	struct ref_iterator *iter0;
+	unsigned int flags;
+};
 
-	/*
-	 * We must make sure that all loose refs are read before accessing the
-	 * packed-refs file; this avoids a race condition in which loose refs
-	 * are migrated to the packed-refs file by a simultaneous process, but
-	 * our in-memory view is from before the migration. get_packed_ref_cache()
-	 * takes care of making sure our view is up to date with what is on
-	 * disk.
-	 */
-	loose_dir = get_loose_refs(refs);
-	if (base && *base) {
-		loose_dir = find_containing_dir(loose_dir, base, 0);
-	}
-	if (loose_dir)
-		prime_ref_dir(loose_dir);
+static int files_ref_iterator_advance(struct ref_iterator *ref_iterator)
+{
+	struct files_ref_iterator *iter =
+		(struct files_ref_iterator *)ref_iterator;
+	int ok;
 
-	packed_ref_cache = get_packed_ref_cache(refs);
-	acquire_packed_ref_cache(packed_ref_cache);
-	packed_dir = get_packed_ref_dir(packed_ref_cache);
-	if (base && *base) {
-		packed_dir = find_containing_dir(packed_dir, base, 0);
-	}
-
-	if (packed_dir && loose_dir) {
-		sort_ref_dir(packed_dir);
-		sort_ref_dir(loose_dir);
-		retval = do_for_each_entry_in_dirs(
-				packed_dir, loose_dir, fn, cb_data);
-	} else if (packed_dir) {
-		sort_ref_dir(packed_dir);
-		retval = do_for_each_entry_in_dir(
-				packed_dir, 0, fn, cb_data);
-	} else if (loose_dir) {
-		sort_ref_dir(loose_dir);
-		retval = do_for_each_entry_in_dir(
-				loose_dir, 0, fn, cb_data);
+	while ((ok = ref_iterator_advance(iter->iter0)) == ITER_OK) {
+		if (!(iter->flags & DO_FOR_EACH_INCLUDE_BROKEN) &&
+		    !ref_resolves_to_object(iter->iter0->refname,
+					    iter->iter0->oid,
+					    iter->iter0->flags))
+			continue;
+
+		iter->base.refname = iter->iter0->refname;
+		iter->base.oid = iter->iter0->oid;
+		iter->base.flags = iter->iter0->flags;
+		return ITER_OK;
 	}
 
-	release_packed_ref_cache(packed_ref_cache);
-	return retval;
+	iter->iter0 = NULL;
+	if (ref_iterator_abort(ref_iterator) != ITER_DONE)
+		ok = ITER_ERROR;
+
+	return ok;
 }
 
-/*
- * Call fn for each reference in the specified ref_cache for which the
- * refname begins with base.  If trim is non-zero, then trim that many
- * characters off the beginning of each refname before passing the
- * refname to fn.  flags can be DO_FOR_EACH_INCLUDE_BROKEN to include
- * broken references in the iteration.  If fn ever returns a non-zero
- * value, stop the iteration and return that value; otherwise, return
- * 0.
- */
-static int do_for_each_ref(struct ref_cache *refs, const char *base,
-			   each_ref_fn fn, int trim, int flags, void *cb_data)
+static int files_ref_iterator_peel(struct ref_iterator *ref_iterator,
+				   struct object_id *peeled)
 {
-	struct ref_entry_cb data;
-	data.base = base;
-	data.trim = trim;
-	data.flags = flags;
-	data.fn = fn;
-	data.cb_data = cb_data;
-
-	if (ref_paranoia < 0)
-		ref_paranoia = git_env_bool("GIT_REF_PARANOIA", 0);
-	if (ref_paranoia)
-		data.flags |= DO_FOR_EACH_INCLUDE_BROKEN;
+	struct files_ref_iterator *iter =
+		(struct files_ref_iterator *)ref_iterator;
 
-	return do_for_each_entry(refs, base, do_one_ref, &data);
+	return ref_iterator_peel(iter->iter0, peeled);
 }
 
-static int do_head_ref(const char *submodule, each_ref_fn fn, void *cb_data)
+static int files_ref_iterator_abort(struct ref_iterator *ref_iterator)
 {
-	struct object_id oid;
-	int flag;
+	struct files_ref_iterator *iter =
+		(struct files_ref_iterator *)ref_iterator;
+	int ok = ITER_DONE;
 
-	if (submodule) {
-		if (resolve_gitlink_ref(submodule, "HEAD", oid.hash) == 0)
-			return fn("HEAD", &oid, 0, cb_data);
+	if (iter->iter0)
+		ok = ref_iterator_abort(iter->iter0);
 
-		return 0;
-	}
-
-	if (!read_ref_full("HEAD", RESOLVE_REF_READING, oid.hash, &flag))
-		return fn("HEAD", &oid, flag, cb_data);
-
-	return 0;
+	release_packed_ref_cache(iter->packed_ref_cache);
+	base_ref_iterator_free(ref_iterator);
+	return ok;
 }
 
-int head_ref(each_ref_fn fn, void *cb_data)
-{
-	return do_head_ref(NULL, fn, cb_data);
-}
+static struct ref_iterator_vtable files_ref_iterator_vtable = {
+	files_ref_iterator_advance,
+	files_ref_iterator_peel,
+	files_ref_iterator_abort
+};
 
-int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+struct ref_iterator *files_ref_iterator_begin(
+		const char *submodule,
+		const char *prefix, unsigned int flags)
 {
-	return do_head_ref(submodule, fn, cb_data);
-}
+	struct ref_cache *refs = get_ref_cache(submodule);
+	struct ref_dir *loose_dir, *packed_dir;
+	struct ref_iterator *loose_iter, *packed_iter;
+	struct files_ref_iterator *iter;
+	struct ref_iterator *ref_iterator;
 
-int for_each_ref(each_ref_fn fn, void *cb_data)
-{
-	return do_for_each_ref(&ref_cache, "", fn, 0, 0, cb_data);
-}
+	if (!refs)
+		return empty_ref_iterator_begin();
 
-int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
-{
-	return do_for_each_ref(get_ref_cache(submodule), "", fn, 0, 0, cb_data);
-}
+	if (ref_paranoia < 0)
+		ref_paranoia = git_env_bool("GIT_REF_PARANOIA", 0);
+	if (ref_paranoia)
+		flags |= DO_FOR_EACH_INCLUDE_BROKEN;
 
-int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data)
-{
-	return do_for_each_ref(&ref_cache, prefix, fn, strlen(prefix), 0, cb_data);
-}
+	iter = xcalloc(1, sizeof(*iter));
+	ref_iterator = &iter->base;
+	base_ref_iterator_init(ref_iterator, &files_ref_iterator_vtable);
 
-int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsigned int broken)
-{
-	unsigned int flag = 0;
+	/*
+	 * We must make sure that all loose refs are read before
+	 * accessing the packed-refs file; this avoids a race
+	 * condition if loose refs are migrated to the packed-refs
+	 * file by a simultaneous process, but our in-memory view is
+	 * from before the migration. We ensure this as follows:
+	 * First, we call prime_ref_dir(), which pre-reads the loose
+	 * references for the subtree into the cache. (If they've
+	 * already been read, that's OK; we only need to guarantee
+	 * that they're read before the packed refs, not *how much*
+	 * before.) After that, we call get_packed_ref_cache(), which
+	 * internally checks whether the packed-ref cache is up to
+	 * date with what is on disk, and re-reads it if not.
+	 */
 
-	if (broken)
-		flag = DO_FOR_EACH_INCLUDE_BROKEN;
-	return do_for_each_ref(&ref_cache, prefix, fn, 0, flag, cb_data);
-}
+	loose_dir = get_loose_refs(refs);
 
-int for_each_ref_in_submodule(const char *submodule, const char *prefix,
-		each_ref_fn fn, void *cb_data)
-{
-	return do_for_each_ref(get_ref_cache(submodule), prefix, fn, strlen(prefix), 0, cb_data);
-}
+	if (prefix && *prefix)
+		loose_dir = find_containing_dir(loose_dir, prefix, 0);
 
-int for_each_replace_ref(each_ref_fn fn, void *cb_data)
-{
-	return do_for_each_ref(&ref_cache, git_replace_ref_base, fn,
-			       strlen(git_replace_ref_base), 0, cb_data);
-}
+	if (loose_dir) {
+		prime_ref_dir(loose_dir);
+		loose_iter = cache_ref_iterator_begin(loose_dir);
+	} else {
+		/* There's nothing to iterate over. */
+		loose_iter = empty_ref_iterator_begin();
+	}
 
-int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
-{
-	struct strbuf buf = STRBUF_INIT;
-	int ret;
-	strbuf_addf(&buf, "%srefs/", get_git_namespace());
-	ret = do_for_each_ref(&ref_cache, buf.buf, fn, 0, 0, cb_data);
-	strbuf_release(&buf);
-	return ret;
-}
+	iter->packed_ref_cache = get_packed_ref_cache(refs);
+	acquire_packed_ref_cache(iter->packed_ref_cache);
+	packed_dir = get_packed_ref_dir(iter->packed_ref_cache);
 
-int for_each_rawref(each_ref_fn fn, void *cb_data)
-{
-	return do_for_each_ref(&ref_cache, "", fn, 0,
-			       DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
-}
+	if (prefix && *prefix)
+		packed_dir = find_containing_dir(packed_dir, prefix, 0);
 
-static void unlock_ref(struct ref_lock *lock)
-{
-	/* Do not free lock->lk -- atexit() still looks at them */
-	if (lock->lk)
-		rollback_lock_file(lock->lk);
-	free(lock->ref_name);
-	free(lock->orig_ref_name);
-	free(lock);
+	if (packed_dir) {
+		packed_iter = cache_ref_iterator_begin(packed_dir);
+	} else {
+		/* There's nothing to iterate over. */
+		packed_iter = empty_ref_iterator_begin();
+	}
+
+	iter->iter0 = overlay_ref_iterator_begin(loose_iter, packed_iter);
+	iter->flags = flags;
+
+	return ref_iterator;
 }
 
 /*
@@ -1852,18 +2026,18 @@ static int verify_lock(struct ref_lock *lock,
 			  lock->old_oid.hash, NULL)) {
 		if (old_sha1) {
 			int save_errno = errno;
-			strbuf_addf(err, "can't verify ref %s", lock->ref_name);
+			strbuf_addf(err, "can't verify ref '%s'", lock->ref_name);
 			errno = save_errno;
 			return -1;
 		} else {
-			hashclr(lock->old_oid.hash);
+			oidclr(&lock->old_oid);
 			return 0;
 		}
 	}
 	if (old_sha1 && hashcmp(lock->old_oid.hash, old_sha1)) {
-		strbuf_addf(err, "ref %s is at %s but expected %s",
+		strbuf_addf(err, "ref '%s' is at %s but expected %s",
 			    lock->ref_name,
-			    sha1_to_hex(lock->old_oid.hash),
+			    oid_to_hex(&lock->old_oid),
 			    sha1_to_hex(old_sha1));
 		errno = EBUSY;
 		return -1;
@@ -1889,19 +2063,17 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
 					    const unsigned char *old_sha1,
 					    const struct string_list *extras,
 					    const struct string_list *skip,
-					    unsigned int flags, int *type_p,
+					    unsigned int flags, int *type,
 					    struct strbuf *err)
 {
 	struct strbuf ref_file = STRBUF_INIT;
-	struct strbuf orig_ref_file = STRBUF_INIT;
-	const char *orig_refname = refname;
 	struct ref_lock *lock;
 	int last_errno = 0;
-	int type;
-	int lflags = 0;
+	int lflags = LOCK_NO_DEREF;
 	int mustexist = (old_sha1 && !is_null_sha1(old_sha1));
-	int resolve_flags = 0;
+	int resolve_flags = RESOLVE_REF_NO_RECURSE;
 	int attempts_remaining = 3;
+	int resolved;
 
 	assert(err);
 
@@ -1911,48 +2083,39 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
 		resolve_flags |= RESOLVE_REF_READING;
 	if (flags & REF_DELETING)
 		resolve_flags |= RESOLVE_REF_ALLOW_BAD_NAME;
-	if (flags & REF_NODEREF) {
-		resolve_flags |= RESOLVE_REF_NO_RECURSE;
-		lflags |= LOCK_NO_DEREF;
-	}
 
-	refname = resolve_ref_unsafe(refname, resolve_flags,
-				     lock->old_oid.hash, &type);
-	if (!refname && errno == EISDIR) {
+	strbuf_git_path(&ref_file, "%s", refname);
+	resolved = !!resolve_ref_unsafe(refname, resolve_flags,
+					lock->old_oid.hash, type);
+	if (!resolved && errno == EISDIR) {
 		/*
 		 * we are trying to lock foo but we used to
 		 * have foo/bar which now does not exist;
 		 * it is normal for the empty directory 'foo'
 		 * to remain.
 		 */
-		strbuf_git_path(&orig_ref_file, "%s", orig_refname);
-		if (remove_empty_directories(&orig_ref_file)) {
+		if (remove_empty_directories(&ref_file)) {
 			last_errno = errno;
-			if (!verify_refname_available_dir(orig_refname, extras, skip,
+			if (!verify_refname_available_dir(refname, extras, skip,
 							  get_loose_refs(&ref_cache), err))
 				strbuf_addf(err, "there are still refs under '%s'",
-					    orig_refname);
+					    refname);
 			goto error_return;
 		}
-		refname = resolve_ref_unsafe(orig_refname, resolve_flags,
-					     lock->old_oid.hash, &type);
+		resolved = !!resolve_ref_unsafe(refname, resolve_flags,
+						lock->old_oid.hash, type);
 	}
-	if (type_p)
-	    *type_p = type;
-	if (!refname) {
+	if (!resolved) {
 		last_errno = errno;
 		if (last_errno != ENOTDIR ||
-		    !verify_refname_available_dir(orig_refname, extras, skip,
+		    !verify_refname_available_dir(refname, extras, skip,
 						  get_loose_refs(&ref_cache), err))
-			strbuf_addf(err, "unable to resolve reference %s: %s",
-				    orig_refname, strerror(last_errno));
+			strbuf_addf(err, "unable to resolve reference '%s': %s",
+				    refname, strerror(last_errno));
 
 		goto error_return;
 	}
 
-	if (flags & REF_NODEREF)
-		refname = orig_refname;
-
 	/*
 	 * If the ref did not exist and we are creating it, make sure
 	 * there is no existing packed ref whose name begins with our
@@ -1969,8 +2132,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
 	lock->lk = xcalloc(1, sizeof(struct lock_file));
 
 	lock->ref_name = xstrdup(refname);
-	lock->orig_ref_name = xstrdup(orig_refname);
-	strbuf_git_path(&ref_file, "%s", refname);
 
  retry:
 	switch (safe_create_leading_directories_const(ref_file.buf)) {
@@ -1982,7 +2143,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
 		/* fall through */
 	default:
 		last_errno = errno;
-		strbuf_addf(err, "unable to create directory for %s",
+		strbuf_addf(err, "unable to create directory for '%s'",
 			    ref_file.buf);
 		goto error_return;
 	}
@@ -2013,7 +2174,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
 
  out:
 	strbuf_release(&ref_file);
-	strbuf_release(&orig_ref_file);
 	errno = last_errno;
 	return lock;
 }
@@ -2167,7 +2327,7 @@ static int pack_if_possible_fn(struct ref_entry *entry, void *cb_data)
 		return 0;
 
 	/* Do not pack symbolic or broken refs: */
-	if ((entry->flag & REF_ISSYMREF) || !ref_resolves_to_object(entry))
+	if ((entry->flag & REF_ISSYMREF) || !entry_resolves_to_object(entry))
 		return 0;
 
 	/* Add a packed ref cache entry equivalent to the loose entry. */
@@ -2241,7 +2401,7 @@ static void prune_ref(struct ref_to_prune *r)
 	transaction = ref_transaction_begin(&err);
 	if (!transaction ||
 	    ref_transaction_delete(transaction, r->name, r->sha1,
-				   REF_ISPRUNING, NULL, &err) ||
+				   REF_ISPRUNING | REF_NODEREF, NULL, &err) ||
 	    ref_transaction_commit(transaction, &err)) {
 		ref_transaction_free(transaction);
 		error("%s", err.buf);
@@ -2353,7 +2513,7 @@ static int delete_ref_loose(struct ref_lock *lock, int flag, struct strbuf *err)
 	return 0;
 }
 
-int delete_refs(struct string_list *refnames)
+int delete_refs(struct string_list *refnames, unsigned int flags)
 {
 	struct strbuf err = STRBUF_INIT;
 	int i, result = 0;
@@ -2382,7 +2542,7 @@ int delete_refs(struct string_list *refnames)
 	for (i = 0; i < refnames->nr; i++) {
 		const char *refname = refnames->items[i].string;
 
-		if (delete_ref(refname, NULL, 0))
+		if (delete_ref(refname, NULL, flags))
 			result |= error(_("could not remove reference %s"), refname);
 	}
 
@@ -2453,8 +2613,8 @@ out:
 }
 
 int verify_refname_available(const char *newname,
-			     struct string_list *extras,
-			     struct string_list *skip,
+			     const struct string_list *extras,
+			     const struct string_list *skip,
 			     struct strbuf *err)
 {
 	struct ref_dir *packed_refs = get_packed_refs(&ref_cache);
@@ -2473,7 +2633,7 @@ static int write_ref_to_lockfile(struct ref_lock *lock,
 				 const unsigned char *sha1, struct strbuf *err);
 static int commit_ref_update(struct ref_lock *lock,
 			     const unsigned char *sha1, const char *logmsg,
-			     int flags, struct strbuf *err);
+			     struct strbuf *err);
 
 int rename_ref(const char *oldrefname, const char *newrefname, const char *logmsg)
 {
@@ -2482,20 +2642,18 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
 	struct ref_lock *lock;
 	struct stat loginfo;
 	int log = !lstat(git_path("logs/%s", oldrefname), &loginfo);
-	const char *symref = NULL;
 	struct strbuf err = STRBUF_INIT;
 
 	if (log && S_ISLNK(loginfo.st_mode))
 		return error("reflog for %s is a symlink", oldrefname);
 
-	symref = resolve_ref_unsafe(oldrefname, RESOLVE_REF_READING,
-				    orig_sha1, &flag);
+	if (!resolve_ref_unsafe(oldrefname, RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
+				orig_sha1, &flag))
+		return error("refname %s not found", oldrefname);
+
 	if (flag & REF_ISSYMREF)
 		return error("refname %s is a symbolic ref, renaming it is not supported",
 			oldrefname);
-	if (!symref)
-		return error("refname %s not found", oldrefname);
-
 	if (!rename_ref_available(oldrefname, newrefname))
 		return 1;
 
@@ -2508,8 +2666,16 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
 		goto rollback;
 	}
 
-	if (!read_ref_full(newrefname, RESOLVE_REF_READING, sha1, NULL) &&
-	    delete_ref(newrefname, sha1, REF_NODEREF)) {
+	/*
+	 * Since we are doing a shallow lookup, sha1 is not the
+	 * correct value to pass to delete_ref as old_sha1. But that
+	 * doesn't matter, because an old_sha1 check wouldn't add to
+	 * the safety anyway; we want to delete the reference whatever
+	 * its current value.
+	 */
+	if (!read_ref_full(newrefname, RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
+			   sha1, NULL) &&
+	    delete_ref(newrefname, NULL, REF_NODEREF)) {
 		if (errno==EISDIR) {
 			struct strbuf path = STRBUF_INIT;
 			int result;
@@ -2533,7 +2699,8 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
 
 	logmoved = log;
 
-	lock = lock_ref_sha1_basic(newrefname, NULL, NULL, NULL, 0, NULL, &err);
+	lock = lock_ref_sha1_basic(newrefname, NULL, NULL, NULL, REF_NODEREF,
+				   NULL, &err);
 	if (!lock) {
 		error("unable to rename '%s' to '%s': %s", oldrefname, newrefname, err.buf);
 		strbuf_release(&err);
@@ -2542,7 +2709,7 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
 	hashcpy(lock->old_oid.hash, orig_sha1);
 
 	if (write_ref_to_lockfile(lock, orig_sha1, &err) ||
-	    commit_ref_update(lock, orig_sha1, logmsg, 0, &err)) {
+	    commit_ref_update(lock, orig_sha1, logmsg, &err)) {
 		error("unable to write current sha1 into %s: %s", newrefname, err.buf);
 		strbuf_release(&err);
 		goto rollback;
@@ -2551,7 +2718,8 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
 	return 0;
 
  rollback:
-	lock = lock_ref_sha1_basic(oldrefname, NULL, NULL, NULL, 0, NULL, &err);
+	lock = lock_ref_sha1_basic(oldrefname, NULL, NULL, NULL, REF_NODEREF,
+				   NULL, &err);
 	if (!lock) {
 		error("unable to lock %s for rollback: %s", oldrefname, err.buf);
 		strbuf_release(&err);
@@ -2561,7 +2729,7 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
 	flag = log_all_ref_updates;
 	log_all_ref_updates = 0;
 	if (write_ref_to_lockfile(lock, orig_sha1, &err) ||
-	    commit_ref_update(lock, orig_sha1, NULL, 0, &err)) {
+	    commit_ref_update(lock, orig_sha1, NULL, &err)) {
 		error("unable to write current sha1 into %s: %s", oldrefname, err.buf);
 		strbuf_release(&err);
 	}
@@ -2588,6 +2756,30 @@ static int close_ref(struct ref_lock *lock)
 
 static int commit_ref(struct ref_lock *lock)
 {
+	char *path = get_locked_file_path(lock->lk);
+	struct stat st;
+
+	if (!lstat(path, &st) && S_ISDIR(st.st_mode)) {
+		/*
+		 * There is a directory at the path we want to rename
+		 * the lockfile to. Hopefully it is empty; try to
+		 * delete it.
+		 */
+		size_t len = strlen(path);
+		struct strbuf sb_path = STRBUF_INIT;
+
+		strbuf_attach(&sb_path, path, len, len);
+
+		/*
+		 * If this fails, commit_lock_file() will also fail
+		 * and will report the problem.
+		 */
+		remove_empty_directories(&sb_path);
+		strbuf_release(&sb_path);
+	} else {
+		free(path);
+	}
+
 	if (commit_lock_file(lock->lk))
 		return -1;
 	return 0;
@@ -2606,7 +2798,7 @@ static int log_ref_setup(const char *refname, struct strbuf *logfile, struct str
 	strbuf_git_path(logfile, "logs/%s", refname);
 	if (force_create || should_autocreate_reflog(refname)) {
 		if (safe_create_leading_directories(logfile->buf) < 0) {
-			strbuf_addf(err, "unable to create directory for %s: "
+			strbuf_addf(err, "unable to create directory for '%s': "
 				    "%s", logfile->buf, strerror(errno));
 			return -1;
 		}
@@ -2620,7 +2812,7 @@ static int log_ref_setup(const char *refname, struct strbuf *logfile, struct str
 
 		if (errno == EISDIR) {
 			if (remove_empty_directories(logfile)) {
-				strbuf_addf(err, "There are still logs under "
+				strbuf_addf(err, "there are still logs under "
 					    "'%s'", logfile->buf);
 				return -1;
 			}
@@ -2628,7 +2820,7 @@ static int log_ref_setup(const char *refname, struct strbuf *logfile, struct str
 		}
 
 		if (logfd < 0) {
-			strbuf_addf(err, "unable to append to %s: %s",
+			strbuf_addf(err, "unable to append to '%s': %s",
 				    logfile->buf, strerror(errno));
 			return -1;
 		}
@@ -2697,13 +2889,13 @@ static int log_ref_write_1(const char *refname, const unsigned char *old_sha1,
 	result = log_ref_write_fd(logfd, old_sha1, new_sha1,
 				  git_committer_info(0), msg);
 	if (result) {
-		strbuf_addf(err, "unable to append to %s: %s", logfile->buf,
+		strbuf_addf(err, "unable to append to '%s': %s", logfile->buf,
 			    strerror(errno));
 		close(logfd);
 		return -1;
 	}
 	if (close(logfd)) {
-		strbuf_addf(err, "unable to append to %s: %s", logfile->buf,
+		strbuf_addf(err, "unable to append to '%s': %s", logfile->buf,
 			    strerror(errno));
 		return -1;
 	}
@@ -2744,14 +2936,14 @@ static int write_ref_to_lockfile(struct ref_lock *lock,
 	o = parse_object(sha1);
 	if (!o) {
 		strbuf_addf(err,
-			    "Trying to write ref %s with nonexistent object %s",
+			    "trying to write ref '%s' with nonexistent object %s",
 			    lock->ref_name, sha1_to_hex(sha1));
 		unlock_ref(lock);
 		return -1;
 	}
 	if (o->type != OBJ_COMMIT && is_branch(lock->ref_name)) {
 		strbuf_addf(err,
-			    "Trying to write non-commit object %s to branch %s",
+			    "trying to write non-commit object %s to branch '%s'",
 			    sha1_to_hex(sha1), lock->ref_name);
 		unlock_ref(lock);
 		return -1;
@@ -2761,7 +2953,7 @@ static int write_ref_to_lockfile(struct ref_lock *lock,
 	    write_in_full(fd, &term, 1) != 1 ||
 	    close_ref(lock) < 0) {
 		strbuf_addf(err,
-			    "Couldn't write %s", get_lock_file_path(lock->lk));
+			    "couldn't write '%s'", get_lock_file_path(lock->lk));
 		unlock_ref(lock);
 		return -1;
 	}
@@ -2775,20 +2967,19 @@ static int write_ref_to_lockfile(struct ref_lock *lock,
  */
 static int commit_ref_update(struct ref_lock *lock,
 			     const unsigned char *sha1, const char *logmsg,
-			     int flags, struct strbuf *err)
+			     struct strbuf *err)
 {
 	clear_loose_ref_cache(&ref_cache);
-	if (log_ref_write(lock->ref_name, lock->old_oid.hash, sha1, logmsg, flags, err) < 0 ||
-	    (strcmp(lock->ref_name, lock->orig_ref_name) &&
-	     log_ref_write(lock->orig_ref_name, lock->old_oid.hash, sha1, logmsg, flags, err) < 0)) {
+	if (log_ref_write(lock->ref_name, lock->old_oid.hash, sha1, logmsg, 0, err)) {
 		char *old_msg = strbuf_detach(err, NULL);
-		strbuf_addf(err, "Cannot update the ref '%s': %s",
+		strbuf_addf(err, "cannot update the ref '%s': %s",
 			    lock->ref_name, old_msg);
 		free(old_msg);
 		unlock_ref(lock);
 		return -1;
 	}
-	if (strcmp(lock->orig_ref_name, "HEAD") != 0) {
+
+	if (strcmp(lock->ref_name, "HEAD") != 0) {
 		/*
 		 * Special hack: If a branch is updated directly and HEAD
 		 * points to it (may happen on the remote side of a push
@@ -2804,6 +2995,7 @@ static int commit_ref_update(struct ref_lock *lock,
 		unsigned char head_sha1[20];
 		int head_flag;
 		const char *head_ref;
+
 		head_ref = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
 					      head_sha1, &head_flag);
 		if (head_ref && (head_flag & REF_ISSYMREF) &&
@@ -2816,8 +3008,9 @@ static int commit_ref_update(struct ref_lock *lock,
 			}
 		}
 	}
+
 	if (commit_ref(lock)) {
-		error("Couldn't set %s", lock->ref_name);
+		strbuf_addf(err, "couldn't set '%s'", lock->ref_name);
 		unlock_ref(lock);
 		return -1;
 	}
@@ -2921,7 +3114,6 @@ int set_worktree_head_symref(const char *gitdir, const char *target)
 	lock = xcalloc(1, sizeof(struct ref_lock));
 	lock->lk = &head_lock;
 	lock->ref_name = xstrdup(head_rel);
-	lock->orig_ref_name = xstrdup(head_rel);
 
 	ret = create_symref_locked(lock, head_rel, target, NULL);
 
@@ -3100,60 +3292,88 @@ int for_each_reflog_ent(const char *refname, each_reflog_ent_fn fn, void *cb_dat
 	strbuf_release(&sb);
 	return ret;
 }
-/*
- * Call fn for each reflog in the namespace indicated by name.  name
- * must be empty or end with '/'.  Name will be used as a scratch
- * space, but its contents will be restored before return.
- */
-static int do_for_each_reflog(struct strbuf *name, each_ref_fn fn, void *cb_data)
-{
-	DIR *d = opendir(git_path("logs/%s", name->buf));
-	int retval = 0;
-	struct dirent *de;
-	int oldlen = name->len;
 
-	if (!d)
-		return name->len ? errno : 0;
+struct files_reflog_iterator {
+	struct ref_iterator base;
 
-	while ((de = readdir(d)) != NULL) {
-		struct stat st;
+	struct dir_iterator *dir_iterator;
+	struct object_id oid;
+};
 
-		if (de->d_name[0] == '.')
+static int files_reflog_iterator_advance(struct ref_iterator *ref_iterator)
+{
+	struct files_reflog_iterator *iter =
+		(struct files_reflog_iterator *)ref_iterator;
+	struct dir_iterator *diter = iter->dir_iterator;
+	int ok;
+
+	while ((ok = dir_iterator_advance(diter)) == ITER_OK) {
+		int flags;
+
+		if (!S_ISREG(diter->st.st_mode))
 			continue;
-		if (ends_with(de->d_name, ".lock"))
+		if (diter->basename[0] == '.')
+			continue;
+		if (ends_with(diter->basename, ".lock"))
 			continue;
-		strbuf_addstr(name, de->d_name);
-		if (stat(git_path("logs/%s", name->buf), &st) < 0) {
-			; /* silently ignore */
-		} else {
-			if (S_ISDIR(st.st_mode)) {
-				strbuf_addch(name, '/');
-				retval = do_for_each_reflog(name, fn, cb_data);
-			} else {
-				struct object_id oid;
 
-				if (read_ref_full(name->buf, 0, oid.hash, NULL))
-					retval = error("bad ref for %s", name->buf);
-				else
-					retval = fn(name->buf, &oid, 0, cb_data);
-			}
-			if (retval)
-				break;
+		if (read_ref_full(diter->relative_path, 0,
+				  iter->oid.hash, &flags)) {
+			error("bad ref for %s", diter->path.buf);
+			continue;
 		}
-		strbuf_setlen(name, oldlen);
+
+		iter->base.refname = diter->relative_path;
+		iter->base.oid = &iter->oid;
+		iter->base.flags = flags;
+		return ITER_OK;
 	}
-	closedir(d);
-	return retval;
+
+	iter->dir_iterator = NULL;
+	if (ref_iterator_abort(ref_iterator) == ITER_ERROR)
+		ok = ITER_ERROR;
+	return ok;
+}
+
+static int files_reflog_iterator_peel(struct ref_iterator *ref_iterator,
+				   struct object_id *peeled)
+{
+	die("BUG: ref_iterator_peel() called for reflog_iterator");
+}
+
+static int files_reflog_iterator_abort(struct ref_iterator *ref_iterator)
+{
+	struct files_reflog_iterator *iter =
+		(struct files_reflog_iterator *)ref_iterator;
+	int ok = ITER_DONE;
+
+	if (iter->dir_iterator)
+		ok = dir_iterator_abort(iter->dir_iterator);
+
+	base_ref_iterator_free(ref_iterator);
+	return ok;
+}
+
+static struct ref_iterator_vtable files_reflog_iterator_vtable = {
+	files_reflog_iterator_advance,
+	files_reflog_iterator_peel,
+	files_reflog_iterator_abort
+};
+
+struct ref_iterator *files_reflog_iterator_begin(void)
+{
+	struct files_reflog_iterator *iter = xcalloc(1, sizeof(*iter));
+	struct ref_iterator *ref_iterator = &iter->base;
+
+	base_ref_iterator_init(ref_iterator, &files_reflog_iterator_vtable);
+	iter->dir_iterator = dir_iterator_begin(git_path("logs"));
+	return ref_iterator;
 }
 
 int for_each_reflog(each_ref_fn fn, void *cb_data)
 {
-	int retval;
-	struct strbuf name;
-	strbuf_init(&name, PATH_MAX);
-	retval = do_for_each_reflog(&name, fn, cb_data);
-	strbuf_release(&name);
-	return retval;
+	return do_for_each_ref_iterator(files_reflog_iterator_begin(),
+					fn, cb_data);
 }
 
 static int ref_update_reject_duplicates(struct string_list *refnames,
@@ -3166,36 +3386,352 @@ static int ref_update_reject_duplicates(struct string_list *refnames,
 	for (i = 1; i < n; i++)
 		if (!strcmp(refnames->items[i - 1].string, refnames->items[i].string)) {
 			strbuf_addf(err,
-				    "Multiple updates for ref '%s' not allowed.",
+				    "multiple updates for ref '%s' not allowed.",
 				    refnames->items[i].string);
 			return 1;
 		}
 	return 0;
 }
 
+/*
+ * If update is a direct update of head_ref (the reference pointed to
+ * by HEAD), then add an extra REF_LOG_ONLY update for HEAD.
+ */
+static int split_head_update(struct ref_update *update,
+			     struct ref_transaction *transaction,
+			     const char *head_ref,
+			     struct string_list *affected_refnames,
+			     struct strbuf *err)
+{
+	struct string_list_item *item;
+	struct ref_update *new_update;
+
+	if ((update->flags & REF_LOG_ONLY) ||
+	    (update->flags & REF_ISPRUNING) ||
+	    (update->flags & REF_UPDATE_VIA_HEAD))
+		return 0;
+
+	if (strcmp(update->refname, head_ref))
+		return 0;
+
+	/*
+	 * First make sure that HEAD is not already in the
+	 * transaction. This insertion is O(N) in the transaction
+	 * size, but it happens at most once per transaction.
+	 */
+	item = string_list_insert(affected_refnames, "HEAD");
+	if (item->util) {
+		/* An entry already existed */
+		strbuf_addf(err,
+			    "multiple updates for 'HEAD' (including one "
+			    "via its referent '%s') are not allowed",
+			    update->refname);
+		return TRANSACTION_NAME_CONFLICT;
+	}
+
+	new_update = ref_transaction_add_update(
+			transaction, "HEAD",
+			update->flags | REF_LOG_ONLY | REF_NODEREF,
+			update->new_sha1, update->old_sha1,
+			update->msg);
+
+	item->util = new_update;
+
+	return 0;
+}
+
+/*
+ * update is for a symref that points at referent and doesn't have
+ * REF_NODEREF set. Split it into two updates:
+ * - The original update, but with REF_LOG_ONLY and REF_NODEREF set
+ * - A new, separate update for the referent reference
+ * Note that the new update will itself be subject to splitting when
+ * the iteration gets to it.
+ */
+static int split_symref_update(struct ref_update *update,
+			       const char *referent,
+			       struct ref_transaction *transaction,
+			       struct string_list *affected_refnames,
+			       struct strbuf *err)
+{
+	struct string_list_item *item;
+	struct ref_update *new_update;
+	unsigned int new_flags;
+
+	/*
+	 * First make sure that referent is not already in the
+	 * transaction. This insertion is O(N) in the transaction
+	 * size, but it happens at most once per symref in a
+	 * transaction.
+	 */
+	item = string_list_insert(affected_refnames, referent);
+	if (item->util) {
+		/* An entry already existed */
+		strbuf_addf(err,
+			    "multiple updates for '%s' (including one "
+			    "via symref '%s') are not allowed",
+			    referent, update->refname);
+		return TRANSACTION_NAME_CONFLICT;
+	}
+
+	new_flags = update->flags;
+	if (!strcmp(update->refname, "HEAD")) {
+		/*
+		 * Record that the new update came via HEAD, so that
+		 * when we process it, split_head_update() doesn't try
+		 * to add another reflog update for HEAD. Note that
+		 * this bit will be propagated if the new_update
+		 * itself needs to be split.
+		 */
+		new_flags |= REF_UPDATE_VIA_HEAD;
+	}
+
+	new_update = ref_transaction_add_update(
+			transaction, referent, new_flags,
+			update->new_sha1, update->old_sha1,
+			update->msg);
+
+	new_update->parent_update = update;
+
+	/*
+	 * Change the symbolic ref update to log only. Also, it
+	 * doesn't need to check its old SHA-1 value, as that will be
+	 * done when new_update is processed.
+	 */
+	update->flags |= REF_LOG_ONLY | REF_NODEREF;
+	update->flags &= ~REF_HAVE_OLD;
+
+	item->util = new_update;
+
+	return 0;
+}
+
+/*
+ * Return the refname under which update was originally requested.
+ */
+static const char *original_update_refname(struct ref_update *update)
+{
+	while (update->parent_update)
+		update = update->parent_update;
+
+	return update->refname;
+}
+
+/*
+ * Check whether the REF_HAVE_OLD and old_oid values stored in update
+ * are consistent with oid, which is the reference's current value. If
+ * everything is OK, return 0; otherwise, write an error message to
+ * err and return -1.
+ */
+static int check_old_oid(struct ref_update *update, struct object_id *oid,
+			 struct strbuf *err)
+{
+	if (!(update->flags & REF_HAVE_OLD) ||
+		   !hashcmp(oid->hash, update->old_sha1))
+		return 0;
+
+	if (is_null_sha1(update->old_sha1))
+		strbuf_addf(err, "cannot lock ref '%s': "
+			    "reference already exists",
+			    original_update_refname(update));
+	else if (is_null_oid(oid))
+		strbuf_addf(err, "cannot lock ref '%s': "
+			    "reference is missing but expected %s",
+			    original_update_refname(update),
+			    sha1_to_hex(update->old_sha1));
+	else
+		strbuf_addf(err, "cannot lock ref '%s': "
+			    "is at %s but expected %s",
+			    original_update_refname(update),
+			    oid_to_hex(oid),
+			    sha1_to_hex(update->old_sha1));
+
+	return -1;
+}
+
+/*
+ * Prepare for carrying out update:
+ * - Lock the reference referred to by update.
+ * - Read the reference under lock.
+ * - Check that its old SHA-1 value (if specified) is correct, and in
+ *   any case record it in update->lock->old_oid for later use when
+ *   writing the reflog.
+ * - If it is a symref update without REF_NODEREF, split it up into a
+ *   REF_LOG_ONLY update of the symref and add a separate update for
+ *   the referent to transaction.
+ * - If it is an update of head_ref, add a corresponding REF_LOG_ONLY
+ *   update of HEAD.
+ */
+static int lock_ref_for_update(struct ref_update *update,
+			       struct ref_transaction *transaction,
+			       const char *head_ref,
+			       struct string_list *affected_refnames,
+			       struct strbuf *err)
+{
+	struct strbuf referent = STRBUF_INIT;
+	int mustexist = (update->flags & REF_HAVE_OLD) &&
+		!is_null_sha1(update->old_sha1);
+	int ret;
+	struct ref_lock *lock;
+
+	if ((update->flags & REF_HAVE_NEW) && is_null_sha1(update->new_sha1))
+		update->flags |= REF_DELETING;
+
+	if (head_ref) {
+		ret = split_head_update(update, transaction, head_ref,
+					affected_refnames, err);
+		if (ret)
+			return ret;
+	}
+
+	ret = lock_raw_ref(update->refname, mustexist,
+			   affected_refnames, NULL,
+			   &update->lock, &referent,
+			   &update->type, err);
+
+	if (ret) {
+		char *reason;
+
+		reason = strbuf_detach(err, NULL);
+		strbuf_addf(err, "cannot lock ref '%s': %s",
+			    original_update_refname(update), reason);
+		free(reason);
+		return ret;
+	}
+
+	lock = update->lock;
+
+	if (update->type & REF_ISSYMREF) {
+		if (update->flags & REF_NODEREF) {
+			/*
+			 * We won't be reading the referent as part of
+			 * the transaction, so we have to read it here
+			 * to record and possibly check old_sha1:
+			 */
+			if (read_ref_full(referent.buf, 0,
+					  lock->old_oid.hash, NULL)) {
+				if (update->flags & REF_HAVE_OLD) {
+					strbuf_addf(err, "cannot lock ref '%s': "
+						    "error reading reference",
+						    original_update_refname(update));
+					return -1;
+				}
+			} else if (check_old_oid(update, &lock->old_oid, err)) {
+				return TRANSACTION_GENERIC_ERROR;
+			}
+		} else {
+			/*
+			 * Create a new update for the reference this
+			 * symref is pointing at. Also, we will record
+			 * and verify old_sha1 for this update as part
+			 * of processing the split-off update, so we
+			 * don't have to do it here.
+			 */
+			ret = split_symref_update(update, referent.buf, transaction,
+						  affected_refnames, err);
+			if (ret)
+				return ret;
+		}
+	} else {
+		struct ref_update *parent_update;
+
+		if (check_old_oid(update, &lock->old_oid, err))
+			return TRANSACTION_GENERIC_ERROR;
+
+		/*
+		 * If this update is happening indirectly because of a
+		 * symref update, record the old SHA-1 in the parent
+		 * update:
+		 */
+		for (parent_update = update->parent_update;
+		     parent_update;
+		     parent_update = parent_update->parent_update) {
+			oidcpy(&parent_update->lock->old_oid, &lock->old_oid);
+		}
+	}
+
+	if ((update->flags & REF_HAVE_NEW) &&
+	    !(update->flags & REF_DELETING) &&
+	    !(update->flags & REF_LOG_ONLY)) {
+		if (!(update->type & REF_ISSYMREF) &&
+		    !hashcmp(lock->old_oid.hash, update->new_sha1)) {
+			/*
+			 * The reference already has the desired
+			 * value, so we don't need to write it.
+			 */
+		} else if (write_ref_to_lockfile(lock, update->new_sha1,
+						 err)) {
+			char *write_err = strbuf_detach(err, NULL);
+
+			/*
+			 * The lock was freed upon failure of
+			 * write_ref_to_lockfile():
+			 */
+			update->lock = NULL;
+			strbuf_addf(err,
+				    "cannot update ref '%s': %s",
+				    update->refname, write_err);
+			free(write_err);
+			return TRANSACTION_GENERIC_ERROR;
+		} else {
+			update->flags |= REF_NEEDS_COMMIT;
+		}
+	}
+	if (!(update->flags & REF_NEEDS_COMMIT)) {
+		/*
+		 * We didn't call write_ref_to_lockfile(), so
+		 * the lockfile is still open. Close it to
+		 * free up the file descriptor:
+		 */
+		if (close_ref(lock)) {
+			strbuf_addf(err, "couldn't close '%s.lock'",
+				    update->refname);
+			return TRANSACTION_GENERIC_ERROR;
+		}
+	}
+	return 0;
+}
+
 int ref_transaction_commit(struct ref_transaction *transaction,
 			   struct strbuf *err)
 {
 	int ret = 0, i;
-	int n = transaction->nr;
-	struct ref_update **updates = transaction->updates;
 	struct string_list refs_to_delete = STRING_LIST_INIT_NODUP;
 	struct string_list_item *ref_to_delete;
 	struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
+	char *head_ref = NULL;
+	int head_type;
+	struct object_id head_oid;
 
 	assert(err);
 
 	if (transaction->state != REF_TRANSACTION_OPEN)
 		die("BUG: commit called for transaction that is not open");
 
-	if (!n) {
+	if (!transaction->nr) {
 		transaction->state = REF_TRANSACTION_CLOSED;
 		return 0;
 	}
 
-	/* Fail if a refname appears more than once in the transaction: */
-	for (i = 0; i < n; i++)
-		string_list_append(&affected_refnames, updates[i]->refname);
+	/*
+	 * Fail if a refname appears more than once in the
+	 * transaction. (If we end up splitting up any updates using
+	 * split_symref_update() or split_head_update(), those
+	 * functions will check that the new updates don't have the
+	 * same refname as any existing ones.)
+	 */
+	for (i = 0; i < transaction->nr; i++) {
+		struct ref_update *update = transaction->updates[i];
+		struct string_list_item *item =
+			string_list_append(&affected_refnames, update->refname);
+
+		/*
+		 * We store a pointer to update in item->util, but at
+		 * the moment we never use the value of this field
+		 * except to check whether it is non-NULL.
+		 */
+		item->util = update;
+	}
 	string_list_sort(&affected_refnames);
 	if (ref_update_reject_duplicates(&affected_refnames, err)) {
 		ret = TRANSACTION_GENERIC_ERROR;
@@ -3203,105 +3739,84 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 	}
 
 	/*
+	 * Special hack: If a branch is updated directly and HEAD
+	 * points to it (may happen on the remote side of a push
+	 * for example) then logically the HEAD reflog should be
+	 * updated too.
+	 *
+	 * A generic solution would require reverse symref lookups,
+	 * but finding all symrefs pointing to a given branch would be
+	 * rather costly for this rare event (the direct update of a
+	 * branch) to be worth it. So let's cheat and check with HEAD
+	 * only, which should cover 99% of all usage scenarios (even
+	 * 100% of the default ones).
+	 *
+	 * So if HEAD is a symbolic reference, then record the name of
+	 * the reference that it points to. If we see an update of
+	 * head_ref within the transaction, then split_head_update()
+	 * arranges for the reflog of HEAD to be updated, too.
+	 */
+	head_ref = resolve_refdup("HEAD", RESOLVE_REF_NO_RECURSE,
+				  head_oid.hash, &head_type);
+
+	if (head_ref && !(head_type & REF_ISSYMREF)) {
+		free(head_ref);
+		head_ref = NULL;
+	}
+
+	/*
 	 * Acquire all locks, verify old values if provided, check
 	 * that new values are valid, and write new values to the
 	 * lockfiles, ready to be activated. Only keep one lockfile
 	 * open at a time to avoid running out of file descriptors.
 	 */
-	for (i = 0; i < n; i++) {
-		struct ref_update *update = updates[i];
+	for (i = 0; i < transaction->nr; i++) {
+		struct ref_update *update = transaction->updates[i];
 
-		if ((update->flags & REF_HAVE_NEW) &&
-		    is_null_sha1(update->new_sha1))
-			update->flags |= REF_DELETING;
-		update->lock = lock_ref_sha1_basic(
-				update->refname,
-				((update->flags & REF_HAVE_OLD) ?
-				 update->old_sha1 : NULL),
-				&affected_refnames, NULL,
-				update->flags,
-				&update->type,
-				err);
-		if (!update->lock) {
-			char *reason;
-
-			ret = (errno == ENOTDIR)
-				? TRANSACTION_NAME_CONFLICT
-				: TRANSACTION_GENERIC_ERROR;
-			reason = strbuf_detach(err, NULL);
-			strbuf_addf(err, "cannot lock ref '%s': %s",
-				    update->refname, reason);
-			free(reason);
+		ret = lock_ref_for_update(update, transaction, head_ref,
+					  &affected_refnames, err);
+		if (ret)
 			goto cleanup;
-		}
-		if ((update->flags & REF_HAVE_NEW) &&
-		    !(update->flags & REF_DELETING)) {
-			int overwriting_symref = ((update->type & REF_ISSYMREF) &&
-						  (update->flags & REF_NODEREF));
-
-			if (!overwriting_symref &&
-			    !hashcmp(update->lock->old_oid.hash, update->new_sha1)) {
-				/*
-				 * The reference already has the desired
-				 * value, so we don't need to write it.
-				 */
-			} else if (write_ref_to_lockfile(update->lock,
-							 update->new_sha1,
-							 err)) {
-				char *write_err = strbuf_detach(err, NULL);
+	}
 
-				/*
-				 * The lock was freed upon failure of
-				 * write_ref_to_lockfile():
-				 */
+	/* Perform updates first so live commits remain referenced */
+	for (i = 0; i < transaction->nr; i++) {
+		struct ref_update *update = transaction->updates[i];
+		struct ref_lock *lock = update->lock;
+
+		if (update->flags & REF_NEEDS_COMMIT ||
+		    update->flags & REF_LOG_ONLY) {
+			if (log_ref_write(lock->ref_name, lock->old_oid.hash,
+					  update->new_sha1,
+					  update->msg, update->flags, err)) {
+				char *old_msg = strbuf_detach(err, NULL);
+
+				strbuf_addf(err, "cannot update the ref '%s': %s",
+					    lock->ref_name, old_msg);
+				free(old_msg);
+				unlock_ref(lock);
 				update->lock = NULL;
-				strbuf_addf(err,
-					    "cannot update the ref '%s': %s",
-					    update->refname, write_err);
-				free(write_err);
 				ret = TRANSACTION_GENERIC_ERROR;
 				goto cleanup;
-			} else {
-				update->flags |= REF_NEEDS_COMMIT;
-			}
-		}
-		if (!(update->flags & REF_NEEDS_COMMIT)) {
-			/*
-			 * We didn't have to write anything to the lockfile.
-			 * Close it to free up the file descriptor:
-			 */
-			if (close_ref(update->lock)) {
-				strbuf_addf(err, "Couldn't close %s.lock",
-					    update->refname);
-				goto cleanup;
 			}
 		}
-	}
-
-	/* Perform updates first so live commits remain referenced */
-	for (i = 0; i < n; i++) {
-		struct ref_update *update = updates[i];
-
 		if (update->flags & REF_NEEDS_COMMIT) {
-			if (commit_ref_update(update->lock,
-					      update->new_sha1, update->msg,
-					      update->flags, err)) {
-				/* freed by commit_ref_update(): */
+			clear_loose_ref_cache(&ref_cache);
+			if (commit_ref(lock)) {
+				strbuf_addf(err, "couldn't set '%s'", lock->ref_name);
+				unlock_ref(lock);
 				update->lock = NULL;
 				ret = TRANSACTION_GENERIC_ERROR;
 				goto cleanup;
-			} else {
-				/* freed by commit_ref_update(): */
-				update->lock = NULL;
 			}
 		}
 	}
-
 	/* Perform deletes now that updates are safely completed */
-	for (i = 0; i < n; i++) {
-		struct ref_update *update = updates[i];
+	for (i = 0; i < transaction->nr; i++) {
+		struct ref_update *update = transaction->updates[i];
 
-		if (update->flags & REF_DELETING) {
+		if (update->flags & REF_DELETING &&
+		    !(update->flags & REF_LOG_ONLY)) {
 			if (delete_ref_loose(update->lock, update->type, err)) {
 				ret = TRANSACTION_GENERIC_ERROR;
 				goto cleanup;
@@ -3324,11 +3839,13 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 cleanup:
 	transaction->state = REF_TRANSACTION_CLOSED;
 
-	for (i = 0; i < n; i++)
-		if (updates[i]->lock)
-			unlock_ref(updates[i]->lock);
+	for (i = 0; i < transaction->nr; i++)
+		if (transaction->updates[i]->lock)
+			unlock_ref(transaction->updates[i]->lock);
 	string_list_clear(&refs_to_delete, 0);
+	free(head_ref);
 	string_list_clear(&affected_refnames, 0);
+
 	return ret;
 }
 
@@ -3344,8 +3861,6 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,
 				   struct strbuf *err)
 {
 	int ret = 0, i;
-	int n = transaction->nr;
-	struct ref_update **updates = transaction->updates;
 	struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
 
 	assert(err);
@@ -3354,8 +3869,9 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,
 		die("BUG: commit called for transaction that is not open");
 
 	/* Fail if a refname appears more than once in the transaction: */
-	for (i = 0; i < n; i++)
-		string_list_append(&affected_refnames, updates[i]->refname);
+	for (i = 0; i < transaction->nr; i++)
+		string_list_append(&affected_refnames,
+				   transaction->updates[i]->refname);
 	string_list_sort(&affected_refnames);
 	if (ref_update_reject_duplicates(&affected_refnames, err)) {
 		ret = TRANSACTION_GENERIC_ERROR;
@@ -3377,8 +3893,8 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,
 	if (for_each_rawref(ref_present, &affected_refnames))
 		die("BUG: initial ref transaction called with existing refs");
 
-	for (i = 0; i < n; i++) {
-		struct ref_update *update = updates[i];
+	for (i = 0; i < transaction->nr; i++) {
+		struct ref_update *update = transaction->updates[i];
 
 		if ((update->flags & REF_HAVE_OLD) &&
 		    !is_null_sha1(update->old_sha1))
@@ -3398,8 +3914,8 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,
 		goto cleanup;
 	}
 
-	for (i = 0; i < n; i++) {
-		struct ref_update *update = updates[i];
+	for (i = 0; i < transaction->nr; i++) {
+		struct ref_update *update = transaction->updates[i];
 
 		if ((update->flags & REF_HAVE_NEW) &&
 		    !is_null_sha1(update->new_sha1))
@@ -3481,7 +3997,8 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
 	 * reference itself, plus we might need to update the
 	 * reference if --updateref was specified:
 	 */
-	lock = lock_ref_sha1_basic(refname, sha1, NULL, NULL, 0, &type, &err);
+	lock = lock_ref_sha1_basic(refname, sha1, NULL, NULL, REF_NODEREF,
+				   &type, &err);
 	if (!lock) {
 		error("cannot lock ref '%s': %s", refname, err.buf);
 		strbuf_release(&err);
diff --git a/refs/iterator.c b/refs/iterator.c
new file mode 100644
index 0000000000..bce1f192f7
--- /dev/null
+++ b/refs/iterator.c
@@ -0,0 +1,384 @@
+/*
+ * Generic reference iterator infrastructure. See refs-internal.h for
+ * documentation about the design and use of reference iterators.
+ */
+
+#include "cache.h"
+#include "refs.h"
+#include "refs/refs-internal.h"
+#include "iterator.h"
+
+int ref_iterator_advance(struct ref_iterator *ref_iterator)
+{
+	return ref_iterator->vtable->advance(ref_iterator);
+}
+
+int ref_iterator_peel(struct ref_iterator *ref_iterator,
+		      struct object_id *peeled)
+{
+	return ref_iterator->vtable->peel(ref_iterator, peeled);
+}
+
+int ref_iterator_abort(struct ref_iterator *ref_iterator)
+{
+	return ref_iterator->vtable->abort(ref_iterator);
+}
+
+void base_ref_iterator_init(struct ref_iterator *iter,
+			    struct ref_iterator_vtable *vtable)
+{
+	iter->vtable = vtable;
+	iter->refname = NULL;
+	iter->oid = NULL;
+	iter->flags = 0;
+}
+
+void base_ref_iterator_free(struct ref_iterator *iter)
+{
+	/* Help make use-after-free bugs fail quickly: */
+	iter->vtable = NULL;
+	free(iter);
+}
+
+struct empty_ref_iterator {
+	struct ref_iterator base;
+};
+
+static int empty_ref_iterator_advance(struct ref_iterator *ref_iterator)
+{
+	return ref_iterator_abort(ref_iterator);
+}
+
+static int empty_ref_iterator_peel(struct ref_iterator *ref_iterator,
+				   struct object_id *peeled)
+{
+	die("BUG: peel called for empty iterator");
+}
+
+static int empty_ref_iterator_abort(struct ref_iterator *ref_iterator)
+{
+	base_ref_iterator_free(ref_iterator);
+	return ITER_DONE;
+}
+
+static struct ref_iterator_vtable empty_ref_iterator_vtable = {
+	empty_ref_iterator_advance,
+	empty_ref_iterator_peel,
+	empty_ref_iterator_abort
+};
+
+struct ref_iterator *empty_ref_iterator_begin(void)
+{
+	struct empty_ref_iterator *iter = xcalloc(1, sizeof(*iter));
+	struct ref_iterator *ref_iterator = &iter->base;
+
+	base_ref_iterator_init(ref_iterator, &empty_ref_iterator_vtable);
+	return ref_iterator;
+}
+
+int is_empty_ref_iterator(struct ref_iterator *ref_iterator)
+{
+	return ref_iterator->vtable == &empty_ref_iterator_vtable;
+}
+
+struct merge_ref_iterator {
+	struct ref_iterator base;
+
+	struct ref_iterator *iter0, *iter1;
+
+	ref_iterator_select_fn *select;
+	void *cb_data;
+
+	/*
+	 * A pointer to iter0 or iter1 (whichever is supplying the
+	 * current value), or NULL if advance has not yet been called.
+	 */
+	struct ref_iterator **current;
+};
+
+static int merge_ref_iterator_advance(struct ref_iterator *ref_iterator)
+{
+	struct merge_ref_iterator *iter =
+		(struct merge_ref_iterator *)ref_iterator;
+	int ok;
+
+	if (!iter->current) {
+		/* Initialize: advance both iterators to their first entries */
+		if ((ok = ref_iterator_advance(iter->iter0)) != ITER_OK) {
+			iter->iter0 = NULL;
+			if (ok == ITER_ERROR)
+				goto error;
+		}
+		if ((ok = ref_iterator_advance(iter->iter1)) != ITER_OK) {
+			iter->iter1 = NULL;
+			if (ok == ITER_ERROR)
+				goto error;
+		}
+	} else {
+		/*
+		 * Advance the current iterator past the just-used
+		 * entry:
+		 */
+		if ((ok = ref_iterator_advance(*iter->current)) != ITER_OK) {
+			*iter->current = NULL;
+			if (ok == ITER_ERROR)
+				goto error;
+		}
+	}
+
+	/* Loop until we find an entry that we can yield. */
+	while (1) {
+		struct ref_iterator **secondary;
+		enum iterator_selection selection =
+			iter->select(iter->iter0, iter->iter1, iter->cb_data);
+
+		if (selection == ITER_SELECT_DONE) {
+			return ref_iterator_abort(ref_iterator);
+		} else if (selection == ITER_SELECT_ERROR) {
+			ref_iterator_abort(ref_iterator);
+			return ITER_ERROR;
+		}
+
+		if ((selection & ITER_CURRENT_SELECTION_MASK) == 0) {
+			iter->current = &iter->iter0;
+			secondary = &iter->iter1;
+		} else {
+			iter->current = &iter->iter1;
+			secondary = &iter->iter0;
+		}
+
+		if (selection & ITER_SKIP_SECONDARY) {
+			if ((ok = ref_iterator_advance(*secondary)) != ITER_OK) {
+				*secondary = NULL;
+				if (ok == ITER_ERROR)
+					goto error;
+			}
+		}
+
+		if (selection & ITER_YIELD_CURRENT) {
+			iter->base.refname = (*iter->current)->refname;
+			iter->base.oid = (*iter->current)->oid;
+			iter->base.flags = (*iter->current)->flags;
+			return ITER_OK;
+		}
+	}
+
+error:
+	ref_iterator_abort(ref_iterator);
+	return ITER_ERROR;
+}
+
+static int merge_ref_iterator_peel(struct ref_iterator *ref_iterator,
+				   struct object_id *peeled)
+{
+	struct merge_ref_iterator *iter =
+		(struct merge_ref_iterator *)ref_iterator;
+
+	if (!iter->current) {
+		die("BUG: peel called before advance for merge iterator");
+	}
+	return ref_iterator_peel(*iter->current, peeled);
+}
+
+static int merge_ref_iterator_abort(struct ref_iterator *ref_iterator)
+{
+	struct merge_ref_iterator *iter =
+		(struct merge_ref_iterator *)ref_iterator;
+	int ok = ITER_DONE;
+
+	if (iter->iter0) {
+		if (ref_iterator_abort(iter->iter0) != ITER_DONE)
+			ok = ITER_ERROR;
+	}
+	if (iter->iter1) {
+		if (ref_iterator_abort(iter->iter1) != ITER_DONE)
+			ok = ITER_ERROR;
+	}
+	base_ref_iterator_free(ref_iterator);
+	return ok;
+}
+
+static struct ref_iterator_vtable merge_ref_iterator_vtable = {
+	merge_ref_iterator_advance,
+	merge_ref_iterator_peel,
+	merge_ref_iterator_abort
+};
+
+struct ref_iterator *merge_ref_iterator_begin(
+		struct ref_iterator *iter0, struct ref_iterator *iter1,
+		ref_iterator_select_fn *select, void *cb_data)
+{
+	struct merge_ref_iterator *iter = xcalloc(1, sizeof(*iter));
+	struct ref_iterator *ref_iterator = &iter->base;
+
+	/*
+	 * We can't do the same kind of is_empty_ref_iterator()-style
+	 * optimization here as overlay_ref_iterator_begin() does,
+	 * because we don't know the semantics of the select function.
+	 * It might, for example, implement "intersect" by passing
+	 * references through only if they exist in both iterators.
+	 */
+
+	base_ref_iterator_init(ref_iterator, &merge_ref_iterator_vtable);
+	iter->iter0 = iter0;
+	iter->iter1 = iter1;
+	iter->select = select;
+	iter->cb_data = cb_data;
+	iter->current = NULL;
+	return ref_iterator;
+}
+
+/*
+ * A ref_iterator_select_fn that overlays the items from front on top
+ * of those from back (like loose refs over packed refs). See
+ * overlay_ref_iterator_begin().
+ */
+static enum iterator_selection overlay_iterator_select(
+		struct ref_iterator *front, struct ref_iterator *back,
+		void *cb_data)
+{
+	int cmp;
+
+	if (!back)
+		return front ? ITER_SELECT_0 : ITER_SELECT_DONE;
+	else if (!front)
+		return ITER_SELECT_1;
+
+	cmp = strcmp(front->refname, back->refname);
+
+	if (cmp < 0)
+		return ITER_SELECT_0;
+	else if (cmp > 0)
+		return ITER_SELECT_1;
+	else
+		return ITER_SELECT_0_SKIP_1;
+}
+
+struct ref_iterator *overlay_ref_iterator_begin(
+		struct ref_iterator *front, struct ref_iterator *back)
+{
+	/*
+	 * Optimization: if one of the iterators is empty, return the
+	 * other one rather than incurring the overhead of wrapping
+	 * them.
+	 */
+	if (is_empty_ref_iterator(front)) {
+		ref_iterator_abort(front);
+		return back;
+	} else if (is_empty_ref_iterator(back)) {
+		ref_iterator_abort(back);
+		return front;
+	}
+
+	return merge_ref_iterator_begin(front, back,
+					overlay_iterator_select, NULL);
+}
+
+struct prefix_ref_iterator {
+	struct ref_iterator base;
+
+	struct ref_iterator *iter0;
+	char *prefix;
+	int trim;
+};
+
+static int prefix_ref_iterator_advance(struct ref_iterator *ref_iterator)
+{
+	struct prefix_ref_iterator *iter =
+		(struct prefix_ref_iterator *)ref_iterator;
+	int ok;
+
+	while ((ok = ref_iterator_advance(iter->iter0)) == ITER_OK) {
+		if (!starts_with(iter->iter0->refname, iter->prefix))
+			continue;
+
+		iter->base.refname = iter->iter0->refname + iter->trim;
+		iter->base.oid = iter->iter0->oid;
+		iter->base.flags = iter->iter0->flags;
+		return ITER_OK;
+	}
+
+	iter->iter0 = NULL;
+	if (ref_iterator_abort(ref_iterator) != ITER_DONE)
+		return ITER_ERROR;
+	return ok;
+}
+
+static int prefix_ref_iterator_peel(struct ref_iterator *ref_iterator,
+				    struct object_id *peeled)
+{
+	struct prefix_ref_iterator *iter =
+		(struct prefix_ref_iterator *)ref_iterator;
+
+	return ref_iterator_peel(iter->iter0, peeled);
+}
+
+static int prefix_ref_iterator_abort(struct ref_iterator *ref_iterator)
+{
+	struct prefix_ref_iterator *iter =
+		(struct prefix_ref_iterator *)ref_iterator;
+	int ok = ITER_DONE;
+
+	if (iter->iter0)
+		ok = ref_iterator_abort(iter->iter0);
+	free(iter->prefix);
+	base_ref_iterator_free(ref_iterator);
+	return ok;
+}
+
+static struct ref_iterator_vtable prefix_ref_iterator_vtable = {
+	prefix_ref_iterator_advance,
+	prefix_ref_iterator_peel,
+	prefix_ref_iterator_abort
+};
+
+struct ref_iterator *prefix_ref_iterator_begin(struct ref_iterator *iter0,
+					       const char *prefix,
+					       int trim)
+{
+	struct prefix_ref_iterator *iter;
+	struct ref_iterator *ref_iterator;
+
+	if (!*prefix && !trim)
+		return iter0; /* optimization: no need to wrap iterator */
+
+	iter = xcalloc(1, sizeof(*iter));
+	ref_iterator = &iter->base;
+
+	base_ref_iterator_init(ref_iterator, &prefix_ref_iterator_vtable);
+
+	iter->iter0 = iter0;
+	iter->prefix = xstrdup(prefix);
+	iter->trim = trim;
+
+	return ref_iterator;
+}
+
+struct ref_iterator *current_ref_iter = NULL;
+
+int do_for_each_ref_iterator(struct ref_iterator *iter,
+			     each_ref_fn fn, void *cb_data)
+{
+	int retval = 0, ok;
+	struct ref_iterator *old_ref_iter = current_ref_iter;
+
+	current_ref_iter = iter;
+	while ((ok = ref_iterator_advance(iter)) == ITER_OK) {
+		retval = fn(iter->refname, iter->oid, iter->flags, cb_data);
+		if (retval) {
+			/*
+			 * If ref_iterator_abort() returns ITER_ERROR,
+			 * we ignore that error in deference to the
+			 * callback function's return value.
+			 */
+			ref_iterator_abort(iter);
+			goto out;
+		}
+	}
+
+out:
+	current_ref_iter = old_ref_iter;
+	if (ok == ITER_ERROR)
+		return -1;
+	return retval;
+}
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index c7dded35f4..efe584701b 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -15,7 +15,7 @@
 
 /*
  * Used as a flag in ref_update::flags when a loose ref is being
- * pruned.
+ * pruned. This flag must only be used when REF_NODEREF is set.
  */
 #define REF_ISPRUNING	0x04
 
@@ -43,6 +43,19 @@
  */
 
 /*
+ * Used as a flag in ref_update::flags when we want to log a ref
+ * update but not actually perform it.  This is used when a symbolic
+ * ref update is split up.
+ */
+#define REF_LOG_ONLY 0x80
+
+/*
+ * Internal flag, meaning that the containing ref_update was via an
+ * update to HEAD.
+ */
+#define REF_UPDATE_VIA_HEAD 0x100
+
+/*
  * Return true iff refname is minimally safe. "Safe" here means that
  * deleting a loose reference by this name will not do any damage, for
  * example by causing a file that is not a reference to be deleted.
@@ -109,8 +122,8 @@ enum peel_status peel_object(const unsigned char *name, unsigned char *sha1);
  * extras and skip must be sorted.
  */
 int verify_refname_available(const char *newname,
-			     struct string_list *extras,
-			     struct string_list *skip,
+			     const struct string_list *extras,
+			     const struct string_list *skip,
 			     struct strbuf *err);
 
 /*
@@ -130,27 +143,59 @@ int should_autocreate_reflog(const char *refname);
  * not exist before update.
  */
 struct ref_update {
+
 	/*
 	 * If (flags & REF_HAVE_NEW), set the reference to this value:
 	 */
 	unsigned char new_sha1[20];
+
 	/*
 	 * If (flags & REF_HAVE_OLD), check that the reference
 	 * previously had this value:
 	 */
 	unsigned char old_sha1[20];
+
 	/*
 	 * One or more of REF_HAVE_NEW, REF_HAVE_OLD, REF_NODEREF,
-	 * REF_DELETING, and REF_ISPRUNING:
+	 * REF_DELETING, REF_ISPRUNING, REF_LOG_ONLY, and
+	 * REF_UPDATE_VIA_HEAD:
 	 */
 	unsigned int flags;
+
 	struct ref_lock *lock;
-	int type;
+	unsigned int type;
 	char *msg;
+
+	/*
+	 * If this ref_update was split off of a symref update via
+	 * split_symref_update(), then this member points at that
+	 * update. This is used for two purposes:
+	 * 1. When reporting errors, we report the refname under which
+	 *    the update was originally requested.
+	 * 2. When we read the old value of this reference, we
+	 *    propagate it back to its parent update for recording in
+	 *    the latter's reflog.
+	 */
+	struct ref_update *parent_update;
+
 	const char refname[FLEX_ARRAY];
 };
 
 /*
+ * Add a ref_update with the specified properties to transaction, and
+ * return a pointer to the new object. This function does not verify
+ * that refname is well-formed. new_sha1 and old_sha1 are only
+ * dereferenced if the REF_HAVE_NEW and REF_HAVE_OLD bits,
+ * respectively, are set in flags.
+ */
+struct ref_update *ref_transaction_add_update(
+		struct ref_transaction *transaction,
+		const char *refname, unsigned int flags,
+		const unsigned char *new_sha1,
+		const unsigned char *old_sha1,
+		const char *msg);
+
+/*
  * Transaction states.
  * OPEN:   The transaction is in a valid state and can accept new updates.
  *         An OPEN transaction can be committed.
@@ -197,4 +242,277 @@ const char *find_descendant_ref(const char *dirname,
 
 int rename_ref_available(const char *oldname, const char *newname);
 
+/* We allow "recursive" symbolic refs. Only within reason, though */
+#define SYMREF_MAXDEPTH 5
+
+/* Include broken references in a do_for_each_ref*() iteration: */
+#define DO_FOR_EACH_INCLUDE_BROKEN 0x01
+
+/*
+ * Reference iterators
+ *
+ * A reference iterator encapsulates the state of an in-progress
+ * iteration over references. Create an instance of `struct
+ * ref_iterator` via one of the functions in this module.
+ *
+ * A freshly-created ref_iterator doesn't yet point at a reference. To
+ * advance the iterator, call ref_iterator_advance(). If successful,
+ * this sets the iterator's refname, oid, and flags fields to describe
+ * the next reference and returns ITER_OK. The data pointed at by
+ * refname and oid belong to the iterator; if you want to retain them
+ * after calling ref_iterator_advance() again or calling
+ * ref_iterator_abort(), you must make a copy. When the iteration has
+ * been exhausted, ref_iterator_advance() releases any resources
+ * assocated with the iteration, frees the ref_iterator object, and
+ * returns ITER_DONE. If you want to abort the iteration early, call
+ * ref_iterator_abort(), which also frees the ref_iterator object and
+ * any associated resources. If there was an internal error advancing
+ * to the next entry, ref_iterator_advance() aborts the iteration,
+ * frees the ref_iterator, and returns ITER_ERROR.
+ *
+ * The reference currently being looked at can be peeled by calling
+ * ref_iterator_peel(). This function is often faster than peel_ref(),
+ * so it should be preferred when iterating over references.
+ *
+ * Putting it all together, a typical iteration looks like this:
+ *
+ *     int ok;
+ *     struct ref_iterator *iter = ...;
+ *
+ *     while ((ok = ref_iterator_advance(iter)) == ITER_OK) {
+ *             if (want_to_stop_iteration()) {
+ *                     ok = ref_iterator_abort(iter);
+ *                     break;
+ *             }
+ *
+ *             // Access information about the current reference:
+ *             if (!(iter->flags & REF_ISSYMREF))
+ *                     printf("%s is %s\n", iter->refname, oid_to_hex(&iter->oid));
+ *
+ *             // If you need to peel the reference:
+ *             ref_iterator_peel(iter, &oid);
+ *     }
+ *
+ *     if (ok != ITER_DONE)
+ *             handle_error();
+ */
+struct ref_iterator {
+	struct ref_iterator_vtable *vtable;
+	const char *refname;
+	const struct object_id *oid;
+	unsigned int flags;
+};
+
+/*
+ * Advance the iterator to the first or next item and return ITER_OK.
+ * If the iteration is exhausted, free the resources associated with
+ * the ref_iterator and return ITER_DONE. On errors, free the iterator
+ * resources and return ITER_ERROR. It is a bug to use ref_iterator or
+ * call this function again after it has returned ITER_DONE or
+ * ITER_ERROR.
+ */
+int ref_iterator_advance(struct ref_iterator *ref_iterator);
+
+/*
+ * If possible, peel the reference currently being viewed by the
+ * iterator. Return 0 on success.
+ */
+int ref_iterator_peel(struct ref_iterator *ref_iterator,
+		      struct object_id *peeled);
+
+/*
+ * End the iteration before it has been exhausted, freeing the
+ * reference iterator and any associated resources and returning
+ * ITER_DONE. If the abort itself failed, return ITER_ERROR.
+ */
+int ref_iterator_abort(struct ref_iterator *ref_iterator);
+
+/*
+ * An iterator over nothing (its first ref_iterator_advance() call
+ * returns ITER_DONE).
+ */
+struct ref_iterator *empty_ref_iterator_begin(void);
+
+/*
+ * Return true iff ref_iterator is an empty_ref_iterator.
+ */
+int is_empty_ref_iterator(struct ref_iterator *ref_iterator);
+
+/*
+ * A callback function used to instruct merge_ref_iterator how to
+ * interleave the entries from iter0 and iter1. The function should
+ * return one of the constants defined in enum iterator_selection. It
+ * must not advance either of the iterators itself.
+ *
+ * The function must be prepared to handle the case that iter0 and/or
+ * iter1 is NULL, which indicates that the corresponding sub-iterator
+ * has been exhausted. Its return value must be consistent with the
+ * current states of the iterators; e.g., it must not return
+ * ITER_SKIP_1 if iter1 has already been exhausted.
+ */
+typedef enum iterator_selection ref_iterator_select_fn(
+		struct ref_iterator *iter0, struct ref_iterator *iter1,
+		void *cb_data);
+
+/*
+ * Iterate over the entries from iter0 and iter1, with the values
+ * interleaved as directed by the select function. The iterator takes
+ * ownership of iter0 and iter1 and frees them when the iteration is
+ * over.
+ */
+struct ref_iterator *merge_ref_iterator_begin(
+		struct ref_iterator *iter0, struct ref_iterator *iter1,
+		ref_iterator_select_fn *select, void *cb_data);
+
+/*
+ * An iterator consisting of the union of the entries from front and
+ * back. If there are entries common to the two sub-iterators, use the
+ * one from front. Each iterator must iterate over its entries in
+ * strcmp() order by refname for this to work.
+ *
+ * The new iterator takes ownership of its arguments and frees them
+ * when the iteration is over. As a convenience to callers, if front
+ * or back is an empty_ref_iterator, then abort that one immediately
+ * and return the other iterator directly, without wrapping it.
+ */
+struct ref_iterator *overlay_ref_iterator_begin(
+		struct ref_iterator *front, struct ref_iterator *back);
+
+/*
+ * Wrap iter0, only letting through the references whose names start
+ * with prefix. If trim is set, set iter->refname to the name of the
+ * reference with that many characters trimmed off the front;
+ * otherwise set it to the full refname. The new iterator takes over
+ * ownership of iter0 and frees it when iteration is over. It makes
+ * its own copy of prefix.
+ *
+ * As an convenience to callers, if prefix is the empty string and
+ * trim is zero, this function returns iter0 directly, without
+ * wrapping it.
+ */
+struct ref_iterator *prefix_ref_iterator_begin(struct ref_iterator *iter0,
+					       const char *prefix,
+					       int trim);
+
+/*
+ * Iterate over the packed and loose references in the specified
+ * submodule that are within find_containing_dir(prefix). If prefix is
+ * NULL or the empty string, iterate over all references in the
+ * submodule.
+ */
+struct ref_iterator *files_ref_iterator_begin(const char *submodule,
+					      const char *prefix,
+					      unsigned int flags);
+
+/*
+ * Iterate over the references in the main ref_store that have a
+ * reflog. The paths within a directory are iterated over in arbitrary
+ * order.
+ */
+struct ref_iterator *files_reflog_iterator_begin(void);
+
+/* Internal implementation of reference iteration: */
+
+/*
+ * Base class constructor for ref_iterators. Initialize the
+ * ref_iterator part of iter, setting its vtable pointer as specified.
+ * This is meant to be called only by the initializers of derived
+ * classes.
+ */
+void base_ref_iterator_init(struct ref_iterator *iter,
+			    struct ref_iterator_vtable *vtable);
+
+/*
+ * Base class destructor for ref_iterators. Destroy the ref_iterator
+ * part of iter and shallow-free the object. This is meant to be
+ * called only by the destructors of derived classes.
+ */
+void base_ref_iterator_free(struct ref_iterator *iter);
+
+/* Virtual function declarations for ref_iterators: */
+
+typedef int ref_iterator_advance_fn(struct ref_iterator *ref_iterator);
+
+typedef int ref_iterator_peel_fn(struct ref_iterator *ref_iterator,
+				 struct object_id *peeled);
+
+/*
+ * Implementations of this function should free any resources specific
+ * to the derived class, then call base_ref_iterator_free() to clean
+ * up and free the ref_iterator object.
+ */
+typedef int ref_iterator_abort_fn(struct ref_iterator *ref_iterator);
+
+struct ref_iterator_vtable {
+	ref_iterator_advance_fn *advance;
+	ref_iterator_peel_fn *peel;
+	ref_iterator_abort_fn *abort;
+};
+
+/*
+ * current_ref_iter is a performance hack: when iterating over
+ * references using the for_each_ref*() functions, current_ref_iter is
+ * set to the reference iterator before calling the callback function.
+ * If the callback function calls peel_ref(), then peel_ref() first
+ * checks whether the reference to be peeled is the one referred to by
+ * the iterator (it usually is) and if so, asks the iterator for the
+ * peeled version of the reference if it is available. This avoids a
+ * refname lookup in a common case. current_ref_iter is set to NULL
+ * when the iteration is over.
+ */
+extern struct ref_iterator *current_ref_iter;
+
+/*
+ * The common backend for the for_each_*ref* functions. Call fn for
+ * each reference in iter. If the iterator itself ever returns
+ * ITER_ERROR, return -1. If fn ever returns a non-zero value, stop
+ * the iteration and return that value. Otherwise, return 0. In any
+ * case, free the iterator when done. This function is basically an
+ * adapter between the callback style of reference iteration and the
+ * iterator style.
+ */
+int do_for_each_ref_iterator(struct ref_iterator *iter,
+			     each_ref_fn fn, void *cb_data);
+
+/*
+ * Read the specified reference from the filesystem or packed refs
+ * file, non-recursively. Set type to describe the reference, and:
+ *
+ * - If refname is the name of a normal reference, fill in sha1
+ *   (leaving referent unchanged).
+ *
+ * - If refname is the name of a symbolic reference, write the full
+ *   name of the reference to which it refers (e.g.
+ *   "refs/heads/master") to referent and set the REF_ISSYMREF bit in
+ *   type (leaving sha1 unchanged). The caller is responsible for
+ *   validating that referent is a valid reference name.
+ *
+ * WARNING: refname might be used as part of a filename, so it is
+ * important from a security standpoint that it be safe in the sense
+ * of refname_is_safe(). Moreover, for symrefs this function sets
+ * referent to whatever the repository says, which might not be a
+ * properly-formatted or even safe reference name. NEITHER INPUT NOR
+ * OUTPUT REFERENCE NAMES ARE VALIDATED WITHIN THIS FUNCTION.
+ *
+ * Return 0 on success. If the ref doesn't exist, set errno to ENOENT
+ * and return -1. If the ref exists but is neither a symbolic ref nor
+ * a sha1, it is broken; set REF_ISBROKEN in type, set errno to
+ * EINVAL, and return -1. If there is another error reading the ref,
+ * set errno appropriately and return -1.
+ *
+ * Backend-specific flags might be set in type as well, regardless of
+ * outcome.
+ *
+ * It is OK for refname to point into referent. If so:
+ *
+ * - if the function succeeds with REF_ISSYMREF, referent will be
+ *   overwritten and the memory formerly pointed to by it might be
+ *   changed or even freed.
+ *
+ * - in all other cases, referent will be untouched, and therefore
+ *   refname will still be valid and unchanged.
+ */
+int read_raw_ref(const char *refname, unsigned char *sha1,
+		 struct strbuf *referent, unsigned int *type);
+
 #endif /* REFS_REFS_INTERNAL_H */
diff --git a/remote-curl.c b/remote-curl.c
index 15e48e25fb..6b83b7783e 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -474,7 +474,7 @@ static int run_slot(struct active_request_slot *slot,
 static int probe_rpc(struct rpc_state *rpc, struct slot_results *results)
 {
 	struct active_request_slot *slot;
-	struct curl_slist *headers = NULL;
+	struct curl_slist *headers = http_copy_default_headers();
 	struct strbuf buf = STRBUF_INIT;
 	int err;
 
@@ -503,7 +503,7 @@ static int probe_rpc(struct rpc_state *rpc, struct slot_results *results)
 static int post_rpc(struct rpc_state *rpc)
 {
 	struct active_request_slot *slot;
-	struct curl_slist *headers = NULL;
+	struct curl_slist *headers = http_copy_default_headers();
 	int use_gzip = rpc->gzip_request;
 	char *gzip_body = NULL;
 	size_t gzip_size = 0;
@@ -984,14 +984,11 @@ static void parse_push(struct strbuf *buf)
 	free(specs);
 }
 
-int main(int argc, const char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	struct strbuf buf = STRBUF_INIT;
 	int nongit;
 
-	git_setup_gettext();
-
-	git_extract_argv0_path(argv[0]);
 	setup_git_directory_gently(&nongit);
 	if (argc < 2) {
 		error("remote-curl: usage: git remote-curl <remote> [<url>]");
diff --git a/remote-testsvn.c b/remote-testsvn.c
index f05ff45298..f87bf851ba 100644
--- a/remote-testsvn.c
+++ b/remote-testsvn.c
@@ -284,7 +284,7 @@ static int do_command(struct strbuf *line)
 	return 0;
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	struct strbuf buf = STRBUF_INIT, url_sb = STRBUF_INIT,
 			private_ref_sb = STRBUF_INIT, marksfilename_sb = STRBUF_INIT,
@@ -292,7 +292,6 @@ int main(int argc, char **argv)
 	static struct remote *remote;
 	const char *url_in;
 
-	git_extract_argv0_path(argv[0]);
 	setup_git_directory();
 	if (argc < 2 || argc > 3) {
 		usage("git-remote-svn <remote-name> [<url>]");
diff --git a/remote.c b/remote.c
index a326e4e251..d29850a81c 100644
--- a/remote.c
+++ b/remote.c
@@ -1544,8 +1544,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
 		 * branch.
 		 */
 		if (ref->expect_old_sha1) {
-			if (ref->expect_old_no_trackback ||
-			    oidcmp(&ref->old_oid, &ref->old_oid_expect))
+			if (oidcmp(&ref->old_oid, &ref->old_oid_expect))
 				reject_reason = REF_STATUS_REJECT_STALE;
 			else
 				/* If the ref isn't stale then force the update. */
@@ -2294,6 +2293,8 @@ int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unse
 	entry = add_cas_entry(cas, arg, colon - arg);
 	if (!*colon)
 		entry->use_tracking = 1;
+	else if (!colon[1])
+		hashclr(entry->expect);
 	else if (get_sha1(colon + 1, entry->expect))
 		return error("cannot parse expected object name '%s'", colon + 1);
 	return 0;
@@ -2343,7 +2344,7 @@ static void apply_cas(struct push_cas_option *cas,
 		if (!entry->use_tracking)
 			hashcpy(ref->old_oid_expect.hash, cas->entry[i].expect);
 		else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
-			ref->expect_old_no_trackback = 1;
+			oidclr(&ref->old_oid_expect);
 		return;
 	}
 
@@ -2353,7 +2354,7 @@ static void apply_cas(struct push_cas_option *cas,
 
 	ref->expect_old_sha1 = 1;
 	if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
-		ref->expect_old_no_trackback = 1;
+		oidclr(&ref->old_oid_expect);
 }
 
 void apply_push_cas(struct push_cas_option *cas,
diff --git a/remote.h b/remote.h
index c21fd3788c..924881169d 100644
--- a/remote.h
+++ b/remote.h
@@ -89,7 +89,6 @@ struct ref {
 		force:1,
 		forced_update:1,
 		expect_old_sha1:1,
-		expect_old_no_trackback:1,
 		deletion:1,
 		matched:1;
 
diff --git a/rerere.c b/rerere.c
index 587b7e2717..aaadec17d8 100644
--- a/rerere.c
+++ b/rerere.c
@@ -8,6 +8,7 @@
 #include "ll-merge.h"
 #include "attr.h"
 #include "pathspec.h"
+#include "sha1-lookup.h"
 
 #define RESOLVED 0
 #define PUNTED 1
@@ -20,6 +21,29 @@ static int rerere_enabled = -1;
 /* automatically update cleanly resolved paths to the index */
 static int rerere_autoupdate;
 
+static int rerere_dir_nr;
+static int rerere_dir_alloc;
+
+#define RR_HAS_POSTIMAGE 1
+#define RR_HAS_PREIMAGE 2
+static struct rerere_dir {
+	unsigned char sha1[20];
+	int status_alloc, status_nr;
+	unsigned char *status;
+} **rerere_dir;
+
+static void free_rerere_dirs(void)
+{
+	int i;
+	for (i = 0; i < rerere_dir_nr; i++) {
+		free(rerere_dir[i]->status);
+		free(rerere_dir[i]);
+	}
+	free(rerere_dir);
+	rerere_dir_nr = rerere_dir_alloc = 0;
+	rerere_dir = NULL;
+}
+
 static void free_rerere_id(struct string_list_item *item)
 {
 	free(item->util);
@@ -27,7 +51,33 @@ static void free_rerere_id(struct string_list_item *item)
 
 static const char *rerere_id_hex(const struct rerere_id *id)
 {
-	return id->hex;
+	return sha1_to_hex(id->collection->sha1);
+}
+
+static void fit_variant(struct rerere_dir *rr_dir, int variant)
+{
+	variant++;
+	ALLOC_GROW(rr_dir->status, variant, rr_dir->status_alloc);
+	if (rr_dir->status_nr < variant) {
+		memset(rr_dir->status + rr_dir->status_nr,
+		       '\0', variant - rr_dir->status_nr);
+		rr_dir->status_nr = variant;
+	}
+}
+
+static void assign_variant(struct rerere_id *id)
+{
+	int variant;
+	struct rerere_dir *rr_dir = id->collection;
+
+	variant = id->variant;
+	if (variant < 0) {
+		for (variant = 0; variant < rr_dir->status_nr; variant++)
+			if (!rr_dir->status[variant])
+				break;
+	}
+	fit_variant(rr_dir, variant);
+	id->variant = variant;
 }
 
 const char *rerere_path(const struct rerere_id *id, const char *file)
@@ -35,20 +85,103 @@ const char *rerere_path(const struct rerere_id *id, const char *file)
 	if (!file)
 		return git_path("rr-cache/%s", rerere_id_hex(id));
 
-	return git_path("rr-cache/%s/%s", rerere_id_hex(id), file);
+	if (id->variant <= 0)
+		return git_path("rr-cache/%s/%s", rerere_id_hex(id), file);
+
+	return git_path("rr-cache/%s/%s.%d",
+			rerere_id_hex(id), file, id->variant);
+}
+
+static int is_rr_file(const char *name, const char *filename, int *variant)
+{
+	const char *suffix;
+	char *ep;
+
+	if (!strcmp(name, filename)) {
+		*variant = 0;
+		return 1;
+	}
+	if (!skip_prefix(name, filename, &suffix) || *suffix != '.')
+		return 0;
+
+	errno = 0;
+	*variant = strtol(suffix + 1, &ep, 10);
+	if (errno || *ep)
+		return 0;
+	return 1;
+}
+
+static void scan_rerere_dir(struct rerere_dir *rr_dir)
+{
+	struct dirent *de;
+	DIR *dir = opendir(git_path("rr-cache/%s", sha1_to_hex(rr_dir->sha1)));
+
+	if (!dir)
+		return;
+	while ((de = readdir(dir)) != NULL) {
+		int variant;
+
+		if (is_rr_file(de->d_name, "postimage", &variant)) {
+			fit_variant(rr_dir, variant);
+			rr_dir->status[variant] |= RR_HAS_POSTIMAGE;
+		} else if (is_rr_file(de->d_name, "preimage", &variant)) {
+			fit_variant(rr_dir, variant);
+			rr_dir->status[variant] |= RR_HAS_PREIMAGE;
+		}
+	}
+	closedir(dir);
+}
+
+static const unsigned char *rerere_dir_sha1(size_t i, void *table)
+{
+	struct rerere_dir **rr_dir = table;
+	return rr_dir[i]->sha1;
+}
+
+static struct rerere_dir *find_rerere_dir(const char *hex)
+{
+	unsigned char sha1[20];
+	struct rerere_dir *rr_dir;
+	int pos;
+
+	if (get_sha1_hex(hex, sha1))
+		return NULL; /* BUG */
+	pos = sha1_pos(sha1, rerere_dir, rerere_dir_nr, rerere_dir_sha1);
+	if (pos < 0) {
+		rr_dir = xmalloc(sizeof(*rr_dir));
+		hashcpy(rr_dir->sha1, sha1);
+		rr_dir->status = NULL;
+		rr_dir->status_nr = 0;
+		rr_dir->status_alloc = 0;
+		pos = -1 - pos;
+
+		/* Make sure the array is big enough ... */
+		ALLOC_GROW(rerere_dir, rerere_dir_nr + 1, rerere_dir_alloc);
+		/* ... and add it in. */
+		rerere_dir_nr++;
+		memmove(rerere_dir + pos + 1, rerere_dir + pos,
+			(rerere_dir_nr - pos - 1) * sizeof(*rerere_dir));
+		rerere_dir[pos] = rr_dir;
+		scan_rerere_dir(rr_dir);
+	}
+	return rerere_dir[pos];
 }
 
 static int has_rerere_resolution(const struct rerere_id *id)
 {
-	struct stat st;
+	const int both = RR_HAS_POSTIMAGE|RR_HAS_PREIMAGE;
+	int variant = id->variant;
 
-	return !stat(rerere_path(id, "postimage"), &st);
+	if (variant < 0)
+		return 0;
+	return ((id->collection->status[variant] & both) == both);
 }
 
 static struct rerere_id *new_rerere_id_hex(char *hex)
 {
 	struct rerere_id *id = xmalloc(sizeof(*id));
-	xsnprintf(id->hex, sizeof(id->hex), "%s", hex);
+	id->collection = find_rerere_dir(hex);
+	id->variant = -1; /* not known yet */
 	return id;
 }
 
@@ -75,16 +208,26 @@ static void read_rr(struct string_list *rr)
 		char *path;
 		unsigned char sha1[20];
 		struct rerere_id *id;
+		int variant;
 
 		/* There has to be the hash, tab, path and then NUL */
 		if (buf.len < 42 || get_sha1_hex(buf.buf, sha1))
 			die("corrupt MERGE_RR");
 
-		if (buf.buf[40] != '\t')
+		if (buf.buf[40] != '.') {
+			variant = 0;
+			path = buf.buf + 40;
+		} else {
+			errno = 0;
+			variant = strtol(buf.buf + 41, &path, 10);
+			if (errno)
+				die("corrupt MERGE_RR");
+		}
+		if (*(path++) != '\t')
 			die("corrupt MERGE_RR");
 		buf.buf[40] = '\0';
-		path = buf.buf + 41;
 		id = new_rerere_id_hex(buf.buf);
+		id->variant = variant;
 		string_list_insert(rr, path)->util = id;
 	}
 	strbuf_release(&buf);
@@ -105,9 +248,16 @@ static int write_rr(struct string_list *rr, int out_fd)
 		id = rr->items[i].util;
 		if (!id)
 			continue;
-		strbuf_addf(&buf, "%s\t%s%c",
-			    rerere_id_hex(id),
-			    rr->items[i].string, 0);
+		assert(id->variant >= 0);
+		if (0 < id->variant)
+			strbuf_addf(&buf, "%s.%d\t%s%c",
+				    rerere_id_hex(id), id->variant,
+				    rr->items[i].string, 0);
+		else
+			strbuf_addf(&buf, "%s\t%s%c",
+				    rerere_id_hex(id),
+				    rr->items[i].string, 0);
+
 		if (write_in_full(out_fd, buf.buf, buf.len) != buf.len)
 			die("unable to write rerere record");
 
@@ -351,8 +501,7 @@ static int handle_file(const char *path, unsigned char *sha1, const char *output
 		error("There were errors while writing %s (%s)",
 		      path, strerror(io.io.wrerror));
 	if (io.io.output && fclose(io.io.output))
-		io.io.wrerror = error("Failed to flush %s: %s",
-				      path, strerror(errno));
+		io.io.wrerror = error_errno("Failed to flush %s", path);
 
 	if (hunk_no < 0) {
 		if (output)
@@ -365,103 +514,6 @@ static int handle_file(const char *path, unsigned char *sha1, const char *output
 }
 
 /*
- * Subclass of rerere_io that reads from an in-core buffer that is a
- * strbuf
- */
-struct rerere_io_mem {
-	struct rerere_io io;
-	struct strbuf input;
-};
-
-/*
- * ... and its getline() method implementation
- */
-static int rerere_mem_getline(struct strbuf *sb, struct rerere_io *io_)
-{
-	struct rerere_io_mem *io = (struct rerere_io_mem *)io_;
-	char *ep;
-	size_t len;
-
-	strbuf_release(sb);
-	if (!io->input.len)
-		return -1;
-	ep = memchr(io->input.buf, '\n', io->input.len);
-	if (!ep)
-		ep = io->input.buf + io->input.len;
-	else if (*ep == '\n')
-		ep++;
-	len = ep - io->input.buf;
-	strbuf_add(sb, io->input.buf, len);
-	strbuf_remove(&io->input, 0, len);
-	return 0;
-}
-
-static int handle_cache(const char *path, unsigned char *sha1, const char *output)
-{
-	mmfile_t mmfile[3] = {{NULL}};
-	mmbuffer_t result = {NULL, 0};
-	const struct cache_entry *ce;
-	int pos, len, i, hunk_no;
-	struct rerere_io_mem io;
-	int marker_size = ll_merge_marker_size(path);
-
-	/*
-	 * Reproduce the conflicted merge in-core
-	 */
-	len = strlen(path);
-	pos = cache_name_pos(path, len);
-	if (0 <= pos)
-		return -1;
-	pos = -pos - 1;
-
-	while (pos < active_nr) {
-		enum object_type type;
-		unsigned long size;
-
-		ce = active_cache[pos++];
-		if (ce_namelen(ce) != len || memcmp(ce->name, path, len))
-			break;
-		i = ce_stage(ce) - 1;
-		if (!mmfile[i].ptr) {
-			mmfile[i].ptr = read_sha1_file(ce->sha1, &type, &size);
-			mmfile[i].size = size;
-		}
-	}
-	for (i = 0; i < 3; i++)
-		if (!mmfile[i].ptr && !mmfile[i].size)
-			mmfile[i].ptr = xstrdup("");
-
-	/*
-	 * NEEDSWORK: handle conflicts from merges with
-	 * merge.renormalize set, too
-	 */
-	ll_merge(&result, path, &mmfile[0], NULL,
-		 &mmfile[1], "ours",
-		 &mmfile[2], "theirs", NULL);
-	for (i = 0; i < 3; i++)
-		free(mmfile[i].ptr);
-
-	memset(&io, 0, sizeof(io));
-	io.io.getline = rerere_mem_getline;
-	if (output)
-		io.io.output = fopen(output, "w");
-	else
-		io.io.output = NULL;
-	strbuf_init(&io.input, 0);
-	strbuf_attach(&io.input, result.ptr, result.size, result.size);
-
-	/*
-	 * Grab the conflict ID and optionally write the original
-	 * contents with conflict markers out.
-	 */
-	hunk_no = handle_path(sha1, (struct rerere_io *)&io, marker_size);
-	strbuf_release(&io.input);
-	if (io.io.output)
-		fclose(io.io.output);
-	return hunk_no;
-}
-
-/*
  * Look at a cache entry at "i" and see if it is not conflicting,
  * conflicting and we are willing to handle, or conflicting and
  * we are unable to handle, and return the determination in *type.
@@ -569,6 +621,33 @@ int rerere_remaining(struct string_list *merge_rr)
 }
 
 /*
+ * Try using the given conflict resolution "ID" to see
+ * if that recorded conflict resolves cleanly what we
+ * got in the "cur".
+ */
+static int try_merge(const struct rerere_id *id, const char *path,
+		     mmfile_t *cur, mmbuffer_t *result)
+{
+	int ret;
+	mmfile_t base = {NULL, 0}, other = {NULL, 0};
+
+	if (read_mmfile(&base, rerere_path(id, "preimage")) ||
+	    read_mmfile(&other, rerere_path(id, "postimage")))
+		ret = 1;
+	else
+		/*
+		 * A three-way merge. Note that this honors user-customizable
+		 * low-level merge driver settings.
+		 */
+		ret = ll_merge(result, path, &base, NULL, cur, "", &other, "", NULL);
+
+	free(base.ptr);
+	free(other.ptr);
+
+	return ret;
+}
+
+/*
  * Find the conflict identified by "id"; the change between its
  * "preimage" (i.e. a previous contents with conflict markers) and its
  * "postimage" (i.e. the corresponding contents with conflicts
@@ -582,30 +661,20 @@ static int merge(const struct rerere_id *id, const char *path)
 {
 	FILE *f;
 	int ret;
-	mmfile_t cur = {NULL, 0}, base = {NULL, 0}, other = {NULL, 0};
+	mmfile_t cur = {NULL, 0};
 	mmbuffer_t result = {NULL, 0};
 
 	/*
 	 * Normalize the conflicts in path and write it out to
 	 * "thisimage" temporary file.
 	 */
-	if (handle_file(path, NULL, rerere_path(id, "thisimage")) < 0) {
-		ret = 1;
-		goto out;
-	}
-
-	if (read_mmfile(&cur, rerere_path(id, "thisimage")) ||
-	    read_mmfile(&base, rerere_path(id, "preimage")) ||
-	    read_mmfile(&other, rerere_path(id, "postimage"))) {
+	if ((handle_file(path, NULL, rerere_path(id, "thisimage")) < 0) ||
+	    read_mmfile(&cur, rerere_path(id, "thisimage"))) {
 		ret = 1;
 		goto out;
 	}
 
-	/*
-	 * A three-way merge. Note that this honors user-customizable
-	 * low-level merge driver settings.
-	 */
-	ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "", NULL);
+	ret = try_merge(id, path, &cur, &result);
 	if (ret)
 		goto out;
 
@@ -614,25 +683,20 @@ static int merge(const struct rerere_id *id, const char *path)
 	 * Mark that "postimage" was used to help gc.
 	 */
 	if (utime(rerere_path(id, "postimage"), NULL) < 0)
-		warning("failed utime() on %s: %s",
-			rerere_path(id, "postimage"),
-			strerror(errno));
+		warning_errno("failed utime() on %s",
+			      rerere_path(id, "postimage"));
 
 	/* Update "path" with the resolution */
 	f = fopen(path, "w");
 	if (!f)
-		return error("Could not open %s: %s", path,
-			     strerror(errno));
+		return error_errno("Could not open %s", path);
 	if (fwrite(result.ptr, result.size, 1, f) != 1)
-		error("Could not write %s: %s", path, strerror(errno));
+		error_errno("Could not write %s", path);
 	if (fclose(f))
-		return error("Writing %s failed: %s", path,
-			     strerror(errno));
+		return error_errno("Writing %s failed", path);
 
 out:
 	free(cur.ptr);
-	free(base.ptr);
-	free(other.ptr);
 	free(result.ptr);
 
 	return ret;
@@ -661,6 +725,13 @@ static void update_paths(struct string_list *update)
 		rollback_lock_file(&index_lock);
 }
 
+static void remove_variant(struct rerere_id *id)
+{
+	unlink_or_warn(rerere_path(id, "postimage"));
+	unlink_or_warn(rerere_path(id, "preimage"));
+	id->collection->status[id->variant] = 0;
+}
+
 /*
  * The path indicated by rr_item may still have conflict for which we
  * have a recorded resolution, in which case replay it and optionally
@@ -672,12 +743,47 @@ static void do_rerere_one_path(struct string_list_item *rr_item,
 			       struct string_list *update)
 {
 	const char *path = rr_item->string;
-	const struct rerere_id *id = rr_item->util;
+	struct rerere_id *id = rr_item->util;
+	struct rerere_dir *rr_dir = id->collection;
+	int variant;
+
+	variant = id->variant;
+
+	/* Has the user resolved it already? */
+	if (variant >= 0) {
+		if (!handle_file(path, NULL, NULL)) {
+			copy_file(rerere_path(id, "postimage"), path, 0666);
+			id->collection->status[variant] |= RR_HAS_POSTIMAGE;
+			fprintf(stderr, "Recorded resolution for '%s'.\n", path);
+			free_rerere_id(rr_item);
+			rr_item->util = NULL;
+			return;
+		}
+		/*
+		 * There may be other variants that can cleanly
+		 * replay.  Try them and update the variant number for
+		 * this one.
+		 */
+	}
+
+	/* Does any existing resolution apply cleanly? */
+	for (variant = 0; variant < rr_dir->status_nr; variant++) {
+		const int both = RR_HAS_PREIMAGE | RR_HAS_POSTIMAGE;
+		struct rerere_id vid = *id;
+
+		if ((rr_dir->status[variant] & both) != both)
+			continue;
+
+		vid.variant = variant;
+		if (merge(&vid, path))
+			continue; /* failed to replay */
 
-	/* Is there a recorded resolution we could attempt to apply? */
-	if (has_rerere_resolution(id)) {
-		if (merge(id, path))
-			return; /* failed to replay */
+		/*
+		 * If there already is a different variant that applies
+		 * cleanly, there is no point maintaining our own variant.
+		 */
+		if (0 <= id->variant && id->variant != variant)
+			remove_variant(id);
 
 		if (rerere_autoupdate)
 			string_list_insert(update, path);
@@ -685,15 +791,24 @@ static void do_rerere_one_path(struct string_list_item *rr_item,
 			fprintf(stderr,
 				"Resolved '%s' using previous resolution.\n",
 				path);
-	} else if (!handle_file(path, NULL, NULL)) {
-		/* The user has resolved it. */
-		copy_file(rerere_path(id, "postimage"), path, 0666);
-		fprintf(stderr, "Recorded resolution for '%s'.\n", path);
-	} else {
+		free_rerere_id(rr_item);
+		rr_item->util = NULL;
 		return;
 	}
-	free_rerere_id(rr_item);
-	rr_item->util = NULL;
+
+	/* None of the existing one applies; we need a new variant */
+	assign_variant(id);
+
+	variant = id->variant;
+	handle_file(path, NULL, rerere_path(id, "preimage"));
+	if (id->collection->status[variant] & RR_HAS_POSTIMAGE) {
+		const char *path = rerere_path(id, "postimage");
+		if (unlink(path))
+			die_errno("cannot unlink stray '%s'", path);
+		id->collection->status[variant] &= ~RR_HAS_POSTIMAGE;
+	}
+	id->collection->status[variant] |= RR_HAS_PREIMAGE;
+	fprintf(stderr, "Recorded preimage for '%s'\n", path);
 }
 
 static int do_plain_rerere(struct string_list *rr, int fd)
@@ -731,24 +846,8 @@ static int do_plain_rerere(struct string_list *rr, int fd)
 		id = new_rerere_id(sha1);
 		string_list_insert(rr, path)->util = id;
 
-		/*
-		 * If the directory does not exist, create
-		 * it.  mkdir_in_gitdir() will fail with
-		 * EEXIST if there already is one.
-		 *
-		 * NEEDSWORK: make sure "gc" does not remove
-		 * preimage without removing the directory.
-		 */
-		if (mkdir_in_gitdir(rerere_path(id, NULL)))
-			continue;
-
-		/*
-		 * We are the first to encounter this
-		 * conflict.  Ask handle_file() to write the
-		 * normalized contents to the "preimage" file.
-		 */
-		handle_file(path, NULL, rerere_path(id, "preimage"));
-		fprintf(stderr, "Recorded preimage for '%s'\n", path);
+		/* Ensure that the directory exists. */
+		mkdir_in_gitdir(rerere_path(id, NULL));
 	}
 
 	for (i = 0; i < rr->nr; i++)
@@ -812,12 +911,111 @@ int setup_rerere(struct string_list *merge_rr, int flags)
 int rerere(int flags)
 {
 	struct string_list merge_rr = STRING_LIST_INIT_DUP;
-	int fd;
+	int fd, status;
 
 	fd = setup_rerere(&merge_rr, flags);
 	if (fd < 0)
 		return 0;
-	return do_plain_rerere(&merge_rr, fd);
+	status = do_plain_rerere(&merge_rr, fd);
+	free_rerere_dirs();
+	return status;
+}
+
+/*
+ * Subclass of rerere_io that reads from an in-core buffer that is a
+ * strbuf
+ */
+struct rerere_io_mem {
+	struct rerere_io io;
+	struct strbuf input;
+};
+
+/*
+ * ... and its getline() method implementation
+ */
+static int rerere_mem_getline(struct strbuf *sb, struct rerere_io *io_)
+{
+	struct rerere_io_mem *io = (struct rerere_io_mem *)io_;
+	char *ep;
+	size_t len;
+
+	strbuf_release(sb);
+	if (!io->input.len)
+		return -1;
+	ep = memchr(io->input.buf, '\n', io->input.len);
+	if (!ep)
+		ep = io->input.buf + io->input.len;
+	else if (*ep == '\n')
+		ep++;
+	len = ep - io->input.buf;
+	strbuf_add(sb, io->input.buf, len);
+	strbuf_remove(&io->input, 0, len);
+	return 0;
+}
+
+static int handle_cache(const char *path, unsigned char *sha1, const char *output)
+{
+	mmfile_t mmfile[3] = {{NULL}};
+	mmbuffer_t result = {NULL, 0};
+	const struct cache_entry *ce;
+	int pos, len, i, hunk_no;
+	struct rerere_io_mem io;
+	int marker_size = ll_merge_marker_size(path);
+
+	/*
+	 * Reproduce the conflicted merge in-core
+	 */
+	len = strlen(path);
+	pos = cache_name_pos(path, len);
+	if (0 <= pos)
+		return -1;
+	pos = -pos - 1;
+
+	while (pos < active_nr) {
+		enum object_type type;
+		unsigned long size;
+
+		ce = active_cache[pos++];
+		if (ce_namelen(ce) != len || memcmp(ce->name, path, len))
+			break;
+		i = ce_stage(ce) - 1;
+		if (!mmfile[i].ptr) {
+			mmfile[i].ptr = read_sha1_file(ce->sha1, &type, &size);
+			mmfile[i].size = size;
+		}
+	}
+	for (i = 0; i < 3; i++)
+		if (!mmfile[i].ptr && !mmfile[i].size)
+			mmfile[i].ptr = xstrdup("");
+
+	/*
+	 * NEEDSWORK: handle conflicts from merges with
+	 * merge.renormalize set, too?
+	 */
+	ll_merge(&result, path, &mmfile[0], NULL,
+		 &mmfile[1], "ours",
+		 &mmfile[2], "theirs", NULL);
+	for (i = 0; i < 3; i++)
+		free(mmfile[i].ptr);
+
+	memset(&io, 0, sizeof(io));
+	io.io.getline = rerere_mem_getline;
+	if (output)
+		io.io.output = fopen(output, "w");
+	else
+		io.io.output = NULL;
+	strbuf_init(&io.input, 0);
+	strbuf_attach(&io.input, result.ptr, result.size, result.size);
+
+	/*
+	 * Grab the conflict ID and optionally write the original
+	 * contents with conflict markers out.
+	 */
+	hunk_no = handle_path(sha1, (struct rerere_io *)&io, marker_size);
+	strbuf_release(&io.input);
+	if (io.io.output)
+		fclose(io.io.output);
+	return hunk_no;
 }
 
 static int rerere_forget_one_path(const char *path, struct string_list *rr)
@@ -838,11 +1036,43 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)
 
 	/* Nuke the recorded resolution for the conflict */
 	id = new_rerere_id(sha1);
+
+	for (id->variant = 0;
+	     id->variant < id->collection->status_nr;
+	     id->variant++) {
+		mmfile_t cur = { NULL, 0 };
+		mmbuffer_t result = {NULL, 0};
+		int cleanly_resolved;
+
+		if (!has_rerere_resolution(id))
+			continue;
+
+		handle_cache(path, sha1, rerere_path(id, "thisimage"));
+		if (read_mmfile(&cur, rerere_path(id, "thisimage"))) {
+			free(cur.ptr);
+			error("Failed to update conflicted state in '%s'", path);
+			goto fail_exit;
+		}
+		cleanly_resolved = !try_merge(id, path, &cur, &result);
+		free(result.ptr);
+		free(cur.ptr);
+		if (cleanly_resolved)
+			break;
+	}
+
+	if (id->collection->status_nr <= id->variant) {
+		error("no remembered resolution for '%s'", path);
+		goto fail_exit;
+	}
+
 	filename = rerere_path(id, "postimage");
-	if (unlink(filename))
-		return (errno == ENOENT
-			? error("no remembered resolution for %s", path)
-			: error("cannot unlink %s: %s", filename, strerror(errno)));
+	if (unlink(filename)) {
+		if (errno == ENOENT)
+			error("no remembered resolution for %s", path);
+		else
+			error_errno("cannot unlink %s", filename);
+		goto fail_exit;
+	}
 
 	/*
 	 * Update the preimage so that the user can resolve the
@@ -861,6 +1091,10 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)
 	item->util = id;
 	fprintf(stderr, "Forgot resolution for %s\n", path);
 	return 0;
+
+fail_exit:
+	free(id);
+	return -1;
 }
 
 int rerere_forget(struct pathspec *pathspec)
@@ -897,29 +1131,16 @@ int rerere_forget(struct pathspec *pathspec)
  * Garbage collection support
  */
 
-/*
- * Note that this is not reentrant but is used only one-at-a-time
- * so it does not matter right now.
- */
-static struct rerere_id *dirname_to_id(const char *name)
-{
-	static struct rerere_id id;
-	xsnprintf(id.hex, sizeof(id.hex), "%s", name);
-	return &id;
-}
-
-static time_t rerere_created_at(const char *dir_name)
+static time_t rerere_created_at(struct rerere_id *id)
 {
 	struct stat st;
-	struct rerere_id *id = dirname_to_id(dir_name);
 
 	return stat(rerere_path(id, "preimage"), &st) ? (time_t) 0 : st.st_mtime;
 }
 
-static time_t rerere_last_used_at(const char *dir_name)
+static time_t rerere_last_used_at(struct rerere_id *id)
 {
 	struct stat st;
-	struct rerere_id *id = dirname_to_id(dir_name);
 
 	return stat(rerere_path(id, "postimage"), &st) ? (time_t) 0 : st.st_mtime;
 }
@@ -929,15 +1150,28 @@ static time_t rerere_last_used_at(const char *dir_name)
  */
 static void unlink_rr_item(struct rerere_id *id)
 {
-	unlink(rerere_path(id, "thisimage"));
-	unlink(rerere_path(id, "preimage"));
-	unlink(rerere_path(id, "postimage"));
-	/*
-	 * NEEDSWORK: what if this rmdir() fails?  Wouldn't we then
-	 * assume that we already have preimage recorded in
-	 * do_plain_rerere()?
-	 */
-	rmdir(rerere_path(id, NULL));
+	unlink_or_warn(rerere_path(id, "thisimage"));
+	remove_variant(id);
+	id->collection->status[id->variant] = 0;
+}
+
+static void prune_one(struct rerere_id *id, time_t now,
+		      int cutoff_resolve, int cutoff_noresolve)
+{
+	time_t then;
+	int cutoff;
+
+	then = rerere_last_used_at(id);
+	if (then)
+		cutoff = cutoff_resolve;
+	else {
+		then = rerere_created_at(id);
+		if (!then)
+			return;
+		cutoff = cutoff_noresolve;
+	}
+	if (then < now - cutoff * 86400)
+		unlink_rr_item(id);
 }
 
 void rerere_gc(struct string_list *rr)
@@ -945,8 +1179,8 @@ void rerere_gc(struct string_list *rr)
 	struct string_list to_remove = STRING_LIST_INIT_DUP;
 	DIR *dir;
 	struct dirent *e;
-	int i, cutoff;
-	time_t now = time(NULL), then;
+	int i;
+	time_t now = time(NULL);
 	int cutoff_noresolve = 15;
 	int cutoff_resolve = 60;
 
@@ -961,25 +1195,32 @@ void rerere_gc(struct string_list *rr)
 		die_errno("unable to open rr-cache directory");
 	/* Collect stale conflict IDs ... */
 	while ((e = readdir(dir))) {
+		struct rerere_dir *rr_dir;
+		struct rerere_id id;
+		int now_empty;
+
 		if (is_dot_or_dotdot(e->d_name))
 			continue;
-
-		then = rerere_last_used_at(e->d_name);
-		if (then) {
-			cutoff = cutoff_resolve;
-		} else {
-			then = rerere_created_at(e->d_name);
-			if (!then)
-				continue;
-			cutoff = cutoff_noresolve;
+		rr_dir = find_rerere_dir(e->d_name);
+		if (!rr_dir)
+			continue; /* or should we remove e->d_name? */
+
+		now_empty = 1;
+		for (id.variant = 0, id.collection = rr_dir;
+		     id.variant < id.collection->status_nr;
+		     id.variant++) {
+			prune_one(&id, now, cutoff_resolve, cutoff_noresolve);
+			if (id.collection->status[id.variant])
+				now_empty = 0;
 		}
-		if (then < now - cutoff * 86400)
+		if (now_empty)
 			string_list_append(&to_remove, e->d_name);
 	}
 	closedir(dir);
-	/* ... and then remove them one-by-one */
+
+	/* ... and then remove the empty directories */
 	for (i = 0; i < to_remove.nr; i++)
-		unlink_rr_item(dirname_to_id(to_remove.items[i].string));
+		rmdir(git_path("rr-cache/%s", to_remove.items[i].string));
 	string_list_clear(&to_remove, 0);
 	rollback_lock_file(&write_lock);
 }
@@ -1000,8 +1241,10 @@ void rerere_clear(struct string_list *merge_rr)
 
 	for (i = 0; i < merge_rr->nr; i++) {
 		struct rerere_id *id = merge_rr->items[i].util;
-		if (!has_rerere_resolution(id))
+		if (!has_rerere_resolution(id)) {
 			unlink_rr_item(id);
+			rmdir(rerere_path(id, NULL));
+		}
 	}
 	unlink_or_warn(git_path_merge_rr());
 	rollback_lock_file(&write_lock);
diff --git a/rerere.h b/rerere.h
index 1222e91921..c2961feaaa 100644
--- a/rerere.h
+++ b/rerere.h
@@ -16,8 +16,10 @@ struct pathspec;
  */
 extern void *RERERE_RESOLVED;
 
+struct rerere_dir;
 struct rerere_id {
-	char hex[41];
+	struct rerere_dir *collection;
+	int variant;
 };
 
 extern int setup_rerere(struct string_list *, int);
diff --git a/revision.c b/revision.c
index 8b2dfe3160..8a29cb03c5 100644
--- a/revision.c
+++ b/revision.c
@@ -59,10 +59,10 @@ static void mark_tree_contents_uninteresting(struct tree *tree)
 	while (tree_entry(&desc, &entry)) {
 		switch (object_type(entry.mode)) {
 		case OBJ_TREE:
-			mark_tree_uninteresting(lookup_tree(entry.sha1));
+			mark_tree_uninteresting(lookup_tree(entry.oid->hash));
 			break;
 		case OBJ_BLOB:
-			mark_blob_uninteresting(lookup_blob(entry.sha1));
+			mark_blob_uninteresting(lookup_blob(entry.oid->hash));
 			break;
 		default:
 			/* Subproject commit - not in this repository */
@@ -846,7 +846,7 @@ static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
 		 */
 		if (left_first != !!(flags & SYMMETRIC_LEFT))
 			continue;
-		commit->util = add_commit_patch_id(commit, &ids);
+		add_commit_patch_id(commit, &ids);
 	}
 
 	/* either cherry_mark or cherry_pick are true */
@@ -873,21 +873,9 @@ static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
 		id = has_commit_patch_id(commit, &ids);
 		if (!id)
 			continue;
-		id->seen = 1;
-		commit->object.flags |= cherry_flag;
-	}
-
-	/* Now check the original side for seen ones */
-	for (p = list; p; p = p->next) {
-		struct commit *commit = p->item;
-		struct patch_id *ent;
 
-		ent = commit->util;
-		if (!ent)
-			continue;
-		if (ent->seen)
-			commit->object.flags |= cherry_flag;
-		commit->util = NULL;
+		commit->object.flags |= cherry_flag;
+		id->commit->object.flags |= cherry_flag;
 	}
 
 	free_patch_ids(&ids);
@@ -1356,8 +1344,10 @@ void init_revisions(struct rev_info *revs, const char *prefix)
 	revs->skip_count = -1;
 	revs->max_count = -1;
 	revs->max_parents = -1;
+	revs->expand_tabs_in_log = -1;
 
 	revs->commit_format = CMIT_FMT_DEFAULT;
+	revs->expand_tabs_in_log_default = 8;
 
 	init_grep_defaults();
 	grep_init(&revs->grep_filter, prefix);
@@ -1423,7 +1413,7 @@ static void prepare_show_merge(struct rev_info *revs)
 		       ce_same_name(ce, active_cache[i+1]))
 			i++;
 	}
-	free_pathspec(&revs->prune_data);
+	clear_pathspec(&revs->prune_data);
 	parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
 		       PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
 	revs->limited = 1;
@@ -1854,12 +1844,23 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 		revs->verbose_header = 1;
 		revs->pretty_given = 1;
 		get_commit_format(arg+9, revs);
+	} else if (!strcmp(arg, "--expand-tabs")) {
+		revs->expand_tabs_in_log = 8;
+	} else if (!strcmp(arg, "--no-expand-tabs")) {
+		revs->expand_tabs_in_log = 0;
+	} else if (skip_prefix(arg, "--expand-tabs=", &arg)) {
+		int val;
+		if (strtol_i(arg, 10, &val) < 0 || val < 0)
+			die("'%s': not a non-negative integer", arg);
+		revs->expand_tabs_in_log = val;
 	} else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
 		revs->show_notes = 1;
 		revs->show_notes_given = 1;
 		revs->notes_opt.use_default_notes = 1;
 	} else if (!strcmp(arg, "--show-signature")) {
 		revs->show_signature = 1;
+	} else if (!strcmp(arg, "--no-show-signature")) {
+		revs->show_signature = 0;
 	} else if (!strcmp(arg, "--show-linear-break") ||
 		   starts_with(arg, "--show-linear-break=")) {
 		if (starts_with(arg, "--show-linear-break="))
@@ -1960,16 +1961,16 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 	} else if (!strcmp(arg, "--grep-debug")) {
 		revs->grep_filter.debug = 1;
 	} else if (!strcmp(arg, "--basic-regexp")) {
-		grep_set_pattern_type_option(GREP_PATTERN_TYPE_BRE, &revs->grep_filter);
+		revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_BRE;
 	} else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
-		grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE, &revs->grep_filter);
+		revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_ERE;
 	} else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
 		revs->grep_filter.regflags |= REG_ICASE;
 		DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
 	} else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
-		grep_set_pattern_type_option(GREP_PATTERN_TYPE_FIXED, &revs->grep_filter);
+		revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED;
 	} else if (!strcmp(arg, "--perl-regexp")) {
-		grep_set_pattern_type_option(GREP_PATTERN_TYPE_PCRE, &revs->grep_filter);
+		revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_PCRE;
 	} else if (!strcmp(arg, "--all-match")) {
 		revs->grep_filter.all_match = 1;
 	} else if (!strcmp(arg, "--invert-grep")) {
@@ -2327,6 +2328,9 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 	if (revs->first_parent_only && revs->bisect)
 		die(_("--first-parent is incompatible with --bisect"));
 
+	if (revs->expand_tabs_in_log < 0)
+		revs->expand_tabs_in_log = revs->expand_tabs_in_log_default;
+
 	return left;
 }
 
diff --git a/revision.h b/revision.h
index dca0d38171..9fac1a607d 100644
--- a/revision.h
+++ b/revision.h
@@ -148,6 +148,8 @@ struct rev_info {
 			linear:1;
 
 	struct date_mode date_mode;
+	int		expand_tabs_in_log; /* unset if negative */
+	int		expand_tabs_in_log_default;
 
 	unsigned int	abbrev;
 	enum cmit_fmt	commit_format;
diff --git a/run-command.c b/run-command.c
index 2d6628012d..33bc63a1de 100644
--- a/run-command.c
+++ b/run-command.c
@@ -233,7 +233,7 @@ static int wait_or_whine(pid_t pid, const char *argv0, int in_signal)
 
 	if (waiting < 0) {
 		failed_errno = errno;
-		error("waitpid for %s failed: %s", argv0, strerror(errno));
+		error_errno("waitpid for %s failed", argv0);
 	} else if (waiting != pid) {
 		error("waitpid is confused (%s)", argv0);
 	} else if (WIFSIGNALED(status)) {
@@ -420,8 +420,7 @@ fail_pipe:
 		}
 	}
 	if (cmd->pid < 0)
-		error("cannot fork() for %s: %s", cmd->argv[0],
-			strerror(errno));
+		error_errno("cannot fork() for %s", cmd->argv[0]);
 	else if (cmd->clean_on_exit)
 		mark_child_for_cleanup(cmd->pid);
 
@@ -482,7 +481,7 @@ fail_pipe:
 			cmd->dir, fhin, fhout, fherr);
 	failed_errno = errno;
 	if (cmd->pid < 0 && (!cmd->silent_exec_failure || errno != ENOENT))
-		error("cannot spawn %s: %s", cmd->argv[0], strerror(errno));
+		error_errno("cannot spawn %s", cmd->argv[0]);
 	if (cmd->clean_on_exit && cmd->pid >= 0)
 		mark_child_for_cleanup(cmd->pid);
 
@@ -703,7 +702,7 @@ int start_async(struct async *async)
 		if (pipe(fdin) < 0) {
 			if (async->out > 0)
 				close(async->out);
-			return error("cannot create pipe: %s", strerror(errno));
+			return error_errno("cannot create pipe");
 		}
 		async->in = fdin[1];
 	}
@@ -715,7 +714,7 @@ int start_async(struct async *async)
 				close_pair(fdin);
 			else if (async->in)
 				close(async->in);
-			return error("cannot create pipe: %s", strerror(errno));
+			return error_errno("cannot create pipe");
 		}
 		async->out = fdout[0];
 	}
@@ -740,7 +739,7 @@ int start_async(struct async *async)
 
 	async->pid = fork();
 	if (async->pid < 0) {
-		error("fork (async) failed: %s", strerror(errno));
+		error_errno("fork (async) failed");
 		goto error;
 	}
 	if (!async->pid) {
@@ -787,7 +786,7 @@ int start_async(struct async *async)
 	{
 		int err = pthread_create(&async->tid, NULL, run_thread, async);
 		if (err) {
-			error("cannot create thread: %s", strerror(err));
+			error_errno("cannot create thread");
 			goto error;
 		}
 	}
@@ -825,7 +824,10 @@ const char *find_hook(const char *name)
 	static struct strbuf path = STRBUF_INIT;
 
 	strbuf_reset(&path);
-	strbuf_git_path(&path, "hooks/%s", name);
+	if (git_hooks_path)
+		strbuf_addf(&path, "%s/%s", git_hooks_path, name);
+	else
+		strbuf_git_path(&path, "hooks/%s", name);
 	if (access(path.buf, X_OK) < 0)
 		return NULL;
 	return path.buf;
@@ -862,19 +864,161 @@ int run_hook_le(const char *const *env, const char *name, ...)
 	return ret;
 }
 
-int capture_command(struct child_process *cmd, struct strbuf *buf, size_t hint)
+struct io_pump {
+	/* initialized by caller */
+	int fd;
+	int type; /* POLLOUT or POLLIN */
+	union {
+		struct {
+			const char *buf;
+			size_t len;
+		} out;
+		struct {
+			struct strbuf *buf;
+			size_t hint;
+		} in;
+	} u;
+
+	/* returned by pump_io */
+	int error; /* 0 for success, otherwise errno */
+
+	/* internal use */
+	struct pollfd *pfd;
+};
+
+static int pump_io_round(struct io_pump *slots, int nr, struct pollfd *pfd)
 {
-	cmd->out = -1;
+	int pollsize = 0;
+	int i;
+
+	for (i = 0; i < nr; i++) {
+		struct io_pump *io = &slots[i];
+		if (io->fd < 0)
+			continue;
+		pfd[pollsize].fd = io->fd;
+		pfd[pollsize].events = io->type;
+		io->pfd = &pfd[pollsize++];
+	}
+
+	if (!pollsize)
+		return 0;
+
+	if (poll(pfd, pollsize, -1) < 0) {
+		if (errno == EINTR)
+			return 1;
+		die_errno("poll failed");
+	}
+
+	for (i = 0; i < nr; i++) {
+		struct io_pump *io = &slots[i];
+
+		if (io->fd < 0)
+			continue;
+
+		if (!(io->pfd->revents & (POLLOUT|POLLIN|POLLHUP|POLLERR|POLLNVAL)))
+			continue;
+
+		if (io->type == POLLOUT) {
+			ssize_t len = xwrite(io->fd,
+					     io->u.out.buf, io->u.out.len);
+			if (len < 0) {
+				io->error = errno;
+				close(io->fd);
+				io->fd = -1;
+			} else {
+				io->u.out.buf += len;
+				io->u.out.len -= len;
+				if (!io->u.out.len) {
+					close(io->fd);
+					io->fd = -1;
+				}
+			}
+		}
+
+		if (io->type == POLLIN) {
+			ssize_t len = strbuf_read_once(io->u.in.buf,
+						       io->fd, io->u.in.hint);
+			if (len < 0)
+				io->error = errno;
+			if (len <= 0) {
+				close(io->fd);
+				io->fd = -1;
+			}
+		}
+	}
+
+	return 1;
+}
+
+static int pump_io(struct io_pump *slots, int nr)
+{
+	struct pollfd *pfd;
+	int i;
+
+	for (i = 0; i < nr; i++)
+		slots[i].error = 0;
+
+	ALLOC_ARRAY(pfd, nr);
+	while (pump_io_round(slots, nr, pfd))
+		; /* nothing */
+	free(pfd);
+
+	/* There may be multiple errno values, so just pick the first. */
+	for (i = 0; i < nr; i++) {
+		if (slots[i].error) {
+			errno = slots[i].error;
+			return -1;
+		}
+	}
+	return 0;
+}
+
+
+int pipe_command(struct child_process *cmd,
+		 const char *in, size_t in_len,
+		 struct strbuf *out, size_t out_hint,
+		 struct strbuf *err, size_t err_hint)
+{
+	struct io_pump io[3];
+	int nr = 0;
+
+	if (in)
+		cmd->in = -1;
+	if (out)
+		cmd->out = -1;
+	if (err)
+		cmd->err = -1;
+
 	if (start_command(cmd) < 0)
 		return -1;
 
-	if (strbuf_read(buf, cmd->out, hint) < 0) {
-		close(cmd->out);
+	if (in) {
+		io[nr].fd = cmd->in;
+		io[nr].type = POLLOUT;
+		io[nr].u.out.buf = in;
+		io[nr].u.out.len = in_len;
+		nr++;
+	}
+	if (out) {
+		io[nr].fd = cmd->out;
+		io[nr].type = POLLIN;
+		io[nr].u.in.buf = out;
+		io[nr].u.in.hint = out_hint;
+		nr++;
+	}
+	if (err) {
+		io[nr].fd = cmd->err;
+		io[nr].type = POLLIN;
+		io[nr].u.in.buf = err;
+		io[nr].u.in.hint = err_hint;
+		nr++;
+	}
+
+	if (pump_io(io, nr) < 0) {
 		finish_command(cmd); /* throw away exit code */
 		return -1;
 	}
 
-	close(cmd->out);
 	return finish_command(cmd);
 }
 
@@ -912,7 +1056,7 @@ struct parallel_processes {
 	struct strbuf buffered_output; /* of finished children */
 };
 
-static int default_start_failure(struct strbuf *err,
+static int default_start_failure(struct strbuf *out,
 				 void *pp_cb,
 				 void *pp_task_cb)
 {
@@ -920,7 +1064,7 @@ static int default_start_failure(struct strbuf *err,
 }
 
 static int default_task_finished(int result,
-				 struct strbuf *err,
+				 struct strbuf *out,
 				 void *pp_cb,
 				 void *pp_task_cb)
 {
@@ -1004,7 +1148,7 @@ static void pp_cleanup(struct parallel_processes *pp)
 	 * When get_next_task added messages to the buffer in its last
 	 * iteration, the buffered output is non empty.
 	 */
-	fputs(pp->buffered_output.buf, stderr);
+	strbuf_write(&pp->buffered_output, stderr);
 	strbuf_release(&pp->buffered_output);
 
 	sigchain_pop_common();
@@ -1089,7 +1233,7 @@ static void pp_output(struct parallel_processes *pp)
 	int i = pp->output_owner;
 	if (pp->children[i].state == GIT_CP_WORKING &&
 	    pp->children[i].err.len) {
-		fputs(pp->children[i].err.buf, stderr);
+		strbuf_write(&pp->children[i].err, stderr);
 		strbuf_reset(&pp->children[i].err);
 	}
 }
@@ -1127,11 +1271,11 @@ static int pp_collect_finished(struct parallel_processes *pp)
 			strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
 			strbuf_reset(&pp->children[i].err);
 		} else {
-			fputs(pp->children[i].err.buf, stderr);
+			strbuf_write(&pp->children[i].err, stderr);
 			strbuf_reset(&pp->children[i].err);
 
 			/* Output all other finished child processes */
-			fputs(pp->buffered_output.buf, stderr);
+			strbuf_write(&pp->buffered_output, stderr);
 			strbuf_reset(&pp->buffered_output);
 
 			/*
diff --git a/run-command.h b/run-command.h
index 49ba764c6c..50666497ae 100644
--- a/run-command.h
+++ b/run-command.h
@@ -79,17 +79,34 @@ int run_command_v_opt(const char **argv, int opt);
 int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const char *const *env);
 
 /**
- * Execute the given command, capturing its stdout in the given strbuf.
+ * Execute the given command, sending "in" to its stdin, and capturing its
+ * stdout and stderr in the "out" and "err" strbufs. Any of the three may
+ * be NULL to skip processing.
+ *
  * Returns -1 if starting the command fails or reading fails, and otherwise
- * returns the exit code of the command. The output collected in the
- * buffer is kept even if the command returns a non-zero exit. The hint field
- * gives a starting size for the strbuf allocation.
+ * returns the exit code of the command. Any output collected in the
+ * buffers is kept even if the command returns a non-zero exit. The hint fields
+ * gives starting sizes for the strbuf allocations.
  *
  * The fields of "cmd" should be set up as they would for a normal run_command
- * invocation. But note that there is no need to set cmd->out; the function
- * sets it up for the caller.
+ * invocation. But note that there is no need to set the in, out, or err
+ * fields; pipe_command handles that automatically.
+ */
+int pipe_command(struct child_process *cmd,
+		 const char *in, size_t in_len,
+		 struct strbuf *out, size_t out_hint,
+		 struct strbuf *err, size_t err_hint);
+
+/**
+ * Convenience wrapper around pipe_command for the common case
+ * of capturing only stdout.
  */
-int capture_command(struct child_process *cmd, struct strbuf *buf, size_t hint);
+static inline int capture_command(struct child_process *cmd,
+				  struct strbuf *out,
+				  size_t hint)
+{
+	return pipe_command(cmd, NULL, 0, out, hint, NULL, 0);
+}
 
 /*
  * The purpose of the following functions is to feed a pipe by running
@@ -141,7 +158,7 @@ void NORETURN async_exit(int code);
  * return the negative signal number.
  */
 typedef int (*get_next_task_fn)(struct child_process *cp,
-				struct strbuf *err,
+				struct strbuf *out,
 				void *pp_cb,
 				void **pp_task_cb);
 
@@ -150,7 +167,7 @@ typedef int (*get_next_task_fn)(struct child_process *cp,
  * a new process.
  *
  * You must not write to stdout or stderr in this function. Add your
- * message to the strbuf err instead, which will be printed without
+ * message to the strbuf out instead, which will be printed without
  * messing up the output of the other parallel processes.
  *
  * pp_cb is the callback cookie as passed into run_processes_parallel,
@@ -160,7 +177,7 @@ typedef int (*get_next_task_fn)(struct child_process *cp,
  * To send a signal to other child processes for abortion, return
  * the negative signal number.
  */
-typedef int (*start_failure_fn)(struct strbuf *err,
+typedef int (*start_failure_fn)(struct strbuf *out,
 				void *pp_cb,
 				void *pp_task_cb);
 
@@ -168,7 +185,7 @@ typedef int (*start_failure_fn)(struct strbuf *err,
  * This callback is called on every child process that finished processing.
  *
  * You must not write to stdout or stderr in this function. Add your
- * message to the strbuf err instead, which will be printed without
+ * message to the strbuf out instead, which will be printed without
  * messing up the output of the other parallel processes.
  *
  * pp_cb is the callback cookie as passed into run_processes_parallel,
@@ -179,7 +196,7 @@ typedef int (*start_failure_fn)(struct strbuf *err,
  * the negative signal number.
  */
 typedef int (*task_finished_fn)(int result,
-				struct strbuf *err,
+				struct strbuf *out,
 				void *pp_cb,
 				void *pp_task_cb);
 
diff --git a/send-pack.c b/send-pack.c
index 37ee04ea3b..90f2ac51a7 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -36,18 +36,15 @@ int option_parse_push_signed(const struct option *opt,
 	die("bad %s argument: %s", opt->long_name, arg);
 }
 
-static int feed_object(const unsigned char *sha1, int fd, int negative)
+static void feed_object(const unsigned char *sha1, FILE *fh, int negative)
 {
-	char buf[42];
-
 	if (negative && !has_sha1_file(sha1))
-		return 1;
+		return;
 
-	memcpy(buf + negative, sha1_to_hex(sha1), 40);
 	if (negative)
-		buf[0] = '^';
-	buf[40 + negative] = '\n';
-	return write_or_whine(fd, buf, 41 + negative, "send-pack: send refs");
+		putc('^', fh);
+	fputs(sha1_to_hex(sha1), fh);
+	putc('\n', fh);
 }
 
 /*
@@ -73,6 +70,7 @@ static int pack_objects(int fd, struct ref *refs, struct sha1_array *extra, stru
 		NULL,
 	};
 	struct child_process po = CHILD_PROCESS_INIT;
+	FILE *po_in;
 	int i;
 
 	i = 4;
@@ -97,21 +95,22 @@ static int pack_objects(int fd, struct ref *refs, struct sha1_array *extra, stru
 	 * We feed the pack-objects we just spawned with revision
 	 * parameters by writing to the pipe.
 	 */
+	po_in = xfdopen(po.in, "w");
 	for (i = 0; i < extra->nr; i++)
-		if (!feed_object(extra->sha1[i], po.in, 1))
-			break;
+		feed_object(extra->sha1[i], po_in, 1);
 
 	while (refs) {
-		if (!is_null_oid(&refs->old_oid) &&
-		    !feed_object(refs->old_oid.hash, po.in, 1))
-			break;
-		if (!is_null_oid(&refs->new_oid) &&
-		    !feed_object(refs->new_oid.hash, po.in, 0))
-			break;
+		if (!is_null_oid(&refs->old_oid))
+			feed_object(refs->old_oid.hash, po_in, 1);
+		if (!is_null_oid(&refs->new_oid))
+			feed_object(refs->new_oid.hash, po_in, 0);
 		refs = refs->next;
 	}
 
-	close(po.in);
+	fflush(po_in);
+	if (ferror(po_in))
+		die_errno("error writing to pack-objects");
+	fclose(po_in);
 
 	if (args->stateless_rpc) {
 		char *buf = xmalloc(LARGE_PACKET_MAX);
@@ -261,12 +260,13 @@ static int generate_push_cert(struct strbuf *req_buf,
 			      const char *push_cert_nonce)
 {
 	const struct ref *ref;
+	struct string_list_item *item;
 	char *signing_key = xstrdup(get_signing_key());
 	const char *cp, *np;
 	struct strbuf cert = STRBUF_INIT;
 	int update_seen = 0;
 
-	strbuf_addf(&cert, "certificate version 0.1\n");
+	strbuf_addstr(&cert, "certificate version 0.1\n");
 	strbuf_addf(&cert, "pusher %s ", signing_key);
 	datestamp(&cert);
 	strbuf_addch(&cert, '\n');
@@ -277,6 +277,9 @@ static int generate_push_cert(struct strbuf *req_buf,
 	}
 	if (push_cert_nonce[0])
 		strbuf_addf(&cert, "nonce %s\n", push_cert_nonce);
+	if (args->push_options)
+		for_each_string_list_item(item, args->push_options)
+			strbuf_addf(&cert, "push-option %s\n", item->string);
 	strbuf_addstr(&cert, "\n");
 
 	for (ref = remote_refs; ref; ref = ref->next) {
@@ -371,6 +374,8 @@ int send_pack(struct send_pack_args *args,
 	int agent_supported = 0;
 	int use_atomic = 0;
 	int atomic_supported = 0;
+	int use_push_options = 0;
+	int push_options_supported = 0;
 	unsigned cmds_sent = 0;
 	int ret;
 	struct async demux;
@@ -393,6 +398,8 @@ int send_pack(struct send_pack_args *args,
 		args->use_thin_pack = 0;
 	if (server_supports("atomic"))
 		atomic_supported = 1;
+	if (server_supports("push-options"))
+		push_options_supported = 1;
 
 	if (args->push_cert != SEND_PACK_PUSH_CERT_NEVER) {
 		int len;
@@ -419,6 +426,11 @@ int send_pack(struct send_pack_args *args,
 
 	use_atomic = atomic_supported && args->atomic;
 
+	if (args->push_options && !push_options_supported)
+		die(_("the receiving end does not support push options"));
+
+	use_push_options = push_options_supported && args->push_options;
+
 	if (status_report)
 		strbuf_addstr(&cap_buf, " report-status");
 	if (use_sideband)
@@ -427,6 +439,8 @@ int send_pack(struct send_pack_args *args,
 		strbuf_addstr(&cap_buf, " quiet");
 	if (use_atomic)
 		strbuf_addstr(&cap_buf, " atomic");
+	if (use_push_options)
+		strbuf_addstr(&cap_buf, " push-options");
 	if (agent_supported)
 		strbuf_addf(&cap_buf, " agent=%s", git_user_agent_sanitized());
 
@@ -513,6 +527,18 @@ int send_pack(struct send_pack_args *args,
 	strbuf_release(&req_buf);
 	strbuf_release(&cap_buf);
 
+	if (use_push_options) {
+		struct string_list_item *item;
+		struct strbuf sb = STRBUF_INIT;
+
+		for_each_string_list_item(item, args->push_options)
+			packet_buf_write(&sb, "%s", item->string);
+
+		write_or_die(out, sb.buf, sb.len);
+		packet_flush(out);
+		strbuf_release(&sb);
+	}
+
 	if (use_sideband && cmds_sent) {
 		memset(&demux, 0, sizeof(demux));
 		demux.proc = sideband_demux;
diff --git a/send-pack.h b/send-pack.h
index 57f222abcc..67fc40f4ec 100644
--- a/send-pack.h
+++ b/send-pack.h
@@ -1,6 +1,8 @@
 #ifndef SEND_PACK_H
 #define SEND_PACK_H
 
+#include "string-list.h"
+
 /* Possible values for push_cert field in send_pack_args. */
 #define SEND_PACK_PUSH_CERT_NEVER 0
 #define SEND_PACK_PUSH_CERT_IF_ASKED 1
@@ -21,6 +23,7 @@ struct send_pack_args {
 		push_cert:2,
 		stateless_rpc:1,
 		atomic:1;
+	const struct string_list *push_options;
 };
 
 struct option;
diff --git a/sequencer.c b/sequencer.c
index e66f2fe0f0..2e9c7d0f03 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -112,7 +112,7 @@ static void remove_sequencer_state(void)
 {
 	struct strbuf seq_dir = STRBUF_INIT;
 
-	strbuf_addf(&seq_dir, "%s", git_path(SEQ_DIR));
+	strbuf_addstr(&seq_dir, git_path(SEQ_DIR));
 	remove_dir_recursively(&seq_dir, 0);
 	strbuf_release(&seq_dir);
 }
@@ -190,7 +190,7 @@ static void write_message(struct strbuf *msgbuf, const char *filename)
 		die_errno(_("Could not write to %s"), filename);
 	strbuf_release(msgbuf);
 	if (commit_lock_file(&msg_file) < 0)
-		die(_("Error wrapping up %s"), filename);
+		die(_("Error wrapping up %s."), filename);
 }
 
 static struct tree *empty_tree(void)
@@ -225,7 +225,7 @@ static int fast_forward_to(const unsigned char *to, const unsigned char *from,
 	if (checkout_fast_forward(from, to, 1))
 		exit(128); /* the callee should have complained already */
 
-	strbuf_addf(&sb, "%s: fast-forward", action_name(opts));
+	strbuf_addf(&sb, _("%s: fast-forward"), action_name(opts));
 
 	transaction = ref_transaction_begin(&err);
 	if (!transaction ||
@@ -293,6 +293,9 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
 	clean = merge_trees(&o,
 			    head_tree,
 			    next_tree, base_tree, &result);
+	strbuf_release(&o.obuf);
+	if (clean < 0)
+		return clean;
 
 	if (active_cache_changed &&
 	    write_locked_index(&the_index, &index_lock, COMMIT_LOCK))
@@ -544,10 +547,8 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
 		 * information followed by "\n\n".
 		 */
 		p = strstr(msg.message, "\n\n");
-		if (p) {
-			p += 2;
-			strbuf_addstr(&msgbuf, p);
-		}
+		if (p)
+			strbuf_addstr(&msgbuf, skip_blank_lines(p + 2));
 
 		if (opts->record_origin) {
 			if (!has_conforming_footer(&msgbuf, NULL, 0))
@@ -561,6 +562,8 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
 	if (!opts->strategy || !strcmp(opts->strategy, "recursive") || opts->action == REPLAY_REVERT) {
 		res = do_recursive_merge(base, next, base_label, next_label,
 					 head, &msgbuf, opts);
+		if (res < 0)
+			return res;
 		write_message(&msgbuf, git_path_merge_msg());
 	} else {
 		struct commit_list *common = NULL;
@@ -697,9 +700,14 @@ static struct commit *parse_insn_line(char *bol, char *eol, struct replay_opts *
 	 * opts; we don't support arbitrary instructions
 	 */
 	if (action != opts->action) {
-		const char *action_str;
-		action_str = action == REPLAY_REVERT ? "revert" : "cherry-pick";
-		error(_("Cannot %s during a %s"), action_str, action_name(opts));
+		if (action == REPLAY_REVERT)
+		      error((opts->action == REPLAY_REVERT)
+			    ? _("Cannot revert during a another revert.")
+			    : _("Cannot revert during a cherry-pick."));
+		else
+		      error((opts->action == REPLAY_REVERT)
+			    ? _("Cannot cherry-pick during a revert.")
+			    : _("Cannot cherry-pick during another cherry-pick."));
 		return NULL;
 	}
 
@@ -875,8 +883,7 @@ static int sequencer_rollback(struct replay_opts *opts)
 		return rollback_single_pick();
 	}
 	if (!f)
-		return error(_("cannot open %s: %s"), git_path_head_file(),
-						strerror(errno));
+		return error_errno(_("cannot open %s"), git_path_head_file());
 	if (strbuf_getline_lf(&buf, f)) {
 		error(_("cannot read %s: %s"), git_path_head_file(),
 		      ferror(f) ?  strerror(errno) : _("unexpected end of file"));
@@ -889,6 +896,10 @@ static int sequencer_rollback(struct replay_opts *opts)
 			git_path_head_file());
 		goto fail;
 	}
+	if (is_null_sha1(sha1)) {
+		error(_("cannot abort from a branch yet to be born"));
+		goto fail;
+	}
 	if (reset_for_rollback(sha1))
 		goto fail;
 	remove_sequencer_state();
@@ -1087,11 +1098,8 @@ int sequencer_pick_revisions(struct replay_opts *opts)
 	walk_revs_populate_todo(&todo_list, opts);
 	if (create_seq_dir() < 0)
 		return -1;
-	if (get_sha1("HEAD", sha1)) {
-		if (opts->action == REPLAY_REVERT)
-			return error(_("Can't revert as initial commit"));
-		return error(_("Can't cherry-pick into empty head"));
-	}
+	if (get_sha1("HEAD", sha1) && (opts->action == REPLAY_REVERT))
+		return error(_("Can't revert as initial commit"));
 	save_head(sha1_to_hex(sha1));
 	save_opts(opts);
 	return pick_commits(todo_list, opts);
diff --git a/server-info.c b/server-info.c
index 5a86e297b5..75dd677413 100644
--- a/server-info.c
+++ b/server-info.c
@@ -36,7 +36,7 @@ static int update_info_file(char *path, int (*generate)(FILE *))
 
 out:
 	if (ret) {
-		error("unable to update %s: %s", path, strerror(errno));
+		error_errno("unable to update %s", path);
 		if (fp)
 			fclose(fp);
 		else if (fd >= 0)
diff --git a/setup.c b/setup.c
index c86bf5c9fa..fe572b82c3 100644
--- a/setup.c
+++ b/setup.c
@@ -157,8 +157,8 @@ static void NORETURN die_verify_filename(const char *prefix,
 					 int diagnose_misspelt_rev)
 {
 	if (!diagnose_misspelt_rev)
-		die("%s: no such path in the working tree.\n"
-		    "Use 'git <command> -- <path>...' to specify paths that do not exist locally.",
+		die(_("%s: no such path in the working tree.\n"
+		      "Use 'git <command> -- <path>...' to specify paths that do not exist locally."),
 		    arg);
 	/*
 	 * Saying "'(icase)foo' does not exist in the index" when the
@@ -170,9 +170,9 @@ static void NORETURN die_verify_filename(const char *prefix,
 		maybe_die_on_misspelt_object_name(arg, prefix);
 
 	/* ... or fall back the most general message. */
-	die("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>...]'", arg);
+	die(_("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>...]'"), arg);
 
 }
 
@@ -220,9 +220,9 @@ void verify_non_filename(const char *prefix, const char *arg)
 		return; /* flag */
 	if (!check_filename(prefix, arg))
 		return;
-	die("ambiguous argument '%s': both revision and filename\n"
-	    "Use '--' to separate paths from revisions, like this:\n"
-	    "'git <command> [<revision>...] -- [<file>...]'", arg);
+	die(_("ambiguous argument '%s': both revision and filename\n"
+	      "Use '--' to separate paths from revisions, like this:\n"
+	      "'git <command> [<revision>...] -- [<file>...]'"), arg);
 }
 
 int get_common_dir(struct strbuf *sb, const char *gitdir)
@@ -759,9 +759,9 @@ static const char *setup_bare_git_dir(struct strbuf *cwd, int offset,
 static const char *setup_nongit(const char *cwd, int *nongit_ok)
 {
 	if (!nongit_ok)
-		die("Not a git repository (or any of the parent directories): %s", DEFAULT_GIT_DIR_ENVIRONMENT);
+		die(_("Not a git repository (or any of the parent directories): %s"), DEFAULT_GIT_DIR_ENVIRONMENT);
 	if (chdir(cwd))
-		die_errno("Cannot come back to cwd");
+		die_errno(_("Cannot come back to cwd"));
 	*nongit_ok = 1;
 	return NULL;
 }
@@ -842,7 +842,7 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)
 		*nongit_ok = 0;
 
 	if (strbuf_getcwd(&cwd))
-		die_errno("Unable to read current working directory");
+		die_errno(_("Unable to read current working directory"));
 	offset = cwd.len;
 
 	/*
@@ -912,19 +912,19 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)
 			if (parent_device != current_device) {
 				if (nongit_ok) {
 					if (chdir(cwd.buf))
-						die_errno("Cannot come back to cwd");
+						die_errno(_("Cannot come back to cwd"));
 					*nongit_ok = 1;
 					return NULL;
 				}
 				strbuf_setlen(&cwd, offset);
-				die("Not a git repository (or any parent up to mount point %s)\n"
-				"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).",
+				die(_("Not a git repository (or any parent up to mount point %s)\n"
+				"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."),
 				    cwd.buf);
 			}
 		}
 		if (chdir("..")) {
 			strbuf_setlen(&cwd, offset);
-			die_errno("Cannot change to '%s/..'", cwd.buf);
+			die_errno(_("Cannot change to '%s/..'"), cwd.buf);
 		}
 		offset = offset_parent;
 	}
@@ -986,9 +986,9 @@ int git_config_perm(const char *var, const char *value)
 	/* A filemode value was given: 0xxx */
 
 	if ((i & 0600) != 0600)
-		die("Problem with core.sharedRepository filemode value "
+		die(_("Problem with core.sharedRepository filemode value "
 		    "(0%.3o).\nThe owner of files must always have "
-		    "read and write permissions.", i);
+		    "read and write permissions."), i);
 
 	/*
 	 * Mask filemode value. Others can not get write permission.
diff --git a/sh-i18n--envsubst.c b/sh-i18n--envsubst.c
index 2842a22d7f..e06b2c1311 100644
--- a/sh-i18n--envsubst.c
+++ b/sh-i18n--envsubst.c
@@ -64,7 +64,7 @@ static void note_variables (const char *string);
 static void subst_from_stdin (void);
 
 int
-main (int argc, char *argv[])
+cmd_main (int argc, const char *argv[])
 {
   /* Default values for command line options.  */
   /* unsigned short int show_variables = 0; */
diff --git a/sha1_file.c b/sha1_file.c
index d0f2aa029b..3045aeabda 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -23,6 +23,7 @@
 #include "bulk-checkin.h"
 #include "streaming.h"
 #include "dir.h"
+#include "mru.h"
 
 #ifndef O_NOATIME
 #if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
@@ -59,14 +60,6 @@ static struct cached_object empty_tree = {
 	0
 };
 
-/*
- * A pointer to the last packed_git in which an object was found.
- * When an object is sought, we look in this packfile first, because
- * objects that are looked up at similar times are often in the same
- * packfile as one another.
- */
-static struct packed_git *last_found_pack;
-
 static struct cached_object *find_cached_object(const unsigned char *sha1)
 {
 	int i;
@@ -301,7 +294,7 @@ static int link_alt_odb_entry(const char *entry, const char *relative_base,
 			return -1;
 		}
 	}
-	if (!strcmp_icase(ent->base, normalized_objdir)) {
+	if (!fspathcmp(ent->base, normalized_objdir)) {
 		free(ent);
 		return -1;
 	}
@@ -522,6 +515,9 @@ static size_t peak_pack_mapped;
 static size_t pack_mapped;
 struct packed_git *packed_git;
 
+static struct mru packed_git_mru_storage;
+struct mru *packed_git_mru = &packed_git_mru_storage;
+
 void pack_report(void)
 {
 	fprintf(stderr,
@@ -795,7 +791,7 @@ void close_all_packs(void)
 
 	for (p = packed_git; p; p = p->next)
 		if (p->do_not_close)
-			die("BUG! Want to close pack marked 'do-not-close'");
+			die("BUG: want to close pack marked 'do-not-close'");
 		else
 			close_pack(p);
 }
@@ -891,36 +887,6 @@ void close_pack_index(struct packed_git *p)
 	}
 }
 
-/*
- * This is used by git-repack in case a newly created pack happens to
- * contain the same set of objects as an existing one.  In that case
- * the resulting file might be different even if its name would be the
- * same.  It is best to close any reference to the old pack before it is
- * replaced on disk.  Of course no index pointers or windows for given pack
- * must subsist at this point.  If ever objects from this pack are requested
- * again, the new version of the pack will be reinitialized through
- * reprepare_packed_git().
- */
-void free_pack_by_name(const char *pack_name)
-{
-	struct packed_git *p, **pp = &packed_git;
-
-	while (*pp) {
-		p = *pp;
-		if (strcmp(pack_name, p->pack_name) == 0) {
-			clear_delta_base_cache();
-			close_pack(p);
-			free(p->bad_object_sha1);
-			*pp = p->next;
-			if (last_found_pack == p)
-				last_found_pack = NULL;
-			free(p);
-			return;
-		}
-		pp = &p->next;
-	}
-}
-
 static unsigned int get_max_fd_limit(void)
 {
 #ifdef RLIMIT_NOFILE
@@ -1107,9 +1073,8 @@ unsigned char *use_pack(struct packed_git *p,
 				PROT_READ, MAP_PRIVATE,
 				p->pack_fd, win->offset);
 			if (win->base == MAP_FAILED)
-				die("packfile %s cannot be mapped: %s",
-					p->pack_name,
-					strerror(errno));
+				die_errno("packfile %s cannot be mapped",
+					  p->pack_name);
 			if (!win->offset && win->len == p->pack_size
 				&& !p->do_not_close)
 				close_pack_fd(p);
@@ -1279,8 +1244,8 @@ static void prepare_packed_git_one(char *objdir, int local)
 	dir = opendir(path.buf);
 	if (!dir) {
 		if (errno != ENOENT)
-			error("unable to open object pack directory: %s: %s",
-			      path.buf, strerror(errno));
+			error_errno("unable to open object pack directory: %s",
+				    path.buf);
 		strbuf_release(&path);
 		return;
 	}
@@ -1386,6 +1351,15 @@ static void rearrange_packed_git(void)
 	free(ary);
 }
 
+static void prepare_packed_git_mru(void)
+{
+	struct packed_git *p;
+
+	mru_clear(packed_git_mru);
+	for (p = packed_git; p; p = p->next)
+		mru_append(packed_git_mru, p);
+}
+
 static int prepare_packed_git_run_once = 0;
 void prepare_packed_git(void)
 {
@@ -1401,6 +1375,7 @@ void prepare_packed_git(void)
 		alt->name[-1] = '/';
 	}
 	rearrange_packed_git();
+	prepare_packed_git_mru();
 	prepare_packed_git_run_once = 1;
 }
 
@@ -1717,7 +1692,7 @@ static int parse_sha1_header_extended(const char *hdr, struct object_info *oi,
 		strbuf_add(oi->typename, type_buf, type_len);
 	/*
 	 * Set type to 0 if its an unknown object and
-	 * we're obtaining the type using '--allow-unkown-type'
+	 * we're obtaining the type using '--allow-unknown-type'
 	 * option.
 	 */
 	if ((flags & LOOKUP_UNKNOWN_OBJECT) && (type < 0))
@@ -2282,7 +2257,7 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
 
 		if (do_check_packed_object_crc && p->index_version > 1) {
 			struct revindex_entry *revidx = find_pack_revindex(p, obj_offset);
-			unsigned long len = revidx[1].offset - obj_offset;
+			off_t len = revidx[1].offset - obj_offset;
 			if (check_pack_crc(p, &w_curs, obj_offset, len, revidx->nr)) {
 				const unsigned char *sha1 =
 					nth_packed_object_sha1(p, revidx->nr);
@@ -2331,7 +2306,7 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
 	case OBJ_OFS_DELTA:
 	case OBJ_REF_DELTA:
 		if (data)
-			die("BUG in unpack_entry: left loop at a valid delta");
+			die("BUG: unpack_entry: left loop at a valid delta");
 		break;
 	case OBJ_COMMIT:
 	case OBJ_TREE:
@@ -2605,21 +2580,15 @@ static int fill_pack_entry(const unsigned char *sha1,
  */
 static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
 {
-	struct packed_git *p;
+	struct mru_entry *p;
 
 	prepare_packed_git();
 	if (!packed_git)
 		return 0;
 
-	if (last_found_pack && fill_pack_entry(sha1, e, last_found_pack))
-		return 1;
-
-	for (p = packed_git; p; p = p->next) {
-		if (p == last_found_pack)
-			continue; /* we already checked this one */
-
-		if (fill_pack_entry(sha1, e, p)) {
-			last_found_pack = p;
+	for (p = packed_git_mru->head; p; p = p->next) {
+		if (fill_pack_entry(sha1, e, p->item)) {
+			mru_mark(packed_git_mru, p);
 			return 1;
 		}
 	}
@@ -2984,7 +2953,7 @@ int finalize_object_file(const char *tmpfile, const char *filename)
 	unlink_or_warn(tmpfile);
 	if (ret) {
 		if (ret != EEXIST) {
-			return error("unable to write sha1 filename %s: %s", filename, strerror(ret));
+			return error_errno("unable to write sha1 filename %s", filename);
 		}
 		/* FIXME!!! Collision check here ? */
 	}
@@ -2998,7 +2967,7 @@ out:
 static int write_buffer(int fd, const void *buf, size_t len)
 {
 	if (write_in_full(fd, buf, len) < 0)
-		return error("file write error (%s)", strerror(errno));
+		return error_errno("file write error");
 	return 0;
 }
 
@@ -3081,7 +3050,7 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
 		if (errno == EACCES)
 			return error("insufficient permission for adding an object to repository database %s", get_object_directory());
 		else
-			return error("unable to create temporary file: %s", strerror(errno));
+			return error_errno("unable to create temporary file");
 	}
 
 	/* Set it up */
@@ -3126,8 +3095,7 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
 		utb.actime = mtime;
 		utb.modtime = mtime;
 		if (utime(tmp_file.buf, &utb) < 0)
-			warning("failed utime() on %s: %s",
-				tmp_file.buf, strerror(errno));
+			warning_errno("failed utime() on %s", tmp_file.buf);
 	}
 
 	return finalize_object_file(tmp_file.buf, filename);
@@ -3360,7 +3328,7 @@ static int index_core(unsigned char *sha1, int fd, size_t size,
 		if (size == read_in_full(fd, buf, size))
 			ret = index_mem(sha1, buf, size, type, path, flags);
 		else
-			ret = error("short read %s", strerror(errno));
+			ret = error_errno("short read");
 		free(buf);
 	} else {
 		void *buf = xmmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
@@ -3425,18 +3393,14 @@ int index_path(unsigned char *sha1, const char *path, struct stat *st, unsigned
 	case S_IFREG:
 		fd = open(path, O_RDONLY);
 		if (fd < 0)
-			return error("open(\"%s\"): %s", path,
-				     strerror(errno));
+			return error_errno("open(\"%s\")", path);
 		if (index_fd(sha1, fd, st, OBJ_BLOB, path, flags) < 0)
 			return error("%s: failed to insert into database",
 				     path);
 		break;
 	case S_IFLNK:
-		if (strbuf_readlink(&sb, path, st->st_size)) {
-			char *errstr = strerror(errno);
-			return error("readlink(\"%s\"): %s", path,
-			             errstr);
-		}
+		if (strbuf_readlink(&sb, path, st->st_size))
+			return error_errno("readlink(\"%s\")", path);
 		if (!(flags & HASH_WRITE_OBJECT))
 			hash_sha1_file(sb.buf, sb.len, blob_type, sha1);
 		else if (write_sha1_file(sb.buf, sb.len, blob_type, sha1))
@@ -3492,7 +3456,7 @@ static int for_each_file_in_obj_subdir(int subdir_nr,
 	if (!dir) {
 		if (errno == ENOENT)
 			return 0;
-		return error("unable to open %s: %s", path->buf, strerror(errno));
+		return error_errno("unable to open %s", path->buf);
 	}
 
 	while ((de = readdir(dir))) {
diff --git a/sha1_name.c b/sha1_name.c
index 776101e8d7..ca7ddd6f2c 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -1215,6 +1215,15 @@ int get_sha1(const char *name, unsigned char *sha1)
 }
 
 /*
+ * This is like "get_sha1()", but for struct object_id.
+ */
+int get_oid(const char *name, struct object_id *oid)
+{
+	return get_sha1(name, oid->hash);
+}
+
+
+/*
  * Many callers know that the user meant to name a commit-ish by
  * syntactical positions where the object name appears.  Calling this
  * function allows the machinery to disambiguate shorter-than-unique
diff --git a/shallow.c b/shallow.c
index 4d554caf8d..54e2db7334 100644
--- a/shallow.c
+++ b/shallow.c
@@ -389,7 +389,7 @@ static void paint_down(struct paint_info *info, const unsigned char *sha1,
 	unsigned int i, nr;
 	struct commit_list *head = NULL;
 	int bitmap_nr = (info->nr_bits + 31) / 32;
-	size_t bitmap_size = st_mult(bitmap_nr, sizeof(uint32_t));
+	size_t bitmap_size = st_mult(sizeof(uint32_t), bitmap_nr);
 	uint32_t *tmp = xmalloc(bitmap_size); /* to be freed before return */
 	uint32_t *bitmap = paint_alloc(info);
 	struct commit *c = lookup_commit_reference_gently(sha1, 1);
diff --git a/shell.c b/shell.c
index c5439a63e9..464ee1a201 100644
--- a/shell.c
+++ b/shell.c
@@ -138,24 +138,13 @@ static struct commands {
 	{ NULL },
 };
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	char *prog;
 	const char **user_argv;
 	struct commands *cmd;
 	int count;
 
-	git_setup_gettext();
-
-	git_extract_argv0_path(argv[0]);
-
-	/*
-	 * 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();
-
 	/*
 	 * Special hack to pretend to be a CVS server
 	 */
diff --git a/shortlog.h b/shortlog.h
index de4f86fb97..5a326c6860 100644
--- a/shortlog.h
+++ b/shortlog.h
@@ -17,6 +17,7 @@ struct shortlog {
 	char *common_repo_prefix;
 	int email;
 	struct string_list mailmap;
+	FILE *file;
 };
 
 void shortlog_init(struct shortlog *log);
diff --git a/show-index.c b/show-index.c
index acf8d5445a..1ead41e211 100644
--- a/show-index.c
+++ b/show-index.c
@@ -4,15 +4,13 @@
 static const char show_index_usage[] =
 "git show-index";
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	int i;
 	unsigned nr;
 	unsigned int version;
 	static unsigned int top_index[256];
 
-	git_setup_gettext();
-
 	if (argc != 1)
 		usage(show_index_usage);
 	if (fread(top_index, 2 * 4, 1, stdin) != 1)
diff --git a/sideband.c b/sideband.c
index fde8adc000..1e4d684d6c 100644
--- a/sideband.c
+++ b/sideband.c
@@ -13,120 +13,103 @@
  * the remote died unexpectedly.  A flush() concludes the stream.
  */
 
-#define PREFIX "remote:"
+#define PREFIX "remote: "
 
 #define ANSI_SUFFIX "\033[K"
 #define DUMB_SUFFIX "        "
 
-#define FIX_SIZE 10  /* large enough for any of the above */
-
 int recv_sideband(const char *me, int in_stream, int out)
 {
-	unsigned pf = strlen(PREFIX);
-	unsigned sf;
-	char buf[LARGE_PACKET_MAX + 2*FIX_SIZE];
-	char *suffix, *term;
-	int skip_pf = 0;
+	const char *term, *suffix;
+	char buf[LARGE_PACKET_MAX + 1];
+	struct strbuf outbuf = STRBUF_INIT;
+	int retval = 0;
 
-	memcpy(buf, PREFIX, pf);
 	term = getenv("TERM");
 	if (isatty(2) && term && strcmp(term, "dumb"))
 		suffix = ANSI_SUFFIX;
 	else
 		suffix = DUMB_SUFFIX;
-	sf = strlen(suffix);
 
-	while (1) {
+	while (!retval) {
+		const char *b, *brk;
 		int band, len;
-		len = packet_read(in_stream, NULL, NULL, buf + pf, LARGE_PACKET_MAX, 0);
+		len = packet_read(in_stream, NULL, NULL, buf, LARGE_PACKET_MAX, 0);
 		if (len == 0)
 			break;
 		if (len < 1) {
-			fprintf(stderr, "%s: protocol error: no band designator\n", me);
-			return SIDEBAND_PROTOCOL_ERROR;
+			strbuf_addf(&outbuf,
+				    "%s%s: protocol error: no band designator",
+				    outbuf.len ? "\n" : "", me);
+			retval = SIDEBAND_PROTOCOL_ERROR;
+			break;
 		}
-		band = buf[pf] & 0xff;
+		band = buf[0] & 0xff;
+		buf[len] = '\0';
 		len--;
 		switch (band) {
 		case 3:
-			buf[pf] = ' ';
-			buf[pf+1+len] = '\0';
-			fprintf(stderr, "%s\n", buf);
-			return SIDEBAND_REMOTE_ERROR;
+			strbuf_addf(&outbuf, "%s%s%s", outbuf.len ? "\n" : "",
+				    PREFIX, buf + 1);
+			retval = SIDEBAND_REMOTE_ERROR;
+			break;
 		case 2:
-			buf[pf] = ' ';
-			do {
-				char *b = buf;
-				int brk = 0;
+			b = buf + 1;
 
-				/*
-				 * If the last buffer didn't end with a line
-				 * break then we should not print a prefix
-				 * this time around.
-				 */
-				if (skip_pf) {
-					b += pf+1;
-				} else {
-					len += pf+1;
-					brk += pf+1;
-				}
-
-				/* Look for a line break. */
-				for (;;) {
-					brk++;
-					if (brk > len) {
-						brk = 0;
-						break;
-					}
-					if (b[brk-1] == '\n' ||
-					    b[brk-1] == '\r')
-						break;
-				}
+			/*
+			 * Append a suffix to each nonempty line to clear the
+			 * end of the screen line.
+			 *
+			 * The output is accumulated in a buffer and
+			 * each line is printed to stderr using
+			 * write(2) to ensure inter-process atomicity.
+			 */
+			while ((brk = strpbrk(b, "\n\r"))) {
+				int linelen = brk - b;
 
-				/*
-				 * Let's insert a suffix to clear the end
-				 * of the screen line if a line break was
-				 * found.  Also, if we don't skip the
-				 * prefix, then a non-empty string must be
-				 * present too.
-				 */
-				if (brk > (skip_pf ? 0 : (pf+1 + 1))) {
-					char save[FIX_SIZE];
-					memcpy(save, b + brk, sf);
-					b[brk + sf - 1] = b[brk - 1];
-					memcpy(b + brk - 1, suffix, sf);
-					fprintf(stderr, "%.*s", brk + sf, b);
-					memcpy(b + brk, save, sf);
-					len -= brk;
+				if (!outbuf.len)
+					strbuf_addstr(&outbuf, PREFIX);
+				if (linelen > 0) {
+					strbuf_addf(&outbuf, "%.*s%s%c",
+						    linelen, b, suffix, *brk);
 				} else {
-					int l = brk ? brk : len;
-					fprintf(stderr, "%.*s", l, b);
-					len -= l;
+					strbuf_addch(&outbuf, *brk);
 				}
+				xwrite(2, outbuf.buf, outbuf.len);
+				strbuf_reset(&outbuf);
 
-				skip_pf = !brk;
-				memmove(buf + pf+1, b + brk, len);
-			} while (len);
-			continue;
+				b = brk + 1;
+			}
+
+			if (*b)
+				strbuf_addf(&outbuf, "%s%s",
+					    outbuf.len ? "" : PREFIX, b);
+			break;
 		case 1:
-			write_or_die(out, buf + pf+1, len);
-			continue;
+			write_or_die(out, buf + 1, len);
+			break;
 		default:
-			fprintf(stderr, "%s: protocol error: bad band #%d\n",
-				me, band);
-			return SIDEBAND_PROTOCOL_ERROR;
+			strbuf_addf(&outbuf, "%s%s: protocol error: bad band #%d",
+				    outbuf.len ? "\n" : "", me, band);
+			retval = SIDEBAND_PROTOCOL_ERROR;
+			break;
 		}
 	}
-	return 0;
+
+	if (outbuf.len) {
+		strbuf_addch(&outbuf, '\n');
+		xwrite(2, outbuf.buf, outbuf.len);
+	}
+	strbuf_release(&outbuf);
+	return retval;
 }
 
 /*
  * fd is connected to the remote side; send the sideband data
  * over multiplexed packet stream.
  */
-ssize_t send_sideband(int fd, int band, const char *data, ssize_t sz, int packet_max)
+void send_sideband(int fd, int band, const char *data, ssize_t sz, int packet_max)
 {
-	ssize_t ssz = sz;
 	const char *p = data;
 
 	while (sz) {
@@ -148,5 +131,4 @@ ssize_t send_sideband(int fd, int band, const char *data, ssize_t sz, int packet
 		p += n;
 		sz -= n;
 	}
-	return ssz;
 }
diff --git a/sideband.h b/sideband.h
index e46bed0b01..7a8146f161 100644
--- a/sideband.h
+++ b/sideband.h
@@ -5,6 +5,6 @@
 #define SIDEBAND_REMOTE_ERROR -1
 
 int recv_sideband(const char *me, int in_stream, int out);
-ssize_t send_sideband(int fd, int band, const char *data, ssize_t sz, int packet_max);
+void send_sideband(int fd, int band, const char *data, ssize_t sz, int packet_max);
 
 #endif
diff --git a/strbuf.c b/strbuf.c
index 2c08dbb153..f3bd5719c6 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -197,6 +197,13 @@ void strbuf_add(struct strbuf *sb, const void *data, size_t len)
 	strbuf_setlen(sb, sb->len + len);
 }
 
+void strbuf_addbuf(struct strbuf *sb, const struct strbuf *sb2)
+{
+	strbuf_grow(sb, sb2->len);
+	memcpy(sb->buf + sb->len, sb2->buf, sb2->len);
+	strbuf_setlen(sb, sb->len + sb2->len);
+}
+
 void strbuf_adddup(struct strbuf *sb, size_t pos, size_t len)
 {
 	strbuf_grow(sb, len);
@@ -395,6 +402,12 @@ ssize_t strbuf_read_once(struct strbuf *sb, int fd, size_t hint)
 	return cnt;
 }
 
+ssize_t strbuf_write(struct strbuf *sb, FILE *f)
+{
+	return sb->len ? fwrite(sb->buf, 1, sb->len, f) : 0;
+}
+
+
 #define STRBUF_MAXLINK (2*PATH_MAX)
 
 int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint)
diff --git a/strbuf.h b/strbuf.h
index f72fd14c2e..ba8d5f1d46 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -263,11 +263,7 @@ static inline void strbuf_addstr(struct strbuf *sb, const char *s)
 /**
  * Copy the contents of another buffer at the end of the current one.
  */
-static inline void strbuf_addbuf(struct strbuf *sb, const struct strbuf *sb2)
-{
-	strbuf_grow(sb, sb2->len);
-	strbuf_add(sb, sb2->buf, sb2->len);
-}
+extern void strbuf_addbuf(struct strbuf *sb, const struct strbuf *sb2);
 
 /**
  * Copy part of the buffer from a given position till a given length to the
@@ -377,6 +373,8 @@ extern ssize_t strbuf_read_once(struct strbuf *, int fd, size_t hint);
 /**
  * Read the contents of a file, specified by its path. The third argument
  * can be used to give a hint about the file size, to avoid reallocs.
+ * Return the number of bytes read or a negative value if some error
+ * occurred while opening or reading the file.
  */
 extern ssize_t strbuf_read_file(struct strbuf *sb, const char *path, size_t hint);
 
@@ -387,6 +385,12 @@ extern ssize_t strbuf_read_file(struct strbuf *sb, const char *path, size_t hint
 extern int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint);
 
 /**
+ * Write the whole content of the strbuf to the stream not stopping at
+ * NUL bytes.
+ */
+extern ssize_t strbuf_write(struct strbuf *sb, FILE *stream);
+
+/**
  * Read a line from a FILE *, overwriting the existing contents of
  * the strbuf.  The strbuf_getline*() family of functions share
  * this signature, but have different line termination conventions.
diff --git a/submodule-config.c b/submodule-config.c
index 7f67ec0c6a..098085be69 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -59,6 +59,8 @@ static void free_one_config(struct submodule_entry *entry)
 {
 	free((void *) entry->config->path);
 	free((void *) entry->config->name);
+	free((void *) entry->config->branch);
+	free((void *) entry->config->update_strategy.command);
 	free(entry->config);
 }
 
@@ -194,8 +196,12 @@ static struct submodule *lookup_or_create_by_name(struct submodule_cache *cache,
 
 	submodule->path = NULL;
 	submodule->url = NULL;
+	submodule->update_strategy.type = SM_UPDATE_UNSPECIFIED;
+	submodule->update_strategy.command = NULL;
 	submodule->fetch_recurse = RECURSE_SUBMODULES_NONE;
 	submodule->ignore = NULL;
+	submodule->branch = NULL;
+	submodule->recommend_shallow = -1;
 
 	hashcpy(submodule->gitmodules_sha1, gitmodules_sha1);
 
@@ -293,7 +299,7 @@ static int parse_config(const char *var, const char *value, void *data)
 	if (!strcmp(item.buf, "path")) {
 		if (!value)
 			ret = config_error_nonbool(var);
-		else if (!me->overwrite && submodule->path != NULL)
+		else if (!me->overwrite && submodule->path)
 			warn_multiple_config(me->commit_sha1, submodule->name,
 					"path");
 		else {
@@ -317,7 +323,7 @@ static int parse_config(const char *var, const char *value, void *data)
 	} else if (!strcmp(item.buf, "ignore")) {
 		if (!value)
 			ret = config_error_nonbool(var);
-		else if (!me->overwrite && submodule->ignore != NULL)
+		else if (!me->overwrite && submodule->ignore)
 			warn_multiple_config(me->commit_sha1, submodule->name,
 					"ignore");
 		else if (strcmp(value, "untracked") &&
@@ -333,13 +339,38 @@ static int parse_config(const char *var, const char *value, void *data)
 	} else if (!strcmp(item.buf, "url")) {
 		if (!value) {
 			ret = config_error_nonbool(var);
-		} else if (!me->overwrite && submodule->url != NULL) {
+		} else if (!me->overwrite && submodule->url) {
 			warn_multiple_config(me->commit_sha1, submodule->name,
 					"url");
 		} else {
 			free((void *) submodule->url);
 			submodule->url = xstrdup(value);
 		}
+	} else if (!strcmp(item.buf, "update")) {
+		if (!value)
+			ret = config_error_nonbool(var);
+		else if (!me->overwrite &&
+			 submodule->update_strategy.type != SM_UPDATE_UNSPECIFIED)
+			warn_multiple_config(me->commit_sha1, submodule->name,
+					     "update");
+		else if (parse_submodule_update_strategy(value,
+			 &submodule->update_strategy) < 0)
+				die(_("invalid value for %s"), var);
+	} else if (!strcmp(item.buf, "shallow")) {
+		if (!me->overwrite && submodule->recommend_shallow != -1)
+			warn_multiple_config(me->commit_sha1, submodule->name,
+					     "shallow");
+		else
+			submodule->recommend_shallow =
+				git_config_bool(var, value);
+	} else if (!strcmp(item.buf, "branch")) {
+		if (!me->overwrite && submodule->branch)
+			warn_multiple_config(me->commit_sha1, submodule->name,
+					     "branch");
+		else {
+			free((void *)submodule->branch);
+			submodule->branch = xstrdup(value);
+		}
 	}
 
 	strbuf_release(&name);
@@ -349,21 +380,20 @@ static int parse_config(const char *var, const char *value, void *data)
 }
 
 static int gitmodule_sha1_from_commit(const unsigned char *commit_sha1,
-				      unsigned char *gitmodules_sha1)
+				      unsigned char *gitmodules_sha1,
+				      struct strbuf *rev)
 {
-	struct strbuf rev = STRBUF_INIT;
 	int ret = 0;
 
 	if (is_null_sha1(commit_sha1)) {
-		hashcpy(gitmodules_sha1, null_sha1);
+		hashclr(gitmodules_sha1);
 		return 1;
 	}
 
-	strbuf_addf(&rev, "%s:.gitmodules", sha1_to_hex(commit_sha1));
-	if (get_sha1(rev.buf, gitmodules_sha1) >= 0)
+	strbuf_addf(rev, "%s:.gitmodules", sha1_to_hex(commit_sha1));
+	if (get_sha1(rev->buf, gitmodules_sha1) >= 0)
 		ret = 1;
 
-	strbuf_release(&rev);
 	return ret;
 }
 
@@ -377,7 +407,7 @@ static const struct submodule *config_from(struct submodule_cache *cache,
 {
 	struct strbuf rev = STRBUF_INIT;
 	unsigned long config_size;
-	char *config;
+	char *config = NULL;
 	unsigned char sha1[20];
 	enum object_type type;
 	const struct submodule *submodule = NULL;
@@ -398,8 +428,8 @@ static const struct submodule *config_from(struct submodule_cache *cache,
 		return entry->config;
 	}
 
-	if (!gitmodule_sha1_from_commit(commit_sha1, sha1))
-		return NULL;
+	if (!gitmodule_sha1_from_commit(commit_sha1, sha1, &rev))
+		goto out;
 
 	switch (lookup_type) {
 	case lookup_name:
@@ -410,24 +440,20 @@ static const struct submodule *config_from(struct submodule_cache *cache,
 		break;
 	}
 	if (submodule)
-		return submodule;
+		goto out;
 
 	config = read_sha1_file(sha1, &type, &config_size);
-	if (!config)
-		return NULL;
-
-	if (type != OBJ_BLOB) {
-		free(config);
-		return NULL;
-	}
+	if (!config || type != OBJ_BLOB)
+		goto out;
 
 	/* fill the submodule config into the cache */
 	parameter.cache = cache;
 	parameter.commit_sha1 = commit_sha1;
 	parameter.gitmodules_sha1 = sha1;
 	parameter.overwrite = 0;
-	git_config_from_mem(parse_config, "submodule-blob", rev.buf,
+	git_config_from_mem(parse_config, CONFIG_ORIGIN_SUBMODULE_BLOB, rev.buf,
 			config, config_size, &parameter);
+	strbuf_release(&rev);
 	free(config);
 
 	switch (lookup_type) {
@@ -438,6 +464,11 @@ static const struct submodule *config_from(struct submodule_cache *cache,
 	default:
 		return NULL;
 	}
+
+out:
+	strbuf_release(&rev);
+	free(config);
+	return submodule;
 }
 
 static const struct submodule *config_from_path(struct submodule_cache *cache,
diff --git a/submodule-config.h b/submodule-config.h
index 9bfa65af03..d05c542d2c 100644
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -2,6 +2,7 @@
 #define SUBMODULE_CONFIG_CACHE_H
 
 #include "hashmap.h"
+#include "submodule.h"
 #include "strbuf.h"
 
 /*
@@ -14,8 +15,11 @@ struct submodule {
 	const char *url;
 	int fetch_recurse;
 	const char *ignore;
+	const char *branch;
+	struct submodule_update_strategy update_strategy;
 	/* the sha1 blob id of the responsible .gitmodules file */
 	unsigned char gitmodules_sha1[20];
+	int recommend_shallow;
 };
 
 int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
diff --git a/submodule.c b/submodule.c
index 62c4356c50..1b5cdfb7e7 100644
--- a/submodule.c
+++ b/submodule.c
@@ -13,9 +13,11 @@
 #include "argv-array.h"
 #include "blob.h"
 #include "thread-utils.h"
+#include "quote.h"
 
 static int config_fetch_recurse_submodules = RECURSE_SUBMODULES_ON_DEMAND;
-static struct string_list changed_submodule_paths;
+static int parallel_jobs = 1;
+static struct string_list changed_submodule_paths = STRING_LIST_INIT_NODUP;
 static int initialized_fetch_ref_tips;
 static struct sha1_array ref_tips_before_fetch;
 static struct sha1_array ref_tips_after_fetch;
@@ -169,7 +171,12 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
 
 int submodule_config(const char *var, const char *value, void *cb)
 {
-	if (starts_with(var, "submodule."))
+	if (!strcmp(var, "submodule.fetchjobs")) {
+		parallel_jobs = git_config_int(var, value);
+		if (parallel_jobs < 0)
+			die(_("negative values not allowed for submodule.fetchJobs"));
+		return 0;
+	} else if (starts_with(var, "submodule."))
 		return parse_submodule_config_option(var, value);
 	else if (!strcmp(var, "fetch.recursesubmodules")) {
 		config_fetch_recurse_submodules = parse_fetch_recurse_submodules_arg(var, value);
@@ -210,6 +217,48 @@ void gitmodules_config(void)
 	}
 }
 
+int parse_submodule_update_strategy(const char *value,
+		struct submodule_update_strategy *dst)
+{
+	free((void*)dst->command);
+	dst->command = NULL;
+	if (!strcmp(value, "none"))
+		dst->type = SM_UPDATE_NONE;
+	else if (!strcmp(value, "checkout"))
+		dst->type = SM_UPDATE_CHECKOUT;
+	else if (!strcmp(value, "rebase"))
+		dst->type = SM_UPDATE_REBASE;
+	else if (!strcmp(value, "merge"))
+		dst->type = SM_UPDATE_MERGE;
+	else if (skip_prefix(value, "!", &value)) {
+		dst->type = SM_UPDATE_COMMAND;
+		dst->command = xstrdup(value);
+	} else
+		return -1;
+	return 0;
+}
+
+const char *submodule_strategy_to_string(const struct submodule_update_strategy *s)
+{
+	struct strbuf sb = STRBUF_INIT;
+	switch (s->type) {
+	case SM_UPDATE_CHECKOUT:
+		return "checkout";
+	case SM_UPDATE_MERGE:
+		return "merge";
+	case SM_UPDATE_REBASE:
+		return "rebase";
+	case SM_UPDATE_NONE:
+		return "none";
+	case SM_UPDATE_UNSPECIFIED:
+		return NULL;
+	case SM_UPDATE_COMMAND:
+		strbuf_addf(&sb, "!%s", s->command);
+		return strbuf_detach(&sb, NULL);
+	}
+	return NULL;
+}
+
 void handle_ignore_submodules_arg(struct diff_options *diffopt,
 				  const char *arg)
 {
@@ -366,7 +415,7 @@ static int submodule_needs_pushing(const char *path, const unsigned char sha1[20
 
 		argv[1] = sha1_to_hex(sha1);
 		cp.argv = argv;
-		cp.env = local_repo_env;
+		prepare_submodule_repo_env(&cp.env_array);
 		cp.git_cmd = 1;
 		cp.no_stdin = 1;
 		cp.out = -1;
@@ -396,7 +445,7 @@ static void collect_submodules_from_diff(struct diff_queue_struct *q,
 		struct diff_filepair *p = q->queue[i];
 		if (!S_ISGITLINK(p->two->mode))
 			continue;
-		if (submodule_needs_pushing(p->two->path, p->two->sha1))
+		if (submodule_needs_pushing(p->two->path, p->two->oid.hash))
 			string_list_insert(needs_pushing, p->two->path);
 	}
 }
@@ -453,7 +502,7 @@ static int push_submodule(const char *path)
 		const char *argv[] = {"push", NULL};
 
 		cp.argv = argv;
-		cp.env = local_repo_env;
+		prepare_submodule_repo_env(&cp.env_array);
 		cp.git_cmd = 1;
 		cp.no_stdin = 1;
 		cp.dir = path;
@@ -499,7 +548,7 @@ static int is_submodule_commit_present(const char *path, unsigned char sha1[20])
 
 		argv[3] = sha1_to_hex(sha1);
 		cp.argv = argv;
-		cp.env = local_repo_env;
+		prepare_submodule_repo_env(&cp.env_array);
 		cp.git_cmd = 1;
 		cp.no_stdin = 1;
 		cp.dir = path;
@@ -528,7 +577,7 @@ static void submodule_collect_changed_cb(struct diff_queue_struct *q,
 			 * being moved around. */
 			struct string_list_item *path;
 			path = unsorted_string_list_lookup(&changed_submodule_paths, p->two->path);
-			if (!path && !is_submodule_commit_present(p->two->path, p->two->sha1))
+			if (!path && !is_submodule_commit_present(p->two->path, p->two->oid.hash))
 				string_list_append(&changed_submodule_paths, xstrdup(p->two->path));
 		} else {
 			/* Submodule is new or was moved here */
@@ -682,7 +731,7 @@ static int get_next_submodule(struct child_process *cp,
 		if (is_directory(git_dir)) {
 			child_process_init(cp);
 			cp->dir = strbuf_detach(&submodule_path, NULL);
-			cp->env = local_repo_env;
+			prepare_submodule_repo_env(&cp->env_array);
 			cp->git_cmd = 1;
 			if (!spf->quiet)
 				strbuf_addf(err, "Fetching submodule %s%s\n",
@@ -750,6 +799,9 @@ int fetch_populated_submodules(const struct argv_array *options,
 	argv_array_push(&spf.args, "--recurse-submodules-default");
 	/* default value, "--submodule-prefix" and its value are added later */
 
+	if (max_parallel_jobs < 0)
+		max_parallel_jobs = parallel_jobs;
+
 	calculate_changed_submodule_paths();
 	run_processes_parallel(max_parallel_jobs,
 			       get_next_submodule,
@@ -794,7 +846,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
 		argv[2] = "-uno";
 
 	cp.argv = argv;
-	cp.env = local_repo_env;
+	prepare_submodule_repo_env(&cp.env_array);
 	cp.git_cmd = 1;
 	cp.no_stdin = 1;
 	cp.out = -1;
@@ -855,7 +907,7 @@ int submodule_uses_gitfile(const char *path)
 
 	/* Now test that all nested submodules use a gitfile too */
 	cp.argv = argv;
-	cp.env = local_repo_env;
+	prepare_submodule_repo_env(&cp.env_array);
 	cp.git_cmd = 1;
 	cp.no_stdin = 1;
 	cp.no_stderr = 1;
@@ -888,7 +940,7 @@ int ok_to_remove_submodule(const char *path)
 		return 0;
 
 	cp.argv = argv;
-	cp.env = local_repo_env;
+	prepare_submodule_repo_env(&cp.env_array);
 	cp.git_cmd = 1;
 	cp.no_stdin = 1;
 	cp.out = -1;
@@ -1094,3 +1146,18 @@ void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir)
 	strbuf_release(&rel_path);
 	free((void *)real_work_tree);
 }
+
+int parallel_submodules(void)
+{
+	return parallel_jobs;
+}
+
+void prepare_submodule_repo_env(struct argv_array *out)
+{
+	const char * const *var;
+
+	for (var = local_repo_env; *var; var++) {
+		if (strcmp(*var, CONFIG_DATA_ENVIRONMENT))
+			argv_array_push(out, *var);
+	}
+}
diff --git a/submodule.h b/submodule.h
index e06eaa5ebb..2af9390998 100644
--- a/submodule.h
+++ b/submodule.h
@@ -14,6 +14,21 @@ enum {
 	RECURSE_SUBMODULES_ON = 2
 };
 
+enum submodule_update_type {
+	SM_UPDATE_UNSPECIFIED = 0,
+	SM_UPDATE_CHECKOUT,
+	SM_UPDATE_REBASE,
+	SM_UPDATE_MERGE,
+	SM_UPDATE_NONE,
+	SM_UPDATE_COMMAND
+};
+
+struct submodule_update_strategy {
+	enum submodule_update_type type;
+	const char *command;
+};
+#define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL}
+
 int is_staging_gitmodules_ok(void);
 int update_path_in_gitmodules(const char *oldpath, const char *newpath);
 int remove_path_from_gitmodules(const char *path);
@@ -22,6 +37,9 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
 		const char *path);
 int submodule_config(const char *var, const char *value, void *cb);
 void gitmodules_config(void);
+int parse_submodule_update_strategy(const char *value,
+		struct submodule_update_strategy *dst);
+const char *submodule_strategy_to_string(const struct submodule_update_strategy *s);
 void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
 void show_submodule_summary(FILE *f, const char *path,
 		const char *line_prefix,
@@ -42,5 +60,13 @@ int find_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_nam
 		struct string_list *needs_pushing);
 int push_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name);
 void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
+int parallel_submodules(void);
+
+/*
+ * Prepare the "env_array" parameter of a "struct child_process" for executing
+ * a submodule by clearing any repo-specific envirionment variables, but
+ * retaining any config in the environment.
+ */
+void prepare_submodule_repo_env(struct argv_array *out);
 
 #endif
diff --git a/t/README b/t/README
index 76a0daa3ac..0f764c0aef 100644
--- a/t/README
+++ b/t/README
@@ -265,7 +265,7 @@ right, so this:
     $ sh ./t9200-git-cvsexport-commit.sh --run='1-4 !3'
 
 will run tests 1, 2, and 4.  Items that comes later have higher
-precendence.  It means that this:
+precedence.  It means that this:
 
     $ sh ./t9200-git-cvsexport-commit.sh --run='!3 1-4'
 
diff --git a/t/helper/.gitignore b/t/helper/.gitignore
new file mode 100644
index 0000000000..d6e8b36798
--- /dev/null
+++ b/t/helper/.gitignore
@@ -0,0 +1,33 @@
+/test-chmtime
+/test-ctype
+/test-config
+/test-date
+/test-delta
+/test-dump-cache-tree
+/test-dump-split-index
+/test-dump-untracked-cache
+/test-fake-ssh
+/test-scrap-cache-tree
+/test-genrandom
+/test-hashmap
+/test-index-version
+/test-line-buffer
+/test-match-trees
+/test-mergesort
+/test-mktemp
+/test-parse-options
+/test-path-utils
+/test-prio-queue
+/test-read-cache
+/test-regex
+/test-revision-walking
+/test-run-command
+/test-sha1
+/test-sha1-array
+/test-sigchain
+/test-string-list
+/test-submodule-config
+/test-subprocess
+/test-svn-fe
+/test-urlmatch-normalization
+/test-wildmatch
diff --git a/test-chmtime.c b/t/helper/test-chmtime.c
index dfe8a83261..e760256406 100644
--- a/test-chmtime.c
+++ b/t/helper/test-chmtime.c
@@ -56,7 +56,7 @@ static int timespec_arg(const char *arg, long int *set_time, int *set_eq)
 	return 1;
 }
 
-int main(int argc, char *argv[])
+int cmd_main(int argc, const char **argv)
 {
 	static int verbose;
 
diff --git a/test-config.c b/t/helper/test-config.c
index 6a77552210..3c6d08cd09 100644
--- a/test-config.c
+++ b/t/helper/test-config.c
@@ -25,6 +25,9 @@
  * 				ascending order of priority from a config_set
  * 				constructed from files entered as arguments.
  *
+ * iterate -> iterate over all values using git_config(), and print some
+ *            data for each
+ *
  * Examples:
  *
  * To print the value with highest priority for key "foo.bAr Baz.rock":
@@ -32,8 +35,38 @@
  *
  */
 
+static const char *scope_name(enum config_scope scope)
+{
+	switch (scope) {
+	case CONFIG_SCOPE_SYSTEM:
+		return "system";
+	case CONFIG_SCOPE_GLOBAL:
+		return "global";
+	case CONFIG_SCOPE_REPO:
+		return "repo";
+	case CONFIG_SCOPE_CMDLINE:
+		return "cmdline";
+	default:
+		return "unknown";
+	}
+}
+static int iterate_cb(const char *var, const char *value, void *data)
+{
+	static int nr;
+
+	if (nr++)
+		putchar('\n');
+
+	printf("key=%s\n", var);
+	printf("value=%s\n", value ? value : "(null)");
+	printf("origin=%s\n", current_config_origin_type());
+	printf("name=%s\n", current_config_name());
+	printf("scope=%s\n", scope_name(current_config_scope()));
+
+	return 0;
+}
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	int i, val;
 	const char *v;
@@ -134,6 +167,9 @@ int main(int argc, char **argv)
 			printf("Value not found for \"%s\"\n", argv[2]);
 			goto exit1;
 		}
+	} else if (!strcmp(argv[1], "iterate")) {
+		git_config(iterate_cb, NULL);
+		goto exit0;
 	}
 
 	die("%s: Please check the syntax and the function name", argv[0]);
diff --git a/test-ctype.c b/t/helper/test-ctype.c
index 707a821f03..bb72c47df5 100644
--- a/test-ctype.c
+++ b/t/helper/test-ctype.c
@@ -28,7 +28,7 @@ static int is_in(const char *s, int ch)
 #define LOWER "abcdefghijklmnopqrstuvwxyz"
 #define UPPER "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	TEST_CLASS(isdigit, DIGIT);
 	TEST_CLASS(isspace, " \n\r\t");
diff --git a/test-date.c b/t/helper/test-date.c
index 63f373557e..506054bcd5 100644
--- a/test-date.c
+++ b/t/helper/test-date.c
@@ -1,11 +1,12 @@
 #include "cache.h"
 
 static const char *usage_msg = "\n"
-"  test-date show [time_t]...\n"
+"  test-date relative [time_t]...\n"
+"  test-date show:<format> [time_t]...\n"
 "  test-date parse [date]...\n"
 "  test-date approxidate [date]...\n";
 
-static void show_dates(char **argv, struct timeval *now)
+static void show_relative_dates(const char **argv, struct timeval *now)
 {
 	struct strbuf buf = STRBUF_INIT;
 
@@ -17,7 +18,30 @@ static void show_dates(char **argv, struct timeval *now)
 	strbuf_release(&buf);
 }
 
-static void parse_dates(char **argv, struct timeval *now)
+static void show_dates(const char **argv, const char *format)
+{
+	struct date_mode mode;
+
+	parse_date_format(format, &mode);
+	for (; *argv; argv++) {
+		char *arg;
+		time_t t;
+		int tz;
+
+		/*
+		 * Do not use our normal timestamp parsing here, as the point
+		 * is to test the formatting code in isolation.
+		 */
+		t = strtol(*argv, &arg, 10);
+		while (*arg == ' ')
+			arg++;
+		tz = atoi(arg);
+
+		printf("%s -> %s\n", *argv, show_date(t, tz, &mode));
+	}
+}
+
+static void parse_dates(const char **argv, struct timeval *now)
 {
 	struct strbuf result = STRBUF_INIT;
 
@@ -36,7 +60,7 @@ static void parse_dates(char **argv, struct timeval *now)
 	strbuf_release(&result);
 }
 
-static void parse_approxidate(char **argv, struct timeval *now)
+static void parse_approxidate(const char **argv, struct timeval *now)
 {
 	for (; *argv; argv++) {
 		time_t t;
@@ -45,7 +69,7 @@ static void parse_approxidate(char **argv, struct timeval *now)
 	}
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	struct timeval now;
 	const char *x;
@@ -61,8 +85,10 @@ int main(int argc, char **argv)
 	argv++;
 	if (!*argv)
 		usage(usage_msg);
-	if (!strcmp(*argv, "show"))
-		show_dates(argv+1, &now);
+	if (!strcmp(*argv, "relative"))
+		show_relative_dates(argv+1, &now);
+	else if (skip_prefix(*argv, "show:", &x))
+		show_dates(argv+1, x);
 	else if (!strcmp(*argv, "parse"))
 		parse_dates(argv+1, &now);
 	else if (!strcmp(*argv, "approxidate"))
diff --git a/test-delta.c b/t/helper/test-delta.c
index 4595cd6433..59937dc1be 100644
--- a/test-delta.c
+++ b/t/helper/test-delta.c
@@ -15,7 +15,7 @@
 static const char usage_str[] =
 	"test-delta (-d|-p) <from_file> <data_file> <out_file>";
 
-int main(int argc, char *argv[])
+int cmd_main(int argc, const char **argv)
 {
 	int fd;
 	struct stat st;
diff --git a/test-dump-cache-tree.c b/t/helper/test-dump-cache-tree.c
index bb53c0aa65..44f3290258 100644
--- a/test-dump-cache-tree.c
+++ b/t/helper/test-dump-cache-tree.c
@@ -54,7 +54,7 @@ static int dump_cache_tree(struct cache_tree *it,
 	return errs;
 }
 
-int main(int ac, char **av)
+int cmd_main(int ac, const char **av)
 {
 	struct index_state istate;
 	struct cache_tree *another = cache_tree();
diff --git a/test-dump-split-index.c b/t/helper/test-dump-split-index.c
index 861d28c9b6..d1689248b4 100644
--- a/test-dump-split-index.c
+++ b/t/helper/test-dump-split-index.c
@@ -7,7 +7,7 @@ static void show_bit(size_t pos, void *data)
 	printf(" %d", (int)pos);
 }
 
-int main(int ac, char **av)
+int cmd_main(int ac, const char **av)
 {
 	struct split_index *si;
 	int i;
diff --git a/test-dump-untracked-cache.c b/t/helper/test-dump-untracked-cache.c
index 0a1c285246..50112cc858 100644
--- a/test-dump-untracked-cache.c
+++ b/t/helper/test-dump-untracked-cache.c
@@ -40,7 +40,7 @@ static void dump(struct untracked_cache_dir *ucd, struct strbuf *base)
 	strbuf_setlen(base, len);
 }
 
-int main(int ac, char **av)
+int cmd_main(int ac, const char **av)
 {
 	struct untracked_cache *uc;
 	struct strbuf base = STRBUF_INIT;
diff --git a/test-fake-ssh.c b/t/helper/test-fake-ssh.c
index 980de216e1..12beee99ad 100644
--- a/test-fake-ssh.c
+++ b/t/helper/test-fake-ssh.c
@@ -2,7 +2,7 @@
 #include "run-command.h"
 #include "strbuf.h"
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	const char *trash_directory = getenv("TRASH_DIRECTORY");
 	struct strbuf buf = STRBUF_INIT;
diff --git a/test-genrandom.c b/t/helper/test-genrandom.c
index 54824d0754..8d11d22d98 100644
--- a/test-genrandom.c
+++ b/t/helper/test-genrandom.c
@@ -6,7 +6,7 @@
 
 #include "git-compat-util.h"
 
-int main(int argc, char *argv[])
+int cmd_main(int argc, const char **argv)
 {
 	unsigned long count, next = 0;
 	unsigned char *c;
diff --git a/test-hashmap.c b/t/helper/test-hashmap.c
index cc2891dd97..7aa9440e27 100644
--- a/test-hashmap.c
+++ b/t/helper/test-hashmap.c
@@ -138,7 +138,7 @@ static void perf_hashmap(unsigned int method, unsigned int rounds)
  *
  * perfhashmap method rounds -> test hashmap.[ch] performance
  */
-int main(int argc, char *argv[])
+int cmd_main(int argc, const char **argv)
 {
 	char line[1024];
 	struct hashmap map;
diff --git a/test-index-version.c b/t/helper/test-index-version.c
index 05d4699c4a..f569f6b7ef 100644
--- a/test-index-version.c
+++ b/t/helper/test-index-version.c
@@ -1,6 +1,6 @@
 #include "cache.h"
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	struct cache_header hdr;
 	int version;
diff --git a/test-line-buffer.c b/t/helper/test-line-buffer.c
index 1e58f0476f..81575fe2ab 100644
--- a/test-line-buffer.c
+++ b/t/helper/test-line-buffer.c
@@ -50,7 +50,7 @@ static void handle_line(const char *line, struct line_buffer *stdin_buf)
 	handle_command(line, arg + 1, stdin_buf);
 }
 
-int main(int argc, char *argv[])
+int cmd_main(int argc, const char **argv)
 {
 	struct line_buffer stdin_buf = LINE_BUFFER_INIT;
 	struct line_buffer file_buf = LINE_BUFFER_INIT;
diff --git a/t/helper/test-match-trees.c b/t/helper/test-match-trees.c
new file mode 100644
index 0000000000..e939502863
--- /dev/null
+++ b/t/helper/test-match-trees.c
@@ -0,0 +1,26 @@
+#include "cache.h"
+#include "tree.h"
+
+int cmd_main(int ac, const char **av)
+{
+	struct object_id hash1, hash2, shifted;
+	struct tree *one, *two;
+
+	setup_git_directory();
+
+	if (get_oid(av[1], &hash1))
+		die("cannot parse %s as an object name", av[1]);
+	if (get_oid(av[2], &hash2))
+		die("cannot parse %s as an object name", av[2]);
+	one = parse_tree_indirect(hash1.hash);
+	if (!one)
+		die("not a tree-ish %s", av[1]);
+	two = parse_tree_indirect(hash2.hash);
+	if (!two)
+		die("not a tree-ish %s", av[2]);
+
+	shift_tree(&one->object.oid, &two->object.oid, &shifted, -1);
+	printf("shifted: %s\n", oid_to_hex(&shifted));
+
+	exit(0);
+}
diff --git a/test-mergesort.c b/t/helper/test-mergesort.c
index ea3b959e94..335cf6b626 100644
--- a/test-mergesort.c
+++ b/t/helper/test-mergesort.c
@@ -22,7 +22,7 @@ static int compare_strings(const void *a, const void *b)
 	return strcmp(x->text, y->text);
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	struct line *line, *p = NULL, *lines = NULL;
 	struct strbuf sb = STRBUF_INIT;
diff --git a/test-mktemp.c b/t/helper/test-mktemp.c
index c8c54213a3..89d9b2f7be 100644
--- a/test-mktemp.c
+++ b/t/helper/test-mktemp.c
@@ -3,7 +3,7 @@
  */
 #include "git-compat-util.h"
 
-int main(int argc, char *argv[])
+int cmd_main(int argc, const char **argv)
 {
 	if (argc != 2)
 		usage("Expected 1 parameter defining the temporary file template");
diff --git a/test-parse-options.c b/t/helper/test-parse-options.c
index 2c8c8f18ed..a01430c24b 100644
--- a/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -7,16 +7,25 @@ static int integer = 0;
 static unsigned long magnitude = 0;
 static unsigned long timestamp;
 static int abbrev = 7;
-static int verbose = 0, dry_run = 0, quiet = 0;
+static int verbose = -1; /* unspecified */
+static int dry_run = 0, quiet = 0;
 static char *string = NULL;
 static char *file = NULL;
 static int ambiguous;
-static struct string_list list;
+static struct string_list list = STRING_LIST_INIT_NODUP;
+
+static struct {
+	int called;
+	const char *arg;
+	int unset;
+} length_cb;
 
 static int length_callback(const struct option *opt, const char *arg, int unset)
 {
-	printf("Callback: \"%s\", %d\n",
-		(arg ? arg : "not set"), unset);
+	length_cb.called = 1;
+	length_cb.arg = arg;
+	length_cb.unset = unset;
+
 	if (unset)
 		return 1; /* do not support unset */
 
@@ -30,13 +39,69 @@ static int number_callback(const struct option *opt, const char *arg, int unset)
 	return 0;
 }
 
-int main(int argc, char **argv)
+static int collect_expect(const struct option *opt, const char *arg, int unset)
+{
+	struct string_list *expect;
+	struct string_list_item *item;
+	struct strbuf label = STRBUF_INIT;
+	const char *colon;
+
+	if (!arg || unset)
+		die("malformed --expect option");
+
+	expect = (struct string_list *)opt->value;
+	colon = strchr(arg, ':');
+	if (!colon)
+		die("malformed --expect option, lacking a colon");
+	strbuf_add(&label, arg, colon - arg);
+	item = string_list_insert(expect, strbuf_detach(&label, NULL));
+	if (item->util)
+		die("malformed --expect option, duplicate %s", label.buf);
+	item->util = (void *)arg;
+	return 0;
+}
+
+__attribute__((format (printf,3,4)))
+static void show(struct string_list *expect, int *status, const char *fmt, ...)
+{
+	struct string_list_item *item;
+	struct strbuf buf = STRBUF_INIT;
+	va_list args;
+
+	va_start(args, fmt);
+	strbuf_vaddf(&buf, fmt, args);
+	va_end(args);
+
+	if (!expect->nr)
+		printf("%s\n", buf.buf);
+	else {
+		char *colon = strchr(buf.buf, ':');
+		if (!colon)
+			die("malformed output format, output lacking colon: %s", fmt);
+		*colon = '\0';
+		item = string_list_lookup(expect, buf.buf);
+		*colon = ':';
+		if (!item)
+			; /* not among entries being checked */
+		else {
+			if (strcmp((const char *)item->util, buf.buf)) {
+				printf("-%s\n", (char *)item->util);
+				printf("+%s\n", buf.buf);
+				*status = 1;
+			}
+		}
+	}
+	strbuf_release(&buf);
+}
+
+int cmd_main(int argc, const char **argv)
 {
 	const char *prefix = "prefix/";
 	const char *usage[] = {
 		"test-parse-options <options>",
 		NULL
 	};
+	struct string_list expect = STRING_LIST_INIT_NODUP;
 	struct option options[] = {
 		OPT_BOOL(0, "yes", &boolean, "get a boolean"),
 		OPT_BOOL('D', "no-doubt", &boolean, "begins with 'no-'"),
@@ -77,28 +142,38 @@ int main(int argc, char **argv)
 		OPT__VERBOSE(&verbose, "be verbose"),
 		OPT__DRY_RUN(&dry_run, "dry run"),
 		OPT__QUIET(&quiet, "be quiet"),
+		OPT_CALLBACK(0, "expect", &expect, "string",
+			     "expected output in the variable dump",
+			     collect_expect),
 		OPT_END(),
 	};
 	int i;
+	int ret = 0;
 
 	argc = parse_options(argc, (const char **)argv, prefix, options, usage, 0);
 
-	printf("boolean: %d\n", boolean);
-	printf("integer: %d\n", integer);
-	printf("magnitude: %lu\n", magnitude);
-	printf("timestamp: %lu\n", timestamp);
-	printf("string: %s\n", string ? string : "(not set)");
-	printf("abbrev: %d\n", abbrev);
-	printf("verbose: %d\n", verbose);
-	printf("quiet: %s\n", quiet ? "yes" : "no");
-	printf("dry run: %s\n", dry_run ? "yes" : "no");
-	printf("file: %s\n", file ? file : "(not set)");
+	if (length_cb.called) {
+		const char *arg = length_cb.arg;
+		int unset = length_cb.unset;
+		show(&expect, &ret, "Callback: \"%s\", %d",
+		     (arg ? arg : "not set"), unset);
+	}
+	show(&expect, &ret, "boolean: %d", boolean);
+	show(&expect, &ret, "integer: %d", integer);
+	show(&expect, &ret, "magnitude: %lu", magnitude);
+	show(&expect, &ret, "timestamp: %lu", timestamp);
+	show(&expect, &ret, "string: %s", string ? string : "(not set)");
+	show(&expect, &ret, "abbrev: %d", abbrev);
+	show(&expect, &ret, "verbose: %d", verbose);
+	show(&expect, &ret, "quiet: %d", quiet);
+	show(&expect, &ret, "dry run: %s", dry_run ? "yes" : "no");
+	show(&expect, &ret, "file: %s", file ? file : "(not set)");
 
 	for (i = 0; i < list.nr; i++)
-		printf("list: %s\n", list.items[i].string);
+		show(&expect, &ret, "list: %s", list.items[i].string);
 
 	for (i = 0; i < argc; i++)
-		printf("arg %02d: %s\n", i, argv[i]);
+		show(&expect, &ret, "arg %02d: %s", i, argv[i]);
 
-	return 0;
+	return ret;
 }
diff --git a/test-path-utils.c b/t/helper/test-path-utils.c
index ba805b374c..1ebe0f750c 100644
--- a/test-path-utils.c
+++ b/t/helper/test-path-utils.c
@@ -156,7 +156,7 @@ static struct test_data dirname_data[] = {
 	{ NULL,              NULL     }
 };
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	if (argc == 3 && !strcmp(argv[1], "normalize_path_copy")) {
 		char *buf = xmallocz(strlen(argv[2]));
@@ -213,7 +213,7 @@ int main(int argc, char **argv)
 	}
 
 	if (argc >= 4 && !strcmp(argv[1], "prefix_path")) {
-		char *prefix = argv[2];
+		const char *prefix = argv[2];
 		int prefix_len = strlen(prefix);
 		int nongit_ok;
 		setup_git_directory_gently(&nongit_ok);
diff --git a/test-prio-queue.c b/t/helper/test-prio-queue.c
index 7be72f0086..ae58fff359 100644
--- a/test-prio-queue.c
+++ b/t/helper/test-prio-queue.c
@@ -16,7 +16,7 @@ static void show(int *v)
 	free(v);
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	struct prio_queue pq = { intcmp };
 
diff --git a/test-read-cache.c b/t/helper/test-read-cache.c
index b25bcf139b..2a7990efc3 100644
--- a/test-read-cache.c
+++ b/t/helper/test-read-cache.c
@@ -1,6 +1,6 @@
 #include "cache.h"
 
-int main (int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	int i, cnt = 1;
 	if (argc == 2)
diff --git a/t/helper/test-regex.c b/t/helper/test-regex.c
new file mode 100644
index 0000000000..b5ea8a97c5
--- /dev/null
+++ b/t/helper/test-regex.c
@@ -0,0 +1,75 @@
+#include "git-compat-util.h"
+#include "gettext.h"
+
+struct reg_flag {
+	const char *name;
+	int flag;
+};
+
+static struct reg_flag reg_flags[] = {
+	{ "EXTENDED",	 REG_EXTENDED	},
+	{ "NEWLINE",	 REG_NEWLINE	},
+	{ "ICASE",	 REG_ICASE	},
+	{ "NOTBOL",	 REG_NOTBOL	},
+#ifdef REG_STARTEND
+	{ "STARTEND",	 REG_STARTEND	},
+#endif
+	{ NULL, 0 }
+};
+
+static int test_regex_bug(void)
+{
+	char *pat = "[^={} \t]+";
+	char *str = "={}\nfred";
+	regex_t r;
+	regmatch_t m[1];
+
+	if (regcomp(&r, pat, REG_EXTENDED | REG_NEWLINE))
+		die("failed regcomp() for pattern '%s'", pat);
+	if (regexec(&r, str, 1, m, 0))
+		die("no match of pattern '%s' to string '%s'", pat, str);
+
+	/* http://sourceware.org/bugzilla/show_bug.cgi?id=3957  */
+	if (m[0].rm_so == 3) /* matches '\n' when it should not */
+		die("regex bug confirmed: re-build git with NO_REGEX=1");
+
+	return 0;
+}
+
+int cmd_main(int argc, const char **argv)
+{
+	const char *pat;
+	const char *str;
+	int flags = 0;
+	regex_t r;
+	regmatch_t m[1];
+
+	if (argc == 2 && !strcmp(argv[1], "--bug"))
+		return test_regex_bug();
+	else if (argc < 3)
+		usage("test-regex --bug\n"
+		      "test-regex <pattern> <string> [<options>]");
+
+	argv++;
+	pat = *argv++;
+	str = *argv++;
+	while (*argv) {
+		struct reg_flag *rf;
+		for (rf = reg_flags; rf->name; rf++)
+			if (!strcmp(*argv, rf->name)) {
+				flags |= rf->flag;
+				break;
+			}
+		if (!rf->name)
+			die("do not recognize %s", *argv);
+		argv++;
+	}
+	git_setup_gettext();
+
+	if (regcomp(&r, pat, flags))
+		die("failed regcomp() for pattern '%s'", pat);
+	if (regexec(&r, str, 1, m, 0))
+		return 1;
+
+	return 0;
+}
diff --git a/test-revision-walking.c b/t/helper/test-revision-walking.c
index 3d0313354b..b8e6fe1d00 100644
--- a/test-revision-walking.c
+++ b/t/helper/test-revision-walking.c
@@ -45,7 +45,7 @@ static int run_revision_walk(void)
 	return got_revision;
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	if (argc < 2)
 		return 1;
diff --git a/test-run-command.c b/t/helper/test-run-command.c
index 30a64a98dc..d24d157379 100644
--- a/test-run-command.c
+++ b/t/helper/test-run-command.c
@@ -26,7 +26,7 @@ static int parallel_next(struct child_process *cp,
 		return 0;
 
 	argv_array_pushv(&cp->args, d->argv);
-	strbuf_addf(err, "preloaded output of a child\n");
+	strbuf_addstr(err, "preloaded output of a child\n");
 	number_callbacks++;
 	return 1;
 }
@@ -36,7 +36,7 @@ static int no_job(struct child_process *cp,
 		  void *cb,
 		  void **task_cb)
 {
-	strbuf_addf(err, "no further jobs available\n");
+	strbuf_addstr(err, "no further jobs available\n");
 	return 0;
 }
 
@@ -45,11 +45,11 @@ static int task_finished(int result,
 			 void *pp_cb,
 			 void *pp_task_cb)
 {
-	strbuf_addf(err, "asking for a quick stop\n");
+	strbuf_addstr(err, "asking for a quick stop\n");
 	return 1;
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	struct child_process proc = CHILD_PROCESS_INIT;
 	int jobs;
diff --git a/test-scrap-cache-tree.c b/t/helper/test-scrap-cache-tree.c
index 6efee31a48..5b2fd09908 100644
--- a/test-scrap-cache-tree.c
+++ b/t/helper/test-scrap-cache-tree.c
@@ -5,7 +5,7 @@
 
 static struct lock_file index_lock;
 
-int main(int ac, char **av)
+int cmd_main(int ac, const char **av)
 {
 	hold_locked_index(&index_lock, 1);
 	if (read_cache() < 0)
diff --git a/test-sha1-array.c b/t/helper/test-sha1-array.c
index 60ea1d5f14..09f7790971 100644
--- a/test-sha1-array.c
+++ b/t/helper/test-sha1-array.c
@@ -6,7 +6,7 @@ static void print_sha1(const unsigned char sha1[20], void *data)
 	puts(sha1_to_hex(sha1));
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	struct sha1_array array = SHA1_ARRAY_INIT;
 	struct strbuf line = STRBUF_INIT;
diff --git a/test-sha1.c b/t/helper/test-sha1.c
index e57eae10bf..a1c13f54ec 100644
--- a/test-sha1.c
+++ b/t/helper/test-sha1.c
@@ -1,6 +1,6 @@
 #include "cache.h"
 
-int main(int ac, char **av)
+int cmd_main(int ac, const char **av)
 {
 	git_SHA_CTX ctx;
 	unsigned char sha1[20];
diff --git a/test-sha1.sh b/t/helper/test-sha1.sh
index cef4bcc866..750b95a0a1 100755
--- a/test-sha1.sh
+++ b/t/helper/test-sha1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 dd if=/dev/zero bs=1048576 count=100 2>/dev/null |
-/usr/bin/time ./test-sha1 >/dev/null
+/usr/bin/time t/helper/test-sha1 >/dev/null
 
 while read expect cnt pfx
 do
@@ -11,7 +11,7 @@ do
 			test -z "$pfx" || echo "$pfx"
 			dd if=/dev/zero bs=1048576 count=$cnt 2>/dev/null |
 			perl -pe 'y/\000/g/'
-		} | ./test-sha1 $cnt
+		} | ./t/helper/test-sha1 $cnt
 	)
 	if test "$expect" = "$actual"
 	then
diff --git a/test-sigchain.c b/t/helper/test-sigchain.c
index e499fce60f..b71edbd442 100644
--- a/test-sigchain.c
+++ b/t/helper/test-sigchain.c
@@ -13,7 +13,7 @@ X(two)
 X(three)
 #undef X
 
-int main(int argc, char **argv) {
+int cmd_main(int argc, const char **argv) {
 	sigchain_push(SIGTERM, one);
 	sigchain_push(SIGTERM, two);
 	sigchain_push(SIGTERM, three);
diff --git a/test-string-list.c b/t/helper/test-string-list.c
index 14bdf9d215..4a68967bd1 100644
--- a/test-string-list.c
+++ b/t/helper/test-string-list.c
@@ -41,7 +41,7 @@ static int prefix_cb(struct string_list_item *item, void *cb_data)
 	return starts_with(item->string, prefix);
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	if (argc == 5 && !strcmp(argv[1], "split")) {
 		struct string_list list = STRING_LIST_INIT_DUP;
diff --git a/test-submodule-config.c b/t/helper/test-submodule-config.c
index dab8c27768..2f144d539a 100644
--- a/test-submodule-config.c
+++ b/t/helper/test-submodule-config.c
@@ -2,7 +2,7 @@
 #include "submodule-config.h"
 #include "submodule.h"
 
-static void die_usage(int argc, char **argv, const char *msg)
+static void die_usage(int argc, const char **argv, const char *msg)
 {
 	fprintf(stderr, "%s\n", msg);
 	fprintf(stderr, "Usage: %s [<commit> <submodulepath>] ...\n", argv[0]);
@@ -14,16 +14,16 @@ static int git_test_config(const char *var, const char *value, void *cb)
 	return parse_submodule_config_option(var, value);
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
-	char **arg = argv;
+	const char **arg = argv;
 	int my_argc = argc;
 	int output_url = 0;
 	int lookup_name = 0;
 
 	arg++;
 	my_argc--;
-	while (starts_with(arg[0], "--")) {
+	while (arg[0] && starts_with(arg[0], "--")) {
 		if (!strcmp(arg[0], "--url"))
 			output_url = 1;
 		if (!strcmp(arg[0], "--name"))
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
 		path_or_name = arg[1];
 
 		if (commit[0] == '\0')
-			hashcpy(commit_sha1, null_sha1);
+			hashclr(commit_sha1);
 		else if (get_sha1(commit, commit_sha1) < 0)
 			die_usage(argc, argv, "Commit not found.");
 
diff --git a/test-subprocess.c b/t/helper/test-subprocess.c
index 56881a0324..30c5765bfc 100644
--- a/test-subprocess.c
+++ b/t/helper/test-subprocess.c
@@ -1,7 +1,7 @@
 #include "cache.h"
 #include "run-command.h"
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	struct child_process cp = CHILD_PROCESS_INIT;
 	int nogit = 0;
diff --git a/test-svn-fe.c b/t/helper/test-svn-fe.c
index 120ec96b0d..7667c0803f 100644
--- a/test-svn-fe.c
+++ b/t/helper/test-svn-fe.c
@@ -11,7 +11,7 @@
 static const char test_svnfe_usage[] =
 	"test-svn-fe (<dumpfile> | [-d] <preimage> <delta> <len>)";
 
-static int apply_delta(int argc, char *argv[])
+static int apply_delta(int argc, const char **argv)
 {
 	struct line_buffer preimage = LINE_BUFFER_INIT;
 	struct line_buffer delta = LINE_BUFFER_INIT;
@@ -35,7 +35,7 @@ static int apply_delta(int argc, char *argv[])
 	return 0;
 }
 
-int main(int argc, char *argv[])
+int cmd_main(int argc, const char **argv)
 {
 	if (argc == 2) {
 		if (svndump_init(argv[1]))
diff --git a/test-urlmatch-normalization.c b/t/helper/test-urlmatch-normalization.c
index 090bf219a7..49b6e836be 100644
--- a/test-urlmatch-normalization.c
+++ b/t/helper/test-urlmatch-normalization.c
@@ -1,7 +1,7 @@
 #include "git-compat-util.h"
 #include "urlmatch.h"
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	const char usage[] = "test-urlmatch-normalization [-p | -l] <url1> | <url1> <url2>";
 	char *url1, *url2;
diff --git a/test-wildmatch.c b/t/helper/test-wildmatch.c
index 578b164fe6..52be876fed 100644
--- a/test-wildmatch.c
+++ b/t/helper/test-wildmatch.c
@@ -1,6 +1,6 @@
 #include "cache.h"
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	int i;
 	for (i = 2; i < argc; i++) {
diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh
index 340534c064..f9cbd47931 100644
--- a/t/lib-git-daemon.sh
+++ b/t/lib-git-daemon.sh
@@ -82,8 +82,7 @@ stop_git_daemon() {
 	kill "$GIT_DAEMON_PID"
 	wait "$GIT_DAEMON_PID" >&3 2>&4
 	ret=$?
-	# expect exit with status 143 = 128+15 for signal TERM=15
-	if test $ret -ne 143
+	if test_match_signal 15 $?
 	then
 		error "git daemon exited with status: $ret"
 	fi
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index 012d40e746..54fd5a6ca0 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -33,7 +33,7 @@ fi
 # Older versions of perforce were available compiled natively for
 # cygwin.  Those do not accept native windows paths, so make sure
 # not to convert for them.
-native_path() {
+native_path () {
 	path="$1" &&
 	if test_have_prereq CYGWIN && ! p4 -V | grep -q CYGWIN
 	then
@@ -49,7 +49,7 @@ native_path() {
 # Attention: This function is not safe again against time offset updates
 # at runtime (e.g. via NTP). The 'clock_gettime(CLOCK_MONOTONIC)'
 # function could fix that but it is not in Python until 3.3.
-time_in_seconds() {
+time_in_seconds () {
 	(cd / && "$PYTHON_PATH" -c 'import time; print(int(time.time()))')
 }
 
@@ -75,7 +75,7 @@ git="$TRASH_DIRECTORY/git"
 pidfile="$TRASH_DIRECTORY/p4d.pid"
 
 # Sometimes "prove" seems to hang on exit because p4d is still running
-cleanup() {
+cleanup () {
 	if test -f "$pidfile"
 	then
 		kill -9 $(cat "$pidfile") 2>/dev/null && exit 255
@@ -89,7 +89,7 @@ trap cleanup EXIT
 TMPDIR="$TRASH_DIRECTORY"
 export TMPDIR
 
-start_p4d() {
+start_p4d () {
 	mkdir -p "$db" "$cli" "$git" &&
 	rm -f "$pidfile" &&
 	(
@@ -151,7 +151,7 @@ start_p4d() {
 	return 0
 }
 
-p4_add_user() {
+p4_add_user () {
 	name=$1 &&
 	p4 user -f -i <<-EOF
 	User: $name
@@ -160,7 +160,16 @@ p4_add_user() {
 	EOF
 }
 
-retry_until_success() {
+p4_add_job () {
+	p4 job -f -i <<-EOF
+	Job: $1
+	Status: open
+	User: dummy
+	Description:
+	EOF
+}
+
+retry_until_success () {
 	timeout=$(($(time_in_seconds) + $RETRY_TIMEOUT))
 	until "$@" 2>/dev/null || test $(time_in_seconds) -gt $timeout
 	do
@@ -168,7 +177,7 @@ retry_until_success() {
 	done
 }
 
-retry_until_fail() {
+retry_until_fail () {
 	timeout=$(($(time_in_seconds) + $RETRY_TIMEOUT))
 	until ! "$@" 2>/dev/null || test $(time_in_seconds) -gt $timeout
 	do
@@ -176,7 +185,7 @@ retry_until_fail() {
 	done
 }
 
-kill_p4d() {
+kill_p4d () {
 	pid=$(cat "$pidfile")
 	retry_until_fail kill $pid
 	retry_until_fail kill -9 $pid
@@ -186,13 +195,13 @@ kill_p4d() {
 	retry_until_fail kill -9 $watchdog_pid
 }
 
-cleanup_git() {
+cleanup_git () {
 	retry_until_success rm -r "$git"
 	test_must_fail test -d "$git" &&
 	retry_until_success mkdir "$git"
 }
 
-marshal_dump() {
+marshal_dump () {
 	what=$1 &&
 	line=${2:-1} &&
 	cat >"$TRASH_DIRECTORY/marshal-dump.py" <<-EOF &&
@@ -209,7 +218,7 @@ marshal_dump() {
 #
 # Construct a client with this list of View lines
 #
-client_view() {
+client_view () {
 	(
 		cat <<-EOF &&
 		Client: $P4CLIENT
@@ -223,7 +232,7 @@ client_view() {
 	) | p4 client -i
 }
 
-is_cli_file_writeable() {
+is_cli_file_writeable () {
 	# cygwin version of p4 does not set read-only attr,
 	# will be marked 444 but -w is true
 	file="$1" &&
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 6a50b8793e..688313ed5c 100644
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -1,8 +1,5 @@
 . ./test-lib.sh
 
-remotes_git_svn=remotes/git""-svn
-git_svn_id=git""-svn-id
-
 if test -n "$NO_SVN_TESTS"
 then
 	skip_all='skipping git svn tests, NO_SVN_TESTS defined'
@@ -68,81 +65,22 @@ svn_cmd () {
 	svn "$orig_svncmd" --config-dir "$svnconf" "$@"
 }
 
-prepare_httpd () {
-	for d in \
-		"$SVN_HTTPD_PATH" \
-		/usr/sbin/apache2 \
-		/usr/sbin/httpd \
-	; do
-		if test -f "$d"
-		then
-			SVN_HTTPD_PATH="$d"
-			break
-		fi
-	done
-	if test -z "$SVN_HTTPD_PATH"
-	then
-		echo >&2 '*** error: Apache not found'
-		return 1
-	fi
-	for d in \
-		"$SVN_HTTPD_MODULE_PATH" \
-		/usr/lib/apache2/modules \
-		/usr/libexec/apache2 \
-	; do
-		if test -d "$d"
-		then
-			SVN_HTTPD_MODULE_PATH="$d"
-			break
-		fi
-	done
-	if test -z "$SVN_HTTPD_MODULE_PATH"
-	then
-		echo >&2 '*** error: Apache module dir not found'
-		return 1
-	fi
-	if test ! -f "$SVN_HTTPD_MODULE_PATH/mod_dav_svn.so"
-	then
-		echo >&2 '*** error: Apache module "mod_dav_svn" not found'
-		return 1
-	fi
-
-	repo_base_path="${1-svn}"
-	mkdir "$GIT_DIR"/logs
-
-	cat > "$GIT_DIR/httpd.conf" <<EOF
-ServerName "git svn test"
-ServerRoot "$GIT_DIR"
-DocumentRoot "$GIT_DIR"
-PidFile "$GIT_DIR/httpd.pid"
-LockFile logs/accept.lock
-Listen 127.0.0.1:$SVN_HTTPD_PORT
-LoadModule dav_module $SVN_HTTPD_MODULE_PATH/mod_dav.so
-LoadModule dav_svn_module $SVN_HTTPD_MODULE_PATH/mod_dav_svn.so
-<Location /$repo_base_path>
-	DAV svn
-	SVNPath "$rawsvnrepo"
-</Location>
-EOF
-}
-
-start_httpd () {
-	if test -z "$SVN_HTTPD_PORT"
-	then
-		echo >&2 'SVN_HTTPD_PORT is not defined!'
-		return
-	fi
-
-	prepare_httpd "$1" || return 1
-
-	"$SVN_HTTPD_PATH" -f "$GIT_DIR"/httpd.conf -k start
-	svnrepo="http://127.0.0.1:$SVN_HTTPD_PORT/$repo_base_path"
-}
-
-stop_httpd () {
-	test -z "$SVN_HTTPD_PORT" && return
-	test ! -f "$GIT_DIR/httpd.conf" && return
-	"$SVN_HTTPD_PATH" -f "$GIT_DIR"/httpd.conf -k stop
+maybe_start_httpd () {
+	loc=${1-svn}
+
+	test_tristate GIT_SVN_TEST_HTTPD
+	case $GIT_SVN_TEST_HTTPD in
+	true)
+		. "$TEST_DIRECTORY"/lib-httpd.sh
+		LIB_HTTPD_SVN="$loc"
+		start_httpd
+		;;
+	*)
+		stop_httpd () {
+			: noop
+		}
+		;;
+	esac
 }
 
 convert_to_rev_db () {
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index db2ef22e8f..ec2aa8f687 100755
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 gpg_version=$(gpg --version 2>&1)
-if test $? = 127; then
-	say "You do not seem to have gpg installed"
-else
+if test $? != 127
+then
 	# As said here: http://www.gnupg.org/documentation/faqs.html#q6.19
 	# the gpg version 1.0.6 didn't parse trust packets correctly, so for
 	# that version, creation of signed tags using the generated key fails.
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index f9f3e5fd82..435a37465a 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -24,7 +24,7 @@
 #    LIB_HTTPD_MODULE_PATH       web server modules path
 #    LIB_HTTPD_PORT              listening port
 #    LIB_HTTPD_DAV               enable DAV
-#    LIB_HTTPD_SVN               enable SVN
+#    LIB_HTTPD_SVN               enable SVN at given location (e.g. "svn")
 #    LIB_HTTPD_SSL               enable SSL
 #
 # Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at>
@@ -162,8 +162,10 @@ prepare_httpd() {
 		if test -n "$LIB_HTTPD_SVN"
 		then
 			HTTPD_PARA="$HTTPD_PARA -DSVN"
-			rawsvnrepo="$HTTPD_ROOT_PATH/svnrepo"
-			svnrepo="http://127.0.0.1:$LIB_HTTPD_PORT/svn"
+			LIB_HTTPD_SVNPATH="$rawsvnrepo"
+			svnrepo="http://127.0.0.1:$LIB_HTTPD_PORT/"
+			svnrepo="$svnrepo$LIB_HTTPD_SVN"
+			export LIB_HTTPD_SVN LIB_HTTPD_SVNPATH
 		fi
 	fi
 }
@@ -180,6 +182,7 @@ start_httpd() {
 	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"
 	fi
 }
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 9317ba0858..c3e631394f 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -102,6 +102,10 @@ Alias /auth/dumb/ www/auth/dumb/
 	SetEnv GIT_HTTP_EXPORT_ALL
 	Header set Set-Cookie name=value
 </LocationMatch>
+<LocationMatch /smart_headers/>
+	SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
+	SetEnv GIT_HTTP_EXPORT_ALL
+</LocationMatch>
 ScriptAliasMatch /smart_*[^/]*/(.*) ${GIT_EXEC_PATH}/git-http-backend/$1
 ScriptAlias /broken_smart/ broken-smart-http.sh/
 ScriptAlias /error/ error.sh/
@@ -128,6 +132,18 @@ RewriteRule ^/ftp-redir/(.*)$ ftp://localhost:1000/$1 [R=302]
 RewriteRule ^/loop-redir/x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-(.*) /$1 [R=302]
 RewriteRule ^/loop-redir/(.*)$ /loop-redir/x-$1 [R=302]
 
+# Apache 2.2 does not understand <RequireAll>, so we use RewriteCond.
+# And as RewriteCond does not allow testing for non-matches, we match
+# the desired case first (one has abra, two has cadabra), and let it
+# pass by marking the RewriteRule as [L], "last rule, do not process
+# any other matching RewriteRules after this"), and then have another
+# RewriteRule that matches all other cases and lets them fail via '[F]',
+# "fail the request".
+RewriteCond %{HTTP:x-magic-one} =abra
+RewriteCond %{HTTP:x-magic-two} =cadabra
+RewriteRule ^/smart_headers/.* - [L]
+RewriteRule ^/smart_headers/.* - [F]
+
 <IfDefine SSL>
 LoadModule ssl_module modules/mod_ssl.so
 
@@ -192,8 +208,8 @@ RewriteRule ^/half-auth-complete/ - [E=AUTHREQUIRED:yes]
 <IfDefine SVN>
 	LoadModule dav_svn_module modules/mod_dav_svn.so
 
-	<Location /svn>
+	<Location /${LIB_HTTPD_SVN}>
 		DAV svn
-		SVNPath svnrepo
+		SVNPath "${LIB_HTTPD_SVNPATH}"
 	</Location>
 </IfDefine>
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 9a96e1566d..25a77ee5cb 100644
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -29,6 +29,7 @@ set_fake_editor () {
 	*/COMMIT_EDITMSG)
 		test -z "$EXPECT_HEADER_COUNT" ||
 			test "$EXPECT_HEADER_COUNT" = "$(sed -n '1s/^# This is a combination of \(.*\) commits\./\1/p' < "$1")" ||
+			test "# # GETTEXT POISON #" = "$(sed -n '1p' < "$1")" ||
 			exit
 		test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1"
 		test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1"
diff --git a/t/perf/README b/t/perf/README
index 8848c14619..49ea4349be 100644
--- a/t/perf/README
+++ b/t/perf/README
@@ -115,8 +115,16 @@ After that you will want to use some of the following:
 
 At least one of the first two is required!
 
-You can use test_expect_success as usual.  For actual performance
-tests, use
+You can use test_expect_success as usual. In both test_expect_success
+and in test_perf, running "git" points to the version that is being
+perf-tested. The $MODERN_GIT variable points to the git wrapper for the
+currently checked-out version (i.e., the one that matches the t/perf
+scripts you are running).  This is useful if your setup uses commands
+that only work with newer versions of git than what you might want to
+test (but obviously your new commands must still create a state that can
+be used by the older version of git you are testing).
+
+For actual performance tests, use
 
 	test_perf 'descriptive string' '
 		command1 &&
diff --git a/t/perf/p3400-rebase.sh b/t/perf/p3400-rebase.sh
new file mode 100644
index 0000000000..b3e7d525d2
--- /dev/null
+++ b/t/perf/p3400-rebase.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+test_description='Tests rebase performance'
+. ./perf-lib.sh
+
+test_perf_default_repo
+
+test_expect_success 'setup' '
+	git checkout -f -b base &&
+	git checkout -b to-rebase &&
+	git checkout -b upstream &&
+	for i in $(seq 100)
+	do
+		# simulate huge diffs
+		echo change$i >unrelated-file$i &&
+		seq 1000 >>unrelated-file$i &&
+		git add unrelated-file$i &&
+		test_tick &&
+		git commit -m commit$i unrelated-file$i &&
+		echo change$i >unrelated-file$i &&
+		seq 1000 | tac >>unrelated-file$i &&
+		git add unrelated-file$i &&
+		test_tick &&
+		git commit -m commit$i-reverse unrelated-file$i ||
+		break
+	done &&
+	git checkout to-rebase &&
+	test_commit our-patch interesting-file
+'
+
+test_perf 'rebase on top of a lot of unrelated changes' '
+	git rebase --onto upstream HEAD^ &&
+	git rebase --onto base HEAD^
+'
+
+test_done
diff --git a/t/perf/p3404-rebase-interactive.sh b/t/perf/p3404-rebase-interactive.sh
new file mode 100755
index 0000000000..88f47de282
--- /dev/null
+++ b/t/perf/p3404-rebase-interactive.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+test_description='Tests rebase -i performance'
+. ./perf-lib.sh
+
+test_perf_default_repo
+
+# This commit merges a sufficiently long topic branch for reasonable
+# performance testing
+branch_merge=ba5312da19c6fdb6c6747d479f58932aae6e900c^{commit}
+export branch_merge
+
+git rev-parse --verify $branch_merge >/dev/null 2>&1 || {
+	skip_all='skipping because $branch_merge was not found'
+	test_done
+}
+
+write_script swap-first-two.sh <<\EOF
+case "$1" in
+*/COMMIT_EDITMSG)
+	mv "$1" "$1".bak &&
+	sed -e '1{h;d}' -e 2G <"$1".bak >"$1"
+	;;
+esac
+EOF
+
+test_expect_success 'setup' '
+	git config core.editor "\"$PWD"/swap-first-two.sh\" &&
+	git checkout -f $branch_merge^2
+'
+
+test_perf 'rebase -i' '
+	git rebase -i $branch_merge^
+'
+
+test_done
diff --git a/t/perf/p4211-line-log.sh b/t/perf/p4211-line-log.sh
index 3d074b0e41..b7ff68d4fa 100755
--- a/t/perf/p4211-line-log.sh
+++ b/t/perf/p4211-line-log.sh
@@ -23,11 +23,11 @@ test_perf 'git log --follow (baseline for -M)' '
 	git log --oneline --follow -- "$file" >/dev/null
 '
 
-test_perf 'git log -L' '
-	git log -L 1:"$file" >/dev/null
+test_perf 'git log -L (renames off)' '
+	git log --no-renames -L 1:"$file" >/dev/null
 '
 
-test_perf 'git log -M -L' '
+test_perf 'git log -L (renames on)' '
 	git log -M -L 1:"$file" >/dev/null
 '
 
diff --git a/t/perf/p5303-many-packs.sh b/t/perf/p5303-many-packs.sh
new file mode 100755
index 0000000000..3779851941
--- /dev/null
+++ b/t/perf/p5303-many-packs.sh
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+test_description='performance with large numbers of packs'
+. ./perf-lib.sh
+
+test_perf_large_repo
+
+# A real many-pack situation would probably come from having a lot of pushes
+# over time. We don't know how big each push would be, but we can fake it by
+# just walking the first-parent chain and having every 5 commits be their own
+# "push". This isn't _entirely_ accurate, as real pushes would have some
+# duplicate objects due to thin-pack fixing, but it's a reasonable
+# approximation.
+#
+# And then all of the rest of the objects can go in a single packfile that
+# represents the state before any of those pushes (actually, we'll generate
+# that first because in such a setup it would be the oldest pack, and we sort
+# the packs by reverse mtime inside git).
+repack_into_n () {
+	rm -rf staging &&
+	mkdir staging &&
+
+	git rev-list --first-parent HEAD |
+	sed -n '1~5p' |
+	head -n "$1" |
+	perl -e 'print reverse <>' \
+	>pushes
+
+	# create base packfile
+	head -n 1 pushes |
+	git pack-objects --delta-base-offset --revs staging/pack
+
+	# and then incrementals between each pair of commits
+	last= &&
+	while read rev
+	do
+		if test -n "$last"; then
+			{
+				echo "$rev" &&
+				echo "^$last"
+			} |
+			git pack-objects --delta-base-offset --revs \
+				staging/pack || return 1
+		fi
+		last=$rev
+	done <pushes &&
+
+	# and install the whole thing
+	rm -f .git/objects/pack/* &&
+	mv staging/* .git/objects/pack/
+}
+
+# Pretend we just have a single branch and no reflogs, and that everything is
+# in objects/pack; that makes our fake pack-building via repack_into_n()
+# much simpler.
+test_expect_success 'simplify reachability' '
+	tip=$(git rev-parse --verify HEAD) &&
+	git for-each-ref --format="option no-deref%0adelete %(refname)" |
+	git update-ref --stdin &&
+	rm -rf .git/logs &&
+	git update-ref refs/heads/master $tip &&
+	git symbolic-ref HEAD refs/heads/master &&
+	git repack -ad
+'
+
+for nr_packs in 1 50 1000
+do
+	test_expect_success "create $nr_packs-pack scenario" '
+		repack_into_n $nr_packs
+	'
+
+	test_perf "rev-list ($nr_packs)" '
+		git rev-list --objects --all >/dev/null
+	'
+
+	# This simulates the interesting part of the repack, which is the
+	# actual pack generation, without smudging the on-disk setup
+	# between trials.
+	test_perf "repack ($nr_packs)" '
+		git pack-objects --keep-true-parents \
+		  --honor-pack-keep --non-empty --all \
+		  --reflog --indexed-objects --delta-base-offset \
+		  --stdout </dev/null >/dev/null
+	'
+done
+
+test_done
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index 5cf74eddec..46f08ee087 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -52,6 +52,9 @@ TEST_NO_MALLOC_CHECK=t
 # need to export them for test_perf subshells
 export TEST_DIRECTORY TRASH_DIRECTORY GIT_BUILD_DIR GIT_TEST_CMP
 
+MODERN_GIT=$GIT_BUILD_DIR/bin-wrappers/git
+export MODERN_GIT
+
 perf_results_dir=$TEST_OUTPUT_DIRECTORY/test-results
 mkdir -p "$perf_results_dir"
 rm -f "$perf_results_dir"/$(basename "$0" .sh).subtests
@@ -80,23 +83,29 @@ test_perf_create_repo_from () {
 	error "bug in the test script: not 2 parameters to test-create-repo"
 	repo="$1"
 	source="$2"
-	source_git=$source/$(cd "$source" && git rev-parse --git-dir)
+	source_git="$(git -C "$source" rev-parse --git-dir)"
+	objects_dir="$("$MODERN_GIT" -C "$source" rev-parse --git-path objects)"
 	mkdir -p "$repo/.git"
 	(
-		cd "$repo/.git" &&
-		{ cp -Rl "$source_git/objects" . 2>/dev/null ||
-			cp -R "$source_git/objects" .; } &&
+		cd "$source" &&
+		{ cp -Rl "$objects_dir" "$repo/.git/" 2>/dev/null ||
+			cp -R "$objects_dir" "$repo/.git/"; } &&
 		for stuff in "$source_git"/*; do
 			case "$stuff" in
-				*/objects|*/hooks|*/config)
+				*/objects|*/hooks|*/config|*/commondir)
 					;;
 				*)
-					cp -R "$stuff" . || exit 1
+					cp -R "$stuff" "$repo/.git/" || exit 1
 					;;
 			esac
-		done &&
-		cd .. &&
-		git init -q &&
+		done
+	) &&
+	(
+		cd "$repo" &&
+		git init -q && {
+			test_have_prereq SYMLINKS ||
+			git config core.symlinks false
+		} &&
 		mv .git/hooks .git/hooks-disabled 2>/dev/null
 	) || error "failed to copy repository '$source' to '$repo'"
 }
@@ -121,11 +130,15 @@ test_checkout_worktree () {
 # Performance tests should never fail.  If they do, stop immediately
 immediate=t
 
+# Perf tests require GNU time
+case "$(uname -s)" in Darwin) GTIME="${GTIME:-gtime}";; esac
+GTIME="${GTIME:-/usr/bin/time}"
+
 test_run_perf_ () {
 	test_cleanup=:
 	test_export_="test_cleanup"
 	export test_cleanup test_export_
-	/usr/bin/time -f "%E %U %S" -o test_time.$i "$SHELL" -c '
+	"$GTIME" -f "%E %U %S" -o test_time.$i "$SHELL" -c '
 . '"$TEST_DIRECTORY"/test-lib-functions.sh'
 test_export () {
 	[ $# != 0 ] || return 0
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 60811a3a7c..1aa5093f36 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -834,7 +834,7 @@ test_expect_success 'git write-tree should be able to write an empty tree' '
 '
 
 test_expect_success 'validate object ID of a known tree' '
-	test "$tree" = 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+	test "$tree" = $EMPTY_TREE
 '
 
 # Various types of objects
diff --git a/t/t0005-signals.sh b/t/t0005-signals.sh
index e7f27ebbc1..46042f1f13 100755
--- a/t/t0005-signals.sh
+++ b/t/t0005-signals.sh
@@ -11,12 +11,13 @@ EOF
 
 test_expect_success 'sigchain works' '
 	{ test-sigchain >actual; ret=$?; } &&
-	case "$ret" in
-	143) true ;; # POSIX w/ SIGTERM=15
-	271) true ;; # ksh w/ SIGTERM=15
-	  3) true ;; # Windows
-	  *) false ;;
-	esac &&
+	{
+		# Signal death by raise() on Windows acts like exit(3),
+		# regardless of the signal number. So we must allow that
+		# as well as the normal signal check.
+		test_match_signal 15 "$ret" ||
+		test "$ret" = 3
+	} &&
 	test_cmp expect actual
 '
 
@@ -41,12 +42,12 @@ test_expect_success 'create blob' '
 
 test_expect_success !MINGW 'a constipated git dies with SIGPIPE' '
 	OUT=$( ((large_git; echo $? 1>&3) | :) 3>&1 ) &&
-	test "$OUT" -eq 141
+	test_match_signal 13 "$OUT"
 '
 
 test_expect_success !MINGW 'a constipated git dies with SIGPIPE even if parent ignores it' '
 	OUT=$( ((trap "" PIPE; large_git; echo $? 1>&3) | :) 3>&1 ) &&
-	test "$OUT" -eq 141
+	test_match_signal 13 "$OUT"
 '
 
 test_done
diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index fac0986134..c0c910867d 100755
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -6,26 +6,55 @@ test_description='test date parsing and printing'
 # arbitrary reference time: 2009-08-30 19:20:00
 TEST_DATE_NOW=1251660000; export TEST_DATE_NOW
 
-check_show() {
+check_relative() {
 	t=$(($TEST_DATE_NOW - $1))
 	echo "$t -> $2" >expect
 	test_expect_${3:-success} "relative date ($2)" "
-	test-date show $t >actual &&
+	test-date relative $t >actual &&
 	test_i18ncmp expect actual
 	"
 }
 
-check_show 5 '5 seconds ago'
-check_show 300 '5 minutes ago'
-check_show 18000 '5 hours ago'
-check_show 432000 '5 days ago'
-check_show 1728000 '3 weeks ago'
-check_show 13000000 '5 months ago'
-check_show 37500000 '1 year, 2 months ago'
-check_show 55188000 '1 year, 9 months ago'
-check_show 630000000 '20 years ago'
-check_show 31449600 '12 months ago'
-check_show 62985600 '2 years ago'
+check_relative 5 '5 seconds ago'
+check_relative 300 '5 minutes ago'
+check_relative 18000 '5 hours ago'
+check_relative 432000 '5 days ago'
+check_relative 1728000 '3 weeks ago'
+check_relative 13000000 '5 months ago'
+check_relative 37500000 '1 year, 2 months ago'
+check_relative 55188000 '1 year, 9 months ago'
+check_relative 630000000 '20 years ago'
+check_relative 31449600 '12 months ago'
+check_relative 62985600 '2 years ago'
+
+check_show () {
+	format=$1
+	time=$2
+	expect=$3
+	test_expect_success $4 "show date ($format:$time)" '
+		echo "$time -> $expect" >expect &&
+		test-date show:$format "$time" >actual &&
+		test_cmp expect actual
+	'
+}
+
+# arbitrary but sensible time for examples
+TIME='1466000000 +0200'
+check_show iso8601 "$TIME" '2016-06-15 16:13:20 +0200'
+check_show iso8601-strict "$TIME" '2016-06-15T16:13:20+02:00'
+check_show rfc2822 "$TIME" 'Wed, 15 Jun 2016 16:13:20 +0200'
+check_show short "$TIME" '2016-06-15'
+check_show default "$TIME" 'Wed Jun 15 16:13:20 2016 +0200'
+check_show raw "$TIME" '1466000000 +0200'
+check_show unix "$TIME" '1466000000'
+check_show iso-local "$TIME" '2016-06-15 14:13:20 +0000'
+check_show raw-local "$TIME" '1466000000 +0000'
+check_show unix-local "$TIME" '1466000000'
+
+# arbitrary time absurdly far in the future
+FUTURE="5758122296 -0400"
+check_show iso       "$FUTURE" "2152-06-19 18:24:56 -0400" LONG_IS_64BIT
+check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" LONG_IS_64BIT
 
 check_parse() {
 	echo "$1 -> $2" >expect
diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
index 89544dd833..d27f438bf4 100755
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -34,7 +34,7 @@ expect_from_stdin () {
 test_stderr () {
 	expected="$1"
 	expect_in stderr "$1" &&
-	test_cmp "$HOME/expected-stderr" "$HOME/stderr"
+	test_i18ncmp "$HOME/expected-stderr" "$HOME/stderr"
 }
 
 broken_c_unquote () {
@@ -47,7 +47,7 @@ broken_c_unquote_verbose () {
 
 stderr_contains () {
 	regexp="$1"
-	if grep "$regexp" "$HOME/stderr"
+	if test_i18ngrep "$regexp" "$HOME/stderr"
 	then
 		return 0
 	else
@@ -605,7 +605,7 @@ cat <<-EOF >expected-verbose
 	a/b/.gitignore:8:!on*	a/b/one
 	a/b/.gitignore:8:!on*	a/b/one one
 	a/b/.gitignore:8:!on*	a/b/one two
-	a/b/.gitignore:8:!on*	"a/b/one\"three"
+	a/b/.gitignore:8:!on*	"a/b/one\\"three"
 	a/b/.gitignore:9:!two	a/b/two
 	a/.gitignore:1:two*	a/b/twooo
 	$global_excludes:2:!globaltwo	globaltwo
@@ -686,7 +686,7 @@ cat <<-EOF >expected-all
 	a/b/.gitignore:8:!on*	b/one
 	a/b/.gitignore:8:!on*	b/one one
 	a/b/.gitignore:8:!on*	b/one two
-	a/b/.gitignore:8:!on*	"b/one\"three"
+	a/b/.gitignore:8:!on*	"b/one\\"three"
 	a/b/.gitignore:9:!two	b/two
 	::	b/not-ignored
 	a/.gitignore:1:two*	b/twooo
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index 7bac2bcf26..e799e59544 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -268,4 +268,15 @@ test_expect_success 'disable filter with empty override' '
 	test_must_be_empty err
 '
 
+test_expect_success 'diff does not reuse worktree files that need cleaning' '
+	test_config filter.counter.clean "echo . >>count; sed s/^/clean:/" &&
+	echo "file filter=counter" >.gitattributes &&
+	test_commit one file &&
+	test_commit two file &&
+
+	>count &&
+	git diff-tree -p HEAD &&
+	test_line_count = 0 count
+'
+
 test_done
diff --git a/t/t0025-crlf-auto.sh b/t/t0025-crlf-auto.sh
index c164b4662a..d0bee08b2e 100755
--- a/t/t0025-crlf-auto.sh
+++ b/t/t0025-crlf-auto.sh
@@ -114,7 +114,7 @@ test_expect_success 'autocrlf=true does not normalize CRLF files' '
 	test -z "$LFonlydiff" -a -z "$CRLFonlydiff" -a -z "$LFwithNULdiff"
 '
 
-test_expect_success 'text=auto, autocrlf=true _does_ normalize CRLF files' '
+test_expect_success 'text=auto, autocrlf=true does not normalize CRLF files' '
 
 	rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
 	git config core.autocrlf true &&
@@ -126,7 +126,7 @@ test_expect_success 'text=auto, autocrlf=true _does_ normalize CRLF files' '
 	LFonlydiff=$(git diff LFonly) &&
 	CRLFonlydiff=$(git diff CRLFonly) &&
 	LFwithNULdiff=$(git diff LFwithNUL) &&
-	test -z "$LFonlydiff" -a -n "$CRLFonlydiff" -a -z "$LFwithNULdiff"
+	test -z "$LFonlydiff" -a -z "$CRLFonlydiff" -a -z "$LFwithNULdiff"
 '
 
 test_expect_success 'text=auto, autocrlf=true does not normalize binary files' '
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
index 93725895a4..2860d2d08b 100755
--- a/t/t0027-auto-crlf.sh
+++ b/t/t0027-auto-crlf.sh
@@ -175,8 +175,8 @@ attr_ascii () {
 	text,lf)   echo "text eol=lf" ;;
 	text,crlf) echo "text eol=crlf" ;;
 	auto,)     echo "text=auto" ;;
-	auto,lf)   echo "text eol=lf" ;;
-	auto,crlf) echo "text eol=crlf" ;;
+	auto,lf)   echo "text=auto eol=lf" ;;
+	auto,crlf) echo "text=auto eol=crlf" ;;
 	lf,)       echo "text eol=lf" ;;
 	crlf,)     echo "text eol=crlf" ;;
 	,) echo "" ;;
@@ -397,10 +397,9 @@ commit_chk_wrnNNO ""      ""      false   ""        ""        ""          ""
 commit_chk_wrnNNO ""      ""      true    LF_CRLF   ""        ""          ""          ""
 commit_chk_wrnNNO ""      ""      input   ""        ""        ""          ""          ""
 
-commit_chk_wrnNNO "auto"  ""      false   "$WILC"   "$WICL"   "$WAMIX"    ""          ""
-commit_chk_wrnNNO "auto"  ""      true    LF_CRLF   ""        LF_CRLF     ""          ""
-commit_chk_wrnNNO "auto"  ""      input   ""        CRLF_LF   CRLF_LF     ""          ""
-
+commit_chk_wrnNNO "auto"  ""      false   "$WILC"   ""        ""          ""          ""
+commit_chk_wrnNNO "auto"  ""      true    LF_CRLF   ""        ""          ""          ""
+commit_chk_wrnNNO "auto"  ""      input   ""        ""        ""          ""          ""
 for crlf in true false input
 do
 	commit_chk_wrnNNO -text ""      $crlf   ""        ""        ""          ""          ""
@@ -408,8 +407,8 @@ do
 	commit_chk_wrnNNO -text crlf    $crlf   ""        ""        ""          ""          ""
 	commit_chk_wrnNNO ""    lf      $crlf   ""       CRLF_LF    CRLF_LF      ""         CRLF_LF
 	commit_chk_wrnNNO ""    crlf    $crlf   LF_CRLF   ""        LF_CRLF     LF_CRLF     ""
-	commit_chk_wrnNNO auto  lf    	$crlf   ""       CRLF_LF    CRLF_LF     ""          CRLF_LF
-	commit_chk_wrnNNO auto  crlf  	$crlf   LF_CRLF   ""        LF_CRLF     LF_CRLF     ""
+	commit_chk_wrnNNO auto  lf    	$crlf   ""        ""        ""          ""          ""
+	commit_chk_wrnNNO auto  crlf  	$crlf   LF_CRLF   ""        ""          ""          ""
 	commit_chk_wrnNNO text  lf    	$crlf   ""       CRLF_LF    CRLF_LF     ""          CRLF_LF
 	commit_chk_wrnNNO text  crlf  	$crlf   LF_CRLF   ""        LF_CRLF     LF_CRLF     ""
 done
@@ -454,9 +453,9 @@ do
 	check_in_repo_NNO -text ""     $crlf   LF  CRLF  CRLF_mix_LF  LF_mix_CR  CRLF_nul
 	check_in_repo_NNO -text lf     $crlf   LF  CRLF  CRLF_mix_LF  LF_mix_CR  CRLF_nul
 	check_in_repo_NNO -text crlf   $crlf   LF  CRLF  CRLF_mix_LF  LF_mix_CR  CRLF_nul
-	check_in_repo_NNO auto  ""     $crlf   LF  LF    LF           LF_mix_CR  CRLF_nul
-	check_in_repo_NNO auto  lf     $crlf   LF  LF    LF           LF_mix_CR  LF_nul
-	check_in_repo_NNO auto  crlf   $crlf   LF  LF    LF           LF_mix_CR  LF_nul
+	check_in_repo_NNO auto  ""     $crlf   LF  CRLF  CRLF_mix_LF  LF_mix_CR  CRLF_nul
+	check_in_repo_NNO auto  lf     $crlf   LF  CRLF  CRLF_mix_LF  LF_mix_CR  CRLF_nul
+	check_in_repo_NNO auto  crlf   $crlf   LF  CRLF  CRLF_mix_LF  LF_mix_CR  CRLF_nul
 	check_in_repo_NNO text  ""     $crlf   LF  LF    LF           LF_mix_CR  LF_nul
 	check_in_repo_NNO text  lf     $crlf   LF  LF    LF           LF_mix_CR  LF_nul
 	check_in_repo_NNO text  crlf   $crlf   LF  LF    LF           LF_mix_CR  LF_nul
@@ -509,7 +508,7 @@ do
 			checkout_files text  "$id" "crlf" "$crlf" "$ceol"  CRLF  CRLF  CRLF         CRLF_mix_CR  CRLF_nul
 			# currently the same as text, eol=XXX
 			checkout_files auto  "$id" "lf"   "$crlf" "$ceol"  LF    CRLF  CRLF_mix_LF  LF_mix_CR    LF_nul
-			checkout_files auto  "$id" "crlf" "$crlf" "$ceol"  CRLF  CRLF  CRLF         CRLF_mix_CR  CRLF_nul
+			checkout_files auto  "$id" "crlf" "$crlf" "$ceol"  CRLF  CRLF  CRLF_mix_LF  LF_mix_CR    LF_nul
 		done
 
 		# core.autocrlf false, different core.eol
@@ -517,7 +516,7 @@ do
 		# core.autocrlf true
 		checkout_files   ""    "$id" ""     true    "$ceol"  CRLF  CRLF  CRLF_mix_LF  LF_mix_CR    LF_nul
 		# text: core.autocrlf = true overrides core.eol
-		checkout_files   auto  "$id" ""     true    "$ceol"  CRLF  CRLF  CRLF         LF_mix_CR    LF_nul
+		checkout_files   auto  "$id" ""     true    "$ceol"  CRLF  CRLF  CRLF_mix_LF  LF_mix_CR    LF_nul
 		checkout_files   text  "$id" ""     true    "$ceol"  CRLF  CRLF  CRLF         CRLF_mix_CR  CRLF_nul
 		# text: core.autocrlf = input overrides core.eol
 		checkout_files   text  "$id" ""     input   "$ceol"  LF    CRLF  CRLF_mix_LF  LF_mix_CR    LF_nul
@@ -531,8 +530,8 @@ do
 	checkout_files     text  "$id" ""     false   ""       $NL   CRLF  $MIX_CRLF_LF $MIX_LF_CR   $LFNUL
 	checkout_files     text  "$id" ""     false   native   $NL   CRLF  $MIX_CRLF_LF $MIX_LF_CR   $LFNUL
 	# auto: core.autocrlf=false and core.eol unset(or native) uses native eol
-	checkout_files     auto  "$id" ""     false   ""       $NL   CRLF  $MIX_CRLF_LF LF_mix_CR    LF_nul
-	checkout_files     auto  "$id" ""     false   native   $NL   CRLF  $MIX_CRLF_LF LF_mix_CR    LF_nul
+	checkout_files     auto  "$id" ""     false   ""       $NL   CRLF  CRLF_mix_LF  LF_mix_CR    LF_nul
+	checkout_files     auto  "$id" ""     false   native   $NL   CRLF  CRLF_mix_LF  LF_mix_CR    LF_nul
 done
 
 # Should be the last test case: remove some files from the worktree
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index 9be6411104..db5f60d0c5 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -7,7 +7,7 @@ test_description='our own option parser'
 
 . ./test-lib.sh
 
-cat > expect << EOF
+cat >expect <<\EOF
 usage: test-parse-options <options>
 
     --yes                 get a boolean
@@ -45,63 +45,24 @@ Standard options
     -v, --verbose         be verbose
     -n, --dry-run         dry run
     -q, --quiet           be quiet
+    --expect <string>     expected output in the variable dump
 
 EOF
 
 test_expect_success 'test help' '
-	test_must_fail test-parse-options -h > output 2> output.err &&
+	test_must_fail test-parse-options -h >output 2>output.err &&
 	test_must_be_empty output.err &&
 	test_i18ncmp expect output
 '
 
 mv expect expect.err
 
-cat >expect.template <<EOF
-boolean: 0
-integer: 0
-magnitude: 0
-timestamp: 0
-string: (not set)
-abbrev: 7
-verbose: 0
-quiet: no
-dry run: no
-file: (not set)
-EOF
-
-check() {
+check () {
 	what="$1" &&
 	shift &&
 	expect="$1" &&
 	shift &&
-	sed "s/^$what .*/$what $expect/" <expect.template >expect &&
-	test-parse-options $* >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-}
-
-check_i18n() {
-	what="$1" &&
-	shift &&
-	expect="$1" &&
-	shift &&
-	sed "s/^$what .*/$what $expect/" <expect.template >expect &&
-	test-parse-options $* >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_i18ncmp expect output
-}
-
-check_unknown() {
-	case "$1" in
-	--*)
-		echo error: unknown option \`${1#--}\' >expect ;;
-	-*)
-		echo error: unknown switch \`${1#-}\' >expect ;;
-	esac &&
-	cat expect.err >>expect &&
-	test_must_fail test-parse-options $* >output 2>output.err &&
-	test_must_be_empty output &&
-	test_cmp expect output.err
+	test-parse-options --expect="$what $expect" "$@"
 }
 
 check_unknown_i18n() {
@@ -156,7 +117,7 @@ test_expect_success 'OPT_MAGNITUDE() 3giga' '
 	check magnitude: 3221225472 -m 3g
 '
 
-cat > expect << EOF
+cat >expect <<\EOF
 boolean: 2
 integer: 1729
 magnitude: 16384
@@ -164,7 +125,7 @@ timestamp: 0
 string: 123
 abbrev: 7
 verbose: 2
-quiet: no
+quiet: 0
 dry run: yes
 file: prefix/my.file
 EOF
@@ -176,7 +137,7 @@ test_expect_success 'short options' '
 	test_must_be_empty output.err
 '
 
-cat > expect << EOF
+cat >expect <<\EOF
 boolean: 2
 integer: 1729
 magnitude: 16384
@@ -184,7 +145,7 @@ timestamp: 0
 string: 321
 abbrev: 10
 verbose: 2
-quiet: no
+quiet: 0
 dry run: no
 file: prefix/fi.le
 EOF
@@ -204,15 +165,15 @@ test_expect_success 'missing required value' '
 	test_expect_code 129 test-parse-options --file
 '
 
-cat > expect << EOF
+cat >expect <<\EOF
 boolean: 1
 integer: 13
 magnitude: 0
 timestamp: 0
 string: 123
 abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
 dry run: no
 file: (not set)
 arg 00: a1
@@ -222,32 +183,32 @@ EOF
 
 test_expect_success 'intermingled arguments' '
 	test-parse-options a1 --string 123 b1 --boolean -j 13 -- --boolean \
-		> output 2> output.err &&
+		>output 2>output.err &&
 	test_must_be_empty output.err &&
 	test_cmp expect output
 '
 
-cat > expect << EOF
+cat >expect <<\EOF
 boolean: 0
 integer: 2
 magnitude: 0
 timestamp: 0
 string: (not set)
 abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
 dry run: no
 file: (not set)
 EOF
 
 test_expect_success 'unambiguously abbreviated option' '
-	test-parse-options --int 2 --boolean --no-bo > output 2> output.err &&
+	test-parse-options --int 2 --boolean --no-bo >output 2>output.err &&
 	test_must_be_empty output.err &&
 	test_cmp expect output
 '
 
 test_expect_success 'unambiguously abbreviated option with "="' '
-	test-parse-options --int=2 > output 2> output.err &&
+	test-parse-options --int=2 >output 2>output.err &&
 	test_must_be_empty output.err &&
 	test_cmp expect output
 '
@@ -256,74 +217,74 @@ test_expect_success 'ambiguously abbreviated option' '
 	test_expect_code 129 test-parse-options --strin 123
 '
 
-cat > expect << EOF
+cat >expect <<\EOF
 boolean: 0
 integer: 0
 magnitude: 0
 timestamp: 0
 string: 123
 abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
 dry run: no
 file: (not set)
 EOF
 
 test_expect_success 'non ambiguous option (after two options it abbreviates)' '
-	test-parse-options --st 123 > output 2> output.err &&
+	test-parse-options --st 123 >output 2>output.err &&
 	test_must_be_empty output.err &&
 	test_cmp expect output
 '
 
-cat > typo.err << EOF
-error: did you mean \`--boolean\` (with two dashes ?)
+cat >typo.err <<\EOF
+error: did you mean `--boolean` (with two dashes ?)
 EOF
 
 test_expect_success 'detect possible typos' '
-	test_must_fail test-parse-options -boolean > output 2> output.err &&
+	test_must_fail test-parse-options -boolean >output 2>output.err &&
 	test_must_be_empty output &&
 	test_cmp typo.err output.err
 '
 
-cat > typo.err << EOF
-error: did you mean \`--ambiguous\` (with two dashes ?)
+cat >typo.err <<\EOF
+error: did you mean `--ambiguous` (with two dashes ?)
 EOF
 
 test_expect_success 'detect possible typos' '
-	test_must_fail test-parse-options -ambiguous > output 2> output.err &&
+	test_must_fail test-parse-options -ambiguous >output 2>output.err &&
 	test_must_be_empty output &&
 	test_cmp typo.err output.err
 '
 
-cat > expect <<EOF
+cat >expect <<\EOF
 boolean: 0
 integer: 0
 magnitude: 0
 timestamp: 0
 string: (not set)
 abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
 dry run: no
 file: (not set)
 arg 00: --quux
 EOF
 
 test_expect_success 'keep some options as arguments' '
-	test-parse-options --quux > output 2> output.err &&
+	test-parse-options --quux >output 2>output.err &&
 	test_must_be_empty output.err &&
-        test_cmp expect output
+	test_cmp expect output
 '
 
-cat > expect <<EOF
+cat >expect <<\EOF
 boolean: 0
 integer: 0
 magnitude: 0
 timestamp: 1
 string: (not set)
 abbrev: 7
-verbose: 0
-quiet: yes
+verbose: -1
+quiet: 1
 dry run: no
 file: (not set)
 arg 00: foo
@@ -331,12 +292,12 @@ EOF
 
 test_expect_success 'OPT_DATE() works' '
 	test-parse-options -t "1970-01-01 00:00:01 +0000" \
-		foo -q > output 2> output.err &&
+		foo -q >output 2>output.err &&
 	test_must_be_empty output.err &&
 	test_cmp expect output
 '
 
-cat > expect <<EOF
+cat >expect <<\EOF
 Callback: "four", 0
 boolean: 5
 integer: 4
@@ -344,112 +305,110 @@ magnitude: 0
 timestamp: 0
 string: (not set)
 abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
 dry run: no
 file: (not set)
 EOF
 
 test_expect_success 'OPT_CALLBACK() and OPT_BIT() work' '
-	test-parse-options --length=four -b -4 > output 2> output.err &&
+	test-parse-options --length=four -b -4 >output 2>output.err &&
 	test_must_be_empty output.err &&
 	test_cmp expect output
 '
 
-cat > expect <<EOF
-Callback: "not set", 1
-EOF
+>expect
 
 test_expect_success 'OPT_CALLBACK() and callback errors work' '
-	test_must_fail test-parse-options --no-length > output 2> output.err &&
+	test_must_fail test-parse-options --no-length >output 2>output.err &&
 	test_i18ncmp expect output &&
 	test_i18ncmp expect.err output.err
 '
 
-cat > expect <<EOF
+cat >expect <<\EOF
 boolean: 1
 integer: 23
 magnitude: 0
 timestamp: 0
 string: (not set)
 abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
 dry run: no
 file: (not set)
 EOF
 
 test_expect_success 'OPT_BIT() and OPT_SET_INT() work' '
-	test-parse-options --set23 -bbbbb --no-or4 > output 2> output.err &&
+	test-parse-options --set23 -bbbbb --no-or4 >output 2>output.err &&
 	test_must_be_empty output.err &&
 	test_cmp expect output
 '
 
 test_expect_success 'OPT_NEGBIT() and OPT_SET_INT() work' '
-	test-parse-options --set23 -bbbbb --neg-or4 > output 2> output.err &&
+	test-parse-options --set23 -bbbbb --neg-or4 >output 2>output.err &&
 	test_must_be_empty output.err &&
 	test_cmp expect output
 '
 
-cat > expect <<EOF
+cat >expect <<\EOF
 boolean: 6
 integer: 0
 magnitude: 0
 timestamp: 0
 string: (not set)
 abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
 dry run: no
 file: (not set)
 EOF
 
 test_expect_success 'OPT_BIT() works' '
-	test-parse-options -bb --or4 > output 2> output.err &&
+	test-parse-options -bb --or4 >output 2>output.err &&
 	test_must_be_empty output.err &&
 	test_cmp expect output
 '
 
 test_expect_success 'OPT_NEGBIT() works' '
-	test-parse-options -bb --no-neg-or4 > output 2> output.err &&
+	test-parse-options -bb --no-neg-or4 >output 2>output.err &&
 	test_must_be_empty output.err &&
 	test_cmp expect output
 '
 
 test_expect_success 'OPT_COUNTUP() with PARSE_OPT_NODASH works' '
-	test-parse-options + + + + + + > output 2> output.err &&
+	test-parse-options + + + + + + >output 2>output.err &&
 	test_must_be_empty output.err &&
 	test_cmp expect output
 '
 
-cat > expect <<EOF
+cat >expect <<\EOF
 boolean: 0
 integer: 12345
 magnitude: 0
 timestamp: 0
 string: (not set)
 abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
 dry run: no
 file: (not set)
 EOF
 
 test_expect_success 'OPT_NUMBER_CALLBACK() works' '
-	test-parse-options -12345 > output 2> output.err &&
+	test-parse-options -12345 >output 2>output.err &&
 	test_must_be_empty output.err &&
 	test_cmp expect output
 '
 
-cat >expect <<EOF
+cat >expect <<\EOF
 boolean: 0
 integer: 0
 magnitude: 0
 timestamp: 0
 string: (not set)
 abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
 dry run: no
 file: (not set)
 EOF
@@ -460,7 +419,7 @@ test_expect_success 'negation of OPT_NONEG flags is not ambiguous' '
 	test_cmp expect output
 '
 
-cat >>expect <<'EOF'
+cat >>expect <<\EOF
 list: foo
 list: bar
 list: baz
@@ -476,4 +435,118 @@ test_expect_success '--no-list resets list' '
 	test_cmp expect output
 '
 
+cat >expect <<\EOF
+boolean: 0
+integer: 0
+magnitude: 0
+timestamp: 0
+string: (not set)
+abbrev: 7
+verbose: -1
+quiet: 3
+dry run: no
+file: (not set)
+EOF
+
+test_expect_success 'multiple quiet levels' '
+	test-parse-options -q -q -q >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+'
+
+cat >expect <<\EOF
+boolean: 0
+integer: 0
+magnitude: 0
+timestamp: 0
+string: (not set)
+abbrev: 7
+verbose: 3
+quiet: 0
+dry run: no
+file: (not set)
+EOF
+
+test_expect_success 'multiple verbose levels' '
+	test-parse-options -v -v -v >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+'
+
+cat >expect <<\EOF
+boolean: 0
+integer: 0
+magnitude: 0
+timestamp: 0
+string: (not set)
+abbrev: 7
+verbose: -1
+quiet: 0
+dry run: no
+file: (not set)
+EOF
+
+test_expect_success '--no-quiet sets --quiet to 0' '
+	test-parse-options --no-quiet >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+'
+
+cat >expect <<\EOF
+boolean: 0
+integer: 0
+magnitude: 0
+timestamp: 0
+string: (not set)
+abbrev: 7
+verbose: -1
+quiet: 0
+dry run: no
+file: (not set)
+EOF
+
+test_expect_success '--no-quiet resets multiple -q to 0' '
+	test-parse-options -q -q -q --no-quiet >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+'
+
+cat >expect <<\EOF
+boolean: 0
+integer: 0
+magnitude: 0
+timestamp: 0
+string: (not set)
+abbrev: 7
+verbose: 0
+quiet: 0
+dry run: no
+file: (not set)
+EOF
+
+test_expect_success '--no-verbose sets verbose to 0' '
+	test-parse-options --no-verbose >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+'
+
+cat >expect <<\EOF
+boolean: 0
+integer: 0
+magnitude: 0
+timestamp: 0
+string: (not set)
+abbrev: 7
+verbose: 0
+quiet: 0
+dry run: no
+file: (not set)
+EOF
+
+test_expect_success '--no-verbose resets multiple verbose to 0' '
+	test-parse-options -v -v -v --no-verbose >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+'
+
 test_done
diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
index 8532a028e7..bf2deee109 100755
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -19,6 +19,13 @@ relative_path() {
 	"test \"\$(test-path-utils relative_path '$1' '$2')\" = '$expected'"
 }
 
+test_submodule_relative_url() {
+	test_expect_success "test_submodule_relative_url: $1 $2 $3 => $4" "
+		actual=\$(git submodule--helper resolve-relative-url-test '$1' '$2' '$3') &&
+		test \"\$actual\" = '$4'
+	"
+}
+
 test_git_path() {
 	test_expect_success "git-path $1 $2 => $3" "
 		$1 git rev-parse --git-path $2 >actual &&
@@ -298,4 +305,43 @@ test_git_path GIT_COMMON_DIR=bar config                   bar/config
 test_git_path GIT_COMMON_DIR=bar packed-refs              bar/packed-refs
 test_git_path GIT_COMMON_DIR=bar shallow                  bar/shallow
 
+# In the tests below, the distinction between $PWD and $(pwd) is important:
+# on Windows, $PWD is POSIX style (/c/foo), $(pwd) has drive letter (c:/foo).
+
+test_submodule_relative_url "../" "../foo" "../submodule" "../../submodule"
+test_submodule_relative_url "../" "../foo/bar" "../submodule" "../../foo/submodule"
+test_submodule_relative_url "../" "../foo/submodule" "../submodule" "../../foo/submodule"
+test_submodule_relative_url "../" "./foo" "../submodule" "../submodule"
+test_submodule_relative_url "../" "./foo/bar" "../submodule" "../foo/submodule"
+test_submodule_relative_url "../../../" "../foo/bar" "../sub/a/b/c" "../../../../foo/sub/a/b/c"
+test_submodule_relative_url "../" "$PWD/addtest" "../repo" "$(pwd)/repo"
+test_submodule_relative_url "../" "foo/bar" "../submodule" "../foo/submodule"
+test_submodule_relative_url "../" "foo" "../submodule" "../submodule"
+
+test_submodule_relative_url "(null)" "../foo/bar" "../sub/a/b/c" "../foo/sub/a/b/c"
+test_submodule_relative_url "(null)" "../foo/bar" "../submodule" "../foo/submodule"
+test_submodule_relative_url "(null)" "../foo/submodule" "../submodule" "../foo/submodule"
+test_submodule_relative_url "(null)" "../foo" "../submodule" "../submodule"
+test_submodule_relative_url "(null)" "./foo/bar" "../submodule" "foo/submodule"
+test_submodule_relative_url "(null)" "./foo" "../submodule" "submodule"
+test_submodule_relative_url "(null)" "//somewhere else/repo" "../subrepo" "//somewhere else/subrepo"
+test_submodule_relative_url "(null)" "$PWD/subsuper_update_r" "../subsubsuper_update_r" "$(pwd)/subsubsuper_update_r"
+test_submodule_relative_url "(null)" "$PWD/super_update_r2" "../subsuper_update_r" "$(pwd)/subsuper_update_r"
+test_submodule_relative_url "(null)" "$PWD/." "../." "$(pwd)/."
+test_submodule_relative_url "(null)" "$PWD" "./." "$(pwd)/."
+test_submodule_relative_url "(null)" "$PWD/addtest" "../repo" "$(pwd)/repo"
+test_submodule_relative_url "(null)" "$PWD" "./å äö" "$(pwd)/å äö"
+test_submodule_relative_url "(null)" "$PWD/." "../submodule" "$(pwd)/submodule"
+test_submodule_relative_url "(null)" "$PWD/submodule" "../submodule" "$(pwd)/submodule"
+test_submodule_relative_url "(null)" "$PWD/home2/../remote" "../bundle1" "$(pwd)/home2/../bundle1"
+test_submodule_relative_url "(null)" "$PWD/submodule_update_repo" "./." "$(pwd)/submodule_update_repo/."
+test_submodule_relative_url "(null)" "file:///tmp/repo" "../subrepo" "file:///tmp/subrepo"
+test_submodule_relative_url "(null)" "foo/bar" "../submodule" "foo/submodule"
+test_submodule_relative_url "(null)" "foo" "../submodule" "submodule"
+test_submodule_relative_url "(null)" "helper:://hostname/repo" "../subrepo" "helper:://hostname/subrepo"
+test_submodule_relative_url "(null)" "ssh://hostname/repo" "../subrepo" "ssh://hostname/subrepo"
+test_submodule_relative_url "(null)" "ssh://hostname:22/repo" "../subrepo" "ssh://hostname:22/subrepo"
+test_submodule_relative_url "(null)" "user@host:path/to/repo" "../subrepo" "user@host:path/to/subrepo"
+test_submodule_relative_url "(null)" "user@host:repo" "../subrepo" "user@host:subrepo"
+
 test_done
diff --git a/t/t0070-fundamental.sh b/t/t0070-fundamental.sh
index 5ed69a6f56..991ed2a48d 100755
--- a/t/t0070-fundamental.sh
+++ b/t/t0070-fundamental.sh
@@ -31,7 +31,7 @@ test_expect_success 'git_mkstemps_mode does not fail if fd 0 is not open' '
 
 test_expect_success 'check for a bug in the regex routines' '
 	# if this test fails, re-build git with NO_REGEX=1
-	test-regex
+	test-regex --bug
 '
 
 test_done
diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh
index d7ef44b4a2..03bd31e9f2 100755
--- a/t/t0300-credentials.sh
+++ b/t/t0300-credentials.sh
@@ -298,4 +298,15 @@ test_expect_success 'helpers can abort the process' '
 	test_cmp expect stdout
 '
 
+test_expect_success 'empty helper spec resets helper list' '
+	test_config credential.helper "verbatim file file" &&
+	check fill "" "verbatim cmdline cmdline" <<-\EOF
+	--
+	username=cmdline
+	password=cmdline
+	--
+	verbatim: get
+	EOF
+'
+
 test_done
diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index 4f38078ff3..b19f332694 100755
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -231,7 +231,7 @@ $tag_content
        | git cat-file --batch)"
 '
 
-test_expect_success "--batch-check for an emtpy line" '
+test_expect_success "--batch-check for an empty line" '
     test " missing" = "$(echo | git cat-file --batch-check)"
 '
 
diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh
index 0c74beedd2..c167f606ca 100755
--- a/t/t1011-read-tree-sparse-checkout.sh
+++ b/t/t1011-read-tree-sparse-checkout.sh
@@ -15,11 +15,11 @@ test_description='sparse checkout tests
 . "$TEST_DIRECTORY"/lib-read-tree.sh
 
 test_expect_success 'setup' '
-	cat >expected <<-\EOF &&
+	cat >expected <<-EOF &&
 	100644 77f0ba1734ed79d12881f81b36ee134de6a3327b 0	init.t
-	100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	sub/added
-	100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	sub/addedtoo
-	100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	subsub/added
+	100644 $EMPTY_BLOB 0	sub/added
+	100644 $EMPTY_BLOB 0	sub/addedtoo
+	100644 $EMPTY_BLOB 0	subsub/added
 	EOF
 	cat >expected.swt <<-\EOF &&
 	H init.t
@@ -244,10 +244,10 @@ test_expect_success 'print errors when failed to update worktree' '
 error: The following untracked working tree files would be overwritten by checkout:
 	sub/added
 	sub/addedtoo
-Please move or remove them before you can switch branches.
+Please move or remove them before you switch branches.
 Aborting
 EOF
-	test_cmp expected actual
+	test_i18ncmp expected actual
 '
 
 test_expect_success 'checkout without --ignore-skip-worktree-bits' '
diff --git a/t/t1050-large.sh b/t/t1050-large.sh
index f9f3d1391f..096dbffecc 100755
--- a/t/t1050-large.sh
+++ b/t/t1050-large.sh
@@ -177,10 +177,9 @@ test_expect_success 'zip achiving, deflate' '
 	git archive --format=zip HEAD >/dev/null
 '
 
-test_expect_success 'fsck' '
-	test_must_fail git fsck 2>err &&
-	n=$(grep "error: attempting to allocate .* over limit" err | wc -l) &&
-	test "$n" -gt 1
+test_expect_success 'fsck large blobs' '
+	git fsck 2>err &&
+	test_must_be_empty err
 '
 
 test_done
diff --git a/t/t1100-commit-tree-options.sh b/t/t1100-commit-tree-options.sh
index b7e9b4fc5b..ae66ba5bab 100755
--- a/t/t1100-commit-tree-options.sh
+++ b/t/t1100-commit-tree-options.sh
@@ -15,7 +15,7 @@ Also make sure that command line parser understands the normal
 . ./test-lib.sh
 
 cat >expected <<EOF
-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+tree $EMPTY_TREE
 author Author Name <author@email> 1117148400 +0000
 committer Committer Name <committer@email> 1117150200 +0000
 
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 3d6f1db9da..923bfc5a26 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -886,7 +886,7 @@ test_expect_success !MINGW 'get --path copes with unset $HOME' '
 		git config --get --path path.normal >>result &&
 		git config --get --path path.trailingtilde >>result
 	) &&
-	grep "[Ff]ailed to expand.*~/" msg &&
+	test_i18ngrep "[Ff]ailed to expand.*~/" msg &&
 	test_cmp expect result
 '
 
@@ -1087,6 +1087,20 @@ test_expect_success 'git -c complains about empty key and value' '
 	test_must_fail git -c "" rev-parse
 '
 
+test_expect_success 'multiple git -c appends config' '
+	test_config alias.x "!git -c x.two=2 config --get-regexp ^x\.*" &&
+	cat >expect <<-\EOF &&
+	x.one 1
+	x.two 2
+	EOF
+	git -c x.one=1 x >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git -c is not confused by empty environment' '
+	GIT_CONFIG_PARAMETERS="" git -c x.one=1 config --list
+'
+
 test_expect_success 'git config --edit works' '
 	git config -f tmp test.value no &&
 	echo test.value=yes >expect &&
@@ -1112,7 +1126,7 @@ test_expect_success 'barf on syntax error' '
 	key garbage
 	EOF
 	test_must_fail git config --get section.key >actual 2>error &&
-	grep " line 3 " error
+	test_i18ngrep " line 3 " error
 '
 
 test_expect_success 'barf on incomplete section header' '
@@ -1122,7 +1136,7 @@ test_expect_success 'barf on incomplete section header' '
 	key = value
 	EOF
 	test_must_fail git config --get section.key >actual 2>error &&
-	grep " line 2 " error
+	test_i18ngrep " line 2 " error
 '
 
 test_expect_success 'barf on incomplete string' '
@@ -1132,7 +1146,7 @@ test_expect_success 'barf on incomplete string' '
 	key = "value string
 	EOF
 	test_must_fail git config --get section.key >actual 2>error &&
-	grep " line 3 " error
+	test_i18ngrep " line 3 " error
 '
 
 test_expect_success 'urlmatch' '
diff --git a/t/t1307-config-blob.sh b/t/t1307-config-blob.sh
index 3c6791e6be..eed31ffa30 100755
--- a/t/t1307-config-blob.sh
+++ b/t/t1307-config-blob.sh
@@ -61,10 +61,7 @@ test_expect_success 'parse errors in blobs are properly attributed' '
 	git commit -m broken &&
 
 	test_must_fail git config --blob=HEAD:config some.value 2>err &&
-
-	# just grep for our token as the exact error message is likely to
-	# change or be internationalized
-	grep "HEAD:config" err
+	test_i18ngrep "HEAD:config" err
 '
 
 test_expect_success 'can parse blob ending with CR' '
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 005d66dbef..7655c94c28 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -197,14 +197,14 @@ test_expect_success 'proper error on error in default config files' '
 	echo "[" >>.git/config &&
 	echo "fatal: bad config line 34 in file .git/config" >expect &&
 	test_expect_code 128 test-config get_value foo.bar 2>actual &&
-	test_cmp expect actual
+	test_i18ncmp expect actual
 '
 
 test_expect_success 'proper error on error in custom config files' '
 	echo "[" >>syntax-error &&
 	echo "fatal: bad config line 1 in file syntax-error" >expect &&
 	test_expect_code 128 test-config configset_get_value foo.bar syntax-error 2>actual &&
-	test_cmp expect actual
+	test_i18ncmp expect actual
 '
 
 test_expect_success 'check line errors for malformed values' '
@@ -229,4 +229,39 @@ test_expect_success 'error on modifying repo config without repo' '
 	)
 '
 
+cmdline_config="'foo.bar=from-cmdline'"
+test_expect_success 'iteration shows correct origins' '
+	echo "[foo]bar = from-repo" >.git/config &&
+	echo "[foo]bar = from-home" >.gitconfig &&
+	if test_have_prereq MINGW
+	then
+		# Use Windows path (i.e. *not* $HOME)
+		HOME_GITCONFIG=$(pwd)/.gitconfig
+	else
+		# Do not get fooled by symbolic links, i.e. $HOME != $(pwd)
+		HOME_GITCONFIG=$HOME/.gitconfig
+	fi &&
+	cat >expect <<-EOF &&
+	key=foo.bar
+	value=from-home
+	origin=file
+	name=$HOME_GITCONFIG
+	scope=global
+
+	key=foo.bar
+	value=from-repo
+	origin=file
+	name=.git/config
+	scope=repo
+
+	key=foo.bar
+	value=from-cmdline
+	origin=command line
+	name=
+	scope=cmdline
+	EOF
+	GIT_CONFIG_PARAMETERS=$cmdline_config test-config iterate >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t1350-config-hooks-path.sh b/t/t1350-config-hooks-path.sh
new file mode 100755
index 0000000000..5e3fb3a6af
--- /dev/null
+++ b/t/t1350-config-hooks-path.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+test_description='Test the core.hooksPath configuration variable'
+
+. ./test-lib.sh
+
+test_expect_success 'set up a pre-commit hook in core.hooksPath' '
+	mkdir -p .git/custom-hooks .git/hooks &&
+	write_script .git/custom-hooks/pre-commit <<-\EOF &&
+	echo CUSTOM >>actual
+	EOF
+	write_script .git/hooks/pre-commit <<-\EOF
+	echo NORMAL >>actual
+	EOF
+'
+
+test_expect_success 'Check that various forms of specifying core.hooksPath work' '
+	test_commit no_custom_hook &&
+	git config core.hooksPath .git/custom-hooks &&
+	test_commit have_custom_hook &&
+	git config core.hooksPath .git/custom-hooks/ &&
+	test_commit have_custom_hook_trailing_slash &&
+	git config core.hooksPath "$PWD/.git/custom-hooks" &&
+	test_commit have_custom_hook_abs_path &&
+	git config core.hooksPath "$PWD/.git/custom-hooks/" &&
+	test_commit have_custom_hook_abs_path_trailing_slash &&
+	cat >expect <<-\EOF &&
+	NORMAL
+	CUSTOM
+	CUSTOM
+	CUSTOM
+	CUSTOM
+	EOF
+	test_cmp expect actual
+'
+
+test_done
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index af1b20dd5c..d4fb977060 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -23,7 +23,7 @@ test_expect_success setup '
 m=refs/heads/master
 n_dir=refs/heads/gu
 n=$n_dir/fixes
-outside=foo
+outside=refs/foo
 
 test_expect_success \
 	"create $m" \
@@ -361,7 +361,7 @@ test_expect_success 'stdin test setup' '
 
 test_expect_success '-z fails without --stdin' '
 	test_must_fail git update-ref -z $m $m $m 2>err &&
-	grep "usage: git update-ref" err
+	test_i18ngrep "usage: git update-ref" err
 '
 
 test_expect_success 'stdin works with no input' '
@@ -479,7 +479,7 @@ test_expect_success 'stdin fails with duplicate refs' '
 	create $a $m
 	EOF
 	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: Multiple updates for ref '"'"'$a'"'"' not allowed." err
+	grep "fatal: multiple updates for ref '"'"'$a'"'"' not allowed." err
 '
 
 test_expect_success 'stdin create ref works' '
@@ -880,7 +880,7 @@ test_expect_success 'stdin -z fails option with unknown name' '
 test_expect_success 'stdin -z fails with duplicate refs' '
 	printf $F "create $a" "$m" "create $b" "$m" "create $a" "$m" >stdin &&
 	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: Multiple updates for ref '"'"'$a'"'"' not allowed." err
+	grep "fatal: multiple updates for ref '"'"'$a'"'"' not allowed." err
 '
 
 test_expect_success 'stdin -z create ref works' '
@@ -1102,6 +1102,41 @@ test_expect_success 'stdin -z delete refs works with packed and loose refs' '
 	test_must_fail git rev-parse --verify -q $c
 '
 
+test_expect_success 'fails with duplicate HEAD update' '
+	git branch target1 $A &&
+	git checkout target1 &&
+	cat >stdin <<-EOF &&
+	update refs/heads/target1 $C
+	option no-deref
+	update HEAD $B
+	EOF
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: multiple updates for '\''HEAD'\'' (including one via its referent .refs/heads/target1.) are not allowed" err &&
+	echo "refs/heads/target1" >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual &&
+	echo "$A" >expect &&
+	git rev-parse refs/heads/target1 >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'fails with duplicate ref update via symref' '
+	git branch target2 $A &&
+	git symbolic-ref refs/heads/symref2 refs/heads/target2 &&
+	cat >stdin <<-EOF &&
+	update refs/heads/target2 $C
+	update refs/heads/symref2 $B
+	EOF
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: multiple updates for '\''refs/heads/target2'\'' (including one via symref .refs/heads/symref2.) are not allowed" err &&
+	echo "refs/heads/target2" >expect &&
+	git symbolic-ref refs/heads/symref2 >actual &&
+	test_cmp expect actual &&
+	echo "$A" >expect &&
+	git rev-parse refs/heads/target2 >actual &&
+	test_cmp expect actual
+'
+
 run_with_limited_open_files () {
 	(ulimit -n 32 && "$@")
 }
diff --git a/t/t1401-symbolic-ref.sh b/t/t1401-symbolic-ref.sh
index 417eecc3af..ca3fa406c3 100755
--- a/t/t1401-symbolic-ref.sh
+++ b/t/t1401-symbolic-ref.sh
@@ -110,7 +110,7 @@ test_expect_success 'symbolic-ref writes reflog entry' '
 	update
 	create
 	EOF
-	git log --format=%gs -g >actual &&
+	git log --format=%gs -g -2 >actual &&
 	test_cmp expect actual
 '
 
diff --git a/t/t1404-update-ref-df-conflicts.sh b/t/t1404-update-ref-df-conflicts.sh
deleted file mode 100755
index 66bafb5cf4..0000000000
--- a/t/t1404-update-ref-df-conflicts.sh
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-test_description='Test git update-ref with D/F conflicts'
-. ./test-lib.sh
-
-test_update_rejected () {
-	prefix="$1" &&
-	before="$2" &&
-	pack="$3" &&
-	create="$4" &&
-	error="$5" &&
-	printf "create $prefix/%s $C\n" $before |
-	git update-ref --stdin &&
-	git for-each-ref $prefix >unchanged &&
-	if $pack
-	then
-		git pack-refs --all
-	fi &&
-	printf "create $prefix/%s $C\n" $create >input &&
-	test_must_fail git update-ref --stdin <input 2>output.err &&
-	grep -F "$error" output.err &&
-	git for-each-ref $prefix >actual &&
-	test_cmp unchanged actual
-}
-
-Q="'"
-
-test_expect_success 'setup' '
-
-	git commit --allow-empty -m Initial &&
-	C=$(git rev-parse HEAD)
-
-'
-
-test_expect_success 'existing loose ref is a simple prefix of new' '
-
-	prefix=refs/1l &&
-	test_update_rejected $prefix "a c e" false "b c/x d" \
-		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
-
-'
-
-test_expect_success 'existing packed ref is a simple prefix of new' '
-
-	prefix=refs/1p &&
-	test_update_rejected $prefix "a c e" true "b c/x d" \
-		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
-
-'
-
-test_expect_success 'existing loose ref is a deeper prefix of new' '
-
-	prefix=refs/2l &&
-	test_update_rejected $prefix "a c e" false "b c/x/y d" \
-		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
-
-'
-
-test_expect_success 'existing packed ref is a deeper prefix of new' '
-
-	prefix=refs/2p &&
-	test_update_rejected $prefix "a c e" true "b c/x/y d" \
-		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
-
-'
-
-test_expect_success 'new ref is a simple prefix of existing loose' '
-
-	prefix=refs/3l &&
-	test_update_rejected $prefix "a c/x e" false "b c d" \
-		"$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
-
-'
-
-test_expect_success 'new ref is a simple prefix of existing packed' '
-
-	prefix=refs/3p &&
-	test_update_rejected $prefix "a c/x e" true "b c d" \
-		"$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
-
-'
-
-test_expect_success 'new ref is a deeper prefix of existing loose' '
-
-	prefix=refs/4l &&
-	test_update_rejected $prefix "a c/x/y e" false "b c d" \
-		"$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
-
-'
-
-test_expect_success 'new ref is a deeper prefix of existing packed' '
-
-	prefix=refs/4p &&
-	test_update_rejected $prefix "a c/x/y e" true "b c d" \
-		"$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
-
-'
-
-test_expect_success 'one new ref is a simple prefix of another' '
-
-	prefix=refs/5 &&
-	test_update_rejected $prefix "a e" false "b c c/x d" \
-		"cannot process $Q$prefix/c$Q and $Q$prefix/c/x$Q at the same time"
-
-'
-
-test_done
diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh
new file mode 100755
index 0000000000..c34ece48f5
--- /dev/null
+++ b/t/t1404-update-ref-errors.sh
@@ -0,0 +1,407 @@
+#!/bin/sh
+
+test_description='Test git update-ref error handling'
+. ./test-lib.sh
+
+# Create some references, perhaps run pack-refs --all, then try to
+# create some more references. Ensure that the second creation fails
+# with the correct error message.
+# Usage: test_update_rejected <before> <pack> <create> <error>
+#   <before> is a ws-separated list of refs to create before the test
+#   <pack> (true or false) tells whether to pack the refs before the test
+#   <create> is a list of variables to attempt creating
+#   <error> is a string to look for in the stderr of update-ref.
+# All references are created in the namespace specified by the current
+# value of $prefix.
+test_update_rejected () {
+	before="$1" &&
+	pack="$2" &&
+	create="$3" &&
+	error="$4" &&
+	printf "create $prefix/%s $C\n" $before |
+	git update-ref --stdin &&
+	git for-each-ref $prefix >unchanged &&
+	if $pack
+	then
+		git pack-refs --all
+	fi &&
+	printf "create $prefix/%s $C\n" $create >input &&
+	test_must_fail git update-ref --stdin <input 2>output.err &&
+	grep -F "$error" output.err &&
+	git for-each-ref $prefix >actual &&
+	test_cmp unchanged actual
+}
+
+Q="'"
+
+test_expect_success 'setup' '
+
+	git commit --allow-empty -m Initial &&
+	C=$(git rev-parse HEAD) &&
+	git commit --allow-empty -m Second &&
+	D=$(git rev-parse HEAD) &&
+	git commit --allow-empty -m Third &&
+	E=$(git rev-parse HEAD)
+'
+
+test_expect_success 'existing loose ref is a simple prefix of new' '
+
+	prefix=refs/1l &&
+	test_update_rejected "a c e" false "b c/x d" \
+		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
+
+'
+
+test_expect_success 'existing packed ref is a simple prefix of new' '
+
+	prefix=refs/1p &&
+	test_update_rejected "a c e" true "b c/x d" \
+		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
+
+'
+
+test_expect_success 'existing loose ref is a deeper prefix of new' '
+
+	prefix=refs/2l &&
+	test_update_rejected "a c e" false "b c/x/y d" \
+		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
+
+'
+
+test_expect_success 'existing packed ref is a deeper prefix of new' '
+
+	prefix=refs/2p &&
+	test_update_rejected "a c e" true "b c/x/y d" \
+		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
+
+'
+
+test_expect_success 'new ref is a simple prefix of existing loose' '
+
+	prefix=refs/3l &&
+	test_update_rejected "a c/x e" false "b c d" \
+		"$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
+
+'
+
+test_expect_success 'new ref is a simple prefix of existing packed' '
+
+	prefix=refs/3p &&
+	test_update_rejected "a c/x e" true "b c d" \
+		"$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
+
+'
+
+test_expect_success 'new ref is a deeper prefix of existing loose' '
+
+	prefix=refs/4l &&
+	test_update_rejected "a c/x/y e" false "b c d" \
+		"$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
+
+'
+
+test_expect_success 'new ref is a deeper prefix of existing packed' '
+
+	prefix=refs/4p &&
+	test_update_rejected "a c/x/y e" true "b c d" \
+		"$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
+
+'
+
+test_expect_success 'one new ref is a simple prefix of another' '
+
+	prefix=refs/5 &&
+	test_update_rejected "a e" false "b c c/x d" \
+		"cannot process $Q$prefix/c$Q and $Q$prefix/c/x$Q at the same time"
+
+'
+
+test_expect_success 'empty directory should not fool rev-parse' '
+	prefix=refs/e-rev-parse &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	echo "$C" >expected &&
+	git rev-parse $prefix/foo >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'empty directory should not fool for-each-ref' '
+	prefix=refs/e-for-each-ref &&
+	git update-ref $prefix/foo $C &&
+	git for-each-ref $prefix >expected &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	git for-each-ref $prefix >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'empty directory should not fool create' '
+	prefix=refs/e-create &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "create %s $C\n" $prefix/foo |
+	git update-ref --stdin
+'
+
+test_expect_success 'empty directory should not fool verify' '
+	prefix=refs/e-verify &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "verify %s $C\n" $prefix/foo |
+	git update-ref --stdin
+'
+
+test_expect_success 'empty directory should not fool 1-arg update' '
+	prefix=refs/e-update-1 &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "update %s $D\n" $prefix/foo |
+	git update-ref --stdin
+'
+
+test_expect_success 'empty directory should not fool 2-arg update' '
+	prefix=refs/e-update-2 &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "update %s $D $C\n" $prefix/foo |
+	git update-ref --stdin
+'
+
+test_expect_success 'empty directory should not fool 0-arg delete' '
+	prefix=refs/e-delete-0 &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "delete %s\n" $prefix/foo |
+	git update-ref --stdin
+'
+
+test_expect_success 'empty directory should not fool 1-arg delete' '
+	prefix=refs/e-delete-1 &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "delete %s $C\n" $prefix/foo |
+	git update-ref --stdin
+'
+
+# Test various errors when reading the old values of references...
+
+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
+	EOF
+	printf "%s\n" "update $prefix/foo $E $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+'
+
+test_expect_success 'incorrect old value blocks update' '
+	prefix=refs/incorrect-update &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $Q$prefix/foo$Q: is at $C but expected $D
+	EOF
+	printf "%s\n" "update $prefix/foo $E $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+'
+
+test_expect_success 'existing old value blocks create' '
+	prefix=refs/existing-create &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $Q$prefix/foo$Q: reference already exists
+	EOF
+	printf "%s\n" "create $prefix/foo $E" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+'
+
+test_expect_success 'incorrect old value blocks delete' '
+	prefix=refs/incorrect-delete &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $Q$prefix/foo$Q: is at $C but expected $D
+	EOF
+	printf "%s\n" "delete $prefix/foo $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+'
+
+test_expect_success 'missing old value blocks indirect update' '
+	prefix=refs/missing-indirect-update &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q
+	EOF
+	printf "%s\n" "update $prefix/symref $E $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+'
+
+test_expect_success 'incorrect old value blocks indirect update' '
+	prefix=refs/incorrect-indirect-update &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
+	EOF
+	printf "%s\n" "update $prefix/symref $E $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+'
+
+test_expect_success 'existing old value blocks indirect create' '
+	prefix=refs/existing-indirect-create &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $Q$prefix/symref$Q: reference already exists
+	EOF
+	printf "%s\n" "create $prefix/symref $E" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+'
+
+test_expect_success 'incorrect old value blocks indirect delete' '
+	prefix=refs/incorrect-indirect-delete &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
+	EOF
+	printf "%s\n" "delete $prefix/symref $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+'
+
+test_expect_success 'missing old value blocks indirect no-deref update' '
+	prefix=refs/missing-noderef-update &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $Q$prefix/symref$Q: reference is missing but expected $D
+	EOF
+	printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+'
+
+test_expect_success 'incorrect old value blocks indirect no-deref update' '
+	prefix=refs/incorrect-noderef-update &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
+	EOF
+	printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+'
+
+test_expect_success 'existing old value blocks indirect no-deref create' '
+	prefix=refs/existing-noderef-create &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $Q$prefix/symref$Q: reference already exists
+	EOF
+	printf "%s\n" "option no-deref" "create $prefix/symref $E" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+'
+
+test_expect_success 'incorrect old value blocks indirect no-deref delete' '
+	prefix=refs/incorrect-noderef-delete &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
+	EOF
+	printf "%s\n" "option no-deref" "delete $prefix/symref $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+'
+
+test_expect_success 'non-empty directory blocks create' '
+	prefix=refs/ne-create &&
+	mkdir -p .git/$prefix/foo/bar &&
+	: >.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
+	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
+	EOF
+	printf "%s\n" "update $prefix/foo $D $C" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+'
+
+test_expect_success 'broken reference blocks create' '
+	prefix=refs/broken-create &&
+	mkdir -p .git/$prefix &&
+	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
+	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
+	EOF
+	printf "%s\n" "update $prefix/foo $D $C" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+'
+
+test_expect_success 'non-empty directory blocks indirect create' '
+	prefix=refs/ne-indirect-create &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	mkdir -p .git/$prefix/foo/bar &&
+	: >.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
+	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
+	EOF
+	printf "%s\n" "update $prefix/symref $D $C" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+'
+
+test_expect_success 'broken reference blocks indirect create' '
+	prefix=refs/broken-indirect-create &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	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
+	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
+	EOF
+	printf "%s\n" "update $prefix/symref $D $C" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+'
+
+test_done
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index c623824b4d..dd2be049ec 100755
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -338,4 +338,36 @@ test_expect_failure 'reflog with non-commit entries displays all entries' '
 	test_line_count = 3 actual
 '
 
+test_expect_success 'reflog expire operates on symref not referrent' '
+	git branch -l the_symref &&
+	git branch -l referrent &&
+	git update-ref referrent HEAD &&
+	git symbolic-ref refs/heads/the_symref refs/heads/referrent &&
+	test_when_finished "rm -f .git/refs/heads/referrent.lock" &&
+	touch .git/refs/heads/referrent.lock &&
+	git reflog expire --expire=all the_symref
+'
+
+test_expect_success 'continue walking past root commits' '
+	git init orphanage &&
+	(
+		cd orphanage &&
+		cat >expect <<-\EOF &&
+		HEAD@{0} commit (initial): orphan2-1
+		HEAD@{1} commit: orphan1-2
+		HEAD@{2} commit (initial): orphan1-1
+		HEAD@{3} commit (initial): initial
+		EOF
+		test_commit initial &&
+		git reflog &&
+		git checkout --orphan orphan1 &&
+		test_commit orphan1-1 &&
+		test_commit orphan1-2 &&
+		git checkout --orphan orphan2 &&
+		test_commit orphan2-1 &&
+		git log -g --format="%gd %gs" >actual &&
+		test_cmp expect actual
+	)
+'
+
 test_done
diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh
index c465abe8e3..8937e25e49 100755
--- a/t/t1430-bad-ref-name.sh
+++ b/t/t1430-bad-ref-name.sh
@@ -42,7 +42,7 @@ test_expect_success 'git branch shows badly named ref as warning' '
 	cp .git/refs/heads/master .git/refs/heads/broken...ref &&
 	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
 	git branch >output 2>error &&
-	grep -e "broken\.\.\.ref" error &&
+	test_i18ngrep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
 	! grep -e "broken\.\.\.ref" output
 '
 
@@ -147,35 +147,145 @@ test_expect_success 'rev-parse skips symref pointing to broken name' '
 	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
 	git branch shadow one &&
 	cp .git/refs/heads/master .git/refs/heads/broken...ref &&
-	git symbolic-ref refs/tags/shadow refs/heads/broken...ref &&
-
+	printf "ref: refs/heads/broken...ref\n" >.git/refs/tags/shadow &&
+	test_when_finished "rm -f .git/refs/tags/shadow" &&
 	git rev-parse --verify one >expect &&
 	git rev-parse --verify shadow >actual 2>err &&
 	test_cmp expect actual &&
-	test_i18ngrep "ignoring.*refs/tags/shadow" err
+	test_i18ngrep "ignoring dangling symref refs/tags/shadow" err
 '
 
-test_expect_success 'update-ref --no-deref -d can delete reference to broken name' '
-	git symbolic-ref refs/heads/badname refs/heads/broken...ref &&
+test_expect_success 'for-each-ref emits warnings for broken names' '
+	cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+	printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
 	test_when_finished "rm -f .git/refs/heads/badname" &&
-	test_path_is_file .git/refs/heads/badname &&
-	git update-ref --no-deref -d refs/heads/badname &&
-	test_path_is_missing .git/refs/heads/badname
+	printf "ref: refs/heads/master\n" >.git/refs/heads/broken...symref &&
+	test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+	git for-each-ref >output 2>error &&
+	! grep -e "broken\.\.\.ref" output &&
+	! grep -e "badname" output &&
+	! grep -e "broken\.\.\.symref" output &&
+	test_i18ngrep "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
+	test_i18ngrep "ignoring broken ref refs/heads/badname" error &&
+	test_i18ngrep "ignoring ref with broken name refs/heads/broken\.\.\.symref" error
 '
 
 test_expect_success 'update-ref -d can delete broken name' '
 	cp .git/refs/heads/master .git/refs/heads/broken...ref &&
 	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
-	git update-ref -d refs/heads/broken...ref &&
+	git update-ref -d refs/heads/broken...ref >output 2>error &&
+	test_must_be_empty output &&
+	test_must_be_empty error &&
+	git branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
+'
+
+test_expect_success 'branch -d can delete broken name' '
+	cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+	git branch -d broken...ref >output 2>error &&
+	test_i18ngrep "Deleted branch broken...ref (was broken)" output &&
+	test_must_be_empty error &&
 	git branch >output 2>error &&
 	! grep -e "broken\.\.\.ref" error &&
 	! grep -e "broken\.\.\.ref" output
 '
 
+test_expect_success 'update-ref --no-deref -d can delete symref to broken name' '
+	cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+	printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
+	test_when_finished "rm -f .git/refs/heads/badname" &&
+	git update-ref --no-deref -d refs/heads/badname >output 2>error &&
+	test_path_is_missing .git/refs/heads/badname &&
+	test_must_be_empty output &&
+	test_must_be_empty error
+'
+
+test_expect_success 'branch -d can delete symref to broken name' '
+	cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+	printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
+	test_when_finished "rm -f .git/refs/heads/badname" &&
+	git branch -d badname >output 2>error &&
+	test_path_is_missing .git/refs/heads/badname &&
+	test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
+	test_must_be_empty error
+'
+
+test_expect_success 'update-ref --no-deref -d can delete dangling symref to broken name' '
+	printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
+	test_when_finished "rm -f .git/refs/heads/badname" &&
+	git update-ref --no-deref -d refs/heads/badname >output 2>error &&
+	test_path_is_missing .git/refs/heads/badname &&
+	test_must_be_empty output &&
+	test_must_be_empty error
+'
+
+test_expect_success 'branch -d can delete dangling symref to broken name' '
+	printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
+	test_when_finished "rm -f .git/refs/heads/badname" &&
+	git branch -d badname >output 2>error &&
+	test_path_is_missing .git/refs/heads/badname &&
+	test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
+	test_must_be_empty error
+'
+
+test_expect_success 'update-ref -d can delete broken name through symref' '
+	cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+	printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
+	test_when_finished "rm -f .git/refs/heads/badname" &&
+	git update-ref -d refs/heads/badname >output 2>error &&
+	test_path_is_missing .git/refs/heads/broken...ref &&
+	test_must_be_empty output &&
+	test_must_be_empty error
+'
+
+test_expect_success 'update-ref --no-deref -d can delete symref with broken name' '
+	printf "ref: refs/heads/master\n" >.git/refs/heads/broken...symref &&
+	test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+	git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
+	test_path_is_missing .git/refs/heads/broken...symref &&
+	test_must_be_empty output &&
+	test_must_be_empty error
+'
+
+test_expect_success 'branch -d can delete symref with broken name' '
+	printf "ref: refs/heads/master\n" >.git/refs/heads/broken...symref &&
+	test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+	git branch -d broken...symref >output 2>error &&
+	test_path_is_missing .git/refs/heads/broken...symref &&
+	test_i18ngrep "Deleted branch broken...symref (was refs/heads/master)" output &&
+	test_must_be_empty error
+'
+
+test_expect_success 'update-ref --no-deref -d can delete dangling symref with broken name' '
+	printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref &&
+	test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+	git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
+	test_path_is_missing .git/refs/heads/broken...symref &&
+	test_must_be_empty output &&
+	test_must_be_empty error
+'
+
+test_expect_success 'branch -d can delete dangling symref with broken name' '
+	printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref &&
+	test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+	git branch -d broken...symref >output 2>error &&
+	test_path_is_missing .git/refs/heads/broken...symref &&
+	test_i18ngrep "Deleted branch broken...symref (was refs/heads/idonotexist)" output &&
+	test_must_be_empty error
+'
+
 test_expect_success 'update-ref -d cannot delete non-ref in .git dir' '
 	echo precious >.git/my-private-file &&
 	echo precious >expect &&
-	test_must_fail git update-ref -d my-private-file &&
+	test_must_fail git update-ref -d my-private-file >output 2>error &&
+	test_must_be_empty output &&
+	test_i18ngrep -e "refusing to update ref with bad name" error &&
 	test_cmp expect .git/my-private-file
 '
 
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 7ee8ea004f..8f52da2771 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -523,4 +523,26 @@ test_expect_success 'fsck --connectivity-only' '
 	)
 '
 
+remove_loose_object () {
+	sha1="$(git rev-parse "$1")" &&
+	remainder=${sha1#??} &&
+	firsttwo=${sha1%$remainder} &&
+	rm .git/objects/$firsttwo/$remainder
+}
+
+test_expect_success 'fsck --name-objects' '
+	rm -rf name-objects &&
+	git init name-objects &&
+	(
+		cd name-objects &&
+		test_commit julius caesar.t &&
+		test_commit augustus &&
+		test_commit caesar &&
+		remove_loose_object $(git rev-parse julius:caesar.t) &&
+		test_must_fail git fsck --name-objects >out &&
+		tree=$(git rev-parse --verify julius:) &&
+		grep "$tree (\(refs/heads/master\|HEAD\)@{[0-9]*}:" out
+	)
+'
+
 test_done
diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh
index 48ee07779d..038e24c401 100755
--- a/t/t1500-rev-parse.sh
+++ b/t/t1500-rev-parse.sh
@@ -3,85 +3,88 @@
 test_description='test git rev-parse'
 . ./test-lib.sh
 
-test_rev_parse() {
-	name=$1
-	shift
-
-	test_expect_success "$name: is-bare-repository" \
-	"test '$1' = \"\$(git rev-parse --is-bare-repository)\""
-	shift
-	[ $# -eq 0 ] && return
-
-	test_expect_success "$name: is-inside-git-dir" \
-	"test '$1' = \"\$(git rev-parse --is-inside-git-dir)\""
-	shift
-	[ $# -eq 0 ] && return
+# usage: [options] label is-bare is-inside-git is-inside-work prefix git-dir
+test_rev_parse () {
+	d=
+	bare=
+	gitdir=
+	while :
+	do
+		case "$1" in
+		-C) d="$2"; shift; shift ;;
+		-b) case "$2" in
+		    [tfu]*) bare="$2"; shift; shift ;;
+		    *) error "test_rev_parse: bogus core.bare value '$2'" ;;
+		    esac ;;
+		-g) gitdir="$2"; shift; shift ;;
+		-*) error "test_rev_parse: unrecognized option '$1'" ;;
+		*) break ;;
+		esac
+	done
 
-	test_expect_success "$name: is-inside-work-tree" \
-	"test '$1' = \"\$(git rev-parse --is-inside-work-tree)\""
-	shift
-	[ $# -eq 0 ] && return
-
-	test_expect_success "$name: prefix" \
-	"test '$1' = \"\$(git rev-parse --show-prefix)\""
+	name=$1
 	shift
-	[ $# -eq 0 ] && return
 
-	test_expect_success "$name: git-dir" \
-	"test '$1' = \"\$(git rev-parse --git-dir)\""
-	shift
-	[ $# -eq 0 ] && return
+	for o in --is-bare-repository \
+		 --is-inside-git-dir \
+		 --is-inside-work-tree \
+		 --show-prefix \
+		 --git-dir
+	do
+		test $# -eq 0 && break
+		expect="$1"
+		test_expect_success "$name: $o" '
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
+
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
+
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		'
+		shift
+	done
 }
 
-# label is-bare is-inside-git is-inside-work prefix git-dir
-
 ROOT=$(pwd)
 
+test_expect_success 'setup' '
+	mkdir -p sub/dir work &&
+	cp -R .git repo.git
+'
+
 test_rev_parse toplevel false false true '' .git
 
-cd .git || exit 1
-test_rev_parse .git/ false true false '' .
-cd objects || exit 1
-test_rev_parse .git/objects/ false true false '' "$ROOT/.git"
-cd ../.. || exit 1
+test_rev_parse -C .git .git/ false true false '' .
+test_rev_parse -C .git/objects .git/objects/ false true false '' "$ROOT/.git"
 
-mkdir -p sub/dir || exit 1
-cd sub/dir || exit 1
-test_rev_parse subdirectory false false true sub/dir/ "$ROOT/.git"
-cd ../.. || exit 1
+test_rev_parse -C sub/dir subdirectory false false true sub/dir/ "$ROOT/.git"
 
-git config core.bare true
-test_rev_parse 'core.bare = true' true false false
+test_rev_parse -b t 'core.bare = true' true false false
 
-git config --unset core.bare
-test_rev_parse 'core.bare undefined' false false true
+test_rev_parse -b u 'core.bare undefined' false false true
 
-mkdir work || exit 1
-cd work || exit 1
-GIT_DIR=../.git
-GIT_CONFIG="$(pwd)"/../.git/config
-export GIT_DIR GIT_CONFIG
 
-git config core.bare false
-test_rev_parse 'GIT_DIR=../.git, core.bare = false' false false true ''
+test_rev_parse -C work -g ../.git -b f 'GIT_DIR=../.git, core.bare = false' false false true ''
 
-git config core.bare true
-test_rev_parse 'GIT_DIR=../.git, core.bare = true' true false false ''
+test_rev_parse -C work -g ../.git -b t 'GIT_DIR=../.git, core.bare = true' true false false ''
 
-git config --unset core.bare
-test_rev_parse 'GIT_DIR=../.git, core.bare undefined' false false true ''
+test_rev_parse -C work -g ../.git -b u 'GIT_DIR=../.git, core.bare undefined' false false true ''
 
-mv ../.git ../repo.git || exit 1
-GIT_DIR=../repo.git
-GIT_CONFIG="$(pwd)"/../repo.git/config
 
-git config core.bare false
-test_rev_parse 'GIT_DIR=../repo.git, core.bare = false' false false true ''
+test_rev_parse -C work -g ../repo.git -b f 'GIT_DIR=../repo.git, core.bare = false' false false true ''
 
-git config core.bare true
-test_rev_parse 'GIT_DIR=../repo.git, core.bare = true' true false false ''
+test_rev_parse -C work -g ../repo.git -b t 'GIT_DIR=../repo.git, core.bare = true' true false false ''
 
-git config --unset core.bare
-test_rev_parse 'GIT_DIR=../repo.git, core.bare undefined' false false true ''
+test_rev_parse -C work -g ../repo.git -b u 'GIT_DIR=../repo.git, core.bare undefined' false false true ''
 
 test_done
diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
index 86c2ff255d..79a0251efa 100755
--- a/t/t1506-rev-parse-diagnosis.sh
+++ b/t/t1506-rev-parse-diagnosis.sh
@@ -106,7 +106,7 @@ test_expect_success 'incorrect revision id' '
 	test_must_fail git rev-parse foobar:file.txt 2>error &&
 	grep "Invalid object name '"'"'foobar'"'"'." error &&
 	test_must_fail git rev-parse foobar 2> error &&
-	grep "unknown revision or path not in the working tree." error
+	test_i18ngrep "unknown revision or path not in the working tree." error
 '
 
 test_expect_success 'incorrect file in sha1:path' '
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index 8aef49f236..292a0720fc 100755
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -33,14 +33,14 @@ test_expect_success 'add one file' '
 	git update-index --add one &&
 	git ls-files --stage >ls-files.actual &&
 	cat >ls-files.expect <<EOF &&
-100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	one
+100644 $EMPTY_BLOB 0	one
 EOF
 	test_cmp ls-files.expect ls-files.actual &&
 
 	test-dump-split-index .git/index | sed "/^own/d" >actual &&
 	cat >expect <<EOF &&
 base $base
-100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	one
+100644 $EMPTY_BLOB 0	one
 replacements:
 deletions:
 EOF
@@ -51,7 +51,7 @@ test_expect_success 'disable split index' '
 	git update-index --no-split-index &&
 	git ls-files --stage >ls-files.actual &&
 	cat >ls-files.expect <<EOF &&
-100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	one
+100644 $EMPTY_BLOB 0	one
 EOF
 	test_cmp ls-files.expect ls-files.actual &&
 
@@ -67,7 +67,7 @@ test_expect_success 'enable split index again, "one" now belongs to base index"'
 	git update-index --split-index &&
 	git ls-files --stage >ls-files.actual &&
 	cat >ls-files.expect <<EOF &&
-100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	one
+100644 $EMPTY_BLOB 0	one
 EOF
 	test_cmp ls-files.expect ls-files.actual &&
 
@@ -105,7 +105,7 @@ test_expect_success 'add another file, which stays index' '
 	git ls-files --stage >ls-files.actual &&
 	cat >ls-files.expect <<EOF &&
 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0	one
-100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	two
+100644 $EMPTY_BLOB 0	two
 EOF
 	test_cmp ls-files.expect ls-files.actual &&
 
@@ -113,7 +113,7 @@ EOF
 	q_to_tab >expect <<EOF &&
 $BASE
 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0Q
-100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	two
+100644 $EMPTY_BLOB 0	two
 replacements: 0
 deletions:
 EOF
@@ -159,14 +159,14 @@ test_expect_success 'add original file back' '
 	git update-index --add one &&
 	git ls-files --stage >ls-files.actual &&
 	cat >ls-files.expect <<EOF &&
-100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	one
+100644 $EMPTY_BLOB 0	one
 EOF
 	test_cmp ls-files.expect ls-files.actual &&
 
 	test-dump-split-index .git/index | sed "/^own/d" >actual &&
 	cat >expect <<EOF &&
 $BASE
-100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	one
+100644 $EMPTY_BLOB 0	one
 replacements:
 deletions: 0
 EOF
@@ -178,8 +178,8 @@ test_expect_success 'add new file' '
 	git update-index --add two &&
 	git ls-files --stage >actual &&
 	cat >expect <<EOF &&
-100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	one
-100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	two
+100644 $EMPTY_BLOB 0	one
+100644 $EMPTY_BLOB 0	two
 EOF
 	test_cmp expect actual
 '
@@ -188,8 +188,8 @@ test_expect_success 'unify index, two files remain' '
 	git update-index --no-split-index &&
 	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 &&
 
diff --git a/t/t2010-checkout-ambiguous.sh b/t/t2010-checkout-ambiguous.sh
index 87bdf9c96b..e76e84afbb 100755
--- a/t/t2010-checkout-ambiguous.sh
+++ b/t/t2010-checkout-ambiguous.sh
@@ -49,7 +49,7 @@ test_expect_success 'disambiguate checking out from a tree-ish' '
 
 test_expect_success 'accurate error message with more than one ref' '
 	test_must_fail git checkout HEAD master -- 2>actual &&
-	grep 2 actual &&
+	test_i18ngrep 2 actual &&
 	test_i18ngrep "one reference expected, 2 given" actual
 '
 
diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh
index 2741262369..2131fb2a56 100755
--- a/t/t2018-checkout-branch.sh
+++ b/t/t2018-checkout-branch.sh
@@ -124,7 +124,7 @@ test_expect_success 'checkout -b to @{-1} fails with the right branch name' '
 	git checkout branch2 &&
 	echo  >expect "fatal: A branch named '\''branch1'\'' already exists." &&
 	test_must_fail git checkout -b @{-1} 2>actual &&
-	test_cmp expect actual
+	test_i18ncmp expect actual
 '
 
 test_expect_success 'checkout -B to an existing branch resets branch to HEAD' '
diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh
index cbfa41ec61..4bcc335a19 100755
--- a/t/t2025-worktree-add.sh
+++ b/t/t2025-worktree-add.sh
@@ -4,6 +4,8 @@ test_description='test git worktree add'
 
 . ./test-lib.sh
 
+. "$TEST_DIRECTORY"/lib-rebase.sh
+
 test_expect_success 'setup' '
 	test_commit init
 '
@@ -18,6 +20,22 @@ test_expect_success '"add" an existing empty worktree' '
 	git worktree add --detach existing_empty master
 '
 
+test_expect_success '"add" using shorthand - fails when no previous branch' '
+	test_must_fail git worktree add existing_short -
+'
+
+test_expect_success '"add" using - shorthand' '
+	git checkout -b newbranch &&
+	echo hello >myworld &&
+	git add myworld &&
+	git commit -m myworld &&
+	git checkout master &&
+	git worktree add short-hand - &&
+	echo refs/heads/newbranch >expect &&
+	git -C short-hand rev-parse --symbolic-full-name HEAD >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success '"add" refuses to checkout locked branch' '
 	test_must_fail git worktree add zere master &&
 	! test -d zere &&
@@ -213,4 +231,73 @@ test_expect_success 'local clone from linked checkout' '
 	( cd here-clone && git fsck )
 '
 
+test_expect_success '"add" worktree with --no-checkout' '
+	git worktree add --no-checkout -b swamp swamp &&
+	! test -e swamp/init.t &&
+	git -C swamp reset --hard &&
+	test_cmp init.t swamp/init.t
+'
+
+test_expect_success '"add" worktree with --checkout' '
+	git worktree add --checkout -b swmap2 swamp2 &&
+	test_cmp init.t swamp2/init.t
+'
+
+test_expect_success 'put a worktree under rebase' '
+	git worktree add under-rebase &&
+	(
+		cd under-rebase &&
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+		git worktree list | grep "under-rebase.*detached HEAD"
+	)
+'
+
+test_expect_success 'add a worktree, checking out a rebased branch' '
+	test_must_fail git worktree add new-rebase under-rebase &&
+	! test -d new-rebase
+'
+
+test_expect_success 'checking out a rebased branch from another worktree' '
+	git worktree add new-place &&
+	test_must_fail git -C new-place checkout under-rebase
+'
+
+test_expect_success 'not allow to delete a branch under rebase' '
+	(
+		cd under-rebase &&
+		test_must_fail git branch -D under-rebase
+	)
+'
+
+test_expect_success 'rename a branch under rebase not allowed' '
+	test_must_fail git branch -M under-rebase rebase-with-new-name
+'
+
+test_expect_success 'check out from current worktree branch ok' '
+	(
+		cd under-rebase &&
+		git checkout under-rebase &&
+		git checkout - &&
+		git rebase --abort
+	)
+'
+
+test_expect_success 'checkout a branch under bisect' '
+	git worktree add under-bisect &&
+	(
+		cd under-bisect &&
+		git bisect start &&
+		git bisect bad &&
+		git bisect good HEAD~2 &&
+		git worktree list | grep "under-bisect.*detached HEAD" &&
+		test_must_fail git worktree add new-bisect under-bisect &&
+		! test -d new-bisect
+	)
+'
+
+test_expect_success 'rename a branch under bisect not allowed' '
+	test_must_fail git branch -M under-bisect bisect-with-new-name
+'
+
 test_done
diff --git a/t/t2028-worktree-move.sh b/t/t2028-worktree-move.sh
new file mode 100755
index 0000000000..8298aaf97f
--- /dev/null
+++ b/t/t2028-worktree-move.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+test_description='test git worktree move, remove, lock and unlock'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	test_commit init &&
+	git worktree add source &&
+	git worktree list --porcelain | grep "^worktree" >actual &&
+	cat <<-EOF >expected &&
+	worktree $(pwd)
+	worktree $(pwd)/source
+	EOF
+	test_cmp expected actual
+'
+
+test_expect_success 'lock main worktree' '
+	test_must_fail git worktree lock .
+'
+
+test_expect_success 'lock linked worktree' '
+	git worktree lock --reason hahaha source &&
+	echo hahaha >expected &&
+	test_cmp expected .git/worktrees/source/locked
+'
+
+test_expect_success 'lock linked worktree from another worktree' '
+	rm .git/worktrees/source/locked &&
+	git worktree add elsewhere &&
+	git -C elsewhere worktree lock --reason hahaha ../source &&
+	echo hahaha >expected &&
+	test_cmp expected .git/worktrees/source/locked
+'
+
+test_expect_success 'lock worktree twice' '
+	test_must_fail git worktree lock source &&
+	echo hahaha >expected &&
+	test_cmp expected .git/worktrees/source/locked
+'
+
+test_expect_success 'lock worktree twice (from the locked worktree)' '
+	test_must_fail git -C source worktree lock . &&
+	echo hahaha >expected &&
+	test_cmp expected .git/worktrees/source/locked
+'
+
+test_expect_success 'unlock main worktree' '
+	test_must_fail git worktree unlock .
+'
+
+test_expect_success 'unlock linked worktree' '
+	git worktree unlock source &&
+	test_path_is_missing .git/worktrees/source/locked
+'
+
+test_expect_success 'unlock worktree twice' '
+	test_must_fail git worktree unlock source &&
+	test_path_is_missing .git/worktrees/source/locked
+'
+
+test_done
diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
index 2a4a749b4f..8f22c43e24 100755
--- a/t/t2203-add-intent.sh
+++ b/t/t2203-add-intent.sh
@@ -82,5 +82,36 @@ test_expect_success 'cache-tree invalidates i-t-a paths' '
 	test_cmp expect actual
 '
 
+test_expect_success 'cache-tree does not ignore dir that has i-t-a entries' '
+	git init ita-in-dir &&
+	(
+		cd ita-in-dir &&
+		mkdir 2 &&
+		for f in 1 2/1 2/2 3
+		do
+			echo "$f" >"$f"
+		done &&
+		git add 1 2/2 3 &&
+		git add -N 2/1 &&
+		git commit -m committed &&
+		git ls-tree -r HEAD >actual &&
+		grep 2/2 actual
+	)
+'
+
+test_expect_success 'cache-tree does skip dir that becomes empty' '
+	rm -fr ita-in-dir &&
+	git init ita-in-dir &&
+	(
+		cd ita-in-dir &&
+		mkdir -p 1/2/3 &&
+		echo 4 >1/2/3/4 &&
+		git add -N 1/2/3/4 &&
+		git write-tree >actual &&
+		echo $EMPTY_TREE >expected &&
+		test_cmp expected actual
+	)
+'
+
 test_done
 
diff --git a/t/t2300-cd-to-toplevel.sh b/t/t2300-cd-to-toplevel.sh
index 9965bc5c92..c8de6d8a19 100755
--- a/t/t2300-cd-to-toplevel.sh
+++ b/t/t2300-cd-to-toplevel.sh
@@ -4,11 +4,20 @@ test_description='cd_to_toplevel'
 
 . ./test-lib.sh
 
+EXEC_PATH="$(git --exec-path)"
+test_have_prereq !MINGW ||
+case "$EXEC_PATH" in
+[A-Za-z]:/*)
+	EXEC_PATH="/${EXEC_PATH%%:*}${EXEC_PATH#?:}"
+	;;
+esac
+
 test_cd_to_toplevel () {
 	test_expect_success $3 "$2" '
 		(
 			cd '"'$1'"' &&
-			. "$(git --exec-path)"/git-sh-setup &&
+			PATH="$EXEC_PATH:$PATH" &&
+			. git-sh-setup &&
 			cd_to_toplevel &&
 			[ "$(pwd -P)" = "$TOPLEVEL" ]
 		)
diff --git a/t/t3033-merge-toplevel.sh b/t/t3033-merge-toplevel.sh
index 46aadc410b..d314599428 100755
--- a/t/t3033-merge-toplevel.sh
+++ b/t/t3033-merge-toplevel.sh
@@ -19,6 +19,8 @@ test_expect_success setup '
 	test_commit three &&
 	git checkout right &&
 	test_commit four &&
+	git checkout --orphan newroot &&
+	test_commit five &&
 	git checkout master
 '
 
@@ -133,4 +135,18 @@ test_expect_success 'merge FETCH_HEAD octopus non-fast-forward' '
 	test_cmp expect actual
 '
 
+# two-project merge
+test_expect_success 'refuse two-project merge by default' '
+	t3033_reset &&
+	git reset --hard four &&
+	test_must_fail git merge five
+'
+
+test_expect_success 'two-project merge with --allow-unrelated-histories' '
+	t3033_reset &&
+	git reset --hard four &&
+	git merge --allow-unrelated-histories five &&
+	git diff --exit-code five
+'
+
 test_done
diff --git a/t/t3101-ls-tree-dirname.sh b/t/t3101-ls-tree-dirname.sh
index 425d858938..327ded4000 100755
--- a/t/t3101-ls-tree-dirname.sh
+++ b/t/t3101-ls-tree-dirname.sh
@@ -16,7 +16,7 @@ This test runs git ls-tree with the following in a tree.
     path3/1.txt        - a file in a directory
     path3/2.txt        - a file in a directory
 
-Test the handling of mulitple directories which have matching file
+Test the handling of multiple directories which have matching file
 entries.  Also test odd filename and missing entries handling.
 '
 . ./test-lib.sh
diff --git a/t/t3102-ls-tree-wildcards.sh b/t/t3102-ls-tree-wildcards.sh
index 4d4b02e760..e804377f1c 100755
--- a/t/t3102-ls-tree-wildcards.sh
+++ b/t/t3102-ls-tree-wildcards.sh
@@ -12,16 +12,16 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'ls-tree a[a] matches literally' '
-	cat >expect <<-\EOF &&
-	100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391	a[a]/three
+	cat >expect <<-EOF &&
+	100644 blob $EMPTY_BLOB	a[a]/three
 	EOF
 	git ls-tree -r HEAD "a[a]" >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'ls-tree outside prefix' '
-	cat >expect <<-\EOF &&
-	100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391	../a[a]/three
+	cat >expect <<-EOF &&
+	100644 blob $EMPTY_BLOB	../a[a]/three
 	EOF
 	( cd aa && git ls-tree -r HEAD "../a[a]"; ) >actual &&
 	test_cmp expect actual
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index f3e3b6cf2e..8a833f354e 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -79,6 +79,15 @@ test_expect_success 'git branch -m dumps usage' '
 	test_i18ngrep "branch name required" err
 '
 
+test_expect_success 'git branch -m m broken_symref should work' '
+	test_when_finished "git branch -D broken_symref" &&
+	git branch -l m &&
+	git symbolic-ref refs/heads/broken_symref refs/heads/i_am_broken &&
+	git branch -m m broken_symref &&
+	git reflog exists refs/heads/broken_symref &&
+	test_must_fail git reflog exists refs/heads/i_am_broken
+'
+
 test_expect_success 'git branch -m m m/m should work' '
 	git branch -l m &&
 	git branch -m m m/m &&
@@ -550,7 +559,7 @@ If you wanted to make '"'master'"' track '"'origin/master'"', do this:
     git branch -d origin/master
     git branch --set-upstream-to origin/master
 EOF
-	test_cmp expected actual
+	test_i18ncmp expected actual
 '
 
 test_expect_success '--set-upstream with two args only shows the deprecation message' '
@@ -559,7 +568,7 @@ test_expect_success '--set-upstream with two args only shows the deprecation mes
 	cat >expected <<EOF &&
 The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
 EOF
-	test_cmp expected actual
+	test_i18ncmp expected actual
 '
 
 test_expect_success '--set-upstream with one arg only shows the deprecation message if the branch existed' '
@@ -568,7 +577,7 @@ test_expect_success '--set-upstream with one arg only shows the deprecation mess
 	cat >expected <<EOF &&
 The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
 EOF
-	test_cmp expected actual
+	test_i18ncmp expected actual
 '
 
 test_expect_success '--set-upstream-to notices an error to set branch as own upstream' '
diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh
index 912a6635a8..7f3ec47241 100755
--- a/t/t3201-branch-contains.sh
+++ b/t/t3201-branch-contains.sh
@@ -156,7 +156,7 @@ test_expect_success 'branch --merged with --verbose' '
 	* topic  2c939f4 [ahead 1] foo
 	  zzz    c77a0a9 second on master
 	EOF
-	test_cmp expect actual
+	test_i18ncmp expect actual
 '
 
 test_done
diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh
index d5572121da..6967436327 100755
--- a/t/t3310-notes-merge-manual-resolve.sh
+++ b/t/t3310-notes-merge-manual-resolve.sh
@@ -178,7 +178,7 @@ test_expect_success 'merge z into m (== y) with default ("manual") resolver => C
 	git config core.notesRef refs/notes/m &&
 	test_must_fail git notes merge z >output &&
 	# Output should point to where to resolve conflicts
-	grep -q "\\.git/NOTES_MERGE_WORKTREE" output &&
+	test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
 	# Inspect merge conflicts
 	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
 	test_cmp expect_conflicts output_conflicts &&
@@ -381,7 +381,7 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol
 	git config core.notesRef refs/notes/m &&
 	test_must_fail git notes merge z >output &&
 	# Output should point to where to resolve conflicts
-	grep -q "\\.git/NOTES_MERGE_WORKTREE" output &&
+	test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
 	# Inspect merge conflicts
 	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
 	test_cmp expect_conflicts output_conflicts &&
@@ -415,7 +415,7 @@ git rev-parse refs/notes/z > pre_merge_z
 test_expect_success 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' '
 	test_must_fail git notes merge z >output &&
 	# Output should point to where to resolve conflicts
-	grep -q "\\.git/NOTES_MERGE_WORKTREE" output &&
+	test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
 	# Inspect merge conflicts
 	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
 	test_cmp expect_conflicts output_conflicts &&
@@ -496,7 +496,7 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol
 	git update-ref refs/notes/m refs/notes/y &&
 	test_must_fail git notes merge z >output &&
 	# Output should point to where to resolve conflicts
-	grep -q "\\.git/NOTES_MERGE_WORKTREE" output &&
+	test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
 	# Inspect merge conflicts
 	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
 	test_cmp expect_conflicts output_conflicts &&
diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh
index 1f71d589f5..6e0511596b 100755
--- a/t/t3320-notes-merge-worktrees.sh
+++ b/t/t3320-notes-merge-worktrees.sh
@@ -52,7 +52,7 @@ test_expect_success 'merge z into y while mid-merge in another workdir fails' '
 		cd worktree &&
 		git config core.notesRef refs/notes/y &&
 		test_must_fail git notes merge z 2>err &&
-		grep "A notes merge into refs/notes/y is already in-progress at" err
+		test_i18ngrep "A notes merge into refs/notes/y is already in-progress at" err
 	) &&
 	test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF
 '
@@ -62,7 +62,7 @@ test_expect_success 'merge z into x while mid-merge on y succeeds' '
 		cd worktree2 &&
 		git config core.notesRef refs/notes/x &&
 		test_must_fail git notes merge z 2>&1 >out &&
-		grep "Automatic notes merge failed" out &&
+		test_i18ngrep "Automatic notes merge failed" out &&
 		grep -v "A notes merge into refs/notes/x is already in-progress in" out
 	) &&
 	echo "ref: refs/notes/x" >expect &&
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 47b5682662..f5fd15e559 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -136,8 +136,8 @@ test_expect_success 'setup: recover' '
 test_expect_success 'Show verbose error when HEAD could not be detached' '
 	>B &&
 	test_must_fail git rebase topic 2>output.err >output.out &&
-	grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
-	grep B output.err
+	test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err &&
+	test_i18ngrep B output.err
 '
 rm -f B
 
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index 8f64505e4f..488945e007 100755
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -85,6 +85,15 @@ test_expect_success 'rebase -Xtheirs' '
 	! grep 11 original
 '
 
+test_expect_success 'rebase -Xtheirs from orphan' '
+	git checkout --orphan orphan-conflicting master~2 &&
+	echo "AB $T" >> original &&
+	git commit -morphan-conflicting original &&
+	git rebase -Xtheirs master &&
+	grep AB original &&
+	! grep 11 original
+'
+
 test_expect_success 'merge and rebase should match' '
 	git diff-tree -r test-rebase test-merge >difference &&
 	if test -s difference
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index d6d65a3a94..197914bbd8 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -60,9 +60,9 @@ test_expect_success 'setup' '
 	test_commit P fileP
 '
 
-# "exec" commands are ran with the user shell by default, but this may
+# "exec" commands are run with the user shell by default, but this may
 # be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work
-# to create a file. Unseting SHELL avoids such non-portable behavior
+# to create a file. Unsetting SHELL avoids such non-portable behavior
 # in tests. It must be exported for it to take effect where needed.
 SHELL=
 export SHELL
@@ -219,9 +219,9 @@ test_expect_success 'abort with error when new base cannot be checked out' '
 	git commit -m "remove file in base" &&
 	set_fake_editor &&
 	test_must_fail git rebase -i master > output 2>&1 &&
-	grep "The following untracked working tree files would be overwritten by checkout:" \
+	test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" \
 		output &&
-	grep "file1" output &&
+	test_i18ngrep "file1" output &&
 	test_path_is_missing .git/rebase-merge &&
 	git reset --hard HEAD^
 '
@@ -540,7 +540,7 @@ test_expect_success 'clean error after failed "exec"' '
 	echo "edited again" > file7 &&
 	git add file7 &&
 	test_must_fail git rebase --continue 2>error &&
-	grep "You have staged changes in your working tree." error
+	test_i18ngrep "You have staged changes in your working tree." error
 '
 
 test_expect_success 'rebase a detached HEAD' '
@@ -770,7 +770,6 @@ test_expect_success 'rebase-i history with funny messages' '
 	test_cmp expect actual
 '
 
-
 test_expect_success 'prepare for rebase -i --exec' '
 	git checkout master &&
 	git checkout -b execute &&
@@ -779,7 +778,6 @@ test_expect_success 'prepare for rebase -i --exec' '
 	test_commit three_exec main.txt three_exec
 '
 
-
 test_expect_success 'running "git rebase -i --exec git show HEAD"' '
 	set_fake_editor &&
 	git rebase -i --exec "git show HEAD" HEAD~2 >actual &&
@@ -792,7 +790,6 @@ test_expect_success 'running "git rebase -i --exec git show HEAD"' '
 	test_cmp expected actual
 '
 
-
 test_expect_success 'running "git rebase --exec git show HEAD -i"' '
 	git reset --hard execute &&
 	set_fake_editor &&
@@ -806,7 +803,6 @@ test_expect_success 'running "git rebase --exec git show HEAD -i"' '
 	test_cmp expected actual
 '
 
-
 test_expect_success 'running "git rebase -ix git show HEAD"' '
 	git reset --hard execute &&
 	set_fake_editor &&
@@ -834,7 +830,6 @@ test_expect_success 'rebase -ix with several <CMD>' '
 	test_cmp expected actual
 '
 
-
 test_expect_success 'rebase -ix with several instances of --exec' '
 	git reset --hard execute &&
 	set_fake_editor &&
@@ -849,7 +844,6 @@ test_expect_success 'rebase -ix with several instances of --exec' '
 	test_cmp expected actual
 '
 
-
 test_expect_success 'rebase -ix with --autosquash' '
 	git reset --hard execute &&
 	git checkout -b autosquash &&
@@ -875,16 +869,15 @@ test_expect_success 'rebase -ix with --autosquash' '
 	test_cmp expected actual
 '
 
-
-test_expect_success 'rebase --exec without -i shows error message' '
+test_expect_success 'rebase --exec works without -i ' '
 	git reset --hard execute &&
-	set_fake_editor &&
-	test_must_fail git rebase --exec "git show HEAD" HEAD~2 2>actual &&
-	echo "The --exec option must be used with the --interactive option" >expected &&
-	test_i18ncmp expected actual
+	rm -rf exec_output &&
+	EDITOR="echo >invoked_editor" git rebase --exec "echo a line >>exec_output"  HEAD~2 2>actual &&
+	test_i18ngrep  "Successfully rebased and updated" actual &&
+	test_line_count = 2 exec_output &&
+	test_path_is_missing invoked_editor
 '
 
-
 test_expect_success 'rebase -i --exec without <CMD>' '
 	git reset --hard execute &&
 	set_fake_editor &&
@@ -1067,7 +1060,7 @@ test_expect_success 'todo count' '
 	EOF
 	test_set_editor "$(pwd)/dump-raw.sh" &&
 	git rebase -i HEAD~4 >actual &&
-	grep "^# Rebase ..* onto ..* ([0-9]" actual
+	test_i18ngrep "^# Rebase ..* onto ..* ([0-9]" actual
 '
 
 test_expect_success 'rebase -i commits that overwrite untracked files (pick)' '
@@ -1167,7 +1160,7 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = ignore' '
 	FAKE_LINES="1 2 3 4" \
 		git rebase -i --root 2>actual &&
 	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test_cmp expect actual
+	test_i18ncmp expect actual
 '
 
 cat >expect <<EOF
@@ -1188,7 +1181,7 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = warn' '
 	set_fake_editor &&
 	FAKE_LINES="1 2 3 4" \
 		git rebase -i --root 2>actual &&
-	test_cmp expect actual &&
+	test_i18ncmp expect actual &&
 	test D = $(git cat-file commit HEAD | sed -ne \$p)
 '
 
@@ -1212,7 +1205,7 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = error' '
 	set_fake_editor &&
 	test_must_fail env FAKE_LINES="1 2 4" \
 		git rebase -i --root 2>actual &&
-	test_cmp expect actual &&
+	test_i18ncmp expect actual &&
 	cp .git/rebase-merge/git-rebase-todo.backup \
 		.git/rebase-merge/git-rebase-todo &&
 	FAKE_LINES="1 2 drop 3 4 drop 5" \
@@ -1235,7 +1228,7 @@ test_expect_success 'static check of bad command' '
 	set_fake_editor &&
 	test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \
 		git rebase -i --root 2>actual &&
-	test_cmp expect actual &&
+	test_i18ncmp expect actual &&
 	FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo &&
 	git rebase --continue &&
 	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
@@ -1270,7 +1263,7 @@ test_expect_success 'static check of bad SHA-1' '
 	set_fake_editor &&
 	test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \
 		git rebase -i --root 2>actual &&
-	test_cmp expect actual &&
+	test_i18ncmp expect actual &&
 	FAKE_LINES="1 2 4 5 6" git rebase --edit-todo &&
 	git rebase --continue &&
 	test E = $(git cat-file commit HEAD | sed -ne \$p)
@@ -1288,4 +1281,12 @@ test_expect_success 'editor saves as CR/LF' '
 	)
 '
 
+SQ="'"
+test_expect_success 'rebase -i --gpg-sign=<key-id>' '
+	set_fake_editor &&
+	FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \
+		>out 2>err &&
+	grep "$SQ-S\"S I Gner\"$SQ" err
+'
+
 test_done
diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh
index 0b52105728..73a39f2923 100755
--- a/t/t3412-rebase-root.sh
+++ b/t/t3412-rebase-root.sh
@@ -133,7 +133,7 @@ test_expect_success 'set up second root and merge' '
 	rm A B C &&
 	test_commit 6 D &&
 	git checkout other &&
-	git merge third
+	git merge --allow-unrelated-histories third
 '
 
 cat > expect-third <<'EOF'
diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh
index 8f53e54ce4..48346f1cc0 100755
--- a/t/t3415-rebase-autosquash.sh
+++ b/t/t3415-rebase-autosquash.sh
@@ -271,4 +271,37 @@ test_expect_success 'autosquash with custom inst format' '
 	test 2 = $(git cat-file commit HEAD^ | grep squash | wc -l)
 '
 
+set_backup_editor () {
+	write_script backup-editor.sh <<-\EOF
+	cp "$1" .git/backup-"$(basename "$1")"
+	EOF
+	test_set_editor "$PWD/backup-editor.sh"
+}
+
+test_expect_failure 'autosquash with multiple empty patches' '
+	test_tick &&
+	git commit --allow-empty -m "empty" &&
+	test_tick &&
+	git commit --allow-empty -m "empty2" &&
+	test_tick &&
+	>fixup &&
+	git add fixup &&
+	git commit --fixup HEAD^^ &&
+	(
+		set_backup_editor &&
+		GIT_USE_REBASE_HELPER=false \
+		git rebase -i --force-rebase --autosquash HEAD~4 &&
+		grep empty2 .git/backup-git-rebase-todo
+	)
+'
+
+test_expect_success 'extra spaces after fixup!' '
+	base=$(git rev-parse HEAD) &&
+	test_commit to-fixup &&
+	git commit --allow-empty -m "fixup!  to-fixup" &&
+	git rebase -i --autosquash --keep-empty HEAD~2 &&
+	parent=$(git rev-parse HEAD^) &&
+	test $base = $parent
+'
+
 test_done
diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh
index 217dd79b2e..49f548cdb9 100755
--- a/t/t3419-rebase-patch-id.sh
+++ b/t/t3419-rebase-patch-id.sh
@@ -73,17 +73,17 @@ do_tests () {
 		run git format-patch --stdout --ignore-if-in-upstream master
 	"
 
-	test_expect_success $pr 'detect upstream patch' "
+	test_expect_success $pr 'detect upstream patch' '
 		git checkout -q master &&
 		scramble file &&
 		git add file &&
-		git commit -q -m 'change big file again' &&
+		git commit -q -m "change big file again" &&
 		git checkout -q other^{} &&
 		git rebase master &&
-		test_must_fail test -n \"\$(git rev-list master...HEAD~)\"
-	"
+		test_must_fail test -n "$(git rev-list master...HEAD~)"
+	'
 
-	test_expect_success $pr 'do not drop patch' "
+	test_expect_success $pr 'do not drop patch' '
 		git branch -f squashed master &&
 		git checkout -q -f squashed &&
 		git reset -q --soft HEAD~2 &&
@@ -91,7 +91,7 @@ do_tests () {
 		git checkout -q other^{} &&
 		test_must_fail git rebase squashed &&
 		rm -rf .git/rebase-apply
-	"
+	'
 }
 
 do_tests 500
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
index 944154b2e0..ab8a63e8d6 100755
--- a/t/t3420-rebase-autostash.sh
+++ b/t/t3420-rebase-autostash.sh
@@ -179,7 +179,7 @@ testrebase " --interactive" .git/rebase-merge
 
 test_expect_success 'abort rebase -i with --autostash' '
 	test_when_finished "git reset --hard" &&
-	echo uncommited-content >file0 &&
+	echo uncommitted-content >file0 &&
 	(
 		write_script abort-editor.sh <<-\EOF &&
 			echo >"$1"
@@ -188,7 +188,38 @@ test_expect_success 'abort rebase -i with --autostash' '
 		test_must_fail git rebase -i --autostash HEAD^ &&
 		rm -f abort-editor.sh
 	) &&
-	echo uncommited-content >expected &&
+	echo uncommitted-content >expected &&
+	test_cmp expected file0
+'
+
+test_expect_success 'restore autostash on editor failure' '
+	test_when_finished "git reset --hard" &&
+	echo uncommitted-content >file0 &&
+	(
+		test_set_editor "false" &&
+		test_must_fail git rebase -i --autostash HEAD^
+	) &&
+	echo uncommitted-content >expected &&
+	test_cmp expected file0
+'
+
+test_expect_success 'autostash is saved on editor failure with conflict' '
+	test_when_finished "git reset --hard" &&
+	echo uncommitted-content >file0 &&
+	(
+		write_script abort-editor.sh <<-\EOF &&
+			echo conflicting-content >file0
+			exit 1
+		EOF
+		test_set_editor "$(pwd)/abort-editor.sh" &&
+		test_must_fail git rebase -i --autostash HEAD^ &&
+		rm -f abort-editor.sh
+	) &&
+	echo conflicting-content >expected &&
+	test_cmp expected file0 &&
+	git checkout file0 &&
+	git stash pop &&
+	echo uncommitted-content >expected &&
 	test_cmp expected file0
 '
 
diff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh
index 9c55cba198..68fe2003ef 100755
--- a/t/t3421-rebase-topology-linear.sh
+++ b/t/t3421-rebase-topology-linear.sh
@@ -253,7 +253,7 @@ test_run_rebase () {
 	"
 }
 test_run_rebase success ''
-test_run_rebase failure -m
+test_run_rebase success -m
 test_run_rebase success -i
 test_run_rebase success -p
 
@@ -268,7 +268,7 @@ test_run_rebase () {
 	"
 }
 test_run_rebase success ''
-test_run_rebase failure -m
+test_run_rebase success -m
 test_run_rebase success -i
 test_run_rebase failure -p
 
diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
new file mode 100755
index 0000000000..3780877e4e
--- /dev/null
+++ b/t/t3427-rebase-subtree.sh
@@ -0,0 +1,119 @@
+#!/bin/sh
+
+test_description='git rebase tests for -Xsubtree
+
+This test runs git rebase and tests the subtree strategy.
+'
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-rebase.sh
+
+commit_message() {
+	git log --pretty=format:%s -1 "$1"
+}
+
+test_expect_success 'setup' '
+	test_commit README &&
+	mkdir files &&
+	(
+		cd files &&
+		git init &&
+		test_commit master1 &&
+		test_commit master2 &&
+		test_commit master3
+	) &&
+	git fetch files master &&
+	git branch files-master FETCH_HEAD &&
+	git read-tree --prefix=files_subtree files-master &&
+	git checkout -- files_subtree &&
+	tree=$(git write-tree) &&
+	head=$(git rev-parse HEAD) &&
+	rev=$(git rev-parse --verify files-master^0) &&
+	commit=$(git commit-tree -p $head -p $rev -m "Add subproject master" $tree) &&
+	git update-ref HEAD $commit &&
+	(
+		cd files_subtree &&
+		test_commit master4
+	) &&
+	test_commit files_subtree/master5
+'
+
+# FAILURE: Does not preserve master4.
+test_expect_failure 'Rebase -Xsubtree --preserve-merges --onto commit 4' '
+	reset_rebase &&
+	git checkout -b rebase-preserve-merges-4 master &&
+	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
+	git commit -m "Empty commit" --allow-empty &&
+	git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
+	verbose test "$(commit_message HEAD~)" = "files_subtree/master4"
+'
+
+# 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)" = "files_subtree/master5"
+'
+
+# FAILURE: Does not preserve master4.
+test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 4' '
+	reset_rebase &&
+	git checkout -b rebase-keep-empty-4 master &&
+	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
+	git commit -m "Empty commit" --allow-empty &&
+	git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
+	verbose test "$(commit_message HEAD~2)" = "files_subtree/master4"
+'
+
+# FAILURE: Does not preserve master5.
+test_expect_failure 'Rebase -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)" = "Empty commit"
+'
+
+# FAILURE: fatal: Could not parse object
+test_expect_failure 'Rebase -Xsubtree --onto commit 4' '
+	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"
+'
+
+# FAILURE: fatal: Could not parse object
+test_expect_failure 'Rebase -Xsubtree --onto commit 5' '
+	reset_rebase &&
+	git checkout -b rebase-onto-5 master &&
+	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
+	git commit -m "Empty commit" --allow-empty &&
+	git rebase -Xsubtree=files_subtree --onto files-master master &&
+	verbose test "$(commit_message HEAD~)" = "files_subtree/master5"
+'
+# FAILURE: fatal: Could not parse object
+test_expect_failure 'Rebase -Xsubtree --onto empty commit' '
+	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 &&
+	verbose test "$(commit_message HEAD)" = "Empty commit"
+'
+
+test_done
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index f14a665356..2978cb9d64 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -7,6 +7,20 @@ test_description='Test of git add, including the -- option.'
 
 . ./test-lib.sh
 
+# Test the file mode "$1" of the file "$2" in the index.
+test_mode_in_index () {
+	case "$(git ls-files -s "$2")" in
+	"$1 "*"	$2")
+		echo pass
+		;;
+	*)
+		echo fail
+		git ls-files -s "$2"
+		return 1
+		;;
+	esac
+}
+
 test_expect_success \
     'Test of git add' \
     'touch foo && git add foo'
@@ -25,18 +39,12 @@ test_expect_success \
 	 echo foo >xfoo1 &&
 	 chmod 755 xfoo1 &&
 	 git add xfoo1 &&
-	 case "$(git ls-files --stage xfoo1)" in
-	 100644" "*xfoo1) echo pass;;
-	 *) echo fail; git ls-files --stage xfoo1; (exit 1);;
-	 esac'
+	 test_mode_in_index 100644 xfoo1'
 
 test_expect_success 'git add: filemode=0 should not get confused by symlink' '
 	rm -f xfoo1 &&
 	test_ln_s_add foo xfoo1 &&
-	case "$(git ls-files --stage xfoo1)" in
-	120000" "*xfoo1) echo pass;;
-	*) echo fail; git ls-files --stage xfoo1; (exit 1);;
-	esac
+	test_mode_in_index 120000 xfoo1
 '
 
 test_expect_success \
@@ -45,28 +53,19 @@ test_expect_success \
 	 echo foo >xfoo2 &&
 	 chmod 755 xfoo2 &&
 	 git update-index --add xfoo2 &&
-	 case "$(git ls-files --stage xfoo2)" in
-	 100644" "*xfoo2) echo pass;;
-	 *) echo fail; git ls-files --stage xfoo2; (exit 1);;
-	 esac'
+	 test_mode_in_index 100644 xfoo2'
 
 test_expect_success 'git add: filemode=0 should not get confused by symlink' '
 	rm -f xfoo2 &&
 	test_ln_s_add foo xfoo2 &&
-	case "$(git ls-files --stage xfoo2)" in
-	120000" "*xfoo2) echo pass;;
-	*) echo fail; git ls-files --stage xfoo2; (exit 1);;
-	esac
+	test_mode_in_index 120000 xfoo2
 '
 
 test_expect_success \
 	'git update-index --add: Test that executable bit is not used...' \
 	'git config core.filemode 0 &&
 	 test_ln_s_add xfoo2 xfoo3 &&	# runs git update-index --add
-	 case "$(git ls-files --stage xfoo3)" in
-	 120000" "*xfoo3) echo pass;;
-	 *) echo fail; git ls-files --stage xfoo3; (exit 1);;
-	 esac'
+	 test_mode_in_index 120000 xfoo3'
 
 test_expect_success '.gitignore test setup' '
 	echo "*.ig" >.gitignore &&
@@ -332,4 +331,22 @@ test_expect_success 'git add --dry-run --ignore-missing of non-existing file out
 	test_i18ncmp expect.err actual.err
 '
 
+test_expect_success 'git add --chmod=[+-]x stages correctly' '
+	rm -f foo1 &&
+	echo foo >foo1 &&
+	git add --chmod=+x foo1 &&
+	test_mode_in_index 100755 foo1 &&
+	git add --chmod=-x foo1 &&
+	test_mode_in_index 100644 foo1
+'
+
+test_expect_success POSIXPERM,SYMLINKS 'git add --chmod=+x with symlinks' '
+	git config core.filemode 1 &&
+	git config core.symlinks 1 &&
+	rm -f foo2 &&
+	echo foo >foo2 &&
+	git add --chmod=+x foo2 &&
+	test_mode_in_index 100755 foo2
+'
+
 test_done
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index ed90c6c6f9..0d1fa45d25 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -9,21 +9,84 @@ test_description='Test rename detection in diff engine.
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/diff-lib.sh
 
-echo >path0 'Line 1
-Line 2
-Line 3
-Line 4
-Line 5
-Line 6
-Line 7
-Line 8
-Line 9
-Line 10
-line 11
-Line 12
-Line 13
-Line 14
-Line 15
+test_expect_success 'setup' '
+	cat >path0 <<-\EOF &&
+	Line 1
+	Line 2
+	Line 3
+	Line 4
+	Line 5
+	Line 6
+	Line 7
+	Line 8
+	Line 9
+	Line 10
+	line 11
+	Line 12
+	Line 13
+	Line 14
+	Line 15
+	EOF
+	cat >expected <<-\EOF &&
+	diff --git a/path0 b/path1
+	rename from path0
+	rename to path1
+	--- a/path0
+	+++ b/path1
+	@@ -8,7 +8,7 @@ Line 7
+	 Line 8
+	 Line 9
+	 Line 10
+	-line 11
+	+Line 11
+	 Line 12
+	 Line 13
+	 Line 14
+	EOF
+	cat >no-rename <<-\EOF
+	diff --git a/path0 b/path0
+	deleted file mode 100644
+	index fdbec44..0000000
+	--- a/path0
+	+++ /dev/null
+	@@ -1,15 +0,0 @@
+	-Line 1
+	-Line 2
+	-Line 3
+	-Line 4
+	-Line 5
+	-Line 6
+	-Line 7
+	-Line 8
+	-Line 9
+	-Line 10
+	-line 11
+	-Line 12
+	-Line 13
+	-Line 14
+	-Line 15
+	diff --git a/path1 b/path1
+	new file mode 100644
+	index 0000000..752c50e
+	--- /dev/null
+	+++ b/path1
+	@@ -0,0 +1,15 @@
+	+Line 1
+	+Line 2
+	+Line 3
+	+Line 4
+	+Line 5
+	+Line 6
+	+Line 7
+	+Line 8
+	+Line 9
+	+Line 10
+	+Line 11
+	+Line 12
+	+Line 13
+	+Line 14
+	+Line 15
+	EOF
 '
 
 test_expect_success \
@@ -43,27 +106,27 @@ test_expect_success \
 test_expect_success \
     'git diff-index -p -M after rename and editing.' \
     'git diff-index -p -M $tree >current'
-cat >expected <<\EOF
-diff --git a/path0 b/path1
-rename from path0
-rename to path1
---- a/path0
-+++ b/path1
-@@ -8,7 +8,7 @@ Line 7
- Line 8
- Line 9
- Line 10
--line 11
-+Line 11
- Line 12
- Line 13
- Line 14
-EOF
+
 
 test_expect_success \
     'validate the output.' \
     'compare_diff_patch current expected'
 
+test_expect_success 'test diff.renames=true' '
+	git -c diff.renames=true diff --cached $tree >current &&
+	compare_diff_patch current expected
+'
+
+test_expect_success 'test diff.renames=false' '
+	git -c diff.renames=false diff --cached $tree >current &&
+	compare_diff_patch current no-rename
+'
+
+test_expect_success 'test diff.renames unset' '
+	git diff --cached $tree >current &&
+	compare_diff_patch current expected
+'
+
 test_expect_success 'favour same basenames over different ones' '
 	cp path1 another-path &&
 	git add another-path &&
diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh
index 43c488b545..35b35a81c8 100755
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
@@ -78,8 +78,6 @@ test_expect_success 'diff-tree pathspec' '
 	test_cmp expected current
 '
 
-EMPTY_TREE=4b825dc642cb6eb9a060e54bf8d69288fbee4904
-
 test_expect_success 'diff-tree with wildcard shows dir also matches' '
 	git diff-tree --name-only $EMPTY_TREE $tree -- "f*" >result &&
 	echo file0 >expected &&
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 6ec6072118..94ef5000e7 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -90,6 +90,8 @@ test_expect_success setup '
 	git commit -m "Rearranged lines in dir/sub" &&
 	git checkout master &&
 
+	git config diff.renames false &&
+
 	git show-branch
 '
 
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 3b99434e3e..b0579dd452 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -229,6 +229,46 @@ check_patch () {
 	grep -e "^Subject:" "$1"
 }
 
+test_expect_success 'format.from=false' '
+
+	git -c format.from=false format-patch --stdout master..side |
+	sed -e "/^\$/q" >patch &&
+	check_patch patch &&
+	! grep "^From: C O Mitter <committer@example.com>\$" patch
+'
+
+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
+'
+
+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
+'
+
+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
+'
+
+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
+'
+
 test_expect_success '--no-to overrides config.to' '
 
 	git config --replace-all format.to \
@@ -549,7 +589,7 @@ test_expect_success 'cover-letter inherits diff options' '
 
 	git mv file foo &&
 	git commit -m foo &&
-	git format-patch --cover-letter -1 &&
+	git format-patch --no-renames --cover-letter -1 &&
 	check_patch 0000-cover-letter.patch &&
 	! grep "file => foo .* 0 *\$" 0000-cover-letter.patch &&
 	git format-patch --cover-letter -1 -M &&
@@ -703,7 +743,7 @@ test_expect_success 'options no longer allowed for format-patch' '
 
 test_expect_success 'format-patch --numstat should produce a patch' '
 	git format-patch --numstat --stdout master..side > output &&
-	test 6 = $(grep "^diff --git a/" output | wc -l)'
+	test 5 = $(grep "^diff --git a/" output | wc -l)'
 
 test_expect_success 'format-patch -- <path>' '
 	git format-patch master..side -- file 2>error &&
@@ -1072,7 +1112,7 @@ test_expect_success '--from omits redundant in-body header' '
 '
 
 test_expect_success 'in-body headers trigger content encoding' '
-	GIT_AUTHOR_NAME="éxötìc" test_commit exotic &&
+	test_env GIT_AUTHOR_NAME="éxötìc" test_commit exotic &&
 	test_when_finished "git reset --hard HEAD^" &&
 	git format-patch -1 --stdout --from >patch &&
 	cat >expect <<-\EOF &&
@@ -1460,4 +1500,150 @@ test_expect_success 'format-patch -o overrides format.outputDirectory' '
 	test_path_is_dir patchset
 '
 
+test_expect_success 'format-patch --base' '
+	git checkout side &&
+	git format-patch --stdout --base=HEAD~3 -1 >patch &&
+	grep "^base-commit:" patch >actual &&
+	grep "^prerequisite-patch-id:" patch >>actual &&
+	echo "base-commit: $(git rev-parse HEAD~3)" >expected &&
+	echo "prerequisite-patch-id: $(git show --patch HEAD~2 | git patch-id --stable | awk "{print \$1}")" >>expected &&
+	echo "prerequisite-patch-id: $(git show --patch HEAD~1 | git patch-id --stable | awk "{print \$1}")" >>expected &&
+	test_cmp expected actual
+'
+
+test_expect_success 'format-patch --base errors out when base commit is in revision list' '
+	test_must_fail git format-patch --base=HEAD -2 &&
+	test_must_fail git format-patch --base=HEAD~1 -2 &&
+	git format-patch --stdout --base=HEAD~2 -2 >patch &&
+	grep "^base-commit:" patch >actual &&
+	echo "base-commit: $(git rev-parse HEAD~2)" >expected &&
+	test_cmp expected actual
+'
+
+test_expect_success 'format-patch --base errors out when base commit is not ancestor of revision list' '
+	# For history as below:
+	#
+	#    ---Q---P---Z---Y---*---X
+	#	 \             /
+	#	  ------------W
+	#
+	# If "format-patch Z..X" is given, P and Z can not be specified as the base commit
+	git checkout -b topic1 master &&
+	git rev-parse HEAD >commit-id-base &&
+	test_commit P &&
+	git rev-parse HEAD >commit-id-P &&
+	test_commit Z &&
+	git rev-parse HEAD >commit-id-Z &&
+	test_commit Y &&
+	git checkout -b topic2 master &&
+	test_commit W &&
+	git merge topic1 &&
+	test_commit X &&
+	test_must_fail git format-patch --base=$(cat commit-id-P) -3 &&
+	test_must_fail git format-patch --base=$(cat commit-id-Z) -3 &&
+	git format-patch --stdout --base=$(cat commit-id-base) -3 >patch &&
+	grep "^base-commit:" patch >actual &&
+	echo "base-commit: $(cat commit-id-base)" >expected &&
+	test_cmp expected actual
+'
+
+test_expect_success 'format-patch --base=auto' '
+	git checkout -b upstream master &&
+	git checkout -b local upstream &&
+	git branch --set-upstream-to=upstream &&
+	test_commit N1 &&
+	test_commit N2 &&
+	git format-patch --stdout --base=auto -2 >patch &&
+	grep "^base-commit:" patch >actual &&
+	echo "base-commit: $(git rev-parse upstream)" >expected &&
+	test_cmp expected actual
+'
+
+test_expect_success 'format-patch errors out when history involves criss-cross' '
+	# setup criss-cross history
+	#
+	#   B---M1---D
+	#  / \ /
+	# A   X
+	#  \ / \
+	#   C---M2---E
+	#
+	git checkout master &&
+	test_commit A &&
+	git checkout -b xb master &&
+	test_commit B &&
+	git checkout -b xc master &&
+	test_commit C &&
+	git checkout -b xbc xb -- &&
+	git merge xc &&
+	git checkout -b xcb xc -- &&
+	git branch --set-upstream-to=xbc &&
+	git merge xb &&
+	git checkout xbc &&
+	test_commit D &&
+	git checkout xcb &&
+	test_commit E &&
+	test_must_fail 	git format-patch --base=auto -1
+'
+
+test_expect_success 'format-patch format.useAutoBaseoption' '
+	test_when_finished "git config --unset format.useAutoBase" &&
+	git checkout local &&
+	git config format.useAutoBase true &&
+	git format-patch --stdout -1 >patch &&
+	grep "^base-commit:" patch >actual &&
+	echo "base-commit: $(git rev-parse upstream)" >expected &&
+	test_cmp expected actual
+'
+
+test_expect_success 'format-patch --base overrides format.useAutoBase' '
+	test_when_finished "git config --unset format.useAutoBase" &&
+	git config format.useAutoBase true &&
+	git format-patch --stdout --base=HEAD~1 -1 >patch &&
+	grep "^base-commit:" patch >actual &&
+	echo "base-commit: $(git rev-parse HEAD~1)" >expected &&
+	test_cmp expected actual
+'
+
+test_expect_success 'format-patch --pretty=mboxrd' '
+	sp=" " &&
+	cat >msg <<-INPUT_END &&
+	mboxrd should escape the body
+
+	From could trip up a loose mbox parser
+	>From extra escape for reversibility
+	>>From extra escape for reversibility 2
+	from lower case not escaped
+	Fromm bad speling not escaped
+	 From with leading space not escaped
+
+	F
+	From
+	From$sp
+	From    $sp
+	From	$sp
+	INPUT_END
+
+	cat >expect <<-INPUT_END &&
+	>From could trip up a loose mbox parser
+	>>From extra escape for reversibility
+	>>>From extra escape for reversibility 2
+	from lower case not escaped
+	Fromm bad speling not escaped
+	 From with leading space not escaped
+
+	F
+	From
+	From
+	From
+	From
+	INPUT_END
+
+	C=$(git commit-tree HEAD^^{tree} -p HEAD <msg) &&
+	git format-patch --pretty=mboxrd --stdout -1 $C~1..$C >patch &&
+	git grep -h --no-index -A11 \
+		"^>From could trip up a loose mbox parser" patch >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 67373dc44e..1795ffc3aa 100755
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -30,6 +30,7 @@ diffpatterns="
 	bibtex
 	cpp
 	csharp
+	css
 	fortran
 	fountain
 	html
diff --git a/t/t4018/css-brace-in-col-1 b/t/t4018/css-brace-in-col-1
new file mode 100644
index 0000000000..7831577506
--- /dev/null
+++ b/t/t4018/css-brace-in-col-1
@@ -0,0 +1,5 @@
+RIGHT label.control-label
+{
+    margin-top: 10px!important;
+    border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-colon-eol b/t/t4018/css-colon-eol
new file mode 100644
index 0000000000..5a30553d29
--- /dev/null
+++ b/t/t4018/css-colon-eol
@@ -0,0 +1,4 @@
+RIGHT h1 {
+color:
+ChangeMe;
+}
diff --git a/t/t4018/css-colon-selector b/t/t4018/css-colon-selector
new file mode 100644
index 0000000000..c6d71fb42d
--- /dev/null
+++ b/t/t4018/css-colon-selector
@@ -0,0 +1,5 @@
+RIGHT a:hover {
+    margin-top:
+    10px!important;
+    border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-common b/t/t4018/css-common
new file mode 100644
index 0000000000..84ed754b33
--- /dev/null
+++ b/t/t4018/css-common
@@ -0,0 +1,4 @@
+RIGHT label.control-label {
+    margin-top: 10px!important;
+    border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-long-selector-list b/t/t4018/css-long-selector-list
new file mode 100644
index 0000000000..7ccd25d9ed
--- /dev/null
+++ b/t/t4018/css-long-selector-list
@@ -0,0 +1,6 @@
+p.header,
+label.control-label,
+div ul#RIGHT {
+    margin-top: 10px!important;
+    border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-prop-sans-indent b/t/t4018/css-prop-sans-indent
new file mode 100644
index 0000000000..a9e3c86b3c
--- /dev/null
+++ b/t/t4018/css-prop-sans-indent
@@ -0,0 +1,5 @@
+RIGHT, label.control-label {
+margin-top: 10px!important;
+padding: 0;
+border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-short-selector-list b/t/t4018/css-short-selector-list
new file mode 100644
index 0000000000..6a0bdee336
--- /dev/null
+++ b/t/t4018/css-short-selector-list
@@ -0,0 +1,4 @@
+label.control, div ul#RIGHT {
+    margin-top: 10px!important;
+    border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-trailing-space b/t/t4018/css-trailing-space
new file mode 100644
index 0000000000..32b5606c70
--- /dev/null
+++ b/t/t4018/css-trailing-space
@@ -0,0 +1,5 @@
+RIGHT label.control-label {
+    margin:10px;   
+    padding:10px;
+    border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4026-color.sh b/t/t4026-color.sh
index 2b32c4fbe6..ec78c5e3ac 100755
--- a/t/t4026-color.sh
+++ b/t/t4026-color.sh
@@ -50,14 +50,19 @@ test_expect_success 'attr negation' '
 	color "nobold nodim noul noblink noreverse" "[22;24;25;27m"
 '
 
+test_expect_success '"no-" variant of negation' '
+	color "no-bold no-blink" "[22;25m"
+'
+
 test_expect_success 'long color specification' '
 	color "254 255 bold dim ul blink reverse" "[1;2;4;5;7;38;5;254;48;5;255m"
 '
 
 test_expect_success 'absurdly long color specification' '
 	color \
-	  "#ffffff #ffffff bold nobold dim nodim ul noul blink noblink reverse noreverse" \
-	  "[1;2;4;5;7;22;24;25;27;38;2;255;255;255;48;2;255;255;255m"
+	  "#ffffff #ffffff bold nobold dim nodim italic noitalic
+	   ul noul blink noblink reverse noreverse strike nostrike" \
+	  "[1;2;3;4;5;7;9;22;23;24;25;27;29;38;2;255;255;255;48;2;255;255;255m"
 '
 
 test_expect_success '0-7 are aliases for basic ANSI color names' '
diff --git a/t/t4033-diff-patience.sh b/t/t4033-diff-patience.sh
index 3c9932edf3..113304dc59 100755
--- a/t/t4033-diff-patience.sh
+++ b/t/t4033-diff-patience.sh
@@ -5,6 +5,14 @@ test_description='patience diff algorithm'
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff-alternative.sh
 
+test_expect_success '--ignore-space-at-eol with a single appended character' '
+	printf "a\nb\nc\n" >pre &&
+	printf "a\nbX\nc\n" >post &&
+	test_must_fail git diff --no-index \
+		--patience --ignore-space-at-eol pre post >diff &&
+	grep "^+.*X" diff
+'
+
 test_diff_frobnitz "patience"
 
 test_diff_unique "patience"
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index f2f55fc51c..912df91226 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -302,6 +302,7 @@ test_language_driver ada
 test_language_driver bibtex
 test_language_driver cpp
 test_language_driver csharp
+test_language_driver css
 test_language_driver fortran
 test_language_driver html
 test_language_driver java
diff --git a/t/t4034/css/expect b/t/t4034/css/expect
new file mode 100644
index 0000000000..ed10393bda
--- /dev/null
+++ b/t/t4034/css/expect
@@ -0,0 +1,16 @@
+<BOLD>diff --git a/pre b/post<RESET>
+<BOLD>index b8ae0bb..fe500b7 100644<RESET>
+<BOLD>--- a/pre<RESET>
+<BOLD>+++ b/post<RESET>
+<CYAN>@@ -1,10 +1,10 @@<RESET>
+.<RED>class-form<RESET><GREEN>other-form<RESET> label.control-label {
+    margin-top: <RED>10<RESET><GREEN>15<RESET>px!important;
+    border : 10px <RED>dashed<RESET><GREEN>dotted<RESET> #C6C6C6;
+}<RESET>
+<RED>#CCCCCC<RESET><GREEN>#CCCCCB<RESET>
+10em<RESET>
+<RED>padding-bottom<RESET><GREEN>margin-left<RESET>
+150<RED>px<RESET><GREEN>em<RESET>
+10px
+<RED>!important<RESET>
+<RED>div<RESET><GREEN>li<RESET>.class#id
diff --git a/t/t4034/css/post b/t/t4034/css/post
new file mode 100644
index 0000000000..fe500b7a4f
--- /dev/null
+++ b/t/t4034/css/post
@@ -0,0 +1,10 @@
+.other-form label.control-label {
+    margin-top: 15px!important;
+    border : 10px dotted #C6C6C6;
+}
+#CCCCCB
+10em
+margin-left
+150em
+10px
+li.class#id
diff --git a/t/t4034/css/pre b/t/t4034/css/pre
new file mode 100644
index 0000000000..b8ae0bb48f
--- /dev/null
+++ b/t/t4034/css/pre
@@ -0,0 +1,10 @@
+.class-form label.control-label {
+    margin-top: 10px!important;
+    border : 10px dashed #C6C6C6;
+}
+#CCCCCC
+10em
+padding-bottom
+150px
+10px!important
+div.class#id
diff --git a/t/t4047-diff-dirstat.sh b/t/t4047-diff-dirstat.sh
index 3b8b7921d6..447a8ffa3a 100755
--- a/t/t4047-diff-dirstat.sh
+++ b/t/t4047-diff-dirstat.sh
@@ -248,7 +248,8 @@ EOF
 	git rm -r src/move/unchanged &&
 	git rm -r src/move/changed &&
 	git rm -r src/move/rearranged &&
-	git commit -m "changes"
+	git commit -m "changes" &&
+	git config diff.renames false
 '
 
 cat <<EOF >expect_diff_stat
diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh
index 001d678e09..b79b87790b 100755
--- a/t/t4051-diff-function-context.sh
+++ b/t/t4051-diff-function-context.sh
@@ -3,90 +3,180 @@
 test_description='diff function context'
 
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
 
+dir="$TEST_DIRECTORY/t4051"
 
-cat <<\EOF >hello.c
-#include <stdio.h>
-
-static int a(void)
-{
-	/*
-	 * Dummy.
-	 */
+commit_and_tag () {
+	tag=$1 &&
+	shift &&
+	git add "$@" &&
+	test_tick &&
+	git commit -m "$tag" &&
+	git tag "$tag"
 }
 
-static int hello_world(void)
-{
-	/* Classic. */
-	printf("Hello world.\n");
-
-	/* Success! */
-	return 0;
+first_context_line () {
+	awk '
+		found {print; exit}
+		/^@@/ {found = 1}
+	'
 }
-static int b(void)
-{
-	/*
-	 * Dummy, too.
-	 */
+
+last_context_line () {
+	sed -ne \$p
 }
 
-int main(int argc, char **argv)
-{
-	a();
-	b();
-	return hello_world();
+check_diff () {
+	name=$1
+	desc=$2
+	options="-W $3"
+
+	test_expect_success "$desc" '
+		git diff $options "$name^" "$name" >"$name.diff"
+	'
+
+	test_expect_success ' diff applies' '
+		test_when_finished "git reset --hard" &&
+		git checkout --detach "$name^" &&
+		git apply --index "$name.diff" &&
+		git diff --exit-code "$name"
+	'
 }
-EOF
 
 test_expect_success 'setup' '
-	git add hello.c &&
-	test_tick &&
-	git commit -m initial &&
-
-	grep -v Classic <hello.c >hello.c.new &&
-	mv hello.c.new hello.c
-'
-
-cat <<\EOF >expected
-diff --git a/hello.c b/hello.c
---- a/hello.c
-+++ b/hello.c
-@@ -10,8 +10,7 @@ static int a(void)
- static int hello_world(void)
- {
--	/* Classic. */
- 	printf("Hello world.\n");
- 
- 	/* Success! */
- 	return 0;
- }
-EOF
-
-test_expect_success 'diff -U0 -W' '
-	git diff -U0 -W >actual &&
-	compare_diff_patch actual expected
-'
-
-cat <<\EOF >expected
-diff --git a/hello.c b/hello.c
---- a/hello.c
-+++ b/hello.c
-@@ -9,9 +9,8 @@ static int a(void)
- 
- static int hello_world(void)
- {
--	/* Classic. */
- 	printf("Hello world.\n");
- 
- 	/* Success! */
- 	return 0;
- }
-EOF
-
-test_expect_success 'diff -W' '
-	git diff -W >actual &&
-	compare_diff_patch actual expected
+	cat "$dir/includes.c" "$dir/dummy.c" "$dir/dummy.c" "$dir/hello.c" \
+		"$dir/dummy.c" "$dir/dummy.c" >file.c &&
+	commit_and_tag initial file.c &&
+
+	grep -v "delete me from hello" <file.c >file.c.new &&
+	mv file.c.new file.c &&
+	commit_and_tag changed_hello file.c &&
+
+	grep -v "delete me from includes" <file.c >file.c.new &&
+	mv file.c.new file.c &&
+	commit_and_tag changed_includes file.c &&
+
+	cat "$dir/appended1.c" >>file.c &&
+	commit_and_tag appended file.c &&
+
+	cat "$dir/appended2.c" >>file.c &&
+	commit_and_tag extended file.c &&
+
+	grep -v "Begin of second part" <file.c >file.c.new &&
+	mv file.c.new file.c &&
+	commit_and_tag long_common_tail file.c &&
+
+	git checkout initial &&
+	grep -v "delete me from hello" <file.c >file.c.new &&
+	mv file.c.new file.c &&
+	cat "$dir/appended1.c" >>file.c &&
+	commit_and_tag changed_hello_appended file.c
+'
+
+check_diff changed_hello 'changed function'
+
+test_expect_success ' context includes begin' '
+	grep "^ .*Begin of hello" changed_hello.diff
+'
+
+test_expect_success ' context includes end' '
+	grep "^ .*End of hello" changed_hello.diff
+'
+
+test_expect_success ' context does not include other functions' '
+	test $(grep -c "^[ +-].*Begin" changed_hello.diff) -le 1
+'
+
+test_expect_success ' context does not include preceding empty lines' '
+	test "$(first_context_line <changed_hello.diff)" != " "
+'
+
+test_expect_success ' context does not include trailing empty lines' '
+	test "$(last_context_line <changed_hello.diff)" != " "
+'
+
+check_diff changed_includes 'changed includes'
+
+test_expect_success ' context includes begin' '
+	grep "^ .*Begin.h" changed_includes.diff
+'
+
+test_expect_success ' context includes end' '
+	grep "^ .*End.h" changed_includes.diff
+'
+
+test_expect_success ' context does not include other functions' '
+	test $(grep -c "^[ +-].*Begin" changed_includes.diff) -le 1
+'
+
+test_expect_success ' context does not include trailing empty lines' '
+	test "$(last_context_line <changed_includes.diff)" != " "
+'
+
+check_diff appended 'appended function'
+
+test_expect_success ' context includes begin' '
+	grep "^[+].*Begin of first part" appended.diff
+'
+
+test_expect_success ' context includes end' '
+	grep "^[+].*End of first part" appended.diff
+'
+
+test_expect_success ' context does not include other functions' '
+	test $(grep -c "^[ +-].*Begin" appended.diff) -le 1
+'
+
+check_diff extended 'appended function part'
+
+test_expect_success ' context includes begin' '
+	grep "^ .*Begin of first part" extended.diff
+'
+
+test_expect_success ' context includes end' '
+	grep "^[+].*End of second part" extended.diff
+'
+
+test_expect_success ' context does not include other functions' '
+	test $(grep -c "^[ +-].*Begin" extended.diff) -le 2
+'
+
+test_expect_success ' context does not include preceding empty lines' '
+	test "$(first_context_line <extended.diff)" != " "
+'
+
+check_diff long_common_tail 'change with long common tail and no context' -U0
+
+test_expect_success ' context includes begin' '
+	grep "^ .*Begin of first part" long_common_tail.diff
+'
+
+test_expect_success ' context includes end' '
+	grep "^ .*End of second part" long_common_tail.diff
+'
+
+test_expect_success ' context does not include other functions' '
+	test $(grep -c "^[ +-].*Begin" long_common_tail.diff) -le 2
+'
+
+test_expect_success ' context does not include preceding empty lines' '
+	test "$(first_context_line <long_common_tail.diff.diff)" != " "
+'
+
+check_diff changed_hello_appended 'changed function plus appended function'
+
+test_expect_success ' context includes begin' '
+	grep "^ .*Begin of hello" changed_hello_appended.diff &&
+	grep "^[+].*Begin of first part" changed_hello_appended.diff
+'
+
+test_expect_success ' context includes end' '
+	grep "^ .*End of hello" changed_hello_appended.diff &&
+	grep "^[+].*End of first part" changed_hello_appended.diff
+'
+
+test_expect_success ' context does not include other functions' '
+	test $(grep -c "^[ +-].*Begin" changed_hello_appended.diff) -le 2
 '
 
 test_done
diff --git a/t/t4051/appended1.c b/t/t4051/appended1.c
new file mode 100644
index 0000000000..a9f56f11db
--- /dev/null
+++ b/t/t4051/appended1.c
@@ -0,0 +1,15 @@
+
+int appended(void) // Begin of first part
+{
+	int i;
+	char *s = "a string";
+
+	printf("%s\n", s);
+
+	for (i = 99;
+	     i >= 0;
+	     i--) {
+		printf("%d bottles of beer on the wall\n", i);
+	}
+
+	printf("End of first part\n");
diff --git a/t/t4051/appended2.c b/t/t4051/appended2.c
new file mode 100644
index 0000000000..e651f7147b
--- /dev/null
+++ b/t/t4051/appended2.c
@@ -0,0 +1,35 @@
+	printf("Begin of second part\n");
+
+	/*
+	 * Lorem ipsum dolor sit amet, consectetuer sadipscing elitr,
+	 * sed diam nonumy eirmod tempor invidunt ut labore et dolore
+	 * magna aliquyam erat, sed diam voluptua. At vero eos et
+	 * accusam et justo duo dolores et ea rebum. Stet clita kasd
+	 * gubergren, no sea takimata sanctus est Lorem ipsum dolor
+	 * sit amet.
+	 *
+	 * Lorem ipsum dolor sit amet, consectetuer sadipscing elitr,
+	 * sed diam nonumy eirmod tempor invidunt ut labore et dolore
+	 * magna aliquyam erat, sed diam voluptua. At vero eos et
+	 * accusam et justo duo dolores et ea rebum. Stet clita kasd
+	 * gubergren, no sea takimata sanctus est Lorem ipsum dolor
+	 * sit amet.
+	 *
+	 * Lorem ipsum dolor sit amet, consectetuer sadipscing elitr,
+	 * sed diam nonumy eirmod tempor invidunt ut labore et dolore
+	 * magna aliquyam erat, sed diam voluptua. At vero eos et
+	 * accusam et justo duo dolores et ea rebum. Stet clita kasd
+	 * gubergren, no sea takimata sanctus est Lorem ipsum dolor
+	 * sit amet.
+	 *
+	 * Lorem ipsum dolor sit amet, consectetuer sadipscing elitr,
+	 * sed diam nonumy eirmod tempor invidunt ut labore et dolore
+	 * magna aliquyam erat, sed diam voluptua. At vero eos et
+	 * accusam et justo duo dolores et ea rebum. Stet clita kasd
+	 * gubergren, no sea takimata sanctus est Lorem ipsum dolor
+	 * sit amet.
+	 *
+	 */
+
+	return 0;
+}	// End of second part
diff --git a/t/t4051/dummy.c b/t/t4051/dummy.c
new file mode 100644
index 0000000000..a43016e870
--- /dev/null
+++ b/t/t4051/dummy.c
@@ -0,0 +1,7 @@
+
+static int dummy(void)	// Begin of dummy
+{
+	int rc = 0;
+
+	return rc;
+}	// End of dummy
diff --git a/t/t4051/hello.c b/t/t4051/hello.c
new file mode 100644
index 0000000000..63b1a1e4ef
--- /dev/null
+++ b/t/t4051/hello.c
@@ -0,0 +1,21 @@
+
+static void hello(void)	// Begin of hello
+{
+	/*
+	 * Classic.
+	 */
+	putchar('H');
+	putchar('e');
+	putchar('l');
+	putchar('l');
+	putchar('o');
+	putchar(' ');
+	/* delete me from hello */
+	putchar('w');
+	putchar('o');
+	putchar('r');
+	putchar('l');
+	putchar('d');
+	putchar('.');
+	putchar('\n');
+}	// End of hello
diff --git a/t/t4051/includes.c b/t/t4051/includes.c
new file mode 100644
index 0000000000..efc68f8bf6
--- /dev/null
+++ b/t/t4051/includes.c
@@ -0,0 +1,20 @@
+#include <Begin.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdarg.h>
+/* delete me from includes */
+#include <string.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <sys/time.h>
+#include <time.h>
+#include <signal.h>
+#include <assert.h>
+#include <regex.h>
+#include <utime.h>
+#include <syslog.h>
+#include <End.h>
diff --git a/t/t4054-diff-bogus-tree.sh b/t/t4054-diff-bogus-tree.sh
index 1d6efab3c5..18f42c5fff 100755
--- a/t/t4054-diff-bogus-tree.sh
+++ b/t/t4054-diff-bogus-tree.sh
@@ -3,8 +3,6 @@
 test_description='test diff with a bogus tree containing the null sha1'
 . ./test-lib.sh
 
-empty_tree=4b825dc642cb6eb9a060e54bf8d69288fbee4904
-
 test_expect_success 'create bogus tree' '
 	bogus_tree=$(
 		printf "100644 fooQQQQQQQQQQQQQQQQQQQQQ" |
@@ -22,13 +20,13 @@ test_expect_success 'create tree with matching file' '
 
 test_expect_success 'raw diff shows null sha1 (addition)' '
 	echo ":000000 100644 $_z40 $_z40 A	foo" >expect &&
-	git diff-tree $empty_tree $bogus_tree >actual &&
+	git diff-tree $EMPTY_TREE $bogus_tree >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'raw diff shows null sha1 (removal)' '
 	echo ":100644 000000 $_z40 $_z40 D	foo" >expect &&
-	git diff-tree $bogus_tree $empty_tree >actual &&
+	git diff-tree $bogus_tree $EMPTY_TREE >actual &&
 	test_cmp expect actual
 '
 
@@ -57,11 +55,11 @@ test_expect_success 'raw diff shows null sha1 (index)' '
 '
 
 test_expect_success 'patch fails due to bogus sha1 (addition)' '
-	test_must_fail git diff-tree -p $empty_tree $bogus_tree
+	test_must_fail git diff-tree -p $EMPTY_TREE $bogus_tree
 '
 
 test_expect_success 'patch fails due to bogus sha1 (removal)' '
-	test_must_fail git diff-tree -p $bogus_tree $empty_tree
+	test_must_fail git diff-tree -p $bogus_tree $EMPTY_TREE
 '
 
 test_expect_success 'patch fails due to bogus sha1 (modification)' '
diff --git a/t/t4130-apply-criss-cross-rename.sh b/t/t4130-apply-criss-cross-rename.sh
index d173acde0f..f8a313bcb9 100755
--- a/t/t4130-apply-criss-cross-rename.sh
+++ b/t/t4130-apply-criss-cross-rename.sh
@@ -13,9 +13,13 @@ create_file() {
 }
 
 test_expect_success 'setup' '
-	create_file file1 "File1 contents" &&
-	create_file file2 "File2 contents" &&
-	create_file file3 "File3 contents" &&
+	# Ensure that file sizes are different, because on Windows
+	# lstat() does not discover inode numbers, and we need
+	# other properties to discover swapped files
+	# (mtime is not always different, either).
+	create_file file1 "some content" &&
+	create_file file2 "some other content" &&
+	create_file file3 "again something else" &&
 	git add file1 file2 file3 &&
 	git commit -m 1
 '
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index b41bd17264..9ce9424d15 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -957,4 +957,24 @@ test_expect_success 'am -s unexpected trailer block' '
 	test_cmp expect actual
 '
 
+test_expect_success 'am --patch-format=mboxrd handles mboxrd' '
+	rm -fr .git/rebase-apply &&
+	git checkout -f first &&
+	echo mboxrd >>file &&
+	git add file &&
+	cat >msg <<-\INPUT_END &&
+	mboxrd should escape the body
+
+	From could trip up a loose mbox parser
+	>From extra escape for reversibility
+	INPUT_END
+	git commit -F msg &&
+	git format-patch --pretty=mboxrd --stdout -1 >mboxrd1 &&
+	grep "^>From could trip up a loose mbox parser" mboxrd1 &&
+	git checkout -f first &&
+	git am --patch-format=mboxrd mboxrd1 &&
+	git cat-file commit HEAD | tail -n4 >out &&
+	test_cmp msg out
+'
+
 test_done
diff --git a/t/t4153-am-resume-override-opts.sh b/t/t4153-am-resume-override-opts.sh
index 7c013d84d5..8ea22d1bcb 100755
--- a/t/t4153-am-resume-override-opts.sh
+++ b/t/t4153-am-resume-override-opts.sh
@@ -53,7 +53,7 @@ test_expect_success '--no-quiet overrides --quiet' '
 	# Applying side1 will be quiet.
 	test_must_fail git am --quiet side[123].eml >out &&
 	test_path_is_dir .git/rebase-apply &&
-	! test_i18ngrep "^Applying: " out &&
+	test_i18ngrep ! "^Applying: " out &&
 	echo side1 >file &&
 	git add file &&
 
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index ed9c91e25b..1a080e7823 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -184,12 +184,27 @@ test_expect_success 'rerere updates postimage timestamp' '
 '
 
 test_expect_success 'rerere clear' '
-	rm $rr/postimage &&
+	mv $rr/postimage .git/post-saved &&
 	echo "$sha1	a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR &&
 	git rerere clear &&
 	! test -d $rr
 '
 
+test_expect_success 'leftover directory' '
+	git reset --hard &&
+	mkdir -p $rr &&
+	test_must_fail git merge first &&
+	test -f $rr/preimage
+'
+
+test_expect_success 'missing preimage' '
+	git reset --hard &&
+	mkdir -p $rr &&
+	cp .git/post-saved $rr/postimage &&
+	test_must_fail git merge first &&
+	test -f $rr/preimage
+'
+
 test_expect_success 'set up for garbage collection tests' '
 	mkdir -p $rr &&
 	echo Hello >$rr/preimage &&
@@ -391,4 +406,157 @@ test_expect_success 'rerere -h' '
 	test_i18ngrep [Uu]sage help
 '
 
+concat_insert () {
+	last=$1
+	shift
+	cat early && printf "%s\n" "$@" && cat late "$last"
+}
+
+count_pre_post () {
+	find .git/rr-cache/ -type f -name "preimage*" >actual &&
+	test_line_count = "$1" actual &&
+	find .git/rr-cache/ -type f -name "postimage*" >actual &&
+	test_line_count = "$2" actual
+}
+
+test_expect_success 'rerere gc' '
+	find .git/rr-cache -type f >original &&
+	xargs test-chmtime -172800 <original &&
+
+	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
+	find .git/rr-cache -type f >actual &&
+	test_cmp original actual &&
+
+	git -c gc.rerereresolved=5 -c gc.rerereunresolved=0 rerere gc &&
+	find .git/rr-cache -type f >actual &&
+	test_cmp original actual &&
+
+	git -c gc.rerereresolved=0 -c gc.rerereunresolved=0 rerere gc &&
+	find .git/rr-cache -type f >actual &&
+	>expect &&
+	test_cmp expect actual
+'
+
+merge_conflict_resolve () {
+	git reset --hard &&
+	test_must_fail git merge six.1 &&
+	# Resolution is to replace 7 with 6.1 and 6.2 (i.e. take both)
+	concat_insert short 6.1 6.2 >file1 &&
+	concat_insert long 6.1 6.2 >file2
+}
+
+test_expect_success 'multiple identical conflicts' '
+	git reset --hard &&
+
+	test_seq 1 6 >early &&
+	>late &&
+	test_seq 11 15 >short &&
+	test_seq 111 120 >long &&
+	concat_insert short >file1 &&
+	concat_insert long >file2 &&
+	git add file1 file2 &&
+	git commit -m base &&
+	git tag base &&
+	git checkout -b six.1 &&
+	concat_insert short 6.1 >file1 &&
+	concat_insert long 6.1 >file2 &&
+	git add file1 file2 &&
+	git commit -m 6.1 &&
+	git checkout -b six.2 HEAD^ &&
+	concat_insert short 6.2 >file1 &&
+	concat_insert long 6.2 >file2 &&
+	git add file1 file2 &&
+	git commit -m 6.2 &&
+
+	# At this point, six.1 and six.2
+	# - derive from common ancestor that has two files
+	#   1...6 7 11..15 (file1) and 1...6 7 111..120 (file2)
+	# - six.1 replaces these 7s with 6.1
+	# - six.2 replaces these 7s with 6.2
+
+	merge_conflict_resolve &&
+
+	# Check that rerere knows that file1 and file2 have conflicts
+
+	printf "%s\n" file1 file2 >expect &&
+	git ls-files -u | sed -e "s/^.*	//" | sort -u >actual &&
+	test_cmp expect actual &&
+
+	git rerere status | sort >actual &&
+	test_cmp expect actual &&
+
+	git rerere remaining >actual &&
+	test_cmp expect actual &&
+
+	count_pre_post 2 0 &&
+
+	# Pretend that the conflicts were made quite some time ago
+	find .git/rr-cache/ -type f | xargs test-chmtime -172800 &&
+
+	# Unresolved entries have not expired yet
+	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
+	count_pre_post 2 0 &&
+
+	# Unresolved entries have expired
+	git -c gc.rerereresolved=5 -c gc.rerereunresolved=1 rerere gc &&
+	count_pre_post 0 0 &&
+
+	# Recreate the conflicted state
+	merge_conflict_resolve &&
+	count_pre_post 2 0 &&
+
+	# Clear it
+	git rerere clear &&
+	count_pre_post 0 0 &&
+
+	# Recreate the conflicted state
+	merge_conflict_resolve &&
+	count_pre_post 2 0 &&
+
+	# We resolved file1 and file2
+	git rerere &&
+	>expect &&
+	git rerere remaining >actual &&
+	test_cmp expect actual &&
+
+	# We must have recorded both of them
+	count_pre_post 2 2 &&
+
+	# Now we should be able to resolve them both
+	git reset --hard &&
+	test_must_fail git merge six.1 &&
+	git rerere &&
+
+	>expect &&
+	git rerere remaining >actual &&
+	test_cmp expect actual &&
+
+	concat_insert short 6.1 6.2 >file1.expect &&
+	concat_insert long 6.1 6.2 >file2.expect &&
+	test_cmp file1.expect file1 &&
+	test_cmp file2.expect file2 &&
+
+	# Forget resolution for file2
+	git rerere forget file2 &&
+	echo file2 >expect &&
+	git rerere status >actual &&
+	test_cmp expect actual &&
+	count_pre_post 2 1 &&
+
+	# file2 already has correct resolution, so record it again
+	git rerere &&
+
+	# Pretend that the resolutions are old again
+	find .git/rr-cache/ -type f | xargs test-chmtime -172800 &&
+
+	# Resolved entries have not expired yet
+	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
+
+	count_pre_post 2 2 &&
+
+	# Resolved entries have expired
+	git -c gc.rerereresolved=1 -c gc.rerereunresolved=5 rerere gc &&
+	count_pre_post 0 0
+'
+
 test_done
diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index f5e63670fa..ae08b57712 100755
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -115,7 +115,7 @@ EOF
 '
 
 test_expect_success !MINGW 'shortlog from non-git directory' '
-	git log HEAD >log &&
+	git log --no-expand-tabs HEAD >log &&
 	GIT_DIR=non-existing git shortlog -w <log >out &&
 	test_cmp expect out
 '
@@ -184,4 +184,10 @@ test_expect_success 'shortlog with revision pseudo options' '
 	git shortlog --exclude=refs/heads/m* --all
 '
 
+test_expect_success 'shortlog with --output=<file>' '
+	git shortlog --output=shortlog -1 master >output &&
+	test ! -s output &&
+	test_line_count = 3 shortlog
+'
+
 test_done
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index cb82eb7e66..e2db47c36e 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -101,8 +101,8 @@ test_expect_success 'oneline' '
 
 test_expect_success 'diff-filter=A' '
 
-	git log --pretty="format:%s" --diff-filter=A HEAD > actual &&
-	git log --pretty="format:%s" --diff-filter A HEAD > actual-separate &&
+	git log --no-renames --pretty="format:%s" --diff-filter=A HEAD > actual &&
+	git log --no-renames --pretty="format:%s" --diff-filter A HEAD > actual-separate &&
 	printf "fifth\nfourth\nthird\ninitial" > expect &&
 	test_cmp expect actual &&
 	test_cmp expect actual-separate
@@ -119,7 +119,7 @@ test_expect_success 'diff-filter=M' '
 
 test_expect_success 'diff-filter=D' '
 
-	actual=$(git log --pretty="format:%s" --diff-filter=D HEAD) &&
+	actual=$(git log --no-renames --pretty="format:%s" --diff-filter=D HEAD) &&
 	expect=$(echo sixth ; echo third) &&
 	verbose test "$actual" = "$expect"
 
@@ -255,6 +255,20 @@ test_expect_success 'log -F -E --grep=<ere> uses ere' '
 	test_cmp expect actual
 '
 
+test_expect_success 'log with grep.patternType configuration' '
+	>expect &&
+	git -c grep.patterntype=fixed \
+	log -1 --pretty=tformat:%s --grep=s.c.nd >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'log with grep.patternType configuration and command line' '
+	echo second >expect &&
+	git -c grep.patterntype=fixed \
+	log -1 --pretty=tformat:%s --basic-regexp --grep=s.c.nd >actual &&
+	test_cmp expect actual
+'
+
 cat > expect <<EOF
 * Second
 * sixth
@@ -848,7 +862,7 @@ sanitize_output () {
 }
 
 test_expect_success 'log --graph with diff and stats' '
-	git log --graph --pretty=short --stat -p >actual &&
+	git log --no-renames --graph --pretty=short --stat -p >actual &&
 	sanitize_output >actual.sanitized <actual &&
 	test_i18ncmp expect actual.sanitized
 '
@@ -860,12 +874,15 @@ test_expect_success 'dotdot is a parent directory' '
 	test_cmp expect actual
 '
 
-test_expect_success GPG 'log --graph --show-signature' '
+test_expect_success GPG 'setup signed branch' '
 	test_when_finished "git reset --hard && git checkout master" &&
 	git checkout -b signed master &&
 	echo foo >foo &&
 	git add foo &&
-	git commit -S -m signed_commit &&
+	git commit -S -m signed_commit
+'
+
+test_expect_success GPG 'log --graph --show-signature' '
 	git log --graph --show-signature -n1 signed >actual &&
 	grep "^| gpg: Signature made" actual &&
 	grep "^| gpg: Good signature" actual
@@ -890,6 +907,31 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' '
 	grep "^| | gpg: Good signature" actual
 '
 
+test_expect_success GPG '--no-show-signature overrides --show-signature' '
+	git log -1 --show-signature --no-show-signature signed >actual &&
+	! grep "^gpg:" actual
+'
+
+test_expect_success GPG 'log.showsignature=true behaves like --show-signature' '
+	test_config log.showsignature true &&
+	git log -1 signed >actual &&
+	grep "gpg: Signature made" actual &&
+	grep "gpg: Good signature" actual
+'
+
+test_expect_success GPG '--no-show-signature overrides log.showsignature=true' '
+	test_config log.showsignature true &&
+	git log -1 --no-show-signature signed >actual &&
+	! grep "^gpg:" actual
+'
+
+test_expect_success GPG '--show-signature overrides log.showsignature=false' '
+	test_config log.showsignature false &&
+	git log -1 --show-signature signed >actual &&
+	grep "gpg: Signature made" actual &&
+	grep "gpg: Good signature" actual
+'
+
 test_expect_success 'log --graph --no-walk is forbidden' '
 	test_must_fail git log --graph --no-walk
 '
diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh
index baa9d3c82e..84a809690e 100755
--- a/t/t4204-patch-id.sh
+++ b/t/t4204-patch-id.sh
@@ -30,11 +30,11 @@ test_expect_success 'patch-id output is well-formed' '
 
 #calculate patch id. Make sure output is not empty.
 calc_patch_id () {
-	name="$1"
+	patch_name="$1"
 	shift
 	git patch-id "$@" |
-	sed "s/ .*//" >patch-id_"$name" &&
-	test_line_count -gt 0 patch-id_"$name"
+	sed "s/ .*//" >patch-id_"$patch_name" &&
+	test_line_count -gt 0 patch-id_"$patch_name"
 }
 
 get_top_diff () {
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 7398605e7b..f5435fd250 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -145,253 +145,310 @@ test_expect_success 'setup more commits' '
 
 test_expect_success 'left alignment formatting' '
 	git log --pretty="tformat:%<(40)%s" >actual &&
-	qz_to_tab_space <<EOF >expected &&
-message two                            Z
-message one                            Z
-add bar                                Z
-$(commit_msg)                    Z
-EOF
+	qz_to_tab_space <<-EOF >expected &&
+	message two                            Z
+	message one                            Z
+	add bar                                Z
+	$(commit_msg)                    Z
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'left alignment formatting. i18n.logOutputEncoding' '
 	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(40)%s" >actual &&
-	qz_to_tab_space <<EOF | iconv -f utf-8 -t $test_encoding >expected &&
-message two                            Z
-message one                            Z
-add bar                                Z
-$(commit_msg)                    Z
-EOF
+	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	message two                            Z
+	message one                            Z
+	add bar                                Z
+	$(commit_msg)                    Z
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'left alignment formatting at the nth column' '
 	git log --pretty="tformat:%h %<|(40)%s" >actual &&
-	qz_to_tab_space <<EOF >expected &&
-$head1 message two                    Z
-$head2 message one                    Z
-$head3 add bar                        Z
-$head4 $(commit_msg)            Z
-EOF
+	qz_to_tab_space <<-EOF >expected &&
+	$head1 message two                    Z
+	$head2 message one                    Z
+	$head3 add bar                        Z
+	$head4 $(commit_msg)            Z
+	EOF
+	test_cmp expected actual
+'
+
+test_expect_success 'left alignment formatting at the nth column' '
+	COLUMNS=50 git log --pretty="tformat:%h %<|(-10)%s" >actual &&
+	qz_to_tab_space <<-EOF >expected &&
+	$head1 message two                    Z
+	$head2 message one                    Z
+	$head3 add bar                        Z
+	$head4 $(commit_msg)            Z
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'left alignment formatting at the nth column. i18n.logOutputEncoding' '
 	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%h %<|(40)%s" >actual &&
-	qz_to_tab_space <<EOF | iconv -f utf-8 -t $test_encoding >expected &&
-$head1 message two                    Z
-$head2 message one                    Z
-$head3 add bar                        Z
-$head4 $(commit_msg)            Z
-EOF
+	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	$head1 message two                    Z
+	$head2 message one                    Z
+	$head3 add bar                        Z
+	$head4 $(commit_msg)            Z
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'left alignment formatting with no padding' '
 	git log --pretty="tformat:%<(1)%s" >actual &&
-	cat <<EOF >expected &&
-message two
-message one
-add bar
-$(commit_msg)
-EOF
+	cat <<-EOF >expected &&
+	message two
+	message one
+	add bar
+	$(commit_msg)
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'left alignment formatting with no padding. i18n.logOutputEncoding' '
 	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(1)%s" >actual &&
-	cat <<EOF | iconv -f utf-8 -t $test_encoding >expected &&
-message two
-message one
-add bar
-$(commit_msg)
-EOF
+	cat <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	message two
+	message one
+	add bar
+	$(commit_msg)
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'left alignment formatting with trunc' '
 	git log --pretty="tformat:%<(10,trunc)%s" >actual &&
-	qz_to_tab_space <<EOF >expected &&
-message ..
-message ..
-add bar  Z
-initial...
-EOF
+	qz_to_tab_space <<-\EOF >expected &&
+	message ..
+	message ..
+	add bar  Z
+	initial...
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'left alignment formatting with trunc. i18n.logOutputEncoding' '
 	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(10,trunc)%s" >actual &&
-	qz_to_tab_space <<EOF | iconv -f utf-8 -t $test_encoding >expected &&
-message ..
-message ..
-add bar  Z
-initial...
-EOF
+	qz_to_tab_space <<-\EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	message ..
+	message ..
+	add bar  Z
+	initial...
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'left alignment formatting with ltrunc' '
 	git log --pretty="tformat:%<(10,ltrunc)%s" >actual &&
-	qz_to_tab_space <<EOF >expected &&
-..sage two
-..sage one
-add bar  Z
-..${sample_utf8_part}lich
-EOF
+	qz_to_tab_space <<-EOF >expected &&
+	..sage two
+	..sage one
+	add bar  Z
+	..${sample_utf8_part}lich
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'left alignment formatting with ltrunc. i18n.logOutputEncoding' '
 	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(10,ltrunc)%s" >actual &&
-	qz_to_tab_space <<EOF | iconv -f utf-8 -t $test_encoding >expected &&
-..sage two
-..sage one
-add bar  Z
-..${sample_utf8_part}lich
-EOF
+	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	..sage two
+	..sage one
+	add bar  Z
+	..${sample_utf8_part}lich
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'left alignment formatting with mtrunc' '
 	git log --pretty="tformat:%<(10,mtrunc)%s" >actual &&
-	qz_to_tab_space <<EOF >expected &&
-mess.. two
-mess.. one
-add bar  Z
-init..lich
-EOF
+	qz_to_tab_space <<-\EOF >expected &&
+	mess.. two
+	mess.. one
+	add bar  Z
+	init..lich
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'left alignment formatting with mtrunc. i18n.logOutputEncoding' '
 	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(10,mtrunc)%s" >actual &&
-	qz_to_tab_space <<EOF | iconv -f utf-8 -t $test_encoding >expected &&
-mess.. two
-mess.. one
-add bar  Z
-init..lich
-EOF
+	qz_to_tab_space <<-\EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	mess.. two
+	mess.. one
+	add bar  Z
+	init..lich
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'right alignment formatting' '
 	git log --pretty="tformat:%>(40)%s" >actual &&
-	qz_to_tab_space <<EOF >expected &&
-Z                            message two
-Z                            message one
-Z                                add bar
-Z                    $(commit_msg)
-EOF
+	qz_to_tab_space <<-EOF >expected &&
+	Z                            message two
+	Z                            message one
+	Z                                add bar
+	Z                    $(commit_msg)
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'right alignment formatting. i18n.logOutputEncoding' '
 	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%>(40)%s" >actual &&
-	qz_to_tab_space <<EOF | iconv -f utf-8 -t $test_encoding >expected &&
-Z                            message two
-Z                            message one
-Z                                add bar
-Z                    $(commit_msg)
-EOF
+	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	Z                            message two
+	Z                            message one
+	Z                                add bar
+	Z                    $(commit_msg)
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'right alignment formatting at the nth column' '
 	git log --pretty="tformat:%h %>|(40)%s" >actual &&
-	qz_to_tab_space <<EOF >expected &&
-$head1                      message two
-$head2                      message one
-$head3                          add bar
-$head4              $(commit_msg)
-EOF
+	qz_to_tab_space <<-EOF >expected &&
+	$head1                      message two
+	$head2                      message one
+	$head3                          add bar
+	$head4              $(commit_msg)
+	EOF
+	test_cmp expected actual
+'
+
+test_expect_success 'right alignment formatting at the nth column' '
+	COLUMNS=50 git log --pretty="tformat:%h %>|(-10)%s" >actual &&
+	qz_to_tab_space <<-EOF >expected &&
+	$head1                      message two
+	$head2                      message one
+	$head3                          add bar
+	$head4              $(commit_msg)
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'right alignment formatting at the nth column. i18n.logOutputEncoding' '
 	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%h %>|(40)%s" >actual &&
-	qz_to_tab_space <<EOF | iconv -f utf-8 -t $test_encoding >expected &&
-$head1                      message two
-$head2                      message one
-$head3                          add bar
-$head4              $(commit_msg)
-EOF
+	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	$head1                      message two
+	$head2                      message one
+	$head3                          add bar
+	$head4              $(commit_msg)
+	EOF
+	test_cmp expected actual
+'
+
+# Note: Space between 'message' and 'two' should be in the same column
+# as in previous test.
+test_expect_success 'right alignment formatting at the nth column with --graph. i18n.logOutputEncoding' '
+	git -c i18n.logOutputEncoding=$test_encoding log --graph --pretty="tformat:%h %>|(40)%s" >actual &&
+	iconv -f utf-8 -t $test_encoding >expected <<-EOF &&
+	* $head1                    message two
+	* $head2                    message one
+	* $head3                        add bar
+	* $head4            $(commit_msg)
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'right alignment formatting with no padding' '
 	git log --pretty="tformat:%>(1)%s" >actual &&
-	cat <<EOF >expected &&
-message two
-message one
-add bar
-$(commit_msg)
-EOF
+	cat <<-EOF >expected &&
+	message two
+	message one
+	add bar
+	$(commit_msg)
+	EOF
+	test_cmp expected actual
+'
+
+test_expect_success 'right alignment formatting with no padding and with --graph' '
+	git log --graph --pretty="tformat:%>(1)%s" >actual &&
+	cat <<-EOF >expected &&
+	* message two
+	* message one
+	* add bar
+	* $(commit_msg)
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'right alignment formatting with no padding. i18n.logOutputEncoding' '
 	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%>(1)%s" >actual &&
-	cat <<EOF | iconv -f utf-8 -t $test_encoding >expected &&
-message two
-message one
-add bar
-$(commit_msg)
-EOF
+	cat <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	message two
+	message one
+	add bar
+	$(commit_msg)
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'center alignment formatting' '
 	git log --pretty="tformat:%><(40)%s" >actual &&
-	qz_to_tab_space <<EOF >expected &&
-Z             message two              Z
-Z             message one              Z
-Z               add bar                Z
-Z         $(commit_msg)          Z
-EOF
+	qz_to_tab_space <<-EOF >expected &&
+	Z             message two              Z
+	Z             message one              Z
+	Z               add bar                Z
+	Z         $(commit_msg)          Z
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'center alignment formatting. i18n.logOutputEncoding' '
 	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%><(40)%s" >actual &&
-	qz_to_tab_space <<EOF | iconv -f utf-8 -t $test_encoding >expected &&
-Z             message two              Z
-Z             message one              Z
-Z               add bar                Z
-Z         $(commit_msg)          Z
-EOF
+	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	Z             message two              Z
+	Z             message one              Z
+	Z               add bar                Z
+	Z         $(commit_msg)          Z
+	EOF
 	test_cmp expected actual
 '
 test_expect_success 'center alignment formatting at the nth column' '
 	git log --pretty="tformat:%h %><|(40)%s" >actual &&
-	qz_to_tab_space <<EOF >expected &&
-$head1           message two          Z
-$head2           message one          Z
-$head3             add bar            Z
-$head4       $(commit_msg)      Z
-EOF
+	qz_to_tab_space <<-EOF >expected &&
+	$head1           message two          Z
+	$head2           message one          Z
+	$head3             add bar            Z
+	$head4       $(commit_msg)      Z
+	EOF
+	test_cmp expected actual
+'
+
+test_expect_success 'center alignment formatting at the nth column' '
+	COLUMNS=70 git log --pretty="tformat:%h %><|(-30)%s" >actual &&
+	qz_to_tab_space <<-EOF >expected &&
+	$head1           message two          Z
+	$head2           message one          Z
+	$head3             add bar            Z
+	$head4       $(commit_msg)      Z
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'center alignment formatting at the nth column. i18n.logOutputEncoding' '
 	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%h %><|(40)%s" >actual &&
-	qz_to_tab_space <<EOF | iconv -f utf-8 -t $test_encoding >expected &&
-$head1           message two          Z
-$head2           message one          Z
-$head3             add bar            Z
-$head4       $(commit_msg)      Z
-EOF
+	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	$head1           message two          Z
+	$head2           message one          Z
+	$head3             add bar            Z
+	$head4       $(commit_msg)      Z
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'center alignment formatting with no padding' '
 	git log --pretty="tformat:%><(1)%s" >actual &&
-	cat <<EOF >expected &&
-message two
-message one
-add bar
-$(commit_msg)
-EOF
+	cat <<-EOF >expected &&
+	message two
+	message one
+	add bar
+	$(commit_msg)
+	EOF
 	test_cmp expected actual
 '
 
@@ -400,34 +457,34 @@ EOF
 old_head1=$(git rev-parse --verify HEAD~0)
 test_expect_success 'center alignment formatting with no padding. i18n.logOutputEncoding' '
 	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%><(1)%s" >actual &&
-	cat <<EOF | iconv -f utf-8 -t $test_encoding >expected &&
-message two
-message one
-add bar
-$(commit_msg)
-EOF
+	cat <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	message two
+	message one
+	add bar
+	$(commit_msg)
+	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'left/right alignment formatting with stealing' '
 	git commit --amend -m short --author "long long long <long@me.com>" &&
 	git log --pretty="tformat:%<(10,trunc)%s%>>(10,ltrunc)% an" >actual &&
-	cat <<EOF >expected &&
-short long  long long
-message ..   A U Thor
-add bar      A U Thor
-initial...   A U Thor
-EOF
+	cat <<-\EOF >expected &&
+	short long  long long
+	message ..   A U Thor
+	add bar      A U Thor
+	initial...   A U Thor
+	EOF
 	test_cmp expected actual
 '
 test_expect_success 'left/right alignment formatting with stealing. i18n.logOutputEncoding' '
 	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(10,trunc)%s%>>(10,ltrunc)% an" >actual &&
-	cat <<EOF | iconv -f utf-8 -t $test_encoding >expected &&
-short long  long long
-message ..   A U Thor
-add bar      A U Thor
-initial...   A U Thor
-EOF
+	cat <<-\EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	short long  long long
+	message ..   A U Thor
+	add bar      A U Thor
+	initial...   A U Thor
+	EOF
 	test_cmp expected actual
 '
 
@@ -447,8 +504,10 @@ test_expect_success 'ISO and ISO-strict date formats display the same values' '
 '
 
 # get new digests (with no abbreviations)
-head1=$(git rev-parse --verify HEAD~0) &&
-head2=$(git rev-parse --verify HEAD~1) &&
+test_expect_success 'set up log decoration tests' '
+	head1=$(git rev-parse --verify HEAD~0) &&
+	head2=$(git rev-parse --verify HEAD~1)
+'
 
 test_expect_success 'log decoration properly follows tag chain' '
 	git tag -a tag1 -m tag1 &&
@@ -456,22 +515,22 @@ test_expect_success 'log decoration properly follows tag chain' '
 	git tag -d tag1 &&
 	git commit --amend -m shorter &&
 	git log --no-walk --tags --pretty="%H %d" --decorate=full >actual &&
-	cat <<EOF >expected &&
-$head1  (tag: refs/tags/tag2)
-$head2  (tag: refs/tags/message-one)
-$old_head1  (tag: refs/tags/message-two)
-EOF
+	cat <<-EOF >expected &&
+	$head1  (tag: refs/tags/tag2)
+	$head2  (tag: refs/tags/message-one)
+	$old_head1  (tag: refs/tags/message-two)
+	EOF
 	sort actual >actual1 &&
 	test_cmp expected actual1
 '
 
 test_expect_success 'clean log decoration' '
 	git log --no-walk --tags --pretty="%H %D" --decorate=full >actual &&
-	cat >expected <<EOF &&
-$head1 tag: refs/tags/tag2
-$head2 tag: refs/tags/message-one
-$old_head1 tag: refs/tags/message-two
-EOF
+	cat >expected <<-EOF &&
+	$head1 tag: refs/tags/tag2
+	$head2 tag: refs/tags/message-one
+	$old_head1 tag: refs/tags/message-two
+	EOF
 	sort actual >actual1 &&
 	test_cmp expected actual1
 '
diff --git a/t/t4207-log-decoration-colors.sh b/t/t4207-log-decoration-colors.sh
index f8008b6a3d..b972296f06 100755
--- a/t/t4207-log-decoration-colors.sh
+++ b/t/t4207-log-decoration-colors.sh
@@ -44,7 +44,7 @@ test_expect_success setup '
 '
 
 cat >expected <<EOF
-${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}${c_commit} ->\
+${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD ->\
  ${c_reset}${c_branch}master${c_reset}${c_commit},\
  ${c_reset}${c_tag}tag: v1.0${c_reset}${c_commit},\
  ${c_reset}${c_tag}tag: B${c_reset}${c_commit})${c_reset} B
diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh
index d8f23f488e..001343e2fc 100755
--- a/t/t4208-log-magic-pathspec.sh
+++ b/t/t4208-log-magic-pathspec.sh
@@ -18,7 +18,7 @@ test_expect_success '"git log :/" should not be ambiguous' '
 test_expect_success '"git log :/a" should be ambiguous (applied both rev and worktree)' '
 	: >a &&
 	test_must_fail git log :/a 2>error &&
-	grep ambiguous error
+	test_i18ngrep ambiguous error
 '
 
 test_expect_success '"git log :/a -- " should not be ambiguous' '
@@ -31,7 +31,7 @@ test_expect_success '"git log -- :/a" should not be ambiguous' '
 
 test_expect_success '"git log :" should be ambiguous' '
 	test_must_fail git log : 2>error &&
-	grep ambiguous error
+	test_i18ngrep ambiguous error
 '
 
 test_expect_success 'git log -- :' '
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 4451127eb2..9d87777b59 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -99,4 +99,11 @@ test_expect_success '-L with --first-parent and a merge' '
 	git log --first-parent -L 1,1:b.c
 '
 
+test_expect_success '-L with --output' '
+	git checkout parallel-change &&
+	git log --output=log -L :main:b.c >output &&
+	test ! -s output &&
+	test_line_count = 70 log
+'
+
 test_done
diff --git a/t/t4213-log-tabexpand.sh b/t/t4213-log-tabexpand.sh
new file mode 100755
index 0000000000..e01a8f6ac9
--- /dev/null
+++ b/t/t4213-log-tabexpand.sh
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+test_description='log/show --expand-tabs'
+
+. ./test-lib.sh
+
+HT="	"
+title='tab indent at the beginning of the title line'
+body='tab indent on a line in the body'
+
+# usage: count_expand $indent $numSP $numHT @format_args
+count_expand ()
+{
+	expect=
+	count=$(( $1 + $2 )) ;# expected spaces
+	while test $count -gt 0
+	do
+		expect="$expect "
+		count=$(( $count - 1 ))
+	done
+	shift 2
+	count=$1 ;# expected tabs
+	while test $count -gt 0
+	do
+		expect="$expect$HT"
+		count=$(( $count - 1 ))
+	done
+	shift
+
+	# The remainder of the command line is "git show -s" options
+	case " $* " in
+	*' --pretty=short '*)
+		line=$title ;;
+	*)
+		line=$body ;;
+	esac
+
+	# Prefix the output with the command line arguments, and
+	# replace SP with a dot both in the expecte and actual output
+	# so that test_cmp would show the differene together with the
+	# breakage in a way easier to consume by the debugging user.
+	{
+		echo "git show -s $*"
+		echo "$expect$line"
+	} | sed -e 's/ /./g' >expect
+
+	{
+		echo "git show -s $*"
+		git show -s "$@" |
+		sed -n -e "/$line\$/p"
+	} | sed -e 's/ /./g' >actual
+
+	test_cmp expect actual
+}
+
+test_expand ()
+{
+	fmt=$1
+	case "$fmt" in
+	*=raw | *=short | *=email)
+		default="0 1" ;;
+	*)
+		default="8 0" ;;
+	esac
+	case "$fmt" in
+	*=email)
+		in=0 ;;
+	*)
+		in=4 ;;
+	esac
+	test_expect_success "expand/no-expand${fmt:+ for $fmt}" '
+		count_expand $in $default $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs &&
+		count_expand $in 8 0 --expand-tabs $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs=8 &&
+		count_expand $in 8 0 --expand-tabs=8 $fmt &&
+		count_expand $in 0 1 $fmt --no-expand-tabs &&
+		count_expand $in 0 1 --no-expand-tabs $fmt &&
+		count_expand $in 0 1 $fmt --expand-tabs=0 &&
+		count_expand $in 0 1 --expand-tabs=0 $fmt &&
+		count_expand $in 4 0 $fmt --expand-tabs=4 &&
+		count_expand $in 4 0 --expand-tabs=4 $fmt
+	'
+}
+
+test_expect_success 'setup' '
+	test_tick &&
+	sed -e "s/Q/$HT/g" <<-EOF >msg &&
+	Q$title
+
+	Q$body
+	EOF
+	git commit --allow-empty -F msg
+'
+
+test_expand ""
+test_expand --pretty
+test_expand --pretty=short
+test_expand --pretty=medium
+test_expand --pretty=full
+test_expand --pretty=fuller
+test_expand --pretty=raw
+test_expand --pretty=email
+
+test_done
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 4b68bbafbe..80b2387341 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -319,4 +319,78 @@ test_expect_success 'catch non-matching pathspec' '
 	test_must_fail git archive -v HEAD -- "*.abc" >/dev/null
 '
 
+# Pull the size and date of each entry in a tarfile using the system tar.
+#
+# We'll pull out only the year from the date; that avoids any question of
+# timezones impacting the result (as long as we keep our test times away from a
+# year boundary; our reference times are all in August).
+#
+# The output of tar_info is expected to be "<size> <year>", both in decimal. It
+# ignores the return value of tar. We have to do this, because some of our test
+# input is only partial (the real data is 64GB in some cases).
+tar_info () {
+	"$TAR" tvf "$1" |
+	awk '{
+		split($4, date, "-")
+		print $3 " " date[1]
+	}'
+}
+
+# See if our system tar can handle a tar file with huge sizes and dates far in
+# the future, and that we can actually parse its output.
+#
+# The reference file was generated by GNU tar, and the magic time and size are
+# both octal 01000000000001, which overflows normal ustar fields.
+test_lazy_prereq TAR_HUGE '
+	echo "68719476737 4147" >expect &&
+	tar_info "$TEST_DIRECTORY"/t5000/huge-and-future.tar >actual &&
+	test_cmp expect actual
+'
+
+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 &&
+	rm -f .git/index &&
+	git update-index --add --cacheinfo 100644,$obj,huge &&
+	git commit -m huge
+'
+
+# We expect git to die with SIGPIPE here (otherwise we
+# would generate the whole 64GB).
+test_expect_success LONG_IS_64BIT 'generate tar with huge size' '
+	{
+		git archive HEAD
+		echo $? >exit-code
+	} | test_copy_bytes 4096 >huge.tar &&
+	echo 141 >expect &&
+	test_cmp expect exit-code
+'
+
+test_expect_success TAR_HUGE,LONG_IS_64BIT 'system tar can read our huge size' '
+	echo 68719476737 >expect &&
+	tar_info huge.tar | cut -d" " -f1 >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success LONG_IS_64BIT 'set up repository with far-future commit' '
+	rm -f .git/index &&
+	echo content >file &&
+	git add file &&
+	GIT_COMMITTER_DATE="@68719476737 +0000" \
+		git commit -m "tempori parendum"
+'
+
+test_expect_success LONG_IS_64BIT 'generate tar with future mtime' '
+	git archive HEAD >future.tar
+'
+
+test_expect_success TAR_HUGE,LONG_IS_64BIT 'system tar can read our future mtime' '
+	echo 4147 >expect &&
+	tar_info future.tar | cut -d" " -f2 >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t5000/19f9c8273ec45a8938e6999cb59b3ff66739902a b/t/t5000/19f9c8273ec45a8938e6999cb59b3ff66739902a
new file mode 100644
index 0000000000..5cbe9ec312
--- /dev/null
+++ b/t/t5000/19f9c8273ec45a8938e6999cb59b3ff66739902a
diff --git a/t/t5000/huge-and-future.tar b/t/t5000/huge-and-future.tar
new file mode 100644
index 0000000000..63155e1855
--- /dev/null
+++ b/t/t5000/huge-and-future.tar
diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh
index 85b3df5e33..1a5a546230 100755
--- a/t/t5100-mailinfo.sh
+++ b/t/t5100-mailinfo.sh
@@ -111,4 +111,35 @@ test_expect_success 'mailinfo on message with quoted >From' '
 	test_cmp "$TEST_DIRECTORY"/t5100/quoted-from.expect quoted-from/msg
 '
 
+test_expect_success 'mailinfo unescapes with --mboxrd' '
+	mkdir mboxrd &&
+	git mailsplit -omboxrd --mboxrd \
+		"$TEST_DIRECTORY"/t5100/sample.mboxrd >last &&
+	test x"$(cat last)" = x2 &&
+	for i in 0001 0002
+	do
+		git mailinfo mboxrd/msg mboxrd/patch \
+		  <mboxrd/$i >mboxrd/out &&
+		test_cmp "$TEST_DIRECTORY"/t5100/${i}mboxrd mboxrd/msg
+	done &&
+	sp=" " &&
+	echo "From " >expect &&
+	echo "From " >>expect &&
+	echo >> expect &&
+	cat >sp <<-INPUT_END &&
+	From mboxrd Mon Sep 17 00:00:00 2001
+	From: trailing spacer <sp@example.com>
+	Subject: [PATCH] a commit with trailing space
+
+	From$sp
+	>From$sp
+
+	INPUT_END
+
+	git mailsplit -f2 -omboxrd --mboxrd <sp >last &&
+	test x"$(cat last)" = x1 &&
+	git mailinfo mboxrd/msg mboxrd/patch <mboxrd/0003 &&
+	test_cmp expect mboxrd/msg
+'
+
 test_done
diff --git a/t/t5100/0001mboxrd b/t/t5100/0001mboxrd
new file mode 100644
index 0000000000..494ec554b9
--- /dev/null
+++ b/t/t5100/0001mboxrd
@@ -0,0 +1,4 @@
+From the beginning, mbox should have been mboxrd
+>From escaped
+From not mangled but this line should have been escaped
+
diff --git a/t/t5100/0002mboxrd b/t/t5100/0002mboxrd
new file mode 100644
index 0000000000..71343d41f2
--- /dev/null
+++ b/t/t5100/0002mboxrd
@@ -0,0 +1,5 @@
+ >From unchanged
+ From also unchanged
+no trailing space, no escaping necessary and '>' was intended:
+>From
+
diff --git a/t/t5100/sample.mboxrd b/t/t5100/sample.mboxrd
new file mode 100644
index 0000000000..79ad5ae0e7
--- /dev/null
+++ b/t/t5100/sample.mboxrd
@@ -0,0 +1,19 @@
+From mboxrd Mon Sep 17 00:00:00 2001
+From: mboxrd writer <mboxrd@example.com>
+Date: Fri, 9 Jun 2006 00:44:16 -0700
+Subject: [PATCH] a commit with escaped From lines
+
+>From the beginning, mbox should have been mboxrd
+>>From escaped
+From not mangled but this line should have been escaped
+
+From mboxrd Mon Sep 17 00:00:00 2001
+From: mboxrd writer <mboxrd@example.com>
+Date: Fri, 9 Jun 2006 00:44:16 -0700
+Subject: [PATCH 2/2] another with fake From lines
+
+ >From unchanged
+ From also unchanged
+no trailing space, no escaping necessary and '>' was intended:
+>From
+
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index d446706e94..3893afd687 100755
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -47,6 +47,12 @@ rev_list_tests() {
 		test_cmp expect actual
 	'
 
+	test_expect_success "counting commits with limit ($state)" '
+		git rev-list --count -n 1 HEAD >expect &&
+		git rev-list --use-bitmap-index --count -n 1 HEAD >actual &&
+		test_cmp expect actual
+	'
+
 	test_expect_success "counting non-linear history ($state)" '
 		git rev-list --count other...master >expect &&
 		git rev-list --use-bitmap-index --count other...master >actual &&
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 9b9bec468a..82d913a6a8 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -259,7 +259,8 @@ test_expect_success 'clone shallow object count' '
 test_expect_success 'pull in shallow repo with missing merge base' '
 	(
 		cd shallow &&
-		test_must_fail git pull --depth 4 .. A
+		git fetch --depth 4 .. A
+		test_must_fail git merge --allow-unrelated-histories FETCH_HEAD
 	)
 '
 
@@ -279,9 +280,10 @@ test_expect_success 'clone shallow depth count' '
 test_expect_success 'clone shallow object count' '
 	(
 		cd shallow &&
+		git prune &&
 		git count-objects -v
 	) > count.shallow &&
-	grep "^count: 55" count.shallow
+	grep "^count: 54" count.shallow
 '
 
 test_expect_success 'fetch --no-shallow on full repo' '
@@ -556,7 +558,6 @@ check_prot_path () {
 }
 
 check_prot_host_port_path () {
-	local diagport
 	case "$2" in
 		*ssh*)
 		pp=ssh
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh
index 44f3d5fb28..9b19cff729 100755
--- a/t/t5504-fetch-receive-strict.sh
+++ b/t/t5504-fetch-receive-strict.sh
@@ -115,8 +115,8 @@ test_expect_success 'push with transfer.fsckobjects' '
 	test_cmp exp act
 '
 
-cat >bogus-commit <<\EOF
-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+cat >bogus-commit <<EOF
+tree $EMPTY_TREE
 author Bugs Bunny 1234567890 +0000
 committer Bugs Bunny <bugs@bun.ni> 1234567890 +0000
 
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index dd2e6ce34e..8198d8eb05 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -1182,7 +1182,7 @@ test_expect_success 'extra args: setup' '
 test_extra_arg () {
 	test_expect_success "extra args: $*" "
 		test_must_fail git remote $* bogus_extra_arg 2>actual &&
-		grep '^usage:' actual
+		test_i18ngrep '^usage:' actual
 	"
 }
 
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 454d896390..668c54be41 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -644,7 +644,7 @@ test_expect_success 'fetch --prune prints the remotes url' '
 		git fetch --prune origin 2>&1 | head -n1 >../actual
 	) &&
 	echo "From ${D}/." >expect &&
-	test_cmp expect actual
+	test_i18ncmp expect actual
 '
 
 test_expect_success 'branchname D/F conflict resolved by --prune' '
@@ -688,4 +688,34 @@ test_expect_success 'fetching with auto-gc does not lock up' '
 	)
 '
 
+test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '
+	git clone . full-output &&
+	test_commit looooooooooooong-tag &&
+	(
+		cd full-output &&
+		git -c fetch.output=full fetch origin 2>&1 | \
+			grep -e "->" | cut -c 22- >../actual
+	) &&
+	cat >expect <<-\EOF &&
+	master               -> origin/master
+	looooooooooooong-tag -> looooooooooooong-tag
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '
+	git clone . compact &&
+	test_commit extraaa &&
+	(
+		cd compact &&
+		git -c fetch.output=compact fetch origin 2>&1 | \
+			grep -e "->" | cut -c 22- >../actual
+	) &&
+	cat >expect <<-\EOF &&
+	master     -> origin/*
+	extraaa    -> *
+	EOF
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index c952d5ef5c..6ad37b5f66 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -9,6 +9,24 @@ modify () {
 	mv "$2.x" "$2"
 }
 
+test_pull_autostash () {
+	git reset --hard before-rebase &&
+	echo dirty >new_file &&
+	git add new_file &&
+	git pull "$@" . copy &&
+	test_cmp_rev HEAD^ copy &&
+	test "$(cat new_file)" = dirty &&
+	test "$(cat file)" = "modified again"
+}
+
+test_pull_autostash_fail () {
+	git reset --hard before-rebase &&
+	echo dirty >new_file &&
+	git add new_file &&
+	test_must_fail git pull "$@" . copy 2>err &&
+	test_i18ngrep "uncommitted changes." err
+}
+
 test_expect_success setup '
 	echo file >file &&
 	git add file &&
@@ -193,7 +211,7 @@ test_expect_success 'fail if the index has unresolved entries' '
 	test -n "$(git ls-files -u)" &&
 	cp file expected &&
 	test_must_fail git pull . second 2>err &&
-	test_i18ngrep "Pull is not possible because you have unmerged files" err &&
+	test_i18ngrep "Pulling is not possible because you have unmerged files." err &&
 	test_cmp expected file &&
 	git add file &&
 	test -z "$(git ls-files -u)" &&
@@ -237,6 +255,38 @@ test_expect_success '--rebase' '
 	test new = "$(git show HEAD:file2)"
 '
 
+test_expect_success '--rebase with conflicts shows advice' '
+	test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
+	git checkout -b seq &&
+	test_seq 5 >seq.txt &&
+	git add seq.txt &&
+	test_tick &&
+	git commit -m "Add seq.txt" &&
+	echo 6 >>seq.txt &&
+	test_tick &&
+	git commit -m "Append to seq.txt" seq.txt &&
+	git checkout -b with-conflicts HEAD^ &&
+	echo conflicting >>seq.txt &&
+	test_tick &&
+	git commit -m "Create conflict" seq.txt &&
+	test_must_fail git pull --rebase . seq 2>err >out &&
+	grep "When you have resolved this problem" out
+'
+
+test_expect_success 'failed --rebase shows advice' '
+	test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
+	git checkout -b diverging &&
+	test_commit attributes .gitattributes "* text=auto" attrs &&
+	sha1="$(printf "1\\r\\n" | git hash-object -w --stdin)" &&
+	git update-index --cacheinfo 0644 $sha1 file &&
+	git commit -m v1-with-cr &&
+	# force checkout because `git reset --hard` will not leave clean `file`
+	git checkout -f -b fails-to-rebase HEAD^ &&
+	test_commit v2-without-cr file "2" file2-lf &&
+	test_must_fail git pull --rebase . diverging 2>err >out &&
+	grep "When you have resolved this problem" out
+'
+
 test_expect_success '--rebase fails with multiple branches' '
 	git reset --hard before-rebase &&
 	test_must_fail git pull --rebase . copy master 2>err &&
@@ -247,15 +297,47 @@ test_expect_success '--rebase fails with multiple branches' '
 
 test_expect_success 'pull --rebase succeeds with dirty working directory and rebase.autostash set' '
 	test_config rebase.autostash true &&
-	git reset --hard before-rebase &&
-	echo dirty >new_file &&
-	git add new_file &&
-	git pull --rebase . copy &&
-	test_cmp_rev HEAD^ copy &&
-	test "$(cat new_file)" = dirty &&
-	test "$(cat file)" = "modified again"
+	test_pull_autostash --rebase
+'
+
+test_expect_success 'pull --rebase --autostash & rebase.autostash=true' '
+	test_config rebase.autostash true &&
+	test_pull_autostash --rebase --autostash
 '
 
+test_expect_success 'pull --rebase --autostash & rebase.autostash=false' '
+	test_config rebase.autostash false &&
+	test_pull_autostash --rebase --autostash
+'
+
+test_expect_success 'pull --rebase --autostash & rebase.autostash unset' '
+	test_unconfig rebase.autostash &&
+	test_pull_autostash --rebase --autostash
+'
+
+test_expect_success 'pull --rebase --no-autostash & rebase.autostash=true' '
+	test_config rebase.autostash true &&
+	test_pull_autostash_fail --rebase --no-autostash
+'
+
+test_expect_success 'pull --rebase --no-autostash & rebase.autostash=false' '
+	test_config rebase.autostash false &&
+	test_pull_autostash_fail --rebase --no-autostash
+'
+
+test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
+	test_unconfig rebase.autostash &&
+	test_pull_autostash_fail --rebase --no-autostash
+'
+
+for i in --autostash --no-autostash
+do
+	test_expect_success "pull $i (without --rebase) is illegal" '
+		test_must_fail git pull $i . copy 2>err &&
+		test_i18ngrep "only valid with --rebase" err
+	'
+done
+
 test_expect_success 'pull.rebase' '
 	git reset --hard before-rebase &&
 	test_config pull.rebase true &&
@@ -264,6 +346,16 @@ test_expect_success 'pull.rebase' '
 	test new = "$(git show HEAD:file2)"
 '
 
+test_expect_success 'pull --autostash & pull.rebase=true' '
+	test_config pull.rebase true &&
+	test_pull_autostash --autostash
+'
+
+test_expect_success 'pull --no-autostash & pull.rebase=true' '
+	test_config pull.rebase true &&
+	test_pull_autostash_fail --no-autostash
+'
+
 test_expect_success 'branch.to-rebase.rebase' '
 	git reset --hard before-rebase &&
 	test_config branch.to-rebase.rebase true &&
@@ -281,6 +373,22 @@ test_expect_success 'branch.to-rebase.rebase should override pull.rebase' '
 	test new = "$(git show HEAD:file2)"
 '
 
+test_expect_success "pull --rebase warns on --verify-signatures" '
+	git reset --hard before-rebase &&
+	git pull --rebase --verify-signatures . copy 2>err &&
+	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
+	test new = "$(git show HEAD:file2)" &&
+	test_i18ngrep "ignoring --verify-signatures for rebase" err
+'
+
+test_expect_success "pull --rebase does not warn on --no-verify-signatures" '
+	git reset --hard before-rebase &&
+	git pull --rebase --no-verify-signatures . copy 2>err &&
+	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
+	test new = "$(git show HEAD:file2)" &&
+	test_i18ngrep ! "verify-signatures" err
+'
+
 # add a feature branch, keep-merge, that is merged into master, so the
 # test can try preserving the merge commit (or not) with various
 # --rebase flags/pull.rebase settings.
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index 18372caa15..ded8f98dbe 100755
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -144,4 +144,25 @@ test_expect_success 'git pull --all --dry-run' '
 	)
 '
 
+test_expect_success 'git pull --allow-unrelated-histories' '
+	test_when_finished "rm -fr src dst" &&
+	git init src &&
+	(
+		cd src &&
+		test_commit one &&
+		test_commit two
+	) &&
+	git clone src dst &&
+	(
+		cd src &&
+		git checkout --orphan side HEAD^ &&
+		test_commit three
+	) &&
+	(
+		cd dst &&
+		test_must_fail git pull ../src side &&
+		git pull --allow-unrelated-histories ../src side
+	)
+'
+
 test_done
diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh
index 3683df13a6..d6981ba304 100755
--- a/t/t5523-push-upstream.sh
+++ b/t/t5523-push-upstream.sh
@@ -75,7 +75,7 @@ test_expect_success TTY 'progress messages go to tty' '
 	ensure_fresh_upstream &&
 
 	test_terminal git push -u upstream master >out 2>err &&
-	grep "Writing objects" err
+	test_i18ngrep "Writing objects" err
 '
 
 test_expect_success 'progress messages do not go to non-tty' '
@@ -83,7 +83,7 @@ test_expect_success 'progress messages do not go to non-tty' '
 
 	# skip progress messages, since stderr is non-tty
 	git push -u upstream master >out 2>err &&
-	! grep "Writing objects" err
+	test_i18ngrep ! "Writing objects" err
 '
 
 test_expect_success 'progress messages go to non-tty (forced)' '
@@ -91,22 +91,22 @@ test_expect_success 'progress messages go to non-tty (forced)' '
 
 	# force progress messages to stderr, even though it is non-tty
 	git push -u --progress upstream master >out 2>err &&
-	grep "Writing objects" err
+	test_i18ngrep "Writing objects" err
 '
 
 test_expect_success TTY 'push -q suppresses progress' '
 	ensure_fresh_upstream &&
 
 	test_terminal git push -u -q upstream master >out 2>err &&
-	! grep "Writing objects" err
+	test_i18ngrep ! "Writing objects" err
 '
 
 test_expect_success TTY 'push --no-progress suppresses progress' '
 	ensure_fresh_upstream &&
 
 	test_terminal git push -u --no-progress upstream master >out 2>err &&
-	! grep "Unpacking objects" err &&
-	! grep "Writing objects" err
+	test_i18ngrep ! "Unpacking objects" err &&
+	test_i18ngrep ! "Writing objects" err
 '
 
 test_expect_success TTY 'quiet push' '
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index 1241146227..954d0e43f5 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -471,4 +471,18 @@ test_expect_success "don't fetch submodule when newly recorded commits are alrea
 	test_i18ncmp expect.err actual.err
 '
 
+test_expect_success 'fetching submodules respects parallel settings' '
+	git config fetch.recurseSubmodules true &&
+	(
+		cd downstream &&
+		GIT_TRACE=$(pwd)/trace.out git fetch --jobs 7 &&
+		grep "7 tasks" trace.out &&
+		git config submodule.fetchJobs 8 &&
+		GIT_TRACE=$(pwd)/trace.out git fetch &&
+		grep "8 tasks" trace.out &&
+		GIT_TRACE=$(pwd)/trace.out git fetch --jobs 9 &&
+		grep "9 tasks" trace.out
+	)
+'
+
 test_done
diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh
index c7320121ec..a2c9e7439f 100755
--- a/t/t5533-push-cas.sh
+++ b/t/t5533-push-cas.sh
@@ -191,4 +191,42 @@ test_expect_success 'cover everything with default force-with-lease (allowed)' '
 	test_cmp expect actual
 '
 
+test_expect_success 'new branch covered by force-with-lease' '
+	setup_srcdst_basic &&
+	(
+		cd dst &&
+		git branch branch master &&
+		git push --force-with-lease=branch origin branch
+	) &&
+	git ls-remote dst refs/heads/branch >expect &&
+	git ls-remote src refs/heads/branch >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'new branch covered by force-with-lease (explicit)' '
+	setup_srcdst_basic &&
+	(
+		cd dst &&
+		git branch branch master &&
+		git push --force-with-lease=branch: origin branch
+	) &&
+	git ls-remote dst refs/heads/branch >expect &&
+	git ls-remote src refs/heads/branch >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'new branch already exists' '
+	setup_srcdst_basic &&
+	(
+		cd src &&
+		git checkout -b branch master &&
+		test_commit F
+	) &&
+	(
+		cd dst &&
+		git branch branch master &&
+		test_must_fail git push --force-with-lease=branch: origin branch
+	)
+'
+
 test_done
diff --git a/t/t5536-fetch-conflicts.sh b/t/t5536-fetch-conflicts.sh
index 6c5d3a4ce0..2e42cf3316 100755
--- a/t/t5536-fetch-conflicts.sh
+++ b/t/t5536-fetch-conflicts.sh
@@ -22,8 +22,8 @@ verify_stderr () {
 	cat >expected &&
 	# We're not interested in the error
 	# "fatal: The remote end hung up unexpectedly":
-	grep -E '^(fatal|warning):' <error | grep -v 'hung up' >actual | sort &&
-	test_cmp expected actual
+	test_i18ngrep -E '^(fatal|warning):' <error | grep -v 'hung up' >actual | sort &&
+	test_i18ncmp expected actual
 }
 
 test_expect_success 'setup' '
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index fd7d06b9a2..4840c71f02 100755
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -119,7 +119,7 @@ test_expect_success 'rejected update prints status' '
 	git commit -m dev2 &&
 	test_must_fail git push origin dev2 2>act &&
 	sed -e "/^remote: /s/ *$//" <act >cmp &&
-	test_cmp exp cmp
+	test_i18ncmp exp cmp
 '
 rm -f "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update"
 
@@ -219,7 +219,7 @@ test_expect_success TTY 'push shows progress when stderr is a tty' '
 	cd "$ROOT_PATH"/test_repo_clone &&
 	test_commit noisy &&
 	test_terminal git push >output 2>&1 &&
-	grep "^Writing objects" output
+	test_i18ngrep "^Writing objects" output
 '
 
 test_expect_success TTY 'push --quiet silences status and progress' '
@@ -233,16 +233,16 @@ test_expect_success TTY 'push --no-progress silences progress but not status' '
 	cd "$ROOT_PATH"/test_repo_clone &&
 	test_commit no-progress &&
 	test_terminal git push --no-progress >output 2>&1 &&
-	grep "^To http" output &&
-	! grep "^Writing objects"
+	test_i18ngrep "^To http" output &&
+	test_i18ngrep ! "^Writing objects"
 '
 
 test_expect_success 'push --progress shows progress to non-tty' '
 	cd "$ROOT_PATH"/test_repo_clone &&
 	test_commit progress &&
 	git push --progress >output 2>&1 &&
-	grep "^To http" output &&
-	grep "^Writing objects" output
+	test_i18ngrep "^To http" output &&
+	test_i18ngrep "^Writing objects" output
 '
 
 test_expect_success 'http push gives sane defaults to reflog' '
@@ -368,5 +368,14 @@ test_expect_success GPG 'push with post-receive to inspect certificate' '
 	test_cmp expect "$HTTPD_DOCUMENT_ROOT_PATH/push-cert-status"
 '
 
+test_expect_success 'push status output scrubs password' '
+	cd "$ROOT_PATH/test_repo_clone" &&
+	git push --porcelain \
+		"$HTTPD_URL_USER_PASS/smart/test_repo.git" \
+		+HEAD:scrub >status &&
+	# should have been scrubbed down to vanilla URL
+	grep "^To $HTTPD_URL/smart/test_repo.git" status
+'
+
 stop_httpd
 test_done
diff --git a/t/t5544-pack-objects-hook.sh b/t/t5544-pack-objects-hook.sh
new file mode 100755
index 0000000000..4357af1525
--- /dev/null
+++ b/t/t5544-pack-objects-hook.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+test_description='test custom script in place of pack-objects'
+. ./test-lib.sh
+
+test_expect_success 'create some history to fetch' '
+	test_commit one &&
+	test_commit two
+'
+
+test_expect_success 'create debugging hook script' '
+	write_script .git/hook <<-\EOF
+		echo >&2 "hook running"
+		echo "$*" >hook.args
+		cat >hook.stdin
+		"$@" <hook.stdin >hook.stdout
+		cat hook.stdout
+	EOF
+'
+
+clear_hook_results () {
+	rm -rf .git/hook.* dst.git
+}
+
+test_expect_success 'hook runs via global config' '
+	clear_hook_results &&
+	test_config_global uploadpack.packObjectsHook ./hook &&
+	git clone --no-local . dst.git 2>stderr &&
+	grep "hook running" stderr
+'
+
+test_expect_success 'hook outputs are sane' '
+	# check that we recorded a usable pack
+	git index-pack --stdin <.git/hook.stdout &&
+
+	# check that we recorded args and stdin. We do not check
+	# the full argument list or the exact pack contents, as it would make
+	# the test brittle. So just sanity check that we could replay
+	# the packing procedure.
+	grep "^git" .git/hook.args &&
+	$(cat .git/hook.args) <.git/hook.stdin >replay
+'
+
+test_expect_success 'hook runs from -c config' '
+	clear_hook_results &&
+	git clone --no-local \
+	  -u "git -c uploadpack.packObjectsHook=./hook upload-pack" \
+	  . dst.git 2>stderr &&
+	grep "hook running" stderr
+'
+
+test_expect_success 'hook does not run from repo config' '
+	clear_hook_results &&
+	test_config uploadpack.packObjectsHook "./hook" &&
+	git clone --no-local . dst.git 2>stderr &&
+	! grep "hook running" stderr &&
+	test_path_is_missing .git/hook.args &&
+	test_path_is_missing .git/hook.stdin &&
+	test_path_is_missing .git/hook.stdout
+'
+
+test_done
diff --git a/t/t5545-push-options.sh b/t/t5545-push-options.sh
new file mode 100755
index 0000000000..ea813b9383
--- /dev/null
+++ b/t/t5545-push-options.sh
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+test_description='pushing to a repository using push options'
+
+. ./test-lib.sh
+
+mk_repo_pair () {
+	rm -rf workbench upstream &&
+	test_create_repo upstream &&
+	test_create_repo workbench &&
+	(
+		cd upstream &&
+		git config receive.denyCurrentBranch warn &&
+		mkdir -p .git/hooks &&
+		cat >.git/hooks/pre-receive <<-'EOF' &&
+		#!/bin/sh
+		if test -n "$GIT_PUSH_OPTION_COUNT"; then
+			i=0
+			>hooks/pre-receive.push_options
+			while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"; do
+				eval "value=\$GIT_PUSH_OPTION_$i"
+				echo $value >>hooks/pre-receive.push_options
+				i=$((i + 1))
+			done
+		fi
+		EOF
+		chmod u+x .git/hooks/pre-receive
+
+		cat >.git/hooks/post-receive <<-'EOF' &&
+		#!/bin/sh
+		if test -n "$GIT_PUSH_OPTION_COUNT"; then
+			i=0
+			>hooks/post-receive.push_options
+			while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"; do
+				eval "value=\$GIT_PUSH_OPTION_$i"
+				echo $value >>hooks/post-receive.push_options
+				i=$((i + 1))
+			done
+		fi
+		EOF
+		chmod u+x .git/hooks/post-receive
+	) &&
+	(
+		cd workbench &&
+		git remote add up ../upstream
+	)
+}
+
+# Compare the ref ($1) in upstream with a ref value from workbench ($2)
+# i.e. test_refs second HEAD@{2}
+test_refs () {
+	test $# = 2 &&
+	git -C upstream rev-parse --verify "$1" >expect &&
+	git -C workbench rev-parse --verify "$2" >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success 'one push option works for a single branch' '
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		git push --push-option=asdf up master
+	) &&
+	test_refs master master &&
+	echo "asdf" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
+'
+
+test_expect_success 'push option denied by remote' '
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions false &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		test_must_fail git push --push-option=asdf up master
+	) &&
+	test_refs master HEAD@{1}
+'
+
+test_expect_success 'two push options work' '
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		git push --push-option=asdf --push-option="more structured text" up master
+	) &&
+	test_refs master master &&
+	printf "asdf\nmore structured text\n" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
+'
+
+test_done
diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh
index 64146352ae..3484b6f0f3 100755
--- a/t/t5550-http-fetch-dumb.sh
+++ b/t/t5550-http-fetch-dumb.sh
@@ -91,6 +91,55 @@ test_expect_success 'configured username does not override URL' '
 	expect_askpass pass user@host
 '
 
+test_expect_success 'set up repo with http submodules' '
+	git init super &&
+	set_askpass user@host pass@host &&
+	(
+		cd super &&
+		git submodule add "$HTTPD_URL/auth/dumb/repo.git" sub &&
+		git commit -m "add submodule"
+	)
+'
+
+test_expect_success 'cmdline credential config passes to submodule via clone' '
+	set_askpass wrong pass@host &&
+	test_must_fail git clone --recursive super super-clone &&
+	rm -rf super-clone &&
+
+	set_askpass wrong pass@host &&
+	git -c "credential.$HTTPD_URL.username=user@host" \
+		clone --recursive super super-clone &&
+	expect_askpass pass user@host
+'
+
+test_expect_success 'cmdline credential config passes submodule via fetch' '
+	set_askpass wrong pass@host &&
+	test_must_fail git -C super-clone fetch --recurse-submodules &&
+
+	set_askpass wrong pass@host &&
+	git -C super-clone \
+	    -c "credential.$HTTPD_URL.username=user@host" \
+	    fetch --recurse-submodules &&
+	expect_askpass pass user@host
+'
+
+test_expect_success 'cmdline credential config passes submodule update' '
+	# advance the submodule HEAD so that a fetch is required
+	git commit --allow-empty -m foo &&
+	git push "$HTTPD_DOCUMENT_ROOT_PATH/auth/dumb/repo.git" HEAD &&
+	sha1=$(git rev-parse HEAD) &&
+	git -C super-clone update-index --cacheinfo 160000,$sha1,sub &&
+
+	set_askpass wrong pass@host &&
+	test_must_fail git -C super-clone submodule update &&
+
+	set_askpass wrong pass@host &&
+	git -C super-clone \
+	    -c "credential.$HTTPD_URL.username=user@host" \
+	    submodule update &&
+	expect_askpass pass user@host
+'
+
 test_expect_success 'fetch changes via http' '
 	echo content >>file &&
 	git commit -a -m two &&
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index 58207d8825..2f375eb94d 100755
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@ -282,5 +282,22 @@ test_expect_success EXPENSIVE 'http can handle enormous ref negotiation' '
 	test_line_count = 100000 tags
 '
 
+test_expect_success 'custom http headers' '
+	test_must_fail git -c http.extraheader="x-magic-two: cadabra" \
+		fetch "$HTTPD_URL/smart_headers/repo.git" &&
+	git -c http.extraheader="x-magic-one: abra" \
+	    -c http.extraheader="x-magic-two: cadabra" \
+	    fetch "$HTTPD_URL/smart_headers/repo.git" &&
+	git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
+	git config -f .gitmodules submodule.sub.path sub &&
+	git config -f .gitmodules submodule.sub.url \
+		"$HTTPD_URL/smart_headers/repo.git" &&
+	git submodule init sub &&
+	test_must_fail git submodule update sub &&
+	git -c http.extraheader="x-magic-one: abra" \
+	    -c http.extraheader="x-magic-two: cadabra" \
+		submodule update sub
+'
+
 stop_httpd
 test_done
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index 1789d0be3d..a433394200 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -308,7 +308,7 @@ test_expect_success 'clone checking out a tag' '
 
 setup_ssh_wrapper () {
 	test_expect_success 'setup ssh wrapper' '
-		cp "$GIT_BUILD_DIR/test-fake-ssh$X" \
+		cp "$GIT_BUILD_DIR/t/helper/test-fake-ssh$X" \
 			"$TRASH_DIRECTORY/ssh-wrapper$X" &&
 		GIT_SSH="$TRASH_DIRECTORY/ssh-wrapper$X" &&
 		export GIT_SSH &&
diff --git a/t/t5614-clone-submodules.sh b/t/t5614-clone-submodules.sh
new file mode 100755
index 0000000000..a87d329656
--- /dev/null
+++ b/t/t5614-clone-submodules.sh
@@ -0,0 +1,122 @@
+#!/bin/sh
+
+test_description='Test shallow cloning of repos with submodules'
+
+. ./test-lib.sh
+
+pwd=$(pwd)
+
+test_expect_success 'setup' '
+	git checkout -b master &&
+	test_commit commit1 &&
+	test_commit commit2 &&
+	mkdir sub &&
+	(
+		cd sub &&
+		git init &&
+		test_commit subcommit1 &&
+		test_commit subcommit2 &&
+		test_commit subcommit3
+	) &&
+	git submodule add "file://$pwd/sub" sub &&
+	git commit -m "add submodule"
+'
+
+test_expect_success 'nonshallow clone implies nonshallow submodule' '
+	test_when_finished "rm -rf super_clone" &&
+	git clone --recurse-submodules "file://$pwd/." super_clone &&
+	git -C super_clone log --oneline >lines &&
+	test_line_count = 3 lines &&
+	git -C super_clone/sub log --oneline >lines &&
+	test_line_count = 3 lines
+'
+
+test_expect_success 'shallow clone with shallow submodule' '
+	test_when_finished "rm -rf super_clone" &&
+	git clone --recurse-submodules --depth 2 --shallow-submodules "file://$pwd/." super_clone &&
+	git -C super_clone log --oneline >lines &&
+	test_line_count = 2 lines &&
+	git -C super_clone/sub log --oneline >lines &&
+	test_line_count = 1 lines
+'
+
+test_expect_success 'shallow clone does not imply shallow submodule' '
+	test_when_finished "rm -rf super_clone" &&
+	git clone --recurse-submodules --depth 2 "file://$pwd/." super_clone &&
+	git -C super_clone log --oneline >lines &&
+	test_line_count = 2 lines &&
+	git -C super_clone/sub log --oneline >lines &&
+	test_line_count = 3 lines
+'
+
+test_expect_success 'shallow clone with non shallow submodule' '
+	test_when_finished "rm -rf super_clone" &&
+	git clone --recurse-submodules --depth 2 --no-shallow-submodules "file://$pwd/." super_clone &&
+	git -C super_clone log --oneline >lines &&
+	test_line_count = 2 lines &&
+	git -C super_clone/sub log --oneline >lines &&
+	test_line_count = 3 lines
+'
+
+test_expect_success 'non shallow clone with shallow submodule' '
+	test_when_finished "rm -rf super_clone" &&
+	git clone --recurse-submodules --no-local --shallow-submodules "file://$pwd/." super_clone &&
+	git -C super_clone log --oneline >lines &&
+	test_line_count = 3 lines &&
+	git -C super_clone/sub log --oneline >lines &&
+	test_line_count = 1 lines
+'
+
+test_expect_success 'clone follows shallow recommendation' '
+	test_when_finished "rm -rf super_clone" &&
+	git config -f .gitmodules submodule.sub.shallow true &&
+	git add .gitmodules &&
+	git commit -m "recommed shallow for sub" &&
+	git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
+	(
+		cd super_clone &&
+		git log --oneline >lines &&
+		test_line_count = 4 lines
+	) &&
+	(
+		cd super_clone/sub &&
+		git log --oneline >lines &&
+		test_line_count = 1 lines
+	)
+'
+
+test_expect_success 'get unshallow recommended shallow submodule' '
+	test_when_finished "rm -rf super_clone" &&
+	git clone --no-local "file://$pwd/." super_clone &&
+	(
+		cd super_clone &&
+		git submodule update --init --no-recommend-shallow &&
+		git log --oneline >lines &&
+		test_line_count = 4 lines
+	) &&
+	(
+		cd super_clone/sub &&
+		git log --oneline >lines &&
+		test_line_count = 3 lines
+	)
+'
+
+test_expect_success 'clone follows non shallow recommendation' '
+	test_when_finished "rm -rf super_clone" &&
+	git config -f .gitmodules submodule.sub.shallow false &&
+	git add .gitmodules &&
+	git commit -m "recommed non shallow for sub" &&
+	git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
+	(
+		cd super_clone &&
+		git log --oneline >lines &&
+		test_line_count = 5 lines
+	) &&
+	(
+		cd super_clone/sub &&
+		git log --oneline >lines &&
+		test_line_count = 3 lines
+	)
+'
+
+test_done
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index b77d4c97c1..a1dcdb81d7 100755
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -184,38 +184,38 @@ commit $head1
 foo
 EOF
 
-test_expect_success '%C(auto) does not enable color by default' '
+test_expect_success '%C(auto,...) does not enable color by default' '
 	git log --format=$AUTO_COLOR -1 >actual &&
 	has_no_color actual
 '
 
-test_expect_success '%C(auto) enables colors for color.diff' '
+test_expect_success '%C(auto,...) enables colors for color.diff' '
 	git -c color.diff=always log --format=$AUTO_COLOR -1 >actual &&
 	has_color actual
 '
 
-test_expect_success '%C(auto) enables colors for color.ui' '
+test_expect_success '%C(auto,...) enables colors for color.ui' '
 	git -c color.ui=always log --format=$AUTO_COLOR -1 >actual &&
 	has_color actual
 '
 
-test_expect_success '%C(auto) respects --color' '
+test_expect_success '%C(auto,...) respects --color' '
 	git log --format=$AUTO_COLOR -1 --color >actual &&
 	has_color actual
 '
 
-test_expect_success '%C(auto) respects --no-color' '
+test_expect_success '%C(auto,...) respects --no-color' '
 	git -c color.ui=always log --format=$AUTO_COLOR -1 --no-color >actual &&
 	has_no_color actual
 '
 
-test_expect_success TTY '%C(auto) respects --color=auto (stdout is tty)' '
+test_expect_success TTY '%C(auto,...) respects --color=auto (stdout is tty)' '
 	test_terminal env TERM=vt100 \
 		git log --format=$AUTO_COLOR -1 --color=auto >actual &&
 	has_color actual
 '
 
-test_expect_success '%C(auto) respects --color=auto (stdout not tty)' '
+test_expect_success '%C(auto,...) respects --color=auto (stdout not tty)' '
 	(
 		TERM=vt100 && export TERM &&
 		git log --format=$AUTO_COLOR -1 --color=auto >actual &&
@@ -223,6 +223,18 @@ test_expect_success '%C(auto) respects --color=auto (stdout not tty)' '
 	)
 '
 
+test_expect_success '%C(auto) respects --color' '
+	git log --color --format="%C(auto)%H" -1 >actual &&
+	printf "\\033[33m%s\\033[m\\n" $(git rev-parse HEAD) >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success '%C(auto) respects --no-color' '
+	git log --no-color --format="%C(auto)%H" -1 >actual &&
+	git rev-parse HEAD >expect &&
+	test_cmp expect actual
+'
+
 iconv -f utf-8 -t $test_encoding > commit-msg <<EOF
 Test printing of complex bodies
 
diff --git a/t/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh
index 28d4f6b259..1408b608eb 100755
--- a/t/t6007-rev-list-cherry-pick-file.sh
+++ b/t/t6007-rev-list-cherry-pick-file.sh
@@ -207,4 +207,25 @@ test_expect_success '--count --left-right' '
 	test_cmp expect actual
 '
 
+# Corrupt the object store deliberately to make sure
+# the object is not even checked for its existence.
+remove_loose_object () {
+	sha1="$(git rev-parse "$1")" &&
+	remainder=${sha1#??} &&
+	firsttwo=${sha1%$remainder} &&
+	rm .git/objects/$firsttwo/$remainder
+}
+
+test_expect_success '--cherry-pick avoids looking at full diffs' '
+	git checkout -b shy-diff &&
+	test_commit dont-look-at-me &&
+	echo Hello >dont-look-at-me.t &&
+	test_tick &&
+	git commit -m tip dont-look-at-me.t &&
+	git checkout -b mainline HEAD^ &&
+	test_commit to-cherry-pick &&
+	remove_loose_object shy-diff^:dont-look-at-me.t &&
+	git rev-list --cherry-pick ...shy-diff
+'
+
 test_done
diff --git a/t/t6009-rev-list-parent.sh b/t/t6009-rev-list-parent.sh
index 66cda17ef3..20e3e2554a 100755
--- a/t/t6009-rev-list-parent.sh
+++ b/t/t6009-rev-list-parent.sh
@@ -47,7 +47,9 @@ test_expect_success 'setup roots, merges and octopuses' '
 	git checkout -b yetanotherbranch four &&
 	test_commit eight &&
 	git checkout master &&
-	test_merge normalmerge newroot &&
+	test_tick &&
+	git merge --allow-unrelated-histories -m normalmerge newroot &&
+	git tag normalmerge &&
 	test_tick &&
 	git merge -m tripus sidebranch anotherbranch &&
 	git tag tripus &&
diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh
index 39b3238da2..e0c5f44cac 100755
--- a/t/t6010-merge-base.sh
+++ b/t/t6010-merge-base.sh
@@ -215,11 +215,13 @@ test_expect_success 'criss-cross merge-base for octopus-step' '
 	git reset --hard E &&
 	test_commit CC2 &&
 	test_tick &&
-	git merge -s ours CC1 &&
+	# E is a root commit unrelated to MMR root on which CC1 is based
+	git merge -s ours --allow-unrelated-histories CC1 &&
 	test_commit CC-o &&
 	test_commit CCB &&
 	git reset --hard CC1 &&
-	git merge -s ours CC2 &&
+	# E is a root commit unrelated to MMR root on which CC1 is based
+	git merge -s ours --allow-unrelated-histories CC2 &&
 	test_commit CCA &&
 
 	git rev-parse CC1 CC2 >expected &&
diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh
index b89cd6b07a..2a0fbb87b1 100755
--- a/t/t6012-rev-list-simplify.sh
+++ b/t/t6012-rev-list-simplify.sh
@@ -71,7 +71,7 @@ test_expect_success setup '
 	note J &&
 
 	git checkout master &&
-	test_tick && git merge -m "Coolest" unrelated &&
+	test_tick && git merge --allow-unrelated-histories -m "Coolest" unrelated &&
 	note K &&
 
 	echo "Immaterial" >elif &&
diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh
index d00f7db868..381f35ed16 100755
--- a/t/t6018-rev-list-glob.sh
+++ b/t/t6018-rev-list-glob.sh
@@ -257,7 +257,7 @@ test_expect_success 'rev-list accumulates multiple --exclude' '
 
 
 # "git rev-list<ENTER>" is likely to be a bug in the calling script and may
-# deserve an error message, but do cases where set of refs programatically
+# deserve an error message, but do cases where set of refs programmatically
 # given using globbing and/or --stdin need to fail with the same error, or
 # are we better off reporting a success with no output?  The following few
 # tests document the current behaviour to remind us that we might want to
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
index 755d30ce2a..3f59e58dfb 100755
--- a/t/t6024-recursive-merge.sh
+++ b/t/t6024-recursive-merge.sh
@@ -76,7 +76,7 @@ test_expect_success "result contains a conflict" "test_cmp expect a1"
 
 git ls-files --stage > out
 cat > expect << EOF
-100644 439cc46de773d8a83c77799b7cc9191c128bfcff 1	a1
+100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1	a1
 100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2	a1
 100644 fd7923529855d0b274795ae3349c5e0438333979 3	a1
 EOF
diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh
index 04c0509c47..ef0cbceafe 100755
--- a/t/t6026-merge-attr.sh
+++ b/t/t6026-merge-attr.sh
@@ -176,7 +176,8 @@ test_expect_success 'up-to-date merge without common ancestor' '
 	test_tick &&
 	(
 		cd repo1 &&
-		git pull ../repo2 master
+		git fetch ../repo2 master &&
+		git merge --allow-unrelated-histories FETCH_HEAD
 	)
 '
 
diff --git a/t/t6029-merge-subtree.sh b/t/t6029-merge-subtree.sh
index 73fc240e85..3e692454a7 100755
--- a/t/t6029-merge-subtree.sh
+++ b/t/t6029-merge-subtree.sh
@@ -49,7 +49,7 @@ test_expect_success 'setup' '
 
 test_expect_success 'initial merge' '
 	git remote add -f gui ../git-gui &&
-	git merge -s ours --no-commit gui/master &&
+	git merge -s ours --no-commit --allow-unrelated-histories gui/master &&
 	git read-tree --prefix=git-gui/ -u gui/master &&
 	git commit -m "Merge git-gui as our subdirectory" &&
 	git checkout -b work &&
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index e74662ba5c..5e5370feb4 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -362,7 +362,7 @@ test_expect_success 'bisect starting with a detached HEAD' '
 test_expect_success 'bisect errors out if bad and good are mistaken' '
 	git bisect reset &&
 	test_must_fail git bisect start $HASH2 $HASH4 2> rev_list_error &&
-	grep "mistook good and bad" rev_list_error &&
+	test_i18ngrep "mistook good and bad" rev_list_error &&
 	git bisect reset
 '
 
@@ -404,7 +404,7 @@ test_expect_success 'side branch creation' '
 
 test_expect_success 'good merge base when good and bad are siblings' '
 	git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt &&
-	grep "merge base must be tested" my_bisect_log.txt &&
+	test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
 	grep $HASH4 my_bisect_log.txt &&
 	git bisect good > my_bisect_log.txt &&
 	test_must_fail grep "merge base must be tested" my_bisect_log.txt &&
@@ -413,7 +413,7 @@ test_expect_success 'good merge base when good and bad are siblings' '
 '
 test_expect_success 'skipped merge base when good and bad are siblings' '
 	git bisect start "$SIDE_HASH7" "$HASH7" > my_bisect_log.txt &&
-	grep "merge base must be tested" my_bisect_log.txt &&
+	test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
 	grep $HASH4 my_bisect_log.txt &&
 	git bisect skip > my_bisect_log.txt 2>&1 &&
 	grep "warning" my_bisect_log.txt &&
@@ -423,11 +423,11 @@ test_expect_success 'skipped merge base when good and bad are siblings' '
 
 test_expect_success 'bad merge base when good and bad are siblings' '
 	git bisect start "$HASH7" HEAD > my_bisect_log.txt &&
-	grep "merge base must be tested" my_bisect_log.txt &&
+	test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
 	grep $HASH4 my_bisect_log.txt &&
 	test_must_fail git bisect bad > my_bisect_log.txt 2>&1 &&
-	grep "merge base $HASH4 is bad" my_bisect_log.txt &&
-	grep "fixed between $HASH4 and \[$SIDE_HASH7\]" my_bisect_log.txt &&
+	test_i18ngrep "merge base $HASH4 is bad" my_bisect_log.txt &&
+	test_i18ngrep "fixed between $HASH4 and \[$SIDE_HASH7\]" my_bisect_log.txt &&
 	git bisect reset
 '
 
@@ -460,9 +460,9 @@ test_expect_success 'many merge bases creation' '
 
 test_expect_success 'good merge bases when good and bad are siblings' '
 	git bisect start "$B_HASH" "$A_HASH" > my_bisect_log.txt &&
-	grep "merge base must be tested" my_bisect_log.txt &&
+	test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
 	git bisect good > my_bisect_log2.txt &&
-	grep "merge base must be tested" my_bisect_log2.txt &&
+	test_i18ngrep "merge base must be tested" my_bisect_log2.txt &&
 	{
 		{
 			grep "$SIDE_HASH5" my_bisect_log.txt &&
@@ -477,14 +477,14 @@ test_expect_success 'good merge bases when good and bad are siblings' '
 
 test_expect_success 'optimized merge base checks' '
 	git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt &&
-	grep "merge base must be tested" my_bisect_log.txt &&
+	test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
 	grep "$HASH4" my_bisect_log.txt &&
 	git bisect good > my_bisect_log2.txt &&
 	test -f ".git/BISECT_ANCESTORS_OK" &&
 	test "$HASH6" = $(git rev-parse --verify HEAD) &&
 	git bisect bad > my_bisect_log3.txt &&
 	git bisect good "$A_HASH" > my_bisect_log4.txt &&
-	grep "merge base must be tested" my_bisect_log4.txt &&
+	test_i18ngrep "merge base must be tested" my_bisect_log4.txt &&
 	test_must_fail test -f ".git/BISECT_ANCESTORS_OK"
 '
 
@@ -562,7 +562,7 @@ test_expect_success 'skipping away from skipped commit' '
 
 test_expect_success 'erroring out when using bad path parameters' '
 	test_must_fail git bisect start $PARA_HASH7 $HASH1 -- foobar 2> error.txt &&
-	grep "bad path parameters" error.txt
+	test_i18ngrep "bad path parameters" error.txt
 '
 
 test_expect_success 'test bisection on bare repo - --no-checkout specified' '
@@ -721,7 +721,7 @@ git bisect good 3de952f2416b6084f557ec417709eac740c6818c
 # first bad commit: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
 EOF
 
-test_expect_success 'bisect log: successfull result' '
+test_expect_success 'bisect log: successful result' '
 	git bisect reset &&
 	git bisect start $HASH4 $HASH2 &&
 	git bisect good &&
@@ -803,7 +803,7 @@ test_expect_success 'bisect terms needs 0 or 1 argument' '
 	test_must_fail git bisect terms 1 2 &&
 	test_must_fail git bisect terms 2>actual &&
 	echo "no terms defined" >expected &&
-	test_cmp expected actual
+	test_i18ncmp expected actual
 '
 
 test_expect_success 'bisect terms shows good/bad after start' '
@@ -875,7 +875,7 @@ test_expect_success 'bisect start --term-* does store terms' '
 	Your current terms are two for the old state
 	and one for the new state.
 	EOF
-	test_cmp expected actual &&
+	test_i18ncmp expected actual &&
 	git bisect terms --term-bad >actual &&
 	echo one >expected &&
 	test_cmp expected actual &&
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh
index 9d6621c056..18aa88b5c0 100755
--- a/t/t6036-recursive-corner-cases.sh
+++ b/t/t6036-recursive-corner-cases.sh
@@ -212,7 +212,8 @@ test_expect_success 'git detects differently handled merges conflict' '
 		-L "" \
 		-L "Temporary merge branch 1" \
 		merged empty merge-me &&
-	test $(git rev-parse :1:new_a) = $(git hash-object merged)
+	sed -e "s/^\([<=>]\)/\1\1\1/" merged >merged-internal &&
+	test $(git rev-parse :1:new_a) = $(git hash-object merged-internal)
 '
 
 #
@@ -299,89 +300,6 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete, rev
 '
 
 #
-# criss-cross + modify/modify with very contrived file contents:
-#
-#      B   D
-#      o---o
-#     / \ / \
-#  A o   X   ? F
-#     \ / \ /
-#      o---o
-#      C   E
-#
-#   Commit A: file with contents 'A\n'
-#   Commit B: file with contents 'B\n'
-#   Commit C: file with contents 'C\n'
-#   Commit D: file with contents 'D\n'
-#   Commit E: file with contents:
-#      <<<<<<< Temporary merge branch 1
-#      C
-#      =======
-#      B
-#      >>>>>>> Temporary merge branch 2
-#
-# Now, when we merge commits D & E, does git detect the conflict?
-
-test_expect_success 'setup differently handled merges of content conflict' '
-	git clean -fdqx &&
-	rm -rf .git &&
-	git init &&
-
-	echo A >file &&
-	git add file &&
-	test_tick &&
-	git commit -m A &&
-
-	git branch B &&
-	git checkout -b C &&
-	echo C >file &&
-	git add file &&
-	test_tick &&
-	git commit -m C &&
-
-	git checkout B &&
-	echo B >file &&
-	git add file &&
-	test_tick &&
-	git commit -m B &&
-
-	git checkout B^0 &&
-	test_must_fail git merge C &&
-	echo D >file &&
-	git add file &&
-	test_tick &&
-	git commit -m D &&
-	git tag D &&
-
-	git checkout C^0 &&
-	test_must_fail git merge B &&
-	cat <<EOF >file &&
-<<<<<<< Temporary merge branch 1
-C
-=======
-B
->>>>>>> Temporary merge branch 2
-EOF
-	git add file &&
-	test_tick &&
-	git commit -m E &&
-	git tag E
-'
-
-test_expect_failure 'git detects conflict w/ criss-cross+contrived resolution' '
-	git checkout D^0 &&
-
-	test_must_fail git merge -s recursive E^0 &&
-
-	test 3 -eq $(git ls-files -s | wc -l) &&
-	test 3 -eq $(git ls-files -u | wc -l) &&
-	test 0 -eq $(git ls-files -o | wc -l) &&
-
-	test $(git rev-parse :2:file) = $(git rev-parse D:file) &&
-	test $(git rev-parse :3:file) = $(git rev-parse E:file)
-'
-
-#
 # criss-cross + d/f conflict via add/add:
 #   Commit A: Neither file 'a' nor directory 'a/' exists.
 #   Commit B: Introduce 'a'
diff --git a/t/t6038-merge-text-auto.sh b/t/t6038-merge-text-auto.sh
index 85c10b0940..5e8d5fa50c 100755
--- a/t/t6038-merge-text-auto.sh
+++ b/t/t6038-merge-text-auto.sh
@@ -16,6 +16,13 @@ test_description='CRLF merge conflict across text=auto change
 
 test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
 
+compare_files () {
+	tr '\015\000' QN <"$1" >"$1".expect &&
+	tr '\015\000' QN <"$2" >"$2".actual &&
+	test_cmp "$1".expect "$2".actual &&
+	rm "$1".expect "$2".actual
+}
+
 test_expect_success setup '
 	git config core.autocrlf false &&
 
@@ -30,7 +37,7 @@ test_expect_success setup '
 	git branch side &&
 
 	echo "* text=auto" >.gitattributes &&
-	touch file &&
+	echo first line >file &&
 	git add .gitattributes file &&
 	test_tick &&
 	git commit -m "normalize file" &&
@@ -81,38 +88,49 @@ test_expect_success 'Merge after setting text=auto' '
 	rm -f .gitattributes &&
 	git reset --hard a &&
 	git merge b &&
-	test_cmp expected file
+	compare_files expected file
 '
 
-test_expect_success 'Merge addition of text=auto' '
+test_expect_success 'Merge addition of text=auto eol=LF' '
+	git config core.eol lf &&
 	cat <<-\EOF >expected &&
 	first line
 	same line
 	EOF
 
-	if test_have_prereq NATIVE_CRLF; then
-		append_cr <expected >expected.temp &&
-		mv expected.temp expected
-	fi &&
 	git config merge.renormalize true &&
 	git rm -fr . &&
 	rm -f .gitattributes &&
 	git reset --hard b &&
 	git merge a &&
-	test_cmp expected file
+	compare_files  expected file
+'
+
+test_expect_success 'Merge addition of text=auto eol=CRLF' '
+	git config core.eol crlf &&
+	cat <<-\EOF >expected &&
+	first line
+	same line
+	EOF
+
+	append_cr <expected >expected.temp &&
+	mv expected.temp expected &&
+	git config merge.renormalize true &&
+	git rm -fr . &&
+	rm -f .gitattributes &&
+	git reset --hard b &&
+	echo >&2 "After git reset --hard b" &&
+	git ls-files -s --eol >&2 &&
+	git merge a &&
+	compare_files  expected file
 '
 
 test_expect_success 'Detect CRLF/LF conflict after setting text=auto' '
+	git config core.eol native &&
 	echo "<<<<<<<" >expected &&
-	if test_have_prereq NATIVE_CRLF; then
-		echo first line | append_cr >>expected &&
-		echo same line | append_cr >>expected &&
-		echo ======= | append_cr >>expected
-	else
-		echo first line >>expected &&
-		echo same line >>expected &&
-		echo ======= >>expected
-	fi &&
+	echo first line >>expected &&
+	echo same line >>expected &&
+	echo ======= >>expected &&
 	echo first line | append_cr >>expected &&
 	echo same line | append_cr >>expected &&
 	echo ">>>>>>>" >>expected &&
@@ -121,29 +139,23 @@ test_expect_success 'Detect CRLF/LF conflict after setting text=auto' '
 	git reset --hard a &&
 	test_must_fail git merge b &&
 	fuzz_conflict file >file.fuzzy &&
-	test_cmp expected file.fuzzy
+	compare_files expected file.fuzzy
 '
 
 test_expect_success 'Detect LF/CRLF conflict from addition of text=auto' '
 	echo "<<<<<<<" >expected &&
 	echo first line | append_cr >>expected &&
 	echo same line | append_cr >>expected &&
-	if test_have_prereq NATIVE_CRLF; then
-		echo ======= | append_cr >>expected &&
-		echo first line | append_cr >>expected &&
-		echo same line | append_cr >>expected
-	else
-		echo ======= >>expected &&
-		echo first line >>expected &&
-		echo same line >>expected
-	fi &&
+	echo ======= >>expected &&
+	echo first line >>expected &&
+	echo same line >>expected &&
 	echo ">>>>>>>" >>expected &&
 	git config merge.renormalize false &&
 	rm -f .gitattributes &&
 	git reset --hard b &&
 	test_must_fail git merge a &&
 	fuzz_conflict file >file.fuzzy &&
-	test_cmp expected file.fuzzy
+	compare_files expected file.fuzzy
 '
 
 test_expect_failure 'checkout -m after setting text=auto' '
@@ -158,7 +170,7 @@ test_expect_failure 'checkout -m after setting text=auto' '
 	git reset --hard initial &&
 	git checkout a -- . &&
 	git checkout -m b &&
-	test_cmp expected file
+	compare_files expected file
 '
 
 test_expect_failure 'checkout -m addition of text=auto' '
@@ -173,7 +185,7 @@ test_expect_failure 'checkout -m addition of text=auto' '
 	git reset --hard initial &&
 	git checkout b -- . &&
 	git checkout -m a &&
-	test_cmp expected file
+	compare_files expected file
 '
 
 test_expect_failure 'cherry-pick patch from after text=auto was added' '
@@ -187,7 +199,7 @@ test_expect_failure 'cherry-pick patch from after text=auto was added' '
 	git reset --hard b &&
 	test_must_fail git cherry-pick a >err 2>&1 &&
 	grep "[Nn]othing added" err &&
-	test_cmp expected file
+	compare_files expected file
 '
 
 test_expect_success 'Test delete/normalize conflict' '
diff --git a/t/t6044-merge-unrelated-index-changes.sh b/t/t6044-merge-unrelated-index-changes.sh
new file mode 100755
index 0000000000..01023486c5
--- /dev/null
+++ b/t/t6044-merge-unrelated-index-changes.sh
@@ -0,0 +1,153 @@
+#!/bin/sh
+
+test_description="merges with unrelated index changes"
+
+. ./test-lib.sh
+
+# Testcase for some simple merges
+#   A
+#   o-----o B
+#    \
+#     \---o C
+#      \
+#       \-o D
+#        \
+#         o E
+#   Commit A: some file a
+#   Commit B: adds file b, modifies end of a
+#   Commit C: adds file c
+#   Commit D: adds file d, modifies beginning of a
+#   Commit E: renames a->subdir/a, adds subdir/e
+
+test_expect_success 'setup trivial merges' '
+	test_seq 1 10 >a &&
+	git add a &&
+	test_tick && git commit -m A &&
+
+	git branch A &&
+	git branch B &&
+	git branch C &&
+	git branch D &&
+	git branch E &&
+
+	git checkout B &&
+	echo b >b &&
+	echo 11 >>a &&
+	git add a b &&
+	test_tick && git commit -m B &&
+
+	git checkout C &&
+	echo c >c &&
+	git add c &&
+	test_tick && git commit -m C &&
+
+	git checkout D &&
+	test_seq 2 10 >a &&
+	echo d >d &&
+	git add a d &&
+	test_tick && git commit -m D &&
+
+	git checkout E &&
+	mkdir subdir &&
+	git mv a subdir/a &&
+	echo e >subdir/e &&
+	git add subdir &&
+	test_tick && git commit -m E
+'
+
+test_expect_success 'ff update' '
+	git reset --hard &&
+	git checkout A^0 &&
+
+	touch random_file && git add random_file &&
+
+	git merge E^0 &&
+
+	test_must_fail git rev-parse HEAD:random_file &&
+	test "$(git diff --name-only --cached E)" = "random_file"
+'
+
+test_expect_success 'ff update, important file modified' '
+	git reset --hard &&
+	git checkout A^0 &&
+
+	mkdir subdir &&
+	touch subdir/e &&
+	git add subdir/e &&
+
+	test_must_fail git merge E^0
+'
+
+test_expect_success 'resolve, trivial' '
+	git reset --hard &&
+	git checkout B^0 &&
+
+	touch random_file && git add random_file &&
+
+	test_must_fail git merge -s resolve C^0
+'
+
+test_expect_success 'resolve, non-trivial' '
+	git reset --hard &&
+	git checkout B^0 &&
+
+	touch random_file && git add random_file &&
+
+	test_must_fail git merge -s resolve D^0
+'
+
+test_expect_success 'recursive' '
+	git reset --hard &&
+	git checkout B^0 &&
+
+	touch random_file && git add random_file &&
+
+	test_must_fail git merge -s recursive C^0
+'
+
+test_expect_success 'octopus, unrelated file touched' '
+	git reset --hard &&
+	git checkout B^0 &&
+
+	touch random_file && git add random_file &&
+
+	test_must_fail git merge C^0 D^0
+'
+
+test_expect_success 'octopus, related file removed' '
+	git reset --hard &&
+	git checkout B^0 &&
+
+	git rm b &&
+
+	test_must_fail git merge C^0 D^0
+'
+
+test_expect_success 'octopus, related file modified' '
+	git reset --hard &&
+	git checkout B^0 &&
+
+	echo 12 >>a && git add a &&
+
+	test_must_fail git merge C^0 D^0
+'
+
+test_expect_success 'ours' '
+	git reset --hard &&
+	git checkout B^0 &&
+
+	touch random_file && git add random_file &&
+
+	test_must_fail git merge -s ours C^0
+'
+
+test_expect_success 'subtree' '
+	git reset --hard &&
+	git checkout B^0 &&
+
+	touch random_file && git add random_file &&
+
+	test_must_fail git merge -s subtree E^0
+'
+
+test_done
diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh
index 10b1452766..1c6952d049 100755
--- a/t/t6101-rev-parse-parents.sh
+++ b/t/t6101-rev-parse-parents.sh
@@ -19,7 +19,7 @@ test_expect_success 'setup' '
 	git checkout --orphan tmp &&
 	test_commit start2 &&
 	git checkout master &&
-	git merge -m next start2 &&
+	git merge -m next --allow-unrelated-histories start2 &&
 	test_commit final &&
 
 	test_seq 40 |
diff --git a/t/t6301-for-each-ref-errors.sh b/t/t6301-for-each-ref-errors.sh
index cdb67a03b7..c734ce2388 100755
--- a/t/t6301-for-each-ref-errors.sh
+++ b/t/t6301-for-each-ref-errors.sh
@@ -20,8 +20,8 @@ test_expect_success 'Broken refs are reported correctly' '
 	test_when_finished "rm -f .git/$r" &&
 	echo "warning: ignoring broken ref $r" >broken-err &&
 	git for-each-ref >out 2>err &&
-	test_cmp full-list out &&
-	test_cmp broken-err err
+	test_i18ncmp full-list out &&
+	test_i18ncmp broken-err err
 '
 
 test_expect_success 'NULL_SHA1 refs are reported correctly' '
@@ -31,10 +31,10 @@ test_expect_success 'NULL_SHA1 refs are reported correctly' '
 	echo "warning: ignoring broken ref $r" >zeros-err &&
 	git for-each-ref >out 2>err &&
 	test_cmp full-list out &&
-	test_cmp zeros-err err &&
+	test_i18ncmp zeros-err err &&
 	git for-each-ref --format="%(objectname) %(refname)" >brief-out 2>brief-err &&
 	test_cmp brief-list brief-out &&
-	test_cmp zeros-err brief-err
+	test_i18ncmp zeros-err brief-err
 '
 
 test_expect_success 'Missing objects are reported correctly' '
@@ -43,7 +43,7 @@ test_expect_success 'Missing objects are reported correctly' '
 	test_when_finished "rm -f .git/$r" &&
 	echo "fatal: missing object $MISSING for $r" >missing-err &&
 	test_must_fail git for-each-ref 2>err &&
-	test_cmp missing-err err &&
+	test_i18ncmp missing-err err &&
 	(
 		cat brief-list &&
 		echo "$MISSING $r"
diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh
index bcf472bf51..d0ab09f4bd 100755
--- a/t/t6302-for-each-ref-filter.sh
+++ b/t/t6302-for-each-ref-filter.sh
@@ -5,20 +5,27 @@ test_description='test for-each-refs usage of ref-filter APIs'
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-gpg.sh
 
-if ! test_have_prereq GPG
-then
-	skip_all="skipping for-each-ref tests, GPG not available"
-	test_done
-fi
-
 test_expect_success 'setup some history and refs' '
 	test_commit one &&
 	test_commit two &&
 	test_commit three &&
 	git checkout -b side &&
 	test_commit four &&
-	git tag -s -m "A signed tag message" signed-tag &&
-	git tag -s -m "Annonated doubly" double-tag signed-tag &&
+	git tag -m "An annotated tag" annotated-tag &&
+	git tag -m "Annonated doubly" doubly-annotated-tag annotated-tag &&
+
+	# Note that these "signed" tags might not actually be signed.
+	# Tests which care about the distinction should be marked
+	# with the GPG prereq.
+	if test_have_prereq GPG
+	then
+		sign=-s
+	else
+		sign=
+	fi &&
+	git tag $sign -m "A signed tag" signed-tag &&
+	git tag $sign -m "Signed doubly" doubly-signed-tag signed-tag &&
+
 	git checkout master &&
 	git update-ref refs/odd/spot master
 '
@@ -36,6 +43,7 @@ test_expect_success 'filtering with --points-at' '
 test_expect_success 'check signed tags with --points-at' '
 	sed -e "s/Z$//" >expect <<-\EOF &&
 	refs/heads/side Z
+	refs/tags/annotated-tag four
 	refs/tags/four Z
 	refs/tags/signed-tag four
 	EOF
@@ -58,7 +66,9 @@ test_expect_success 'filtering with --merged' '
 test_expect_success 'filtering with --no-merged' '
 	cat >expect <<-\EOF &&
 	refs/heads/side
-	refs/tags/double-tag
+	refs/tags/annotated-tag
+	refs/tags/doubly-annotated-tag
+	refs/tags/doubly-signed-tag
 	refs/tags/four
 	refs/tags/signed-tag
 	EOF
@@ -71,7 +81,9 @@ test_expect_success 'filtering with --contains' '
 	refs/heads/master
 	refs/heads/side
 	refs/odd/spot
-	refs/tags/double-tag
+	refs/tags/annotated-tag
+	refs/tags/doubly-annotated-tag
+	refs/tags/doubly-signed-tag
 	refs/tags/four
 	refs/tags/signed-tag
 	refs/tags/three
@@ -90,7 +102,9 @@ test_expect_success 'left alignment is default' '
 	refname is refs/heads/master  |refs/heads/master
 	refname is refs/heads/side    |refs/heads/side
 	refname is refs/odd/spot      |refs/odd/spot
-	refname is refs/tags/double-tag|refs/tags/double-tag
+	refname is refs/tags/annotated-tag|refs/tags/annotated-tag
+	refname is refs/tags/doubly-annotated-tag|refs/tags/doubly-annotated-tag
+	refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag
 	refname is refs/tags/four     |refs/tags/four
 	refname is refs/tags/one      |refs/tags/one
 	refname is refs/tags/signed-tag|refs/tags/signed-tag
@@ -106,7 +120,9 @@ test_expect_success 'middle alignment' '
 	| refname is refs/heads/master |refs/heads/master
 	|  refname is refs/heads/side  |refs/heads/side
 	|   refname is refs/odd/spot   |refs/odd/spot
-	|refname is refs/tags/double-tag|refs/tags/double-tag
+	|refname is refs/tags/annotated-tag|refs/tags/annotated-tag
+	|refname is refs/tags/doubly-annotated-tag|refs/tags/doubly-annotated-tag
+	|refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag
 	|  refname is refs/tags/four   |refs/tags/four
 	|   refname is refs/tags/one   |refs/tags/one
 	|refname is refs/tags/signed-tag|refs/tags/signed-tag
@@ -122,7 +138,9 @@ test_expect_success 'right alignment' '
 	|  refname is refs/heads/master|refs/heads/master
 	|    refname is refs/heads/side|refs/heads/side
 	|      refname is refs/odd/spot|refs/odd/spot
-	|refname is refs/tags/double-tag|refs/tags/double-tag
+	|refname is refs/tags/annotated-tag|refs/tags/annotated-tag
+	|refname is refs/tags/doubly-annotated-tag|refs/tags/doubly-annotated-tag
+	|refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag
 	|     refname is refs/tags/four|refs/tags/four
 	|      refname is refs/tags/one|refs/tags/one
 	|refname is refs/tags/signed-tag|refs/tags/signed-tag
@@ -137,7 +155,9 @@ cat >expect <<-\EOF
 |       refname is refs/heads/master       |refs/heads/master
 |        refname is refs/heads/side        |refs/heads/side
 |         refname is refs/odd/spot         |refs/odd/spot
-|     refname is refs/tags/double-tag      |refs/tags/double-tag
+|    refname is refs/tags/annotated-tag    |refs/tags/annotated-tag
+|refname is refs/tags/doubly-annotated-tag |refs/tags/doubly-annotated-tag
+|  refname is refs/tags/doubly-signed-tag  |refs/tags/doubly-signed-tag
 |        refname is refs/tags/four         |refs/tags/four
 |         refname is refs/tags/one         |refs/tags/one
 |     refname is refs/tags/signed-tag      |refs/tags/signed-tag
@@ -182,7 +202,9 @@ test_expect_success 'alignment with format quote' "
 	|'      '\''master| A U Thor'\''      '|
 	|'       '\''side| A U Thor'\''       '|
 	|'     '\''odd/spot| A U Thor'\''     '|
-	|'        '\''double-tag| '\''        '|
+	|'      '\''annotated-tag| '\''       '|
+	|'   '\''doubly-annotated-tag| '\''   '|
+	|'    '\''doubly-signed-tag| '\''     '|
 	|'       '\''four| A U Thor'\''       '|
 	|'       '\''one| A U Thor'\''        '|
 	|'        '\''signed-tag| '\''        '|
@@ -198,7 +220,9 @@ test_expect_success 'nested alignment with quote formatting' "
 	|'         master               '|
 	|'           side               '|
 	|'       odd/spot               '|
-	|'     double-tag               '|
+	|'  annotated-tag               '|
+	|'doubly-annotated-tag          '|
+	|'doubly-signed-tag             '|
 	|'           four               '|
 	|'            one               '|
 	|'     signed-tag               '|
@@ -214,10 +238,12 @@ test_expect_success 'check `%(contents:lines=1)`' '
 	master |three
 	side |four
 	odd/spot |three
-	double-tag |Annonated doubly
+	annotated-tag |An annotated tag
+	doubly-annotated-tag |Annonated doubly
+	doubly-signed-tag |Signed doubly
 	four |four
 	one |one
-	signed-tag |A signed tag message
+	signed-tag |A signed tag
 	three |three
 	two |two
 	EOF
@@ -230,7 +256,9 @@ test_expect_success 'check `%(contents:lines=0)`' '
 	master |
 	side |
 	odd/spot |
-	double-tag |
+	annotated-tag |
+	doubly-annotated-tag |
+	doubly-signed-tag |
 	four |
 	one |
 	signed-tag |
@@ -246,10 +274,12 @@ test_expect_success 'check `%(contents:lines=99999)`' '
 	master |three
 	side |four
 	odd/spot |three
-	double-tag |Annonated doubly
+	annotated-tag |An annotated tag
+	doubly-annotated-tag |Annonated doubly
+	doubly-signed-tag |Signed doubly
 	four |four
 	one |one
-	signed-tag |A signed tag message
+	signed-tag |A signed tag
 	three |three
 	two |two
 	EOF
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 4a2570ed95..e365d1ff77 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -292,8 +292,8 @@ test_expect_success 'setup submodule' '
 	echo content >file &&
 	git add file &&
 	git commit -m "added sub and file" &&
-	mkdir -p deep/directory/hierachy &&
-	git submodule add ./. deep/directory/hierachy/sub &&
+	mkdir -p deep/directory/hierarchy &&
+	git submodule add ./. deep/directory/hierarchy/sub &&
 	git commit -m "added another submodule" &&
 	git branch submodule
 '
@@ -485,8 +485,8 @@ test_expect_success 'moving a submodule in nested directories' '
 		# git status would fail if the update of linking git dir to
 		# work dir of the submodule failed.
 		git status &&
-		git config -f ../.gitmodules submodule.deep/directory/hierachy/sub.path >../actual &&
-		echo "directory/hierachy/sub" >../expect
+		git config -f ../.gitmodules submodule.deep/directory/hierarchy/sub.path >../actual &&
+		echo "directory/hierarchy/sub" >../expect
 	) &&
 	test_cmp actual expect
 '
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index cf3469b142..8b0f71a2ac 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -775,6 +775,47 @@ test_expect_success GPG '-s implies annotated tag' '
 	test_cmp expect actual
 '
 
+get_tag_header forcesignannotated-implied-sign $commit commit $time >expect
+echo "A message" >>expect
+echo '-----BEGIN PGP SIGNATURE-----' >>expect
+test_expect_success GPG \
+	'git tag -s implied if configured with tag.forcesignannotated' \
+	'test_config tag.forcesignannotated true &&
+	git tag -m "A message" forcesignannotated-implied-sign &&
+	get_tag_msg forcesignannotated-implied-sign >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success GPG \
+	'lightweight with no message when configured with tag.forcesignannotated' \
+	'test_config tag.forcesignannotated true &&
+	git tag forcesignannotated-lightweight &&
+	tag_exists forcesignannotated-lightweight &&
+	test_must_fail git tag -v forcesignannotated-no-message
+'
+
+get_tag_header forcesignannotated-annotate $commit commit $time >expect
+echo "A message" >>expect
+test_expect_success GPG \
+	'git tag -a disable configured tag.forcesignannotated' \
+	'test_config tag.forcesignannotated true &&
+	git tag -a -m "A message" forcesignannotated-annotate &&
+	get_tag_msg forcesignannotated-annotate >actual &&
+	test_cmp expect actual &&
+	test_must_fail git tag -v forcesignannotated-annotate
+'
+
+get_tag_header forcesignannotated-disabled $commit commit $time >expect
+echo "A message" >>expect
+echo '-----BEGIN PGP SIGNATURE-----' >>expect
+test_expect_success GPG \
+	'git tag --sign enable GPG sign' \
+	'test_config tag.forcesignannotated false &&
+	git tag --sign -m "A message" forcesignannotated-disabled &&
+	get_tag_msg forcesignannotated-disabled >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success GPG \
 	'trying to create a signed tag with non-existing -F file should fail' '
 	! test -f nonexistingfile &&
@@ -1161,10 +1202,17 @@ test_expect_success GPG,RFC1991 \
 # try to sign with bad user.signingkey
 git config user.signingkey BobTheMouse
 test_expect_success GPG \
-	'git tag -s fails if gpg is misconfigured' \
+	'git tag -s fails if gpg is misconfigured (bad key)' \
 	'test_must_fail git tag -s -m tail tag-gpg-failure'
 git config --unset user.signingkey
 
+# try to produce invalid signature
+test_expect_success GPG \
+	'git tag -s fails if gpg is misconfigured (bad signature format)' \
+	'test_config gpg.program echo &&
+	 test_must_fail git tag -s -m tail tag-gpg-failure'
+
+
 # try to verify without gpg:
 
 rm -rf gpghome
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index e4fc5c826c..c8dc665f2f 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -49,6 +49,19 @@ test_expect_success TTY 'LESS and LV envvars are set for pagination' '
 	grep ^LV= pager-env.out
 '
 
+test_expect_success !MINGW,TTY 'LESS and LV envvars set by git-sh-setup' '
+	(
+		sane_unset LESS LV &&
+		PAGER="env >pager-env.out; wc" &&
+		export PAGER &&
+		PATH="$(git --exec-path):$PATH" &&
+		export PATH &&
+		test_terminal sh -c ". git-sh-setup && git_pager"
+	) &&
+	grep ^LESS= pager-env.out &&
+	grep ^LV= pager-env.out
+'
+
 test_expect_success TTY 'some commands do not use a pager' '
 	rm -f paginated.out &&
 	test_terminal git rev-list HEAD &&
diff --git a/t/t7011-skip-worktree-reading.sh b/t/t7011-skip-worktree-reading.sh
index 88d60c1ce2..84f41451ec 100755
--- a/t/t7011-skip-worktree-reading.sh
+++ b/t/t7011-skip-worktree-reading.sh
@@ -23,17 +23,15 @@ S sub/1
 H sub/2
 EOF
 
-NULL_SHA1=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-
 setup_absent() {
 	test -f 1 && rm 1
 	git update-index --remove 1 &&
-	git update-index --add --cacheinfo 100644 $NULL_SHA1 1 &&
+	git update-index --add --cacheinfo 100644 $EMPTY_BLOB 1 &&
 	git update-index --skip-worktree 1
 }
 
 test_absent() {
-	echo "100644 $NULL_SHA1 0	1" > expected &&
+	echo "100644 $EMPTY_BLOB 0	1" > expected &&
 	git ls-files --stage 1 > result &&
 	test_cmp expected result &&
 	test ! -f 1
@@ -42,12 +40,12 @@ test_absent() {
 setup_dirty() {
 	git update-index --force-remove 1 &&
 	echo dirty > 1 &&
-	git update-index --add --cacheinfo 100644 $NULL_SHA1 1 &&
+	git update-index --add --cacheinfo 100644 $EMPTY_BLOB 1 &&
 	git update-index --skip-worktree 1
 }
 
 test_dirty() {
-	echo "100644 $NULL_SHA1 0	1" > expected &&
+	echo "100644 $EMPTY_BLOB 0	1" > expected &&
 	git ls-files --stage 1 > result &&
 	test_cmp expected result &&
 	echo dirty > expected
@@ -120,7 +118,7 @@ test_expect_success 'grep with skip-worktree file' '
 	test "$(git grep --no-ext-grep test)" = "1:test"
 '
 
-echo ":000000 100644 $_z40 $NULL_SHA1 A	1" > expected
+echo ":000000 100644 $_z40 $EMPTY_BLOB A	1" > expected
 test_expect_success 'diff-index does not examine skip-worktree absent entries' '
 	setup_absent &&
 	git diff-index HEAD -- 1 > result &&
diff --git a/t/t7012-skip-worktree-writing.sh b/t/t7012-skip-worktree-writing.sh
index 9ceaa4049f..9d1abe50ef 100755
--- a/t/t7012-skip-worktree-writing.sh
+++ b/t/t7012-skip-worktree-writing.sh
@@ -53,17 +53,15 @@ test_expect_success 'read-tree removes worktree, dirty case' '
 	git update-index --no-skip-worktree added
 '
 
-NULL_SHA1=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-
 setup_absent() {
 	test -f 1 && rm 1
 	git update-index --remove 1 &&
-	git update-index --add --cacheinfo 100644 $NULL_SHA1 1 &&
+	git update-index --add --cacheinfo 100644 $EMPTY_BLOB 1 &&
 	git update-index --skip-worktree 1
 }
 
 test_absent() {
-	echo "100644 $NULL_SHA1 0	1" > expected &&
+	echo "100644 $EMPTY_BLOB 0	1" > expected &&
 	git ls-files --stage 1 > result &&
 	test_cmp expected result &&
 	test ! -f 1
@@ -72,12 +70,12 @@ test_absent() {
 setup_dirty() {
 	git update-index --force-remove 1 &&
 	echo dirty > 1 &&
-	git update-index --add --cacheinfo 100644 $NULL_SHA1 1 &&
+	git update-index --add --cacheinfo 100644 $EMPTY_BLOB 1 &&
 	git update-index --skip-worktree 1
 }
 
 test_dirty() {
-	echo "100644 $NULL_SHA1 0	1" > expected &&
+	echo "100644 $EMPTY_BLOB 0	1" > expected &&
 	git ls-files --stage 1 > result &&
 	test_cmp expected result &&
 	echo dirty > expected
diff --git a/t/t7030-verify-tag.sh b/t/t7030-verify-tag.sh
index 4608e71343..07079a41c4 100755
--- a/t/t7030-verify-tag.sh
+++ b/t/t7030-verify-tag.sh
@@ -112,4 +112,17 @@ test_expect_success GPG 'verify signatures with --raw' '
 	)
 '
 
+test_expect_success GPG 'verify multiple tags' '
+	tags="fourth-signed sixth-signed seventh-signed" &&
+	for i in $tags
+	do
+		git verify-tag -v --raw $i || return 1
+	done >expect.stdout 2>expect.stderr.1 &&
+	grep "^.GNUPG:." <expect.stderr.1 >expect.stderr &&
+	git verify-tag -v --raw $tags >actual.stdout 2>actual.stderr.1 &&
+	grep "^.GNUPG:." <actual.stderr.1 >actual.stderr &&
+	test_cmp expect.stdout actual.stdout &&
+	test_cmp expect.stderr actual.stderr
+'
+
 test_done
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index 44bf1d84af..4d17363a92 100755
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -34,6 +34,7 @@ test_expect_success 'M/D conflict does not segfault' '
 On branch side
 You have unmerged paths.
   (fix conflicts and run "git commit")
+  (use "git merge --abort" to abort the merge)
 
 Unmerged paths:
   (use "git add/rm <file>..." as appropriate to mark resolution)
@@ -138,6 +139,7 @@ test_expect_success 'status when conflicts with add and rm advice (deleted by th
 On branch master
 You have unmerged paths.
   (fix conflicts and run "git commit")
+  (use "git merge --abort" to abort the merge)
 
 Unmerged paths:
   (use "git add/rm <file>..." as appropriate to mark resolution)
@@ -171,6 +173,7 @@ test_expect_success 'status when conflicts with add and rm advice (both deleted)
 On branch conflict_second
 You have unmerged paths.
   (fix conflicts and run "git commit")
+  (use "git merge --abort" to abort the merge)
 
 Unmerged paths:
   (use "git add/rm <file>..." as appropriate to mark resolution)
@@ -195,6 +198,7 @@ test_expect_success 'status when conflicts with only rm advice (both deleted)' '
 On branch conflict_second
 You have unmerged paths.
   (fix conflicts and run "git commit")
+  (use "git merge --abort" to abort the merge)
 
 Changes to be committed:
 
diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh
index a971884cfd..0667bd9dd3 100755
--- a/t/t7063-status-untracked-cache.sh
+++ b/t/t7063-status-untracked-cache.sh
@@ -4,6 +4,20 @@ test_description='test untracked cache'
 
 . ./test-lib.sh
 
+# On some filesystems (e.g. FreeBSD's ext2 and ufs) directory mtime
+# is updated lazily after contents in the directory changes, which
+# forces the untracked cache code to take the slow path.  A test
+# that wants to make sure that the fast path works correctly should
+# call this helper to make mtime of the containing directory in sync
+# with the reality before checking the fast path behaviour.
+#
+# See <20160803174522.5571-1-pclouds@gmail.com> if you want to know
+# more.
+
+sync_mtime () {
+	find . -type d -ls >/dev/null
+}
+
 avoid_racy() {
 	sleep 1
 }
@@ -53,7 +67,7 @@ A  two
 EOF
 
 cat >../dump.expect <<EOF &&
-info/exclude e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+info/exclude $EMPTY_BLOB
 core.excludesfile 0000000000000000000000000000000000000000
 exclude_per_dir .gitignore
 flags 00000006
@@ -137,7 +151,7 @@ EOF
 test_expect_success 'verify untracked cache dump' '
 	test-dump-untracked-cache >../actual &&
 	cat >../expect <<EOF &&
-info/exclude e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+info/exclude $EMPTY_BLOB
 core.excludesfile 0000000000000000000000000000000000000000
 exclude_per_dir .gitignore
 flags 00000006
@@ -184,7 +198,7 @@ EOF
 test_expect_success 'verify untracked cache dump' '
 	test-dump-untracked-cache >../actual &&
 	cat >../expect <<EOF &&
-info/exclude e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+info/exclude $EMPTY_BLOB
 core.excludesfile 0000000000000000000000000000000000000000
 exclude_per_dir .gitignore
 flags 00000006
@@ -416,7 +430,8 @@ test_expect_success 'create/modify files, some of which are gitignored' '
 	echo four >done/four && # four is gitignored at a higher level
 	echo five >done/five && # five is not gitignored
 	echo test >base && #we need to ensure that the root dir is touched
-	rm base
+	rm base &&
+	sync_mtime
 '
 
 test_expect_success 'test sparse status with untracked cache' '
@@ -643,7 +658,7 @@ test_expect_success 'test ident field is working' '
 	cp -R done dthree dtwo four three ../other_worktree &&
 	GIT_WORK_TREE=../other_worktree git status 2>../err &&
 	echo "warning: Untracked cache is disabled on this system or location." >../expect &&
-	test_cmp ../expect ../err
+	test_i18ncmp ../expect ../err
 '
 
 test_done
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 98bcfe21aa..86f23be34a 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -66,14 +66,14 @@ test_expect_success 'reset --hard message' '
 	hex=$(git log -1 --format="%h") &&
 	git reset --hard > .actual &&
 	echo HEAD is now at $hex $(commit_msg) > .expected &&
-	test_cmp .expected .actual
+	test_i18ncmp .expected .actual
 '
 
 test_expect_success 'reset --hard message (ISO8859-1 logoutputencoding)' '
 	hex=$(git log -1 --format="%h") &&
 	git -c "i18n.logOutputEncoding=$test_encoding" reset --hard > .actual &&
 	echo HEAD is now at $hex $(commit_msg $test_encoding) > .expected &&
-	test_cmp .expected .actual
+	test_i18ncmp .expected .actual
 '
 
 >.diff_expect
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 885923610a..d4b217b0ee 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -257,7 +257,7 @@ test_expect_success 'checkout to detach HEAD' '
 	git checkout -f renamer && git clean -f &&
 	git checkout renamer^ 2>messages &&
 	test_i18ngrep "HEAD is now at 7329388" messages &&
-	test_line_count -gt 1 messages &&
+	(test_line_count -gt 1 messages || test -n "$GETTEXT_POISON") &&
 	H=$(git rev-parse --verify HEAD) &&
 	M=$(git show-ref -s --verify refs/heads/master) &&
 	test "z$H" = "z$M" &&
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 75db023898..b77cce8e40 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -22,6 +22,22 @@ test_expect_success 'setup - initial commit' '
 	git branch initial
 '
 
+test_expect_success 'submodule init aborts on missing .gitmodules file' '
+	test_when_finished "git update-index --remove sub" &&
+	git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
+	# missing the .gitmodules file here
+	test_must_fail git submodule init 2>actual &&
+	test_i18ngrep "No url found for submodule path" actual
+'
+
+test_expect_success 'submodule update aborts on missing .gitmodules file' '
+	test_when_finished "git update-index --remove sub" &&
+	git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
+	# missing the .gitmodules file here
+	git submodule update sub 2>actual &&
+	test_i18ngrep "Submodule path .sub. not initialized" actual
+'
+
 test_expect_success 'configuration parsing' '
 	test_when_finished "rm -f .gitmodules" &&
 	cat >.gitmodules <<-\EOF &&
@@ -466,7 +482,7 @@ test_expect_success 'update --init' '
 	git config --remove-section submodule.example &&
 	test_must_fail git config submodule.example.url &&
 
-	git submodule update init > update.out &&
+	git submodule update init 2> update.out &&
 	cat update.out &&
 	test_i18ngrep "not initialized" update.out &&
 	test_must_fail git rev-parse --resolve-git-dir init/.git &&
@@ -484,7 +500,7 @@ test_expect_success 'update --init from subdirectory' '
 	mkdir -p sub &&
 	(
 		cd sub &&
-		git submodule update ../init >update.out &&
+		git submodule update ../init 2>update.out &&
 		cat update.out &&
 		test_i18ngrep "not initialized" update.out &&
 		test_must_fail git rev-parse --resolve-git-dir ../init/.git &&
@@ -902,7 +918,7 @@ test_expect_success 'submodule deinit works on repository without submodules' '
 		git init &&
 		>file &&
 		git add file &&
-		git commit -m "repo should not be empty"
+		git commit -m "repo should not be empty" &&
 		git submodule deinit . &&
 		git submodule deinit --all
 	)
@@ -926,7 +942,7 @@ test_expect_success 'submodule deinit from subdirectory' '
 		cd sub &&
 		git submodule deinit ../init >../output
 	) &&
-	grep "\\.\\./init" output &&
+	test_i18ngrep "\\.\\./init" output &&
 	test -z "$(git config --get-regexp "submodule\.example\.")" &&
 	test -n "$(git config --get-regexp "submodule\.example2\.")" &&
 	test -f example2/.git &&
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index 79bc135bf6..0726799e74 100755
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -62,13 +62,13 @@ test_expect_success 'change submodule' '
 '
 
 reset_submodule_urls () {
-	local root
-	root=$(pwd) &&
 	(
+		root=$(pwd) &&
 		cd super-clone/submodule &&
 		git config remote.origin.url "$root/submodule"
 	) &&
 	(
+		root=$(pwd) &&
 		cd super-clone/submodule/sub-submodule &&
 		git config remote.origin.url "$root/submodule"
 	)
@@ -157,7 +157,7 @@ test_expect_success '"git submodule sync" should update submodule URLs - subdire
 		cd sub &&
 		git submodule sync >../../output
 	) &&
-	grep "\\.\\./submodule" output &&
+	test_i18ngrep "\\.\\./submodule" output &&
 	test -d "$(
 		cd super-clone/submodule &&
 		git config remote.origin.url
@@ -188,7 +188,7 @@ test_expect_success '"git submodule sync --recursive" should update all submodul
 		cd sub &&
 		git submodule sync --recursive >../../output
 	) &&
-	grep "\\.\\./submodule/sub-submodule" output &&
+	test_i18ngrep "\\.\\./submodule/sub-submodule" output &&
 	test -d "$(
 		cd super-clone/submodule &&
 		git config remote.origin.url
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index e5af4b4976..64f322c4cc 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -108,24 +108,36 @@ pwd=$(pwd)
 
 cat <<EOF >expect
 Submodule path '../super': checked out '$supersha1'
-Submodule 'merging' ($pwd/merging) registered for path '../super/merging'
-Submodule 'none' ($pwd/none) registered for path '../super/none'
-Submodule 'rebasing' ($pwd/rebasing) registered for path '../super/rebasing'
-Submodule 'submodule' ($pwd/submodule) registered for path '../super/submodule'
 Submodule path '../super/merging': checked out '$mergingsha1'
 Submodule path '../super/none': checked out '$nonesha1'
 Submodule path '../super/rebasing': checked out '$rebasingsha1'
 Submodule path '../super/submodule': checked out '$submodulesha1'
 EOF
 
+cat <<EOF >expect2
+Submodule 'merging' ($pwd/merging) registered for path '../super/merging'
+Submodule 'none' ($pwd/none) registered for path '../super/none'
+Submodule 'rebasing' ($pwd/rebasing) registered for path '../super/rebasing'
+Submodule 'submodule' ($pwd/submodule) registered for path '../super/submodule'
+Cloning into '$pwd/recursivesuper/super/merging'...
+done.
+Cloning into '$pwd/recursivesuper/super/none'...
+done.
+Cloning into '$pwd/recursivesuper/super/rebasing'...
+done.
+Cloning into '$pwd/recursivesuper/super/submodule'...
+done.
+EOF
+
 test_expect_success 'submodule update --init --recursive from subdirectory' '
 	git -C recursivesuper/super reset --hard HEAD^ &&
 	(cd recursivesuper &&
 	 mkdir tmp &&
 	 cd tmp &&
-	 git submodule update --init --recursive ../super >../../actual
+	 git submodule update --init --recursive ../super >../../actual 2>../../actual2
 	) &&
-	test_cmp expect actual
+	test_i18ncmp expect actual &&
+	test_i18ncmp expect2 actual2
 '
 
 apos="'";
@@ -197,9 +209,42 @@ test_expect_success 'submodule update --remote should fetch upstream changes' '
 	)
 '
 
+test_expect_success 'submodule update --remote should fetch upstream changes with .' '
+	(
+		cd super &&
+		git config -f .gitmodules submodule."submodule".branch "." &&
+		git add .gitmodules &&
+		git commit -m "submodules: update from the respective superproject branch"
+	) &&
+	(
+		cd submodule &&
+		echo line4a >> file &&
+		git add file &&
+		test_tick &&
+		git commit -m "upstream line4a" &&
+		git checkout -b test-branch &&
+		test_commit on-test-branch
+	) &&
+	(
+		cd super &&
+		git submodule update --remote --force submodule &&
+		git -C submodule log -1 --oneline >actual
+		git -C ../submodule log -1 --oneline master >expect
+		test_cmp expect actual &&
+		git checkout -b test-branch &&
+		git submodule update --remote --force submodule &&
+		git -C submodule log -1 --oneline >actual
+		git -C ../submodule log -1 --oneline test-branch >expect
+		test_cmp expect actual &&
+		git checkout master &&
+		git branch -d test-branch &&
+		git reset --hard HEAD^
+	)
+'
+
 test_expect_success 'local config should override .gitmodules branch' '
 	(cd submodule &&
-	 git checkout -b test-branch &&
+	 git checkout test-branch &&
 	 echo line5 >> file &&
 	 git add file &&
 	 test_tick &&
@@ -358,7 +403,7 @@ test_expect_success 'submodule update - command in .git/config catches failure'
 	(cd super &&
 	 test_must_fail git submodule update submodule 2>../actual
 	) &&
-	test_cmp actual expect
+	test_i18ncmp actual expect
 '
 
 cat << EOF >expect
@@ -376,7 +421,7 @@ test_expect_success 'submodule update - command in .git/config catches failure -
 	 mkdir tmp && cd tmp &&
 	 test_must_fail git submodule update ../submodule 2>../../actual
 	) &&
-	test_cmp actual expect
+	test_i18ncmp actual expect
 '
 
 cat << EOF >expect
@@ -396,7 +441,7 @@ test_expect_success 'recursive submodule update - command in .git/config catches
 	 mkdir -p tmp && cd tmp &&
 	 test_must_fail git submodule update --recursive ../super 2>../../actual
 	) &&
-	test_cmp actual expect
+	test_i18ncmp actual expect
 '
 
 test_expect_success 'submodule init does not copy command into .git/config' '
@@ -829,16 +874,35 @@ test_expect_success SYMLINKS 'submodule update can handle symbolic links in pwd'
 '
 
 test_expect_success 'submodule update clone shallow submodule' '
+	test_when_finished "rm -rf super3" &&
+	first=$(git -C cloned submodule status submodule |cut -c2-41) &&
+	second=$(git -C submodule rev-parse HEAD) &&
+	commit_count=$(git -C submodule rev-list --count $first^..$second) &&
 	git clone cloned super3 &&
 	pwd=$(pwd) &&
-	(cd super3 &&
-	 sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
-	 mv -f .gitmodules.tmp .gitmodules &&
-	 git submodule update --init --depth=3
-	 (cd submodule &&
-	  test 1 = $(git log --oneline | wc -l)
-	 )
-)
+	(
+		cd super3 &&
+		sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
+		mv -f .gitmodules.tmp .gitmodules &&
+		git submodule update --init --depth=$commit_count &&
+		test 1 = $(git -C submodule log --oneline | wc -l)
+	)
+'
+
+test_expect_success 'submodule update clone shallow submodule outside of depth' '
+	test_when_finished "rm -rf super3" &&
+	git clone cloned super3 &&
+	pwd=$(pwd) &&
+	(
+		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 &&
+		test_i18ngrep "Direct fetching of that commit failed." actual &&
+		git -C ../submodule config uploadpack.allowReachableSHA1InWant true &&
+		git submodule update --init --depth=1 >actual &&
+		test 1 = $(git -C submodule log --oneline | wc -l)
+	)
 '
 
 test_expect_success 'submodule update --recursive drops module name before recursing' '
@@ -850,4 +914,31 @@ test_expect_success 'submodule update --recursive drops module name before recur
 	 test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual
 	)
 '
+
+test_expect_success 'submodule update can be run in parallel' '
+	(cd super2 &&
+	 GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 7 &&
+	 grep "7 tasks" trace.out &&
+	 git config submodule.fetchJobs 8 &&
+	 GIT_TRACE=$(pwd)/trace.out git submodule update &&
+	 grep "8 tasks" trace.out &&
+	 GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 9 &&
+	 grep "9 tasks" trace.out
+	)
+'
+
+test_expect_success 'git clone passes the parallel jobs config on to submodules' '
+	test_when_finished "rm -rf super4" &&
+	GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 7 . super4 &&
+	grep "7 tasks" trace.out &&
+	rm -rf super4 &&
+	git config --global submodule.fetchJobs 8 &&
+	GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules . super4 &&
+	grep "8 tasks" trace.out &&
+	rm -rf super4 &&
+	GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 9 . super4 &&
+	grep "9 tasks" trace.out &&
+	rm -rf super4
+'
+
 test_done
diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh
index fc97c3314e..400e2b1439 100755
--- a/t/t7411-submodule-config.sh
+++ b/t/t7411-submodule-config.sh
@@ -82,6 +82,17 @@ test_expect_success 'error in one submodule config lets continue' '
 	)
 '
 
+test_expect_success 'error message contains blob reference' '
+	(cd super &&
+		sha1=$(git rev-parse HEAD) &&
+		test-submodule-config \
+			HEAD b \
+			HEAD submodule \
+				2>actual_err &&
+		grep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null
+	)
+'
+
 cat >super/expect_url <<EOF
 Submodule url: 'git@somewhere.else.net:a.git' for path 'b'
 Submodule url: 'git@somewhere.else.net:submodule.git' for path 'submodule'
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 900f7de05a..d84897a67a 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -607,4 +607,24 @@ test_expect_success '--only works on to-be-born branch' '
 	test_cmp expected actual
 '
 
+test_expect_success '--dry-run with conflicts fixed from a merge' '
+	# setup two branches with conflicting information
+	# in the same file, resolve the conflict,
+	# call commit with --dry-run
+	echo "Initial contents, unimportant" >test-file &&
+	git add test-file &&
+	git commit -m "Initial commit" &&
+	echo "commit-1-state" >test-file &&
+	git commit -m "commit 1" -i test-file &&
+	git tag commit-1 &&
+	git checkout -b branch-2 HEAD^1 &&
+	echo "commit-2-state" >test-file &&
+	git commit -m "commit 2" -i test-file &&
+	! $(git merge --no-commit commit-1) &&
+	echo "commit-2-state" >test-file &&
+	git add test-file &&
+	git commit --dry-run &&
+	git commit -m "conflicts fixed from merge."
+'
+
 test_done
diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh
index 2ddf28c984..ed2653d46f 100755
--- a/t/t7507-commit-verbose.sh
+++ b/t/t7507-commit-verbose.sh
@@ -3,11 +3,10 @@
 test_description='verbose commit template'
 . ./test-lib.sh
 
-cat >check-for-diff <<EOF
-#!$SHELL_PATH
-exec grep '^diff --git' "\$1"
+write_script "check-for-diff" <<\EOF &&
+grep '^diff --git' "$1" >out
+exit 0
 EOF
-chmod +x check-for-diff
 test_set_editor "$PWD/check-for-diff"
 
 cat >message <<'EOF'
@@ -23,7 +22,8 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'initial commit shows verbose diff' '
-	git commit --amend -v
+	git commit --amend -v &&
+	test_line_count = 1 out
 '
 
 test_expect_success 'second commit' '
@@ -39,13 +39,15 @@ check_message() {
 
 test_expect_success 'verbose diff is stripped out' '
 	git commit --amend -v &&
-	check_message message
+	check_message message &&
+	test_line_count = 1 out
 '
 
 test_expect_success 'verbose diff is stripped out (mnemonicprefix)' '
 	git config diff.mnemonicprefix true &&
 	git commit --amend -v &&
-	check_message message
+	check_message message &&
+	test_line_count = 1 out
 '
 
 cat >diff <<'EOF'
@@ -96,4 +98,60 @@ test_expect_success 'verbose diff is stripped out with set core.commentChar' '
 	test_i18ngrep "Aborting commit due to empty commit message." err
 '
 
+test_expect_success 'status does not verbose without --verbose' '
+	git status >actual &&
+	! grep "^diff --git" actual
+'
+
+test_expect_success 'setup -v -v' '
+	echo dirty >file
+'
+
+for i in true 1
+do
+	test_expect_success "commit.verbose=$i and --verbose omitted" "
+		git -c commit.verbose=$i commit --amend &&
+		test_line_count = 1 out
+	"
+done
+
+for i in false -2 -1 0
+do
+	test_expect_success "commit.verbose=$i and --verbose omitted" "
+		git -c commit.verbose=$i commit --amend &&
+		test_line_count = 0 out
+	"
+done
+
+for i in 2 3
+do
+	test_expect_success "commit.verbose=$i and --verbose omitted" "
+		git -c commit.verbose=$i commit --amend &&
+		test_line_count = 2 out
+	"
+done
+
+for i in true false -2 -1 0 1 2 3
+do
+	test_expect_success "commit.verbose=$i and --verbose" "
+		git -c commit.verbose=$i commit --amend --verbose &&
+		test_line_count = 1 out
+	"
+
+	test_expect_success "commit.verbose=$i and --no-verbose" "
+		git -c commit.verbose=$i commit --amend --no-verbose &&
+		test_line_count = 0 out
+	"
+
+	test_expect_success "commit.verbose=$i and -v -v" "
+		git -c commit.verbose=$i commit --amend -v -v &&
+		test_line_count = 2 out
+	"
+done
+
+test_expect_success "status ignores commit.verbose=true" '
+	git -c commit.verbose=true status >actual &&
+	! grep "^diff --git actual"
+'
+
 test_done
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index c3ed7cb51c..fb00e6d9b0 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -803,7 +803,7 @@ EOF
 '
 
 cat >expect <<EOF
-:100644 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 M	dir1/modified
+:100644 100644 $EMPTY_BLOB 0000000000000000000000000000000000000000 M	dir1/modified
 EOF
 test_expect_success 'status refreshes the index' '
 	touch dir2/added &&
@@ -1377,7 +1377,7 @@ EOF
 	git config --add -f .gitmodules submodule.subname.ignore all &&
 	git config --add -f .gitmodules submodule.subname.path sm &&
 	git status > output &&
-	test_cmp expect output &&
+	test_i18ncmp expect output &&
 	git config -f .gitmodules  --remove-section submodule.subname
 '
 
@@ -1387,7 +1387,7 @@ test_expect_success '.git/config ignore=all suppresses unstaged submodule summar
 	git config --add submodule.subname.ignore all &&
 	git config --add submodule.subname.path sm &&
 	git status > output &&
-	test_cmp expect output &&
+	test_i18ncmp expect output &&
 	git config --remove-section submodule.subname &&
 	git config -f .gitmodules  --remove-section submodule.subname
 '
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index 18e5cf0663..6e839f5489 100755
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -45,12 +45,18 @@ test_expect_success GPG 'create signed commits' '
 	git tag seventh-signed &&
 
 	echo 8 >file && test_tick && git commit -a -m eighth -SB7227189 &&
-	git tag eighth-signed-alt
+	git tag eighth-signed-alt &&
+
+	# commit.gpgsign is still on but this must not be signed
+	git tag ninth-unsigned $(echo 9 | git commit-tree HEAD^{tree}) &&
+	# explicit -S of course must sign.
+	git tag tenth-signed $(echo 9 | git commit-tree -S HEAD^{tree})
 '
 
 test_expect_success GPG 'verify and show signatures' '
 	(
-		for commit in initial second merge fourth-signed fifth-signed sixth-signed seventh-signed
+		for commit in initial second merge fourth-signed \
+			fifth-signed sixth-signed seventh-signed tenth-signed
 		do
 			git verify-commit $commit &&
 			git show --pretty=short --show-signature $commit >actual &&
@@ -60,7 +66,8 @@ test_expect_success GPG 'verify and show signatures' '
 		done
 	) &&
 	(
-		for commit in merge^2 fourth-unsigned sixth-unsigned seventh-unsigned
+		for commit in merge^2 fourth-unsigned sixth-unsigned \
+			seventh-unsigned ninth-unsigned
 		do
 			test_must_fail git verify-commit $commit &&
 			git show --pretty=short --show-signature $commit >actual &&
@@ -203,4 +210,11 @@ test_expect_success GPG 'show lack of signature with custom format' '
 	test_cmp expect actual
 '
 
+test_expect_success GPG 'log.showsignature behaves like --show-signature' '
+	test_config log.showsignature true &&
+	git show initial >actual &&
+	grep "gpg: Signature made" actual &&
+	grep "gpg: Good signature" actual
+'
+
 test_done
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index 49d19a3b36..5c3db656df 100755
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -29,6 +29,7 @@ test_expect_success 'status when conflicts unresolved' '
 On branch conflicts
 You have unmerged paths.
   (fix conflicts and run "git commit")
+  (use "git merge --abort" to abort the merge)
 
 Unmerged paths:
   (use "git add <file>..." to mark resolution)
diff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh
index 0cb9d11f21..5d56c38546 100755
--- a/t/t7605-merge-resolve.sh
+++ b/t/t7605-merge-resolve.sh
@@ -27,7 +27,7 @@ test_expect_success 'setup' '
 	git tag c3
 '
 
-test_expect_success 'merge c1 to c2' '
+merge_c1_to_c2_cmds='
 	git reset --hard c1 &&
 	git merge -s resolve c2 &&
 	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
@@ -41,6 +41,10 @@ test_expect_success 'merge c1 to c2' '
 	test 3 = $(git ls-files | wc -l)
 '
 
+test_expect_success 'merge c1 to c2'        "$merge_c1_to_c2_cmds"
+
+test_expect_success 'merge c1 to c2, again' "$merge_c1_to_c2_cmds"
+
 test_expect_success 'merge c2 to c3 (fails)' '
 	git reset --hard c2 &&
 	test_must_fail git merge -s resolve c3
diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh
index 758a623cdb..9444d6a9b9 100755
--- a/t/t7607-merge-overwrite.sh
+++ b/t/t7607-merge-overwrite.sh
@@ -115,7 +115,7 @@ cat >expect <<\EOF
 error: The following untracked working tree files would be overwritten by merge:
 	sub
 	sub2
-Please move or remove them before you can merge.
+Please move or remove them before you merge.
 Aborting
 EOF
 
@@ -125,7 +125,7 @@ test_expect_success 'will not overwrite untracked file in leading path' '
 	cp important sub &&
 	cp important sub2 &&
 	test_must_fail git merge sub 2>out &&
-	test_cmp out expect &&
+	test_i18ncmp out expect &&
 	test_path_is_missing .git/MERGE_HEAD &&
 	test_cmp important sub &&
 	test_cmp important sub2 &&
diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh
index 6729cb379f..f80bdb81e1 100755
--- a/t/t7609-merge-co-error-msgs.sh
+++ b/t/t7609-merge-co-error-msgs.sh
@@ -31,7 +31,7 @@ error: The following untracked working tree files would be overwritten by merge:
 	four
 	three
 	two
-Please move or remove them before you can merge.
+Please move or remove them before you merge.
 Aborting
 EOF
 
@@ -53,10 +53,10 @@ error: Your local changes to the following files would be overwritten by merge:
 	four
 	three
 	two
-Please commit your changes or stash them before you can merge.
+Please commit your changes or stash them before you merge.
 error: The following untracked working tree files would be overwritten by merge:
 	five
-Please move or remove them before you can merge.
+Please move or remove them before you merge.
 Aborting
 EOF
 
@@ -72,7 +72,7 @@ cat >expect <<\EOF
 error: Your local changes to the following files would be overwritten by checkout:
 	rep/one
 	rep/two
-Please commit your changes or stash them before you can switch branches.
+Please commit your changes or stash them before you switch branches.
 Aborting
 EOF
 
@@ -94,7 +94,7 @@ cat >expect <<\EOF
 error: Your local changes to the following files would be overwritten by checkout:
 	rep/one
 	rep/two
-Please commit your changes or stash them before you can switch branches.
+Please commit your changes or stash them before you switch branches.
 Aborting
 EOF
 
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 76306cf268..7217f3968d 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -589,7 +589,12 @@ test_expect_success 'filenames seen by tools start with ./' '
 	git reset --hard master >/dev/null 2>&1
 '
 
-test_expect_success 'temporary filenames are used with mergetool.writeToTemp' '
+test_lazy_prereq MKTEMP '
+	tempdir=$(mktemp -d -t foo.XXXXXX) &&
+	test -d "$tempdir"
+'
+
+test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToTemp' '
 	git checkout -b test16 branch1 &&
 	test_config mergetool.writeToTemp true &&
 	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
diff --git a/t/t7701-repack-unpack-unreachable.sh b/t/t7701-repack-unpack-unreachable.sh
index b66e383866..987573c41f 100755
--- a/t/t7701-repack-unpack-unreachable.sh
+++ b/t/t7701-repack-unpack-unreachable.sh
@@ -122,4 +122,32 @@ test_expect_success 'keep packed objects found only in index' '
 	git cat-file blob :file
 '
 
+test_expect_success 'repack -k keeps unreachable packed objects' '
+	# create packed-but-unreachable object
+	sha1=$(echo unreachable-packed | git hash-object -w --stdin) &&
+	pack=$(echo $sha1 | git pack-objects .git/objects/pack/pack) &&
+	git prune-packed &&
+
+	# -k should keep it
+	git repack -adk &&
+	git cat-file -p $sha1 &&
+
+	# and double check that without -k it would have been removed
+	git repack -ad &&
+	test_must_fail git cat-file -p $sha1
+'
+
+test_expect_success 'repack -k packs unreachable loose objects' '
+	# create loose unreachable object
+	sha1=$(echo would-be-deleted-loose | git hash-object -w --stdin) &&
+	objpath=.git/objects/$(echo $sha1 | sed "s,..,&/,") &&
+	test_path_is_file $objpath &&
+
+	# and confirm that the loose object goes away, but we can
+	# still access it (ergo, it is packed)
+	git repack -adk &&
+	test_path_is_missing $objpath &&
+	git cat-file -p $sha1
+'
+
 test_done
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 7ce4cd753e..2974900578 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -412,6 +412,20 @@ run_dir_diff_test 'difftool --dir-diff from subdirectory' '
 	)
 '
 
+run_dir_diff_test 'difftool --dir-diff from subdirectory with GIT_DIR set' '
+	(
+		GIT_DIR=$(pwd)/.git &&
+		export GIT_DIR &&
+		GIT_WORK_TREE=$(pwd) &&
+		export GIT_WORK_TREE &&
+		cd sub &&
+		git difftool --dir-diff $symlinks --extcmd ls \
+			branch -- sub >output &&
+		grep sub output &&
+		! grep file output
+	)
+'
+
 run_dir_diff_test 'difftool --dir-diff when worktree file is missing' '
 	test_when_finished git reset --hard &&
 	rm file2 &&
@@ -446,7 +460,7 @@ write_script .git/CHECK_SYMLINKS <<\EOF
 for f in file file2 sub/sub
 do
 	echo "$f"
-	readlink "$2/$f"
+	ls -ld "$2/$f" | sed -e 's/.* -> //'
 done >actual
 EOF
 
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 1e72971a16..de2405ccba 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -9,7 +9,9 @@ test_description='git grep various.
 . ./test-lib.sh
 
 cat >hello.c <<EOF
+#include <assert.h>
 #include <stdio.h>
+
 int main(int argc, const char **argv)
 {
 	printf("Hello world.\n");
@@ -175,7 +177,7 @@ do
 
 	test_expect_success "grep -c $L (no /dev/null)" '
 		! git grep -c test $H | grep /dev/null
-        '
+	'
 
 	test_expect_success "grep --max-depth -1 $L" '
 		{
@@ -353,7 +355,7 @@ test_expect_success 'grep -l -C' '
 cat >expected <<EOF
 file:5
 EOF
-test_expect_success 'grep -l -C' '
+test_expect_success 'grep -c -C' '
 	git grep -c -C1 foo >actual &&
 	test_cmp expected actual
 '
@@ -579,7 +581,7 @@ test_expect_success 'log grep (9)' '
 '
 
 test_expect_success 'log grep (9)' '
-	git log -g --grep-reflog="commit: third" --author="non-existant" --pretty=tformat:%s >actual &&
+	git log -g --grep-reflog="commit: third" --author="non-existent" --pretty=tformat:%s >actual &&
 	: >expect &&
 	test_cmp expect actual
 '
@@ -715,6 +717,7 @@ test_expect_success 'grep -p' '
 
 cat >expected <<EOF
 hello.c-#include <stdio.h>
+hello.c-
 hello.c=int main(int argc, const char **argv)
 hello.c-{
 hello.c-	printf("Hello world.\n");
@@ -741,6 +744,16 @@ test_expect_success 'grep -W' '
 '
 
 cat >expected <<EOF
+hello.c-#include <assert.h>
+hello.c:#include <stdio.h>
+EOF
+
+test_expect_success 'grep -W shows no trailing empty lines' '
+	git grep -W stdio >actual &&
+	test_cmp expected actual
+'
+
+cat >expected <<EOF
 hello.c=	printf("Hello world.\n");
 hello.c:	return 0;
 hello.c-	/* char ?? */
@@ -1232,8 +1245,8 @@ test_expect_success 'grep --heading' '
 
 cat >expected <<EOF
 <BOLD;GREEN>hello.c<RESET>
-2:int main(int argc, const <BLACK;BYELLOW>char<RESET> **argv)
-6:	/* <BLACK;BYELLOW>char<RESET> ?? */
+4:int main(int argc, const <BLACK;BYELLOW>char<RESET> **argv)
+8:	/* <BLACK;BYELLOW>char<RESET> ?? */
 
 <BOLD;GREEN>hello_world<RESET>
 3:Hel<BLACK;BYELLOW>lo_w<RESET>orld
@@ -1340,7 +1353,7 @@ test_expect_success 'grep --color -e A --and --not -e B with context' '
 '
 
 cat >expected <<EOF
-hello.c-#include <stdio.h>
+hello.c-
 hello.c=int main(int argc, const char **argv)
 hello.c-{
 hello.c:	pr<RED>int<RESET>f("<RED>Hello<RESET> world.\n");
@@ -1364,4 +1377,62 @@ test_expect_success 'grep --color -e A --and -e B -p with context' '
 	test_cmp expected actual
 '
 
+test_expect_success 'grep can find things only in the work tree' '
+	: >work-tree-only &&
+	git add work-tree-only &&
+	test_when_finished "git rm -f work-tree-only" &&
+	echo "find in work tree" >work-tree-only &&
+	git grep --quiet "find in work tree" &&
+	test_must_fail git grep --quiet --cached "find in work tree" &&
+	test_must_fail git grep --quiet "find in work tree" HEAD
+'
+
+test_expect_success 'grep can find things only in the work tree (i-t-a)' '
+	echo "intend to add this" >intend-to-add &&
+	git add -N intend-to-add &&
+	test_when_finished "git rm -f intend-to-add" &&
+	git grep --quiet "intend to add this" &&
+	test_must_fail git grep --quiet --cached "intend to add this" &&
+	test_must_fail git grep --quiet "intend to add this" HEAD
+'
+
+test_expect_success 'grep does not search work tree with assume unchanged' '
+	echo "intend to add this" >intend-to-add &&
+	git add -N intend-to-add &&
+	git update-index --assume-unchanged intend-to-add &&
+	test_when_finished "git rm -f intend-to-add" &&
+	test_must_fail git grep --quiet "intend to add this" &&
+	test_must_fail git grep --quiet --cached "intend to add this" &&
+	test_must_fail git grep --quiet "intend to add this" HEAD
+'
+
+test_expect_success 'grep can find things only in the index' '
+	echo "only in the index" >cache-this &&
+	git add cache-this &&
+	rm cache-this &&
+	test_when_finished "git rm --cached cache-this" &&
+	test_must_fail git grep --quiet "only in the index" &&
+	git grep --quiet --cached "only in the index" &&
+	test_must_fail git grep --quiet "only in the index" HEAD
+'
+
+test_expect_success 'grep does not report i-t-a with -L --cached' '
+	echo "intend to add this" >intend-to-add &&
+	git add -N intend-to-add &&
+	test_when_finished "git rm -f intend-to-add" &&
+	git ls-files | grep -v "^intend-to-add\$" >expected &&
+	git grep -L --cached "nonexistent_string" >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'grep does not report i-t-a and assume unchanged with -L' '
+	echo "intend to add this" >intend-to-add-assume-unchanged &&
+	git add -N intend-to-add-assume-unchanged &&
+	test_when_finished "git rm -f intend-to-add-assume-unchanged" &&
+	git update-index --assume-unchanged intend-to-add-assume-unchanged &&
+	git ls-files | grep -v "^intend-to-add-assume-unchanged\$" >expected &&
+	git grep -L "nonexistent_string" >actual &&
+	test_cmp expected actual
+'
+
 test_done
diff --git a/t/t7812-grep-icase-non-ascii.sh b/t/t7812-grep-icase-non-ascii.sh
new file mode 100755
index 0000000000..169fd8d706
--- /dev/null
+++ b/t/t7812-grep-icase-non-ascii.sh
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+test_description='grep icase on non-English locales'
+
+. ./lib-gettext.sh
+
+test_expect_success GETTEXT_LOCALE 'setup' '
+	test_write_lines "TILRAUN: Halló Heimur!" >file &&
+	git add file &&
+	LC_ALL="$is_IS_locale" &&
+	export LC_ALL
+'
+
+test_have_prereq GETTEXT_LOCALE &&
+test-regex "HALLÓ" "Halló" ICASE &&
+test_set_prereq REGEX_LOCALE
+
+test_expect_success REGEX_LOCALE 'grep literal string, no -F' '
+	git grep -i "TILRAUN: Halló Heimur!" &&
+	git grep -i "TILRAUN: HALLÓ HEIMUR!"
+'
+
+test_expect_success GETTEXT_LOCALE,LIBPCRE 'grep pcre utf-8 icase' '
+	git grep --perl-regexp    "TILRAUN: H.lló Heimur!" &&
+	git grep --perl-regexp -i "TILRAUN: H.lló Heimur!" &&
+	git grep --perl-regexp -i "TILRAUN: H.LLÓ HEIMUR!"
+'
+
+test_expect_success GETTEXT_LOCALE,LIBPCRE 'grep pcre utf-8 string with "+"' '
+	test_write_lines "TILRAUN: Hallóó Heimur!" >file2 &&
+	git add file2 &&
+	git grep -l --perl-regexp "TILRAUN: H.lló+ Heimur!" >actual &&
+	echo file >expected &&
+	echo file2 >>expected &&
+	test_cmp expected actual
+'
+
+test_expect_success REGEX_LOCALE 'grep literal string, with -F' '
+	git grep --debug -i -F "TILRAUN: Halló Heimur!"  2>&1 >/dev/null |
+		 grep fixed >debug1 &&
+	test_write_lines "fixed TILRAUN: Halló Heimur!" >expect1 &&
+	test_cmp expect1 debug1 &&
+
+	git grep --debug -i -F "TILRAUN: HALLÓ HEIMUR!"  2>&1 >/dev/null |
+		 grep fixed >debug2 &&
+	test_write_lines "fixed TILRAUN: HALLÓ HEIMUR!" >expect2 &&
+	test_cmp expect2 debug2
+'
+
+test_expect_success REGEX_LOCALE 'grep string with regex, with -F' '
+	test_write_lines "^*TILR^AUN:.* \\Halló \$He[]imur!\$" >file &&
+
+	git grep --debug -i -F "^*TILR^AUN:.* \\Halló \$He[]imur!\$" 2>&1 >/dev/null |
+		 grep fixed >debug1 &&
+	test_write_lines "fixed \\^*TILR^AUN:\\.\\* \\\\Halló \$He\\[]imur!\\\$" >expect1 &&
+	test_cmp expect1 debug1 &&
+
+	git grep --debug -i -F "^*TILR^AUN:.* \\HALLÓ \$HE[]IMUR!\$"  2>&1 >/dev/null |
+		 grep fixed >debug2 &&
+	test_write_lines "fixed \\^*TILR^AUN:\\.\\* \\\\HALLÓ \$HE\\[]IMUR!\\\$" >expect2 &&
+	test_cmp expect2 debug2
+'
+
+test_expect_success REGEX_LOCALE 'pickaxe -i on non-ascii' '
+	git commit -m first &&
+	git log --format=%f -i -S"TILRAUN: HALLÓ HEIMUR!" >actual &&
+	echo first >expected &&
+	test_cmp expected actual
+'
+
+test_done
diff --git a/t/t7813-grep-icase-iso.sh b/t/t7813-grep-icase-iso.sh
new file mode 100755
index 0000000000..efef7fb81f
--- /dev/null
+++ b/t/t7813-grep-icase-iso.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+test_description='grep icase on non-English locales'
+
+. ./lib-gettext.sh
+
+test_expect_success GETTEXT_ISO_LOCALE 'setup' '
+	printf "TILRAUN: Halló Heimur!" >file &&
+	git add file &&
+	LC_ALL="$is_IS_iso_locale" &&
+	export LC_ALL
+'
+
+test_expect_success GETTEXT_ISO_LOCALE,LIBPCRE 'grep pcre string' '
+	git grep --perl-regexp -i "TILRAUN: H.lló Heimur!" &&
+	git grep --perl-regexp -i "TILRAUN: H.LLÓ HEIMUR!"
+'
+
+test_done
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
index a9b266f0d3..e48370dfa0 100755
--- a/t/t8003-blame-corner-cases.sh
+++ b/t/t8003-blame-corner-cases.sh
@@ -41,12 +41,12 @@ test_expect_success setup '
 	test_tick &&
 	GIT_AUTHOR_NAME=Fourth git commit -m Fourth &&
 
-	{
-		echo ABC
-		echo DEF
-		echo XXXX
-		echo GHIJK
-	} >cow &&
+	cat >cow <<-\EOF &&
+	ABC
+	DEF
+	XXXX
+	GHIJK
+	EOF
 	git add cow &&
 	test_tick &&
 	GIT_AUTHOR_NAME=Fifth git commit -m Fifth
@@ -115,11 +115,11 @@ test_expect_success 'append with -C -C -C' '
 test_expect_success 'blame wholesale copy' '
 
 	git blame -f -C -C1 HEAD^ -- cow | sed -e "$pick_fc" >current &&
-	{
-		echo mouse-Initial
-		echo mouse-Second
-		echo mouse-Third
-	} >expected &&
+	cat >expected <<-\EOF &&
+	mouse-Initial
+	mouse-Second
+	mouse-Third
+	EOF
 	test_cmp expected current
 
 '
@@ -127,16 +127,61 @@ test_expect_success 'blame wholesale copy' '
 test_expect_success 'blame wholesale copy and more' '
 
 	git blame -f -C -C1 HEAD -- cow | sed -e "$pick_fc" >current &&
-	{
-		echo mouse-Initial
-		echo mouse-Second
-		echo cow-Fifth
-		echo mouse-Third
-	} >expected &&
+	cat >expected <<-\EOF &&
+	mouse-Initial
+	mouse-Second
+	cow-Fifth
+	mouse-Third
+	EOF
 	test_cmp expected current
 
 '
 
+test_expect_success 'blame wholesale copy and more in the index' '
+
+	cat >horse <<-\EOF &&
+	ABC
+	DEF
+	XXXX
+	YYYY
+	GHIJK
+	EOF
+	git add horse &&
+	test_when_finished "git rm -f horse" &&
+	git blame -f -C -C1 -- horse | sed -e "$pick_fc" >current &&
+	cat >expected <<-\EOF &&
+	mouse-Initial
+	mouse-Second
+	cow-Fifth
+	horse-Not
+	mouse-Third
+	EOF
+	test_cmp expected current
+
+'
+
+test_expect_success 'blame during cherry-pick with file rename conflict' '
+
+	test_when_finished "git reset --hard && git checkout master" &&
+	git checkout HEAD~3 &&
+	echo MOUSE >> mouse &&
+	git mv mouse rodent &&
+	git add rodent &&
+	GIT_AUTHOR_NAME=Rodent git commit -m "rodent" &&
+	git checkout --detach master &&
+	(git cherry-pick HEAD@{1} || test $? -eq 1) &&
+	git show HEAD@{1}:rodent > rodent &&
+	git add rodent &&
+	git blame -f -C -C1 rodent | sed -e "$pick_fc" >current &&
+	cat current &&
+	cat >expected <<-\EOF &&
+	mouse-Initial
+	mouse-Second
+	rodent-Not
+	EOF
+	test_cmp expected current
+'
+
 test_expect_success 'blame path that used to be a directory' '
 	mkdir path &&
 	echo A A A A A >path/file &&
diff --git a/t/t8008-blame-formats.sh b/t/t8008-blame-formats.sh
index 29f84a6dd1..92c8e792d1 100755
--- a/t/t8008-blame-formats.sh
+++ b/t/t8008-blame-formats.sh
@@ -87,4 +87,21 @@ test_expect_success 'blame --line-porcelain output' '
 	test_cmp expect actual
 '
 
+test_expect_success '--porcelain detects first non-blank line as subject' '
+	(
+		GIT_INDEX_FILE=.git/tmp-index &&
+		export GIT_INDEX_FILE &&
+		echo "This is it" >single-file &&
+		git add single-file &&
+		tree=$(git write-tree) &&
+		commit=$(printf "%s\n%s\n%s\n\n\n  \noneline\n\nbody\n" \
+			"tree $tree" \
+			"author A <a@b.c> 123456789 +0000" \
+			"committer C <c@d.e> 123456789 +0000" |
+		git hash-object -w -t commit --stdin) &&
+		git blame --porcelain $commit -- single-file >output &&
+		grep "^summary oneline$" output
+	)
+'
+
 test_done
diff --git a/t/t9003-help-autocorrect.sh b/t/t9003-help-autocorrect.sh
index dfe95c923b..b1c7919c4a 100755
--- a/t/t9003-help-autocorrect.sh
+++ b/t/t9003-help-autocorrect.sh
@@ -31,10 +31,10 @@ test_expect_success 'autocorrect showing candidates' '
 	git config help.autocorrect 0 &&
 
 	test_must_fail git lfg 2>actual &&
-	sed -e "1,/^Did you mean this/d" actual | grep lgf &&
+	grep "^	lgf" actual &&
 
 	test_must_fail git distimdist 2>actual &&
-	sed -e "1,/^Did you mean this/d" actual | grep distimdistim
+	grep "^	distimdistim" actual
 '
 
 test_expect_success 'autocorrect running commands' '
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 22d8367ff3..92a3aa8063 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -8,8 +8,6 @@ GIT_SVN_LC_ALL=${LC_ALL:-$LANG}
 
 . ./lib-git-svn.sh
 
-say 'define NO_SVN_TESTS to skip git svn tests'
-
 case "$GIT_SVN_LC_ALL" in
 *.UTF-8)
 	test_set_prereq UTF8
@@ -19,6 +17,27 @@ case "$GIT_SVN_LC_ALL" in
 	;;
 esac
 
+deepdir=nothing-above
+ceiling=$PWD
+
+test_expect_success 'git svn --version works anywhere' '
+	mkdir -p "$deepdir" && (
+		GIT_CEILING_DIRECTORIES="$ceiling" &&
+		export GIT_CEILING_DIRECTORIES &&
+		cd "$deepdir" &&
+		git svn --version
+	)
+'
+
+test_expect_success 'git svn help works anywhere' '
+	mkdir -p "$deepdir" && (
+		GIT_CEILING_DIRECTORIES="$ceiling" &&
+		export GIT_CEILING_DIRECTORIES &&
+		cd "$deepdir" &&
+		git svn help
+	)
+'
+
 test_expect_success \
     'initialize git svn' '
 	mkdir import &&
@@ -45,13 +64,13 @@ test_expect_success "checkout from svn" 'svn co "$svnrepo" "$SVN_TREE"'
 
 name='try a deep --rmdir with a commit'
 test_expect_success "$name" '
-	git checkout -f -b mybranch ${remotes_git_svn} &&
+	git checkout -f -b mybranch remotes/git-svn &&
 	mv dir/a/b/c/d/e/file dir/file &&
 	cp dir/file file &&
 	git update-index --add --remove dir/a/b/c/d/e/file dir/file file &&
 	git commit -m "$name" &&
 	git svn set-tree --find-copies-harder --rmdir \
-		${remotes_git_svn}..mybranch &&
+		remotes/git-svn..mybranch &&
 	svn_cmd up "$SVN_TREE" &&
 	test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a'
 
@@ -65,14 +84,14 @@ test_expect_success "$name" "
 	git update-index --add dir/file/file &&
 	git commit -m '$name' &&
 	test_must_fail git svn set-tree --find-copies-harder --rmdir \
-		${remotes_git_svn}..mybranch
+		remotes/git-svn..mybranch
 "
 
 
 name='detect node change from directory to file #1'
 test_expect_success "$name" '
 	rm -rf dir "$GIT_DIR"/index &&
-	git checkout -f -b mybranch2 ${remotes_git_svn} &&
+	git checkout -f -b mybranch2 remotes/git-svn &&
 	mv bar/zzz zzz &&
 	rm -rf bar &&
 	mv zzz bar &&
@@ -80,14 +99,14 @@ test_expect_success "$name" '
 	git update-index --add -- bar &&
 	git commit -m "$name" &&
 	test_must_fail git svn set-tree --find-copies-harder --rmdir \
-		${remotes_git_svn}..mybranch2
+		remotes/git-svn..mybranch2
 '
 
 
 name='detect node change from file to directory #2'
 test_expect_success "$name" '
 	rm -f "$GIT_DIR"/index &&
-	git checkout -f -b mybranch3 ${remotes_git_svn} &&
+	git checkout -f -b mybranch3 remotes/git-svn &&
 	rm bar/zzz &&
 	git update-index --remove bar/zzz &&
 	mkdir bar/zzz &&
@@ -95,7 +114,7 @@ test_expect_success "$name" '
 	git update-index --add bar/zzz/yyy &&
 	git commit -m "$name" &&
 	git svn set-tree --find-copies-harder --rmdir \
-		${remotes_git_svn}..mybranch3 &&
+		remotes/git-svn..mybranch3 &&
 	svn_cmd up "$SVN_TREE" &&
 	test -d "$SVN_TREE"/bar/zzz &&
 	test -e "$SVN_TREE"/bar/zzz/yyy
@@ -104,7 +123,7 @@ test_expect_success "$name" '
 name='detect node change from directory to file #2'
 test_expect_success "$name" '
 	rm -f "$GIT_DIR"/index &&
-	git checkout -f -b mybranch4 ${remotes_git_svn} &&
+	git checkout -f -b mybranch4 remotes/git-svn &&
 	rm -rf dir &&
 	git update-index --remove -- dir/file &&
 	touch dir &&
@@ -112,19 +131,19 @@ test_expect_success "$name" '
 	git update-index --add -- dir &&
 	git commit -m "$name" &&
 	test_must_fail git svn set-tree --find-copies-harder --rmdir \
-		${remotes_git_svn}..mybranch4
+		remotes/git-svn..mybranch4
 '
 
 
 name='remove executable bit from a file'
 test_expect_success POSIXPERM "$name" '
 	rm -f "$GIT_DIR"/index &&
-	git checkout -f -b mybranch5 ${remotes_git_svn} &&
+	git checkout -f -b mybranch5 remotes/git-svn &&
 	chmod -x exec.sh &&
 	git update-index exec.sh &&
 	git commit -m "$name" &&
 	git svn set-tree --find-copies-harder --rmdir \
-		${remotes_git_svn}..mybranch5 &&
+		remotes/git-svn..mybranch5 &&
 	svn_cmd up "$SVN_TREE" &&
 	test ! -x "$SVN_TREE"/exec.sh'
 
@@ -135,7 +154,7 @@ test_expect_success POSIXPERM "$name" '
 	git update-index exec.sh &&
 	git commit -m "$name" &&
 	git svn set-tree --find-copies-harder --rmdir \
-		${remotes_git_svn}..mybranch5 &&
+		remotes/git-svn..mybranch5 &&
 	svn_cmd up "$SVN_TREE" &&
 	test -x "$SVN_TREE"/exec.sh'
 
@@ -147,7 +166,7 @@ test_expect_success SYMLINKS "$name" '
 	git update-index exec.sh &&
 	git commit -m "$name" &&
 	git svn set-tree --find-copies-harder --rmdir \
-		${remotes_git_svn}..mybranch5 &&
+		remotes/git-svn..mybranch5 &&
 	svn_cmd up "$SVN_TREE" &&
 	test -h "$SVN_TREE"/exec.sh'
 
@@ -159,7 +178,7 @@ test_expect_success POSIXPERM,SYMLINKS "$name" '
 	git update-index --add file exec-2.sh &&
 	git commit -m "$name" &&
 	git svn set-tree --find-copies-harder --rmdir \
-		${remotes_git_svn}..mybranch5 &&
+		remotes/git-svn..mybranch5 &&
 	svn_cmd up "$SVN_TREE" &&
 	test -x "$SVN_TREE"/file &&
 	test -h "$SVN_TREE"/exec-2.sh'
@@ -172,7 +191,7 @@ test_expect_success POSIXPERM,SYMLINKS "$name" '
 	git update-index exec-2.sh &&
 	git commit -m "$name" &&
 	git svn set-tree --find-copies-harder --rmdir \
-		${remotes_git_svn}..mybranch5 &&
+		remotes/git-svn..mybranch5 &&
 	svn_cmd up "$SVN_TREE" &&
 	test -f "$SVN_TREE"/exec-2.sh &&
 	test ! -h "$SVN_TREE"/exec-2.sh &&
@@ -194,7 +213,7 @@ GIT_SVN_ID=alt
 export GIT_SVN_ID
 test_expect_success "$name" \
     'git svn init "$svnrepo" && git svn fetch &&
-     git rev-list --pretty=raw ${remotes_git_svn} | grep ^tree | uniq > a &&
+     git rev-list --pretty=raw remotes/git-svn | grep ^tree | uniq > a &&
      git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
      test_cmp a b'
 
@@ -217,17 +236,17 @@ EOF
 
 test_expect_success POSIXPERM,SYMLINKS "$name" "test_cmp a expected"
 
-test_expect_success 'exit if remote refs are ambigious' "
+test_expect_success 'exit if remote refs are ambigious' '
         git config --add svn-remote.svn.fetch \
-                              bar:refs/${remotes_git_svn} &&
+		bar:refs/remotes/git-svn &&
 	test_must_fail git svn migrate
-"
+'
 
 test_expect_success 'exit if init-ing a would clobber a URL' '
         svnadmin create "${PWD}/svnrepo2" &&
         svn mkdir -m "mkdir bar" "${svnrepo}2/bar" &&
         git config --unset svn-remote.svn.fetch \
-                                "^bar:refs/${remotes_git_svn}$" &&
+		"^bar:refs/remotes/git-svn$" &&
 	test_must_fail git svn init "${svnrepo}2/bar"
         '
 
@@ -237,7 +256,7 @@ test_expect_success \
         git config --get svn-remote.svn.fetch \
                               "^bar:refs/remotes/bar$" &&
         git config --get svn-remote.svn.fetch \
-                              "^:refs/${remotes_git_svn}$"
+			      "^:refs/remotes/git-svn$"
         '
 
 test_expect_success 'dcommit $rev does not clobber current branch' '
@@ -259,26 +278,26 @@ test_expect_success 'dcommit $rev does not clobber current branch' '
 	git branch -D my-bar
 	'
 
-test_expect_success 'able to dcommit to a subdirectory' "
+test_expect_success 'able to dcommit to a subdirectory' '
 	git svn fetch -i bar &&
 	git checkout -b my-bar refs/remotes/bar &&
 	echo abc > d &&
 	git update-index --add d &&
-	git commit -m '/bar/d should be in the log' &&
+	git commit -m "/bar/d should be in the log" &&
 	git svn dcommit -i bar &&
-	test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" &&
+	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" &&
 	mkdir newdir &&
 	echo new > newdir/dir &&
 	git update-index --add newdir/dir &&
-	git commit -m 'add a new directory' &&
+	git commit -m "add a new directory" &&
 	git svn dcommit -i bar &&
-	test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" &&
+	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" &&
 	echo foo >> newdir/dir &&
 	git update-index newdir/dir &&
-	git commit -m 'modify a file in new directory' &&
+	git commit -m "modify a file in new directory" &&
 	git svn dcommit -i bar &&
-	test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\"
-	"
+	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
+'
 
 test_expect_success 'dcommit should not fail with a touched file' '
 	test_commit "commit-new-file-foo2" foo2 &&
@@ -291,13 +310,13 @@ test_expect_success 'rebase should not fail with a touched file' '
 	git svn rebase
 '
 
-test_expect_success 'able to set-tree to a subdirectory' "
+test_expect_success 'able to set-tree to a subdirectory' '
 	echo cba > d &&
 	git update-index d &&
-	git commit -m 'update /bar/d' &&
+	git commit -m "update /bar/d" &&
 	git svn set-tree -i bar HEAD &&
-	test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\"
-	"
+	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
+'
 
 test_expect_success 'git-svn works in a bare repository' '
 	mkdir bare-repo &&
diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index e8173d5fef..07bfb63777 100755
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -73,11 +73,11 @@ test_expect_success 'fetch revisions from svn' 'git svn fetch'
 
 name='test svn:keywords ignoring'
 test_expect_success "$name" \
-	'git checkout -b mybranch ${remotes_git_svn} &&
+	'git checkout -b mybranch remotes/git-svn &&
 	echo Hi again >> kw.c &&
 	git commit -a -m "test keywords ignoring" &&
-	git svn set-tree ${remotes_git_svn}..mybranch &&
-	git pull . ${remotes_git_svn}'
+	git svn set-tree remotes/git-svn..mybranch &&
+	git pull . remotes/git-svn'
 
 expect='/* $Id$ */'
 got="$(sed -ne 2p kw.c)"
@@ -95,7 +95,7 @@ test_expect_success "propset CR on crlf files" '
 
 test_expect_success 'fetch and pull latest from svn and checkout a new wc' \
 	'git svn fetch &&
-	 git pull . ${remotes_git_svn} &&
+	 git pull . remotes/git-svn &&
 	 svn_cmd co "$svnrepo" new_wc'
 
 for i in crlf ne_crlf lf ne_lf cr ne_cr empty_cr empty_lf empty empty_crlf
@@ -117,7 +117,7 @@ cd test_wc
 	 svn_cmd commit -m "propset CRLF on cr files"'
 cd ..
 test_expect_success 'fetch and pull latest from svn' \
-	'git svn fetch && git pull . ${remotes_git_svn}'
+	'git svn fetch && git pull . remotes/git-svn'
 
 b_cr="$(git hash-object cr)"
 b_ne_cr="$(git hash-object ne_cr)"
@@ -168,7 +168,7 @@ cat >create-ignore-index.expect <<\EOF
 EOF
 
 test_expect_success 'test create-ignore' "
-	git svn fetch && git pull . ${remotes_git_svn} &&
+	git svn fetch && git pull . remotes/git-svn &&
 	git svn create-ignore &&
 	cmp ./.gitignore create-ignore.expect &&
 	cmp ./deeply/.gitignore create-ignore.expect &&
diff --git a/t/t9102-git-svn-deep-rmdir.sh b/t/t9102-git-svn-deep-rmdir.sh
index eb70f4839c..66cd51102c 100755
--- a/t/t9102-git-svn-deep-rmdir.sh
+++ b/t/t9102-git-svn-deep-rmdir.sh
@@ -17,7 +17,7 @@ test_expect_success 'initialize repo' '
 test_expect_success 'mirror via git svn' '
 	git svn init "$svnrepo" &&
 	git svn fetch &&
-	git checkout -f -b test-rmdir ${remotes_git_svn}
+	git checkout -f -b test-rmdir remotes/git-svn
 	'
 
 test_expect_success 'Try a commit on rmdir' '
diff --git a/t/t9103-git-svn-tracked-directory-removed.sh b/t/t9103-git-svn-tracked-directory-removed.sh
index 3413164cb1..b28271345c 100755
--- a/t/t9103-git-svn-tracked-directory-removed.sh
+++ b/t/t9103-git-svn-tracked-directory-removed.sh
@@ -23,17 +23,19 @@ test_expect_success 'make history for tracking' '
 
 test_expect_success 'clone repo with git' '
 	git svn clone -s "$svnrepo" x &&
-	test -f x/FOLLOWME &&
-	test ! -f x/README
+	test_path_is_file x/FOLLOWME &&
+	test_path_is_missing x/README
 '
 
-test_expect_success 'make sure r2 still has old file' "
-	cd x &&
-		test -n \"\$(git svn find-rev r1)\" &&
-		git reset --hard \$(git svn find-rev r1) &&
-		test -f README &&
-		test ! -f FOLLOWME &&
-		test x\$(git svn find-rev r2) = x
-"
+test_expect_success 'make sure r2 still has old file' '
+	(
+		cd x &&
+		test -n "$(git svn find-rev r1)" &&
+		git reset --hard "$(git svn find-rev r1)" &&
+		test_path_is_file README &&
+		test_path_is_missing FOLLOWME &&
+		test -z "$(git svn find-rev r2)"
+	)
+'
 
 test_done
diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh
index f6d7ac7c5f..dbe8deac0d 100755
--- a/t/t9106-git-svn-commit-diff-clobber.sh
+++ b/t/t9106-git-svn-commit-diff-clobber.sh
@@ -44,7 +44,7 @@ test_expect_success 'commit complementing change from git' '
 test_expect_success 'dcommit fails to commit because of conflict' '
 	git svn init "$svnrepo" &&
 	git svn fetch &&
-	git reset --hard refs/${remotes_git_svn} &&
+	git reset --hard refs/remotes/git-svn &&
 	svn_cmd co "$svnrepo" t.svn &&
 	(
 		cd t.svn &&
@@ -59,7 +59,7 @@ test_expect_success 'dcommit fails to commit because of conflict' '
 	'
 
 test_expect_success 'dcommit does the svn equivalent of an index merge' "
-	git reset --hard refs/${remotes_git_svn} &&
+	git reset --hard refs/remotes/git-svn &&
 	echo 'index merge' > file2 &&
 	git update-index --add file2 &&
 	git commit -a -m 'index merge' &&
@@ -81,7 +81,7 @@ test_expect_success 'commit another change from svn side' '
 	'
 
 test_expect_success 'multiple dcommit from git svn will not clobber svn' "
-	git reset --hard refs/${remotes_git_svn} &&
+	git reset --hard refs/remotes/git-svn &&
 	echo new file >> new-file &&
 	git update-index --add new-file &&
 	git commit -a -m 'new file' &&
diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index 9060198037..9f3ef8f2ef 100755
--- a/t/t9107-git-svn-migrate.sh
+++ b/t/t9107-git-svn-migrate.sh
@@ -19,13 +19,14 @@ test_expect_success 'setup old-looking metadata' '
 	git svn init "$svnrepo" &&
 	git svn fetch &&
 	rm -rf "$GIT_DIR"/svn &&
-	git update-ref refs/heads/git-svn-HEAD refs/${remotes_git_svn} &&
-	git update-ref refs/heads/svn-HEAD refs/${remotes_git_svn} &&
-	git update-ref -d refs/${remotes_git_svn} refs/${remotes_git_svn}
+	git update-ref refs/heads/git-svn-HEAD refs/remotes/git-svn &&
+	git update-ref refs/heads/svn-HEAD refs/remotes/git-svn &&
+	git update-ref -d refs/remotes/git-svn refs/remotes/git-svn
 	'
 
-head=$(git rev-parse --verify refs/heads/git-svn-HEAD^0)
-test_expect_success 'git-svn-HEAD is a real HEAD' "test -n '$head'"
+test_expect_success 'git-svn-HEAD is a real HEAD' '
+	git rev-parse --verify refs/heads/git-svn-HEAD^0
+'
 
 svnrepo_escaped=$(echo $svnrepo | sed 's/ /%20/')
 
@@ -35,11 +36,11 @@ test_expect_success 'initialize old-style (v0) git svn layout' '
 	echo "$svnrepo" > "$GIT_DIR"/svn/info/url &&
 	git svn migrate &&
 	! test -d "$GIT_DIR"/git-svn &&
-	git rev-parse --verify refs/${remotes_git_svn}^0 &&
+	git rev-parse --verify refs/remotes/git-svn^0 &&
 	git rev-parse --verify refs/remotes/svn^0 &&
 	test "$(git config --get svn-remote.svn.url)" = "$svnrepo_escaped" &&
 	test $(git config --get svn-remote.svn.fetch) = \
-             ":refs/${remotes_git_svn}"
+		":refs/remotes/git-svn"
 	'
 
 test_expect_success 'initialize a multi-repository repo' '
@@ -56,9 +57,11 @@ test_expect_success 'initialize a multi-repository repo' '
 	                        "^tags/\*:refs/remotes/origin/tags/\*$" &&
 	git config --add svn-remote.svn.fetch "branches/a:refs/remotes/origin/a" &&
 	git config --add svn-remote.svn.fetch "branches/b:refs/remotes/origin/b" &&
-	for i in tags/0.1 tags/0.2 tags/0.3; do
+	for i in tags/0.1 tags/0.2 tags/0.3
+	do
 		git config --add svn-remote.svn.fetch \
-		                 $i:refs/remotes/origin/$i || exit 1; done &&
+			$i:refs/remotes/origin/$i || return 1
+	done &&
 	git config --get-all svn-remote.svn.fetch > fetch.out &&
 	grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
 	grep "^branches/a:refs/remotes/origin/a$" fetch.out &&
@@ -66,34 +69,42 @@ test_expect_success 'initialize a multi-repository repo' '
 	grep "^tags/0\.1:refs/remotes/origin/tags/0\.1$" fetch.out &&
 	grep "^tags/0\.2:refs/remotes/origin/tags/0\.2$" fetch.out &&
 	grep "^tags/0\.3:refs/remotes/origin/tags/0\.3$" fetch.out &&
-	grep "^:refs/${remotes_git_svn}" fetch.out
+	grep "^:refs/remotes/git-svn" fetch.out
 	'
 
 # refs should all be different, but the trees should all be the same:
-test_expect_success 'multi-fetch works on partial urls + paths' "
+test_expect_success 'multi-fetch works on partial urls + paths' '
+	refs="trunk a b tags/0.1 tags/0.2 tags/0.3" &&
 	git svn multi-fetch &&
-	for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do
-		git rev-parse --verify refs/remotes/origin/\$i^0 >> refs.out || exit 1;
-	    done &&
-	test -z \"\$(sort < refs.out | uniq -d)\" &&
-	for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do
-	  for j in trunk a b tags/0.1 tags/0.2 tags/0.3; do
-		if test \$j != \$i; then continue; fi
-	    test -z \"\$(git diff refs/remotes/origin/\$i \
-				 refs/remotes/origin/\$j)\" ||exit 1; done; done
-	"
+	for i in $refs
+	do
+		git rev-parse --verify refs/remotes/origin/$i^0 || return 1;
+	done >refs.out &&
+	test -z "$(sort <refs.out | uniq -d)" &&
+	for i in $refs
+	do
+		for j in $refs
+		do
+			git diff --exit-code refs/remotes/origin/$i \
+					     refs/remotes/origin/$j ||
+				return 1
+		done
+	done
+'
 
 test_expect_success 'migrate --minimize on old inited layout' '
 	git config --unset-all svn-remote.svn.fetch &&
 	git config --unset-all svn-remote.svn.url &&
 	rm -rf "$GIT_DIR"/svn &&
-	for i in $(cat fetch.out); do
+	for i in $(cat fetch.out)
+	do
 		path=$(expr $i : "\([^:]*\):.*$")
 		ref=$(expr $i : "[^:]*:\(refs/remotes/.*\)$")
 		if test -z "$ref"; then continue; fi
 		if test -n "$path"; then path="/$path"; fi
-		( mkdir -p "$GIT_DIR"/svn/$ref/info/ &&
-		echo "$svnrepo"$path > "$GIT_DIR"/svn/$ref/info/url ) || exit 1;
+		mkdir -p "$GIT_DIR"/svn/$ref/info/ &&
+		echo "$svnrepo"$path >"$GIT_DIR"/svn/$ref/info/url ||
+		return 1
 	done &&
 	git svn migrate --minimize &&
 	test -z "$(git config -l | grep "^svn-remote\.git-svn\.")" &&
@@ -104,7 +115,7 @@ test_expect_success 'migrate --minimize on old inited layout' '
 	grep "^tags/0\.1:refs/remotes/origin/tags/0\.1$" fetch.out &&
 	grep "^tags/0\.2:refs/remotes/origin/tags/0\.2$" fetch.out &&
 	grep "^tags/0\.3:refs/remotes/origin/tags/0\.3$" fetch.out &&
-	grep "^:refs/${remotes_git_svn}" fetch.out
+	grep "^:refs/remotes/git-svn" fetch.out
 	'
 
 test_expect_success  ".rev_db auto-converted to .rev_map.UUID" '
diff --git a/t/t9110-git-svn-use-svm-props.sh b/t/t9110-git-svn-use-svm-props.sh
index 29fbdfdd3f..dde0a3c222 100755
--- a/t/t9110-git-svn-use-svm-props.sh
+++ b/t/t9110-git-svn-use-svm-props.sh
@@ -22,31 +22,31 @@ uuid=161ce429-a9dd-4828-af4a-52023f968c89
 bar_url=http://mayonaise/svnrepo/bar
 test_expect_success 'verify metadata for /bar' "
 	git cat-file commit refs/remotes/bar | \
-	   grep '^${git_svn_id}: $bar_url@12 $uuid$' &&
+	   grep '^git-svn-id: $bar_url@12 $uuid$' &&
 	git cat-file commit refs/remotes/bar~1 | \
-	   grep '^${git_svn_id}: $bar_url@11 $uuid$' &&
+	   grep '^git-svn-id: $bar_url@11 $uuid$' &&
 	git cat-file commit refs/remotes/bar~2 | \
-	   grep '^${git_svn_id}: $bar_url@10 $uuid$' &&
+	   grep '^git-svn-id: $bar_url@10 $uuid$' &&
 	git cat-file commit refs/remotes/bar~3 | \
-	   grep '^${git_svn_id}: $bar_url@9 $uuid$' &&
+	   grep '^git-svn-id: $bar_url@9 $uuid$' &&
 	git cat-file commit refs/remotes/bar~4 | \
-	   grep '^${git_svn_id}: $bar_url@6 $uuid$' &&
+	   grep '^git-svn-id: $bar_url@6 $uuid$' &&
 	git cat-file commit refs/remotes/bar~5 | \
-	   grep '^${git_svn_id}: $bar_url@1 $uuid$'
+	   grep '^git-svn-id: $bar_url@1 $uuid$'
 	"
 
 e_url=http://mayonaise/svnrepo/dir/a/b/c/d/e
 test_expect_success 'verify metadata for /dir/a/b/c/d/e' "
 	git cat-file commit refs/remotes/e | \
-	   grep '^${git_svn_id}: $e_url@1 $uuid$'
+	   grep '^git-svn-id: $e_url@1 $uuid$'
 	"
 
 dir_url=http://mayonaise/svnrepo/dir
 test_expect_success 'verify metadata for /dir' "
 	git cat-file commit refs/remotes/dir | \
-	   grep '^${git_svn_id}: $dir_url@2 $uuid$' &&
+	   grep '^git-svn-id: $dir_url@2 $uuid$' &&
 	git cat-file commit refs/remotes/dir~1 | \
-	   grep '^${git_svn_id}: $dir_url@1 $uuid$'
+	   grep '^git-svn-id: $dir_url@1 $uuid$'
 	"
 
 test_expect_success 'find commit based on SVN revision number' "
diff --git a/t/t9111-git-svn-use-svnsync-props.sh b/t/t9111-git-svn-use-svnsync-props.sh
index bd081c2ec3..22b6e5ee7d 100755
--- a/t/t9111-git-svn-use-svnsync-props.sh
+++ b/t/t9111-git-svn-use-svnsync-props.sh
@@ -21,31 +21,31 @@ uuid=161ce429-a9dd-4828-af4a-52023f968c89
 bar_url=http://mayonaise/svnrepo/bar
 test_expect_success 'verify metadata for /bar' "
 	git cat-file commit refs/remotes/bar | \
-	   grep '^${git_svn_id}: $bar_url@12 $uuid$' &&
+	   grep '^git-svn-id: $bar_url@12 $uuid$' &&
 	git cat-file commit refs/remotes/bar~1 | \
-	   grep '^${git_svn_id}: $bar_url@11 $uuid$' &&
+	   grep '^git-svn-id: $bar_url@11 $uuid$' &&
 	git cat-file commit refs/remotes/bar~2 | \
-	   grep '^${git_svn_id}: $bar_url@10 $uuid$' &&
+	   grep '^git-svn-id: $bar_url@10 $uuid$' &&
 	git cat-file commit refs/remotes/bar~3 | \
-	   grep '^${git_svn_id}: $bar_url@9 $uuid$' &&
+	   grep '^git-svn-id: $bar_url@9 $uuid$' &&
 	git cat-file commit refs/remotes/bar~4 | \
-	   grep '^${git_svn_id}: $bar_url@6 $uuid$' &&
+	   grep '^git-svn-id: $bar_url@6 $uuid$' &&
 	git cat-file commit refs/remotes/bar~5 | \
-	   grep '^${git_svn_id}: $bar_url@1 $uuid$'
+	   grep '^git-svn-id: $bar_url@1 $uuid$'
 	"
 
 e_url=http://mayonaise/svnrepo/dir/a/b/c/d/e
 test_expect_success 'verify metadata for /dir/a/b/c/d/e' "
 	git cat-file commit refs/remotes/e | \
-	   grep '^${git_svn_id}: $e_url@1 $uuid$'
+	   grep '^git-svn-id: $e_url@1 $uuid$'
 	"
 
 dir_url=http://mayonaise/svnrepo/dir
 test_expect_success 'verify metadata for /dir' "
 	git cat-file commit refs/remotes/dir | \
-	   grep '^${git_svn_id}: $dir_url@2 $uuid$' &&
+	   grep '^git-svn-id: $dir_url@2 $uuid$' &&
 	git cat-file commit refs/remotes/dir~1 | \
-	   grep '^${git_svn_id}: $dir_url@1 $uuid$'
+	   grep '^git-svn-id: $dir_url@1 $uuid$'
 	"
 
 test_done
diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh
index a87d3d3fc1..64bb495834 100755
--- a/t/t9115-git-svn-dcommit-funky-renames.sh
+++ b/t/t9115-git-svn-dcommit-funky-renames.sh
@@ -8,9 +8,10 @@ test_description='git svn dcommit can commit renames of files with ugly names'
 . ./lib-git-svn.sh
 
 test_expect_success 'load repository with strange names' '
-	svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9115/funky-names.dump &&
-	start_httpd gtk+
-	'
+	svnadmin load -q "$rawsvnrepo" <"$TEST_DIRECTORY"/t9115/funky-names.dump
+'
+
+maybe_start_httpd gtk+
 
 test_expect_success 'init and fetch repository' '
 	git svn init "$svnrepo" &&
diff --git a/t/t9118-git-svn-funky-branch-names.sh b/t/t9118-git-svn-funky-branch-names.sh
index ecb1fed147..41a026637f 100755
--- a/t/t9118-git-svn-funky-branch-names.sh
+++ b/t/t9118-git-svn-funky-branch-names.sh
@@ -32,7 +32,7 @@ test_expect_success 'setup svnrepo' '
 			"$svnrepo/pr ject/branches/trailing_dotlock.lock" &&
 	svn_cmd cp -m "reflog" "$svnrepo/pr ject/trunk" \
 			"$svnrepo/pr ject/branches/not-a@{0}reflog@" &&
-	start_httpd
+	maybe_start_httpd
 	'
 
 # SVN 1.7 will truncate "not-a%40{0]" to just "not-a".
diff --git a/t/t9120-git-svn-clone-with-percent-escapes.sh b/t/t9120-git-svn-clone-with-percent-escapes.sh
index 1c84ce1023..b28a1741e3 100755
--- a/t/t9120-git-svn-clone-with-percent-escapes.sh
+++ b/t/t9120-git-svn-clone-with-percent-escapes.sh
@@ -15,14 +15,14 @@ test_expect_success 'setup svnrepo' '
 	svn_cmd cp -m "tag" "$svnrepo/pr ject/trunk" \
 	  "$svnrepo/pr ject/tags/v1" &&
 	rm -rf project &&
-	start_httpd
+	maybe_start_httpd
 '
 
 test_expect_success 'test clone with percent escapes' '
 	git svn clone "$svnrepo/pr%20ject" clone &&
 	(
 		cd clone &&
-		git rev-parse refs/${remotes_git_svn}
+		git rev-parse refs/remotes/git-svn
 	)
 '
 
@@ -42,7 +42,7 @@ test_expect_success 'test clone trunk with percent escapes and minimize-url' '
 	git svn clone --minimize-url "$svnrepo/pr%20ject/trunk" minimize &&
 	(
 		cd minimize &&
-		git rev-parse refs/${remotes_git_svn}
+		git rev-parse refs/remotes/git-svn
 	)
 '
 
@@ -50,7 +50,7 @@ test_expect_success 'test clone trunk with percent escapes' '
 	git svn clone "$svnrepo/pr%20ject/trunk" trunk &&
 	(
 		cd trunk &&
-		git rev-parse refs/${remotes_git_svn}
+		git rev-parse refs/remotes/git-svn
 	)
 '
 
diff --git a/t/t9123-git-svn-rebuild-with-rewriteroot.sh b/t/t9123-git-svn-rebuild-with-rewriteroot.sh
index fd8184787f..ead404589e 100755
--- a/t/t9123-git-svn-rebuild-with-rewriteroot.sh
+++ b/t/t9123-git-svn-rebuild-with-rewriteroot.sh
@@ -17,7 +17,7 @@ rm -rf import
 test_expect_success 'init, fetch and checkout repository' '
 	git svn init --rewrite-root=http://invalid.invalid/ "$svnrepo" &&
 	git svn fetch &&
-	git checkout -b mybranch ${remotes_git_svn}
+	git checkout -b mybranch remotes/git-svn
 	'
 
 test_expect_success 'remove rev_map' '
diff --git a/t/t9142-git-svn-shallow-clone.sh b/t/t9142-git-svn-shallow-clone.sh
index e21ee5f663..9ee23be640 100755
--- a/t/t9142-git-svn-shallow-clone.sh
+++ b/t/t9142-git-svn-shallow-clone.sh
@@ -18,7 +18,7 @@ test_expect_success 'setup test repository' '
 		svn_cmd add foo &&
 		svn_cmd commit -m "add foo"
 	) &&
-	start_httpd
+	maybe_start_httpd
 '
 
 test_expect_success 'clone trunk with "-r HEAD"' '
diff --git a/t/t9153-git-svn-rewrite-uuid.sh b/t/t9153-git-svn-rewrite-uuid.sh
index 88a2cfa233..372ef15685 100755
--- a/t/t9153-git-svn-rewrite-uuid.sh
+++ b/t/t9153-git-svn-rewrite-uuid.sh
@@ -17,9 +17,9 @@ test_expect_success 'load svn repo' "
 
 test_expect_success 'verify uuid' "
 	git cat-file commit refs/remotes/git-svn~0 | \
-	   grep '^${git_svn_id}: .*@2 $uuid$' &&
+	   grep '^git-svn-id: .*@2 $uuid$' &&
 	git cat-file commit refs/remotes/git-svn~1 | \
-	   grep '^${git_svn_id}: .*@1 $uuid$'
+	   grep '^git-svn-id: .*@1 $uuid$'
 	"
 
 test_done
diff --git a/t/t9158-git-svn-mergeinfo.sh b/t/t9158-git-svn-mergeinfo.sh
index 13f78f2682..a875b45102 100755
--- a/t/t9158-git-svn-mergeinfo.sh
+++ b/t/t9158-git-svn-mergeinfo.sh
@@ -7,8 +7,6 @@ test_description='git svn mergeinfo propagation'
 
 . ./lib-git-svn.sh
 
-say 'define NO_SVN_TESTS to skip git svn tests'
-
 test_expect_success 'initialize source svn repo' '
 	svn_cmd mkdir -m x "$svnrepo"/trunk &&
 	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
diff --git a/t/t9160-git-svn-preserve-empty-dirs.sh b/t/t9160-git-svn-preserve-empty-dirs.sh
index b4a4434604..0ede3cfedb 100755
--- a/t/t9160-git-svn-preserve-empty-dirs.sh
+++ b/t/t9160-git-svn-preserve-empty-dirs.sh
@@ -11,7 +11,6 @@ local Git repository with placeholder files.'
 
 . ./lib-git-svn.sh
 
-say 'define NO_SVN_TESTS to skip git svn tests'
 GIT_REPO=git-svn-repo
 
 test_expect_success 'initialize source svn repo containing empty dirs' '
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 25bb60b281..2e0ba3ebd8 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -7,23 +7,6 @@ test_description='test git fast-import utility'
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
 
-# Print $1 bytes from stdin to stdout.
-#
-# This could be written as "head -c $1", but IRIX "head" does not
-# support the -c option.
-head_c () {
-	perl -e '
-		my $len = $ARGV[1];
-		while ($len > 0) {
-			my $s;
-			my $nread = sysread(STDIN, $s, $len);
-			die "cannot read: $!" unless defined($nread);
-			print $s;
-			$len -= $nread;
-		}
-	' - "$1"
-}
-
 verify_packs () {
 	for p in .git/objects/pack/*.pack
 	do
@@ -52,6 +35,7 @@ echo "$@"'
 ###
 
 test_expect_success 'empty stream succeeds' '
+	git config fastimport.unpackLimit 0 &&
 	git fast-import </dev/null
 '
 
@@ -2480,7 +2464,7 @@ test_expect_success PIPE 'R: copy using cat-file' '
 
 		read blob_id type size <&3 &&
 		echo "$blob_id $type $size" >response &&
-		head_c $size >blob <&3 &&
+		test_copy_bytes $size >blob <&3 &&
 		read newline <&3 &&
 
 		cat <<-EOF &&
@@ -2523,7 +2507,7 @@ test_expect_success PIPE 'R: print blob mid-commit' '
 		EOF
 
 		read blob_id type size <&3 &&
-		head_c $size >actual <&3 &&
+		test_copy_bytes $size >actual <&3 &&
 		read newline <&3 &&
 
 		echo
@@ -2558,7 +2542,7 @@ test_expect_success PIPE 'R: print staged blob within commit' '
 		echo "cat-blob $to_get" &&
 
 		read blob_id type size <&3 &&
-		head_c $size >actual <&3 &&
+		test_copy_bytes $size >actual <&3 &&
 		read newline <&3 &&
 
 		echo deleteall
@@ -2650,6 +2634,21 @@ test_expect_success 'R: ignore non-git options' '
 	git fast-import <input
 '
 
+test_expect_success 'R: corrupt lines do not mess marks file' '
+	rm -f io.marks &&
+	blob=$(echo hi | git hash-object --stdin) &&
+	cat >expect <<-EOF &&
+	:3 0000000000000000000000000000000000000000
+	:1 $blob
+	:2 $blob
+	EOF
+	cp expect io.marks &&
+	test_must_fail git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF &&
+
+	EOF
+	test_cmp expect io.marks
+'
+
 ##
 ## R: very large blobs
 ##
@@ -2675,6 +2674,7 @@ test_expect_success 'R: blob bigger than threshold' '
 	echo >>input &&
 
 	test_create_repo R &&
+	git --git-dir=R/.git config fastimport.unpackLimit 0 &&
 	git --git-dir=R/.git fast-import --big-file-threshold=1 <input
 '
 
diff --git a/t/t9302-fast-import-unpack-limit.sh b/t/t9302-fast-import-unpack-limit.sh
new file mode 100755
index 0000000000..a04de14677
--- /dev/null
+++ b/t/t9302-fast-import-unpack-limit.sh
@@ -0,0 +1,105 @@
+#!/bin/sh
+test_description='test git fast-import unpack limit'
+. ./test-lib.sh
+
+test_expect_success 'create loose objects on import' '
+	test_tick &&
+	cat >input <<-INPUT_END &&
+	commit refs/heads/master
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data <<COMMIT
+	initial
+	COMMIT
+
+	done
+	INPUT_END
+
+	git -c fastimport.unpackLimit=2 fast-import --done <input &&
+	git fsck --no-progress &&
+	test $(find .git/objects/?? -type f | wc -l) -eq 2 &&
+	test $(find .git/objects/pack -type f | wc -l) -eq 0
+'
+
+test_expect_success 'bigger packs are preserved' '
+	test_tick &&
+	cat >input <<-INPUT_END &&
+	commit refs/heads/master
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data <<COMMIT
+	incremental should create a pack
+	COMMIT
+	from refs/heads/master^0
+
+	commit refs/heads/branch
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data <<COMMIT
+	branch
+	COMMIT
+
+	done
+	INPUT_END
+
+	git -c fastimport.unpackLimit=2 fast-import --done <input &&
+	git fsck --no-progress &&
+	test $(find .git/objects/?? -type f | wc -l) -eq 2 &&
+	test $(find .git/objects/pack -type f | wc -l) -eq 2
+'
+
+test_expect_success 'lookups after checkpoint works' '
+	hello_id=$(echo hello | git hash-object --stdin -t blob) &&
+	id="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE" &&
+	before=$(git rev-parse refs/heads/master^0) &&
+	(
+		cat <<-INPUT_END &&
+		blob
+		mark :1
+		data 6
+		hello
+
+		commit refs/heads/master
+		mark :2
+		committer $id
+		data <<COMMIT
+		checkpoint after this
+		COMMIT
+		from refs/heads/master^0
+		M 100644 :1 hello
+
+		# pre-checkpoint
+		cat-blob :1
+		cat-blob $hello_id
+		checkpoint
+		# post-checkpoint
+		cat-blob :1
+		cat-blob $hello_id
+		INPUT_END
+
+		n=0 &&
+		from=$before &&
+		while test x"$from" = x"$before"
+		do
+			if test $n -gt 30
+			then
+				echo >&2 "checkpoint did not update branch"
+				exit 1
+			else
+				n=$(($n + 1))
+			fi &&
+			sleep 1 &&
+			from=$(git rev-parse refs/heads/master^0)
+		done &&
+		cat <<-INPUT_END &&
+		commit refs/heads/master
+		committer $id
+		data <<COMMIT
+		make sure from "unpacked sha1 reference" works, too
+		COMMIT
+		from $from
+		INPUT_END
+		echo done
+	) | git -c fastimport.unpackLimit=100 fast-import --done &&
+	test $(find .git/objects/?? -type f | wc -l) -eq 6 &&
+	test $(find .git/objects/pack -type f | wc -l) -eq 2
+'
+
+test_done
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index d708cbf032..432c61d246 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -45,7 +45,8 @@ test_expect_success 'setup' '
   touch secondrootfile &&
   git add secondrootfile &&
   git commit -m "second root") &&
-  git pull secondroot master &&
+  git fetch secondroot master &&
+  git merge --allow-unrelated-histories FETCH_HEAD &&
   git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
   GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
   GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log" &&
diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
index f324b9f010..84787eee9a 100755
--- a/t/t9401-git-cvsserver-crlf.sh
+++ b/t/t9401-git-cvsserver-crlf.sh
@@ -154,7 +154,7 @@ test_expect_success 'adding files' '
     echo "more text" > src.c &&
     GIT_CONFIG="$git_config" cvs -Q add src.c >cvs.log 2>&1 &&
     marked_as . src.c "" &&
-    echo "psuedo-binary" > temp.bin
+    echo "pseudo-binary" > temp.bin
     ) &&
     GIT_CONFIG="$git_config" cvs -Q add subdir/temp.bin >cvs.log 2>&1 &&
     marked_as subdir temp.bin "-kb" &&
diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh
index 0aafd03334..6a86d6996b 100755
--- a/t/t9801-git-p4-branch.sh
+++ b/t/t9801-git-p4-branch.sh
@@ -300,7 +300,7 @@ test_expect_success 'git p4 clone complex branches' '
 		test_path_is_file file2 &&
 		test_path_is_file file3 &&
 		! grep update file2 &&
-		test_path_is_missing .git/git-p4-tmp
+		test_must_fail git show-ref --verify refs/git-p4-tmp
 	)
 '
 
@@ -352,7 +352,7 @@ test_expect_success 'git p4 sync changes to two branches in the same changelist'
 		test_path_is_file file2 &&
 		test_path_is_file file3 &&
 		! grep update file2 &&
-		test_path_is_missing .git/git-p4-tmp
+		test_must_fail git show-ref --verify refs/git-p4-tmp
 	)
 '
 
diff --git a/t/t9826-git-p4-keep-empty-commits.sh b/t/t9826-git-p4-keep-empty-commits.sh
index be12960d39..fa8b9daf1f 100755
--- a/t/t9826-git-p4-keep-empty-commits.sh
+++ b/t/t9826-git-p4-keep-empty-commits.sh
@@ -47,23 +47,23 @@ test_expect_success 'Clone repo root path with all history' '
 		git init . &&
 		git p4 clone --use-client-spec --destination="$git" //depot@all &&
 		cat >expect <<-\EOF &&
-Remove file 4
-[git-p4: depot-paths = "//depot/": change = 6]
+		Remove file 4
+		[git-p4: depot-paths = "//depot/": change = 6]
 
-Remove file 3
-[git-p4: depot-paths = "//depot/": change = 5]
+		Remove file 3
+		[git-p4: depot-paths = "//depot/": change = 5]
 
-Add file 4
-[git-p4: depot-paths = "//depot/": change = 4]
+		Add file 4
+		[git-p4: depot-paths = "//depot/": change = 4]
 
-Add file 3
-[git-p4: depot-paths = "//depot/": change = 3]
+		Add file 3
+		[git-p4: depot-paths = "//depot/": change = 3]
 
-Add file 2
-[git-p4: depot-paths = "//depot/": change = 2]
+		Add file 2
+		[git-p4: depot-paths = "//depot/": change = 2]
 
-Add file 1
-[git-p4: depot-paths = "//depot/": change = 1]
+		Add file 1
+		[git-p4: depot-paths = "//depot/": change = 1]
 
 		EOF
 		git log --format=%B >actual &&
@@ -80,23 +80,23 @@ test_expect_success 'Clone repo subdir with all history but keep empty commits'
 		git config git-p4.keepEmptyCommits true &&
 		git p4 clone --use-client-spec --destination="$git" //depot@all &&
 		cat >expect <<-\EOF &&
-Remove file 4
-[git-p4: depot-paths = "//depot/": change = 6]
+		Remove file 4
+		[git-p4: depot-paths = "//depot/": change = 6]
 
-Remove file 3
-[git-p4: depot-paths = "//depot/": change = 5]
+		Remove file 3
+		[git-p4: depot-paths = "//depot/": change = 5]
 
-Add file 4
-[git-p4: depot-paths = "//depot/": change = 4]
+		Add file 4
+		[git-p4: depot-paths = "//depot/": change = 4]
 
-Add file 3
-[git-p4: depot-paths = "//depot/": change = 3]
+		Add file 3
+		[git-p4: depot-paths = "//depot/": change = 3]
 
-Add file 2
-[git-p4: depot-paths = "//depot/": change = 2]
+		Add file 2
+		[git-p4: depot-paths = "//depot/": change = 2]
 
-Add file 1
-[git-p4: depot-paths = "//depot/": change = 1]
+		Add file 1
+		[git-p4: depot-paths = "//depot/": change = 1]
 
 		EOF
 		git log --format=%B >actual &&
@@ -112,14 +112,14 @@ test_expect_success 'Clone repo subdir with all history' '
 		git init . &&
 		git p4 clone --use-client-spec --destination="$git" --verbose //depot@all &&
 		cat >expect <<-\EOF &&
-Remove file 3
-[git-p4: depot-paths = "//depot/": change = 5]
+		Remove file 3
+		[git-p4: depot-paths = "//depot/": change = 5]
 
-Add file 3
-[git-p4: depot-paths = "//depot/": change = 3]
+		Add file 3
+		[git-p4: depot-paths = "//depot/": change = 3]
 
-Add file 1
-[git-p4: depot-paths = "//depot/": change = 1]
+		Add file 1
+		[git-p4: depot-paths = "//depot/": change = 1]
 
 		EOF
 		git log --format=%B >actual &&
diff --git a/t/t9828-git-p4-map-user.sh b/t/t9828-git-p4-map-user.sh
new file mode 100755
index 0000000000..e20395c89f
--- /dev/null
+++ b/t/t9828-git-p4-map-user.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+test_description='Clone repositories and map users'
+
+. ./lib-git-p4.sh
+
+test_expect_success 'start p4d' '
+	start_p4d
+'
+
+test_expect_success 'Create a repo with different users' '
+	client_view "//depot/... //client/..." &&
+	(
+		cd "$cli" &&
+
+		>author.txt &&
+		p4 add author.txt &&
+		p4 submit -d "Add file author\\n" &&
+
+		P4USER=mmax &&
+		>max.txt &&
+		p4 add max.txt &&
+		p4 submit -d "Add file max" &&
+
+		P4USER=eri &&
+		>moritz.txt &&
+		p4 add moritz.txt &&
+		p4 submit -d "Add file moritz" &&
+
+		P4USER=no &&
+		>nobody.txt &&
+		p4 add nobody.txt &&
+		p4 submit -d "Add file nobody"
+	)
+'
+
+test_expect_success 'Clone repo root path with all history' '
+	client_view "//depot/... //client/..." &&
+	test_when_finished cleanup_git &&
+	(
+		cd "$git" &&
+		git init . &&
+		git config --add git-p4.mapUser "mmax = Max Musterman   <max@example.com> "  &&
+		git config --add git-p4.mapUser "  eri=Erika Musterman <erika@example.com>" &&
+		git p4 clone --use-client-spec --destination="$git" //depot@all &&
+		cat >expect <<-\EOF &&
+			no <no@client>
+			Erika Musterman <erika@example.com>
+			Max Musterman <max@example.com>
+			Dr. author <author@example.com>
+		EOF
+		git log --format="%an <%ae>" >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
+test_done
diff --git a/t/t9829-git-p4-jobs.sh b/t/t9829-git-p4-jobs.sh
new file mode 100755
index 0000000000..971aeeea1f
--- /dev/null
+++ b/t/t9829-git-p4-jobs.sh
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+test_description='git p4 retrieve job info'
+
+. ./lib-git-p4.sh
+
+test_expect_success 'start p4d' '
+	start_p4d
+'
+
+test_expect_success 'add p4 jobs' '
+	(
+		p4_add_job TESTJOB-A &&
+		p4_add_job TESTJOB-B
+	)
+'
+
+test_expect_success 'add p4 files' '
+	client_view "//depot/... //client/..." &&
+	(
+		cd "$cli" &&
+		>file1 &&
+		p4 add file1 &&
+		p4 submit -d "Add file 1"
+	)
+'
+
+test_expect_success 'check log message of changelist with no jobs' '
+	client_view "//depot/... //client/..." &&
+	test_when_finished cleanup_git &&
+	(
+		cd "$git" &&
+		git init . &&
+		git p4 clone --use-client-spec --destination="$git" //depot@all &&
+		cat >expect <<-\EOF &&
+		Add file 1
+		[git-p4: depot-paths = "//depot/": change = 1]
+
+		EOF
+		git log --format=%B >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'add TESTJOB-A to change 1' '
+	(
+		cd "$cli" &&
+		p4 fix -c 1 TESTJOB-A
+	)
+'
+
+test_expect_success 'check log message of changelist with one job' '
+	client_view "//depot/... //client/..." &&
+	test_when_finished cleanup_git &&
+	(
+		cd "$git" &&
+		git init . &&
+		git p4 clone --use-client-spec --destination="$git" //depot@all &&
+		cat >expect <<-\EOF &&
+		Add file 1
+		Jobs: TESTJOB-A
+		[git-p4: depot-paths = "//depot/": change = 1]
+
+		EOF
+		git log --format=%B >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'add TESTJOB-B to change 1' '
+	(
+		cd "$cli" &&
+		p4 fix -c 1 TESTJOB-B
+	)
+'
+
+test_expect_success 'check log message of changelist with more jobs' '
+	client_view "//depot/... //client/..." &&
+	test_when_finished cleanup_git &&
+	(
+		cd "$git" &&
+		git init . &&
+		git p4 clone --use-client-spec --destination="$git" //depot@all &&
+		cat >expect <<-\EOF &&
+		Add file 1
+		Jobs: TESTJOB-A TESTJOB-B
+		[git-p4: depot-paths = "//depot/": change = 1]
+
+		EOF
+		git log --format=%B >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
+test_done
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 3978fc0b45..4f7eadb596 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -612,7 +612,7 @@ test_must_fail () {
 	then
 		echo >&2 "test_must_fail: command succeeded: $*"
 		return 1
-	elif test $exit_code -eq 141 && list_contains "$_test_ok" sigpipe
+	elif test_match_signal 13 $exit_code && list_contains "$_test_ok" sigpipe
 	then
 		return 0
 	elif test $exit_code -gt 129 && test $exit_code -le 192
@@ -939,3 +939,54 @@ mingw_read_file_strip_cr_ () {
 		eval "$1=\$$1\$line"
 	done
 }
+
+# Like "env FOO=BAR some-program", but run inside a subshell, which means
+# it also works for shell functions (though those functions cannot impact
+# the environment outside of the test_env invocation).
+test_env () {
+	(
+		while test $# -gt 0
+		do
+			case "$1" in
+			*=*)
+				eval "${1%%=*}=\${1#*=}"
+				eval "export ${1%%=*}"
+				shift
+				;;
+			*)
+				"$@"
+				exit
+				;;
+			esac
+		done
+	)
+}
+
+# Returns true if the numeric exit code in "$2" represents the expected signal
+# in "$1". Signals should be given numerically.
+test_match_signal () {
+	if test "$2" = "$((128 + $1))"
+	then
+		# POSIX
+		return 0
+	elif test "$2" = "$((256 + $1))"
+	then
+		# ksh
+		return 0
+	fi
+	return 1
+}
+
+# Read up to "$1" bytes (or to EOF) from stdin and write them to stdout.
+test_copy_bytes () {
+	perl -e '
+		my $len = $ARGV[1];
+		while ($len > 0) {
+			my $s;
+			my $nread = sysread(STDIN, $s, $len);
+			die "cannot read: $!" unless defined($nread);
+			print $s;
+			$len -= $nread;
+		}
+	' - "$1"
+}
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 39c70f0326..d731d66e36 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -162,6 +162,9 @@ _x40="$_x05$_x05$_x05$_x05$_x05$_x05$_x05$_x05"
 # Zero SHA-1
 _z40=0000000000000000000000000000000000000000
 
+EMPTY_TREE=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+EMPTY_BLOB=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+
 # Line feed
 LF='
 '
@@ -170,7 +173,7 @@ LF='
 # when case-folding filenames
 u200c=$(printf '\342\200\214')
 
-export _x05 _x40 _z40 LF u200c
+export _x05 _x40 _z40 LF u200c EMPTY_TREE EMPTY_BLOB
 
 # Each test should start with something like this, after copyright notices:
 #
@@ -798,7 +801,7 @@ then
 	# override all git executables in TEST_DIRECTORY/..
 	GIT_VALGRIND=$TEST_DIRECTORY/valgrind
 	mkdir -p "$GIT_VALGRIND"/bin
-	for file in $GIT_BUILD_DIR/git* $GIT_BUILD_DIR/test-*
+	for file in $GIT_BUILD_DIR/git* $GIT_BUILD_DIR/t/helper/test-*
 	do
 		make_valgrind_symlink $file
 	done
@@ -867,10 +870,10 @@ test -d "$GIT_BUILD_DIR"/templates/blt || {
 	error "You haven't built things yet, have you?"
 }
 
-if ! test -x "$GIT_BUILD_DIR"/test-chmtime
+if ! test -x "$GIT_BUILD_DIR"/t/helper/test-chmtime
 then
 	echo >&2 'You need to build test-chmtime:'
-	echo >&2 'Run "make test-chmtime" in the source (toplevel) directory'
+	echo >&2 'Run "make t/helper/test-chmtime" in the source (toplevel) directory'
 	exit 1
 fi
 
@@ -1111,3 +1114,12 @@ run_with_limited_cmdline () {
 }
 
 test_lazy_prereq CMDLINE_LIMIT 'run_with_limited_cmdline true'
+
+build_option () {
+	git version --build-options |
+	sed -ne "s/^$1: //p"
+}
+
+test_lazy_prereq LONG_IS_64BIT '
+	test 8 -le "$(build_option sizeof-long)"
+'
diff --git a/tag.c b/tag.c
index d72f742af9..d1dcd18cd7 100644
--- a/tag.c
+++ b/tag.c
@@ -6,6 +6,59 @@
 
 const char *tag_type = "tag";
 
+static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags)
+{
+	struct signature_check sigc;
+	size_t payload_size;
+	int ret;
+
+	memset(&sigc, 0, sizeof(sigc));
+
+	payload_size = parse_signature(buf, size);
+
+	if (size == payload_size) {
+		if (flags & GPG_VERIFY_VERBOSE)
+			write_in_full(1, buf, payload_size);
+		return error("no signature found");
+	}
+
+	ret = check_signature(buf, payload_size, buf + payload_size,
+				size - payload_size, &sigc);
+	print_signature_buffer(&sigc, flags);
+
+	signature_check_clear(&sigc);
+	return ret;
+}
+
+int gpg_verify_tag(const unsigned char *sha1, const char *name_to_report,
+		unsigned flags)
+{
+	enum object_type type;
+	char *buf;
+	unsigned long size;
+	int ret;
+
+	type = sha1_object_info(sha1, NULL);
+	if (type != OBJ_TAG)
+		return error("%s: cannot verify a non-tag object of type %s.",
+				name_to_report ?
+				name_to_report :
+				find_unique_abbrev(sha1, DEFAULT_ABBREV),
+				typename(type));
+
+	buf = read_sha1_file(sha1, &type, &size);
+	if (!buf)
+		return error("%s: unable to read file.",
+				name_to_report ?
+				name_to_report :
+				find_unique_abbrev(sha1, DEFAULT_ABBREV));
+
+	ret = run_gpg_verify(buf, size, flags);
+
+	free(buf);
+	return ret;
+}
+
 struct object *deref_tag(struct object *o, const char *warn, int warnlen)
 {
 	while (o && o->type == OBJ_TAG)
diff --git a/tag.h b/tag.h
index f4580aea42..a5721b6731 100644
--- a/tag.h
+++ b/tag.h
@@ -17,5 +17,7 @@ extern int parse_tag_buffer(struct tag *item, const void *data, unsigned long si
 extern int parse_tag(struct tag *item);
 extern struct object *deref_tag(struct object *, const char *, int);
 extern struct object *deref_tag_noverify(struct object *);
+extern int gpg_verify_tag(const unsigned char *sha1,
+		const char *name_to_report, unsigned flags);
 
 #endif /* TAG_H */
diff --git a/templates/hooks--pre-receive.sample b/templates/hooks--pre-receive.sample
new file mode 100644
index 0000000000..a1fd29ec14
--- /dev/null
+++ b/templates/hooks--pre-receive.sample
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to make use of push options.
+# The example simply echoes all push options that start with 'echoback='
+# and rejects all pushes when the "reject" push option is used.
+#
+# To enable this hook, rename this file to "pre-receive".
+
+if test -n "$GIT_PUSH_OPTION_COUNT"
+then
+	i=0
+	while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
+	do
+		eval "value=\$GIT_PUSH_OPTION_$i"
+		case "$value" in
+		echoback=*)
+			echo "echo from the pre-receive-hook: ${value#*=}" >&2
+			;;
+		reject)
+			exit 1
+		esac
+		i=$((i + 1))
+	done
+fi
diff --git a/test-match-trees.c b/test-match-trees.c
deleted file mode 100644
index 4dad7095f1..0000000000
--- a/test-match-trees.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "cache.h"
-#include "tree.h"
-
-int main(int ac, char **av)
-{
-	unsigned char hash1[20], hash2[20], shifted[20];
-	struct tree *one, *two;
-
-	setup_git_directory();
-
-	if (get_sha1(av[1], hash1))
-		die("cannot parse %s as an object name", av[1]);
-	if (get_sha1(av[2], hash2))
-		die("cannot parse %s as an object name", av[2]);
-	one = parse_tree_indirect(hash1);
-	if (!one)
-		die("not a tree-ish %s", av[1]);
-	two = parse_tree_indirect(hash2);
-	if (!two)
-		die("not a tree-ish %s", av[2]);
-
-	shift_tree(one->object.oid.hash, two->object.oid.hash, shifted, -1);
-	printf("shifted: %s\n", sha1_to_hex(shifted));
-
-	exit(0);
-}
diff --git a/test-regex.c b/test-regex.c
deleted file mode 100644
index 0dc598ecdc..0000000000
--- a/test-regex.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "git-compat-util.h"
-
-int main(int argc, char **argv)
-{
-	char *pat = "[^={} \t]+";
-	char *str = "={}\nfred";
-	regex_t r;
-	regmatch_t m[1];
-
-	if (regcomp(&r, pat, REG_EXTENDED | REG_NEWLINE))
-		die("failed regcomp() for pattern '%s'", pat);
-	if (regexec(&r, str, 1, m, 0))
-		die("no match of pattern '%s' to string '%s'", pat, str);
-
-	/* http://sourceware.org/bugzilla/show_bug.cgi?id=3957  */
-	if (m[0].rm_so == 3) /* matches '\n' when it should not */
-		die("regex bug confirmed: re-build git with NO_REGEX=1");
-
-	exit(0);
-}
diff --git a/trace.c b/trace.c
index 4aeea60973..7508aea028 100644
--- a/trace.c
+++ b/trace.c
@@ -25,15 +25,25 @@
 #include "cache.h"
 #include "quote.h"
 
+/*
+ * "Normalize" a key argument by converting NULL to our trace_default,
+ * and otherwise passing through the value. All caller-facing functions
+ * should normalize their inputs in this way, though most get it
+ * for free by calling get_trace_fd() (directly or indirectly).
+ */
+static void normalize_trace_key(struct trace_key **key)
+{
+	static struct trace_key trace_default = { "GIT_TRACE" };
+	if (!*key)
+		*key = &trace_default;
+}
+
 /* Get a trace file descriptor from "key" env variable. */
 static int get_trace_fd(struct trace_key *key)
 {
-	static struct trace_key trace_default = { "GIT_TRACE" };
 	const char *trace;
 
-	/* use default "GIT_TRACE" if NULL */
-	if (!key)
-		key = &trace_default;
+	normalize_trace_key(&key);
 
 	/* don't open twice */
 	if (key->initialized)
@@ -51,22 +61,19 @@ static int get_trace_fd(struct trace_key *key)
 	else if (is_absolute_path(trace)) {
 		int fd = open(trace, O_WRONLY | O_APPEND | O_CREAT, 0666);
 		if (fd == -1) {
-			fprintf(stderr,
-				"Could not open '%s' for tracing: %s\n"
-				"Defaulting to tracing on stderr...\n",
+			warning("could not open '%s' for tracing: %s",
 				trace, strerror(errno));
-			key->fd = STDERR_FILENO;
+			trace_disable(key);
 		} else {
 			key->fd = fd;
 			key->need_close = 1;
 		}
 	} else {
-		fprintf(stderr, "What does '%s' for %s mean?\n"
-			"If you want to trace into a file, then please set "
-			"%s to an absolute pathname (starting with /).\n"
-			"Defaulting to tracing on stderr...\n",
-			trace, key->key, key->key);
-		key->fd = STDERR_FILENO;
+		warning("unknown trace value for '%s': %s\n"
+			"         If you want to trace into a file, then please set %s\n"
+			"         to an absolute pathname (starting with /)",
+			key->key, trace, key->key);
+		trace_disable(key);
 	}
 
 	key->initialized = 1;
@@ -75,6 +82,8 @@ static int get_trace_fd(struct trace_key *key)
 
 void trace_disable(struct trace_key *key)
 {
+	normalize_trace_key(&key);
+
 	if (key->need_close)
 		close(key->fd);
 	key->fd = 0;
@@ -82,9 +91,6 @@ void trace_disable(struct trace_key *key)
 	key->need_close = 0;
 }
 
-static const char err_msg[] = "Could not trace into fd given by "
-	"GIT_TRACE environment variable";
-
 static int prepare_trace_line(const char *file, int line,
 			      struct trace_key *key, struct strbuf *buf)
 {
@@ -120,18 +126,27 @@ static int prepare_trace_line(const char *file, int line,
 	return 1;
 }
 
+static void trace_write(struct trace_key *key, const void *buf, unsigned len)
+{
+	if (write_in_full(get_trace_fd(key), buf, len) < 0) {
+		normalize_trace_key(&key);
+		warning("unable to write trace for %s: %s",
+			key->key, strerror(errno));
+		trace_disable(key);
+	}
+}
+
 void trace_verbatim(struct trace_key *key, const void *buf, unsigned len)
 {
 	if (!trace_want(key))
 		return;
-	write_or_whine_pipe(get_trace_fd(key), buf, len, err_msg);
+	trace_write(key, buf, len);
 }
 
 static void print_trace_line(struct trace_key *key, struct strbuf *buf)
 {
 	strbuf_complete_line(buf);
-
-	write_or_whine_pipe(get_trace_fd(key), buf->buf, buf->len, err_msg);
+	trace_write(key, buf->buf, buf->len);
 	strbuf_release(buf);
 }
 
diff --git a/trailer.c b/trailer.c
index 8e48a5c990..c6ea9ac64d 100644
--- a/trailer.c
+++ b/trailer.c
@@ -562,7 +562,7 @@ static int git_trailer_config(const char *conf_key, const char *value, void *cb)
 			warning(_("unknown value '%s' for key '%s'"), value, conf_key);
 		break;
 	default:
-		die("internal bug in trailer.c");
+		die("BUG: trailer.c: unhandled type %d", type);
 	}
 	return 0;
 }
diff --git a/transport-helper.c b/transport-helper.c
index 13b7a57a75..db2f930c74 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -1038,7 +1038,7 @@ static struct ref *get_refs_list(struct transport *transport, int for_push)
 				(*tail)->status |= REF_STATUS_UPTODATE;
 				if (read_ref((*tail)->name,
 					     (*tail)->old_oid.hash) < 0)
-					die(N_("Could not read ref %s"),
+					die(_("Could not read ref %s"),
 					    (*tail)->name);
 			}
 		}
@@ -1103,7 +1103,7 @@ static void transfer_debug(const char *fmt, ...)
 }
 
 /* Stream state: More data may be coming in this direction. */
-#define SSTATE_TRANSFERING 0
+#define SSTATE_TRANSFERRING 0
 /*
  * Stream state: No more data coming in this direction, flushing rest of
  * data.
@@ -1112,7 +1112,7 @@ static void transfer_debug(const char *fmt, ...)
 /* Stream state: Transfer in this direction finished. */
 #define SSTATE_FINISHED 2
 
-#define STATE_NEEDS_READING(state) ((state) <= SSTATE_TRANSFERING)
+#define STATE_NEEDS_READING(state) ((state) <= SSTATE_TRANSFERRING)
 #define STATE_NEEDS_WRITING(state) ((state) <= SSTATE_FLUSHING)
 #define STATE_NEEDS_CLOSING(state) ((state) == SSTATE_FLUSHING)
 
@@ -1166,7 +1166,7 @@ static int udt_do_read(struct unidirectional_transfer *t)
 	bytes = read(t->src, t->buf + t->bufuse, BUFFERSIZE - t->bufuse);
 	if (bytes < 0 && errno != EWOULDBLOCK && errno != EAGAIN &&
 		errno != EINTR) {
-		error("read(%s) failed: %s", t->src_name, strerror(errno));
+		error_errno("read(%s) failed", t->src_name);
 		return -1;
 	} else if (bytes == 0) {
 		transfer_debug("%s EOF (with %i bytes in buffer)",
@@ -1193,7 +1193,7 @@ static int udt_do_write(struct unidirectional_transfer *t)
 	transfer_debug("%s is writable", t->dest_name);
 	bytes = xwrite(t->dest, t->buf, t->bufuse);
 	if (bytes < 0 && errno != EWOULDBLOCK) {
-		error("write(%s) failed: %s", t->dest_name, strerror(errno));
+		error_errno("write(%s) failed", t->dest_name);
 		return -1;
 	} else if (bytes > 0) {
 		t->bufuse -= bytes;
@@ -1306,7 +1306,7 @@ static int tloop_join(pid_t pid, const char *name)
 {
 	int tret;
 	if (waitpid(pid, &tret, 0) < 0) {
-		error("%s process failed to wait: %s", name, strerror(errno));
+		error_errno("%s process failed to wait", name);
 		return 1;
 	}
 	if (!WIFEXITED(tret) || WEXITSTATUS(tret)) {
@@ -1369,7 +1369,7 @@ int bidirectional_transfer_loop(int input, int output)
 	state.ptg.dest = 1;
 	state.ptg.src_is_sock = (input == output);
 	state.ptg.dest_is_sock = 0;
-	state.ptg.state = SSTATE_TRANSFERING;
+	state.ptg.state = SSTATE_TRANSFERRING;
 	state.ptg.bufuse = 0;
 	state.ptg.src_name = "remote input";
 	state.ptg.dest_name = "stdout";
@@ -1378,7 +1378,7 @@ int bidirectional_transfer_loop(int input, int output)
 	state.gtp.dest = output;
 	state.gtp.src_is_sock = 0;
 	state.gtp.dest_is_sock = (input == output);
-	state.gtp.state = SSTATE_TRANSFERING;
+	state.gtp.state = SSTATE_TRANSFERRING;
 	state.gtp.bufuse = 0;
 	state.gtp.src_name = "stdin";
 	state.gtp.dest_name = "remote output";
diff --git a/transport.c b/transport.c
index 095e61f0ad..cf8de6e888 100644
--- a/transport.c
+++ b/transport.c
@@ -59,7 +59,7 @@ static void set_upstreams(struct transport *transport, struct ref *refs,
 				localname + 11, transport->remote->name,
 				remotename);
 		else
-			printf("Would set upstream of '%s' to '%s' of '%s'\n",
+			printf(_("Would set upstream of '%s' to '%s' of '%s'\n"),
 				localname + 11, remotename + 11,
 				transport->remote->name);
 	}
@@ -148,7 +148,7 @@ static int set_git_option(struct git_transport_options *opts,
 			char *end;
 			opts->depth = strtol(value, &end, 0);
 			if (*end)
-				die("transport: invalid depth option '%s'", value);
+				die(_("transport: invalid depth option '%s'"), value);
 		}
 		return 0;
 	}
@@ -321,11 +321,6 @@ static void print_ref_status(char flag, const char *summary, struct ref *to, str
 	}
 }
 
-static const char *status_abbrev(unsigned char sha1[20])
-{
-	return find_unique_abbrev(sha1, DEFAULT_ABBREV);
-}
-
 static void print_ok_ref_status(struct ref *ref, int porcelain)
 {
 	if (ref->deletion)
@@ -340,7 +335,8 @@ static void print_ok_ref_status(struct ref *ref, int porcelain)
 		char type;
 		const char *msg;
 
-		strbuf_addstr(&quickref, status_abbrev(ref->old_oid.hash));
+		strbuf_add_unique_abbrev(&quickref, ref->old_oid.hash,
+					 DEFAULT_ABBREV);
 		if (ref->forced_update) {
 			strbuf_addstr(&quickref, "...");
 			type = '+';
@@ -350,7 +346,8 @@ static void print_ok_ref_status(struct ref *ref, int porcelain)
 			type = ' ';
 			msg = NULL;
 		}
-		strbuf_addstr(&quickref, status_abbrev(ref->new_oid.hash));
+		strbuf_add_unique_abbrev(&quickref, ref->new_oid.hash,
+					 DEFAULT_ABBREV);
 
 		print_ref_status(type, quickref.buf, ref, ref->peer_ref, msg, porcelain);
 		strbuf_release(&quickref);
@@ -359,8 +356,11 @@ static void print_ok_ref_status(struct ref *ref, int porcelain)
 
 static int print_one_push_status(struct ref *ref, const char *dest, int count, int porcelain)
 {
-	if (!count)
-		fprintf(porcelain ? stdout : stderr, "To %s\n", dest);
+	if (!count) {
+		char *url = transport_anonymize_url(dest);
+		fprintf(porcelain ? stdout : stderr, "To %s\n", url);
+		free(url);
+	}
 
 	switch(ref->status) {
 	case REF_STATUS_NONE:
@@ -510,6 +510,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
 	args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN);
 	args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN);
 	args.atomic = !!(flags & TRANSPORT_PUSH_ATOMIC);
+	args.push_options = transport->push_options;
 	args.url = transport->url;
 
 	if (flags & TRANSPORT_PUSH_CERT_ALWAYS)
@@ -563,7 +564,7 @@ void transport_take_over(struct transport *transport,
 	struct git_transport_data *data;
 
 	if (!transport->smart_options)
-		die("Bug detected: Taking over transport requires non-NULL "
+		die("BUG: taking over transport requires non-NULL "
 		    "smart_options field.");
 
 	data = xcalloc(1, sizeof(*data));
@@ -767,19 +768,19 @@ static void die_with_unpushed_submodules(struct string_list *needs_pushing)
 {
 	int i;
 
-	fprintf(stderr, "The following submodule paths contain changes that can\n"
-			"not be found on any remote:\n");
+	fprintf(stderr, _("The following submodule paths contain changes that can\n"
+			"not be found on any remote:\n"));
 	for (i = 0; i < needs_pushing->nr; i++)
 		printf("  %s\n", needs_pushing->items[i].string);
-	fprintf(stderr, "\nPlease try\n\n"
-			"	git push --recurse-submodules=on-demand\n\n"
-			"or cd to the path and use\n\n"
-			"	git push\n\n"
-			"to push them to a remote.\n\n");
+	fprintf(stderr, _("\nPlease try\n\n"
+			  "	git push --recurse-submodules=on-demand\n\n"
+			  "or cd to the path and use\n\n"
+			  "	git push\n\n"
+			  "to push them to a remote.\n\n"));
 
 	string_list_clear(needs_pushing, 0);
 
-	die("Aborting.");
+	die(_("Aborting."));
 }
 
 static int run_pre_push_hook(struct transport *transport,
diff --git a/transport.h b/transport.h
index c68140892c..6fe3485325 100644
--- a/transport.h
+++ b/transport.h
@@ -48,6 +48,12 @@ struct transport {
 	 */
 	unsigned cloning : 1;
 
+	/*
+	 * These strings will be passed to the {pre, post}-receive hook,
+	 * on the remote side, if both sides support the push options capability.
+	 */
+	const struct string_list *push_options;
+
 	/**
 	 * Returns 0 if successful, positive if the option is not
 	 * recognized or is inapplicable, and negative if the option
@@ -134,6 +140,7 @@ struct transport {
 #define TRANSPORT_PUSH_CERT_ALWAYS 2048
 #define TRANSPORT_PUSH_CERT_IF_ASKED 4096
 #define TRANSPORT_PUSH_ATOMIC 8192
+#define TRANSPORT_PUSH_OPTIONS 16384
 
 #define TRANSPORT_SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
 #define TRANSPORT_SUMMARY(x) (int)(TRANSPORT_SUMMARY_WIDTH + strlen(x) - gettext_width(x)), (x)
diff --git a/tree-diff.c b/tree-diff.c
index 4dda9a14ab..e164e532b2 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -14,6 +14,16 @@
  */
 #define S_IFXMIN_NEQ	S_DIFFTREE_IFXMIN_NEQ
 
+#define FAST_ARRAY_ALLOC(x, nr) do { \
+	if ((nr) <= 2) \
+		(x) = xalloca((nr) * sizeof(*(x))); \
+	else \
+		ALLOC_ARRAY((x), nr); \
+} while(0)
+#define FAST_ARRAY_FREE(x, nr) do { \
+	if ((nr) > 2) \
+		free((x)); \
+} while(0)
 
 static struct combine_diff_path *ll_diff_tree_paths(
 	struct combine_diff_path *p, const unsigned char *sha1,
@@ -183,7 +193,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p,
 
 	if (t) {
 		/* path present in resulting tree */
-		sha1 = tree_entry_extract(t, &path, &mode);
+		sha1 = tree_entry_extract(t, &path, &mode)->hash;
 		pathlen = tree_entry_len(&t->entry);
 		isdir = S_ISDIR(mode);
 	} else {
@@ -229,7 +239,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p,
 						DIFF_STATUS_ADDED;
 
 			if (tpi_valid) {
-				sha1_i = tp[i].entry.sha1;
+				sha1_i = tp[i].entry.oid->hash;
 				mode_i = tp[i].entry.mode;
 			}
 			else {
@@ -265,19 +275,19 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p,
 	if (recurse) {
 		const unsigned char **parents_sha1;
 
-		parents_sha1 = xalloca(nparent * sizeof(parents_sha1[0]));
+		FAST_ARRAY_ALLOC(parents_sha1, nparent);
 		for (i = 0; i < nparent; ++i) {
 			/* same rule as in emitthis */
 			int tpi_valid = tp && !(tp[i].entry.mode & S_IFXMIN_NEQ);
 
-			parents_sha1[i] = tpi_valid ? tp[i].entry.sha1
+			parents_sha1[i] = tpi_valid ? tp[i].entry.oid->hash
 						    : NULL;
 		}
 
 		strbuf_add(base, path, pathlen);
 		strbuf_addch(base, '/');
 		p = ll_diff_tree_paths(p, sha1, parents_sha1, nparent, base, opt);
-		xalloca_free(parents_sha1);
+		FAST_ARRAY_FREE(parents_sha1, nparent);
 	}
 
 	strbuf_setlen(base, old_baselen);
@@ -402,8 +412,8 @@ static struct combine_diff_path *ll_diff_tree_paths(
 	void *ttree, **tptree;
 	int i;
 
-	tp     = xalloca(nparent * sizeof(tp[0]));
-	tptree = xalloca(nparent * sizeof(tptree[0]));
+	FAST_ARRAY_ALLOC(tp, nparent);
+	FAST_ARRAY_ALLOC(tptree, nparent);
 
 	/*
 	 * load parents first, as they are probably already cached.
@@ -482,7 +492,7 @@ static struct combine_diff_path *ll_diff_tree_paths(
 						continue;
 
 					/* diff(t,pi) != ø */
-					if (hashcmp(t.entry.sha1, tp[i].entry.sha1) ||
+					if (oidcmp(t.entry.oid, tp[i].entry.oid) ||
 					    (t.entry.mode != tp[i].entry.mode))
 						continue;
 
@@ -531,8 +541,8 @@ static struct combine_diff_path *ll_diff_tree_paths(
 	free(ttree);
 	for (i = nparent-1; i >= 0; i--)
 		free(tptree[i]);
-	xalloca_free(tptree);
-	xalloca_free(tp);
+	FAST_ARRAY_FREE(tptree, nparent);
+	FAST_ARRAY_FREE(tp, nparent);
 
 	return p;
 }
@@ -607,7 +617,7 @@ static void try_to_follow_renames(const unsigned char *old, const unsigned char
 	diff_setup_done(&diff_opts);
 	ll_diff_tree_sha1(old, new, base, &diff_opts);
 	diffcore_std(&diff_opts);
-	free_pathspec(&diff_opts.pathspec);
+	clear_pathspec(&diff_opts.pathspec);
 
 	/* Go through the new set of filepairing, and see if we find a more interesting one */
 	opt->found_follow = 0;
@@ -630,7 +640,7 @@ static void try_to_follow_renames(const unsigned char *old, const unsigned char
 			/* Update the path we use from now on.. */
 			path[0] = p->one->path;
 			path[1] = NULL;
-			free_pathspec(&opt->pathspec);
+			clear_pathspec(&opt->pathspec);
 			parse_pathspec(&opt->pathspec,
 				       PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
 				       PATHSPEC_LITERAL_PATH, "", path);
diff --git a/tree-walk.c b/tree-walk.c
index cd4bb2c38b..ce27842439 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -38,7 +38,7 @@ static void decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned
 	/* Initialize the descriptor entry */
 	desc->entry.path = path;
 	desc->entry.mode = canon_mode(mode);
-	desc->entry.sha1 = (const unsigned char *)(path + len);
+	desc->entry.oid  = (const struct object_id *)(path + len);
 }
 
 void init_tree_desc(struct tree_desc *desc, const void *buffer, unsigned long size)
@@ -76,7 +76,7 @@ static void entry_extract(struct tree_desc *t, struct name_entry *a)
 void update_tree_entry(struct tree_desc *desc)
 {
 	const void *buf = desc->buffer;
-	const unsigned char *end = desc->entry.sha1 + 20;
+	const unsigned char *end = desc->entry.oid->hash + 20;
 	unsigned long size = desc->size;
 	unsigned long len = end - (const unsigned char *)buf;
 
@@ -110,7 +110,7 @@ void setup_traverse_info(struct traverse_info *info, const char *base)
 		pathlen--;
 	info->pathlen = pathlen ? pathlen + 1 : 0;
 	info->name.path = base;
-	info->name.sha1 = (void *)(base + pathlen + 1);
+	info->name.oid = (void *)(base + pathlen + 1);
 	if (pathlen)
 		info->prev = &dummy;
 }
@@ -433,10 +433,10 @@ static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char
 	int namelen = strlen(name);
 	while (t->size) {
 		const char *entry;
-		const unsigned char *sha1;
+		const struct object_id *oid;
 		int entrylen, cmp;
 
-		sha1 = tree_entry_extract(t, &entry, mode);
+		oid = tree_entry_extract(t, &entry, mode);
 		entrylen = tree_entry_len(&t->entry);
 		update_tree_entry(t);
 		if (entrylen > namelen)
@@ -447,7 +447,7 @@ static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char
 		if (cmp < 0)
 			break;
 		if (entrylen == namelen) {
-			hashcpy(result, sha1);
+			hashcpy(result, oid->hash);
 			return 0;
 		}
 		if (name[entrylen] != '/')
@@ -455,10 +455,10 @@ static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char
 		if (!S_ISDIR(*mode))
 			break;
 		if (++entrylen == namelen) {
-			hashcpy(result, sha1);
+			hashcpy(result, oid->hash);
 			return 0;
 		}
-		return get_tree_entry(sha1, name + entrylen, result, mode);
+		return get_tree_entry(oid->hash, name + entrylen, result, mode);
 	}
 	return -1;
 }
diff --git a/tree-walk.h b/tree-walk.h
index 174eb617df..97a7d6957e 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -2,7 +2,7 @@
 #define TREE_WALK_H
 
 struct name_entry {
-	const unsigned char *sha1;
+	const struct object_id *oid;
 	const char *path;
 	unsigned int mode;
 };
@@ -13,16 +13,16 @@ struct tree_desc {
 	unsigned int size;
 };
 
-static inline const unsigned char *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
+static inline const struct object_id *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
 {
 	*pathp = desc->entry.path;
 	*modep = desc->entry.mode;
-	return desc->entry.sha1;
+	return desc->entry.oid;
 }
 
 static inline int tree_entry_len(const struct name_entry *ne)
 {
-	return (const char *)ne->sha1 - ne->path - 1;
+	return (const char *)ne->oid - ne->path - 1;
 }
 
 void update_tree_entry(struct tree_desc *);
diff --git a/tree.c b/tree.c
index f79ff9813e..0089e52d9d 100644
--- a/tree.c
+++ b/tree.c
@@ -76,7 +76,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base,
 				continue;
 		}
 
-		switch (fn(entry.sha1, base,
+		switch (fn(entry.oid->hash, base,
 			   entry.path, entry.mode, stage, context)) {
 		case 0:
 			continue;
@@ -87,19 +87,19 @@ static int read_tree_1(struct tree *tree, struct strbuf *base,
 		}
 
 		if (S_ISDIR(entry.mode))
-			hashcpy(sha1, entry.sha1);
+			hashcpy(sha1, entry.oid->hash);
 		else if (S_ISGITLINK(entry.mode)) {
 			struct commit *commit;
 
-			commit = lookup_commit(entry.sha1);
+			commit = lookup_commit(entry.oid->hash);
 			if (!commit)
 				die("Commit %s in submodule path %s%s not found",
-				    sha1_to_hex(entry.sha1),
+				    oid_to_hex(entry.oid),
 				    base->buf, entry.path);
 
 			if (parse_commit(commit))
 				die("Invalid commit %s in submodule path %s%s",
-				    sha1_to_hex(entry.sha1),
+				    oid_to_hex(entry.oid),
 				    base->buf, entry.path);
 
 			hashcpy(sha1, commit->tree->object.oid.hash);
diff --git a/unpack-trees.c b/unpack-trees.c
index aea9aa749f..11c37fbc58 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -62,17 +62,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
 	if (!strcmp(cmd, "checkout"))
 		msg = advice_commit_before_merge
 		      ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
-			  "Please commit your changes or stash them before you can switch branches.")
+			  "Please commit your changes or stash them before you switch branches.")
 		      : _("Your local changes to the following files would be overwritten by checkout:\n%%s");
 	else if (!strcmp(cmd, "merge"))
 		msg = advice_commit_before_merge
 		      ? _("Your local changes to the following files would be overwritten by merge:\n%%s"
-			  "Please commit your changes or stash them before you can merge.")
+			  "Please commit your changes or stash them before you merge.")
 		      : _("Your local changes to the following files would be overwritten by merge:\n%%s");
 	else
 		msg = advice_commit_before_merge
 		      ? _("Your local changes to the following files would be overwritten by %s:\n%%s"
-			  "Please commit your changes or stash them before you can %s.")
+			  "Please commit your changes or stash them before you %s.")
 		      : _("Your local changes to the following files would be overwritten by %s:\n%%s");
 	msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
 		xstrfmt(msg, cmd, cmd);
@@ -83,34 +83,34 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
 	if (!strcmp(cmd, "checkout"))
 		msg = advice_commit_before_merge
 		      ? _("The following untracked working tree files would be removed by checkout:\n%%s"
-			  "Please move or remove them before you can switch branches.")
+			  "Please move or remove them before you switch branches.")
 		      : _("The following untracked working tree files would be removed by checkout:\n%%s");
 	else if (!strcmp(cmd, "merge"))
 		msg = advice_commit_before_merge
 		      ? _("The following untracked working tree files would be removed by merge:\n%%s"
-			  "Please move or remove them before you can merge.")
+			  "Please move or remove them before you merge.")
 		      : _("The following untracked working tree files would be removed by merge:\n%%s");
 	else
 		msg = advice_commit_before_merge
 		      ? _("The following untracked working tree files would be removed by %s:\n%%s"
-			  "Please move or remove them before you can %s.")
+			  "Please move or remove them before you %s.")
 		      : _("The following untracked working tree files would be removed by %s:\n%%s");
 	msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, cmd, cmd);
 
 	if (!strcmp(cmd, "checkout"))
 		msg = advice_commit_before_merge
 		      ? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
-			  "Please move or remove them before you can switch branches.")
+			  "Please move or remove them before you switch branches.")
 		      : _("The following untracked working tree files would be overwritten by checkout:\n%%s");
 	else if (!strcmp(cmd, "merge"))
 		msg = advice_commit_before_merge
 		      ? _("The following untracked working tree files would be overwritten by merge:\n%%s"
-			  "Please move or remove them before you can merge.")
+			  "Please move or remove them before you merge.")
 		      : _("The following untracked working tree files would be overwritten by merge:\n%%s");
 	else
 		msg = advice_commit_before_merge
 		      ? _("The following untracked working tree files would be overwritten by %s:\n%%s"
-			  "Please move or remove them before you can %s.")
+			  "Please move or remove them before you %s.")
 		      : _("The following untracked working tree files would be overwritten by %s:\n%%s");
 	msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, cmd, cmd);
 
@@ -509,7 +509,7 @@ static int traverse_trees_recursive(int n, unsigned long dirmask,
 	for (i = 0; i < n; i++, dirmask >>= 1) {
 		const unsigned char *sha1 = NULL;
 		if (dirmask & 1)
-			sha1 = names[i].sha1;
+			sha1 = names[i].oid->hash;
 		buf[i] = fill_tree_descriptor(t+i, sha1);
 	}
 
@@ -625,7 +625,7 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info, con
 	ce->ce_mode = create_ce_mode(n->mode);
 	ce->ce_flags = create_ce_flags(stage);
 	ce->ce_namelen = len;
-	hashcpy(ce->sha1, n->sha1);
+	hashcpy(ce->sha1, n->oid->hash);
 	make_traverse_path(ce->name, info, n);
 
 	return ce;
@@ -1533,8 +1533,7 @@ static int verify_absent_1(const struct cache_entry *ce,
 
 		path = xmemdupz(ce->name, len);
 		if (lstat(path, &st))
-			ret = error("cannot stat '%s': %s", path,
-					strerror(errno));
+			ret = error_errno("cannot stat '%s'", path);
 		else
 			ret = check_ok_to_remove(path, len, DT_UNKNOWN, NULL,
 						 &st, error_type, o);
@@ -1542,8 +1541,7 @@ static int verify_absent_1(const struct cache_entry *ce,
 		return ret;
 	} else if (lstat(ce->name, &st)) {
 		if (errno != ENOENT)
-			return error("cannot stat '%s': %s", ce->name,
-				     strerror(errno));
+			return error_errno("cannot stat '%s'", ce->name);
 		return 0;
 	} else {
 		return check_ok_to_remove(ce->name, ce_namelen(ce),
diff --git a/upload-pack.c b/upload-pack.c
index dc802a07c2..ca7f941780 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -14,8 +14,12 @@
 #include "sigchain.h"
 #include "version.h"
 #include "string-list.h"
+#include "parse-options.h"
 
-static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<n>] <dir>";
+static const char * const upload_pack_usage[] = {
+	N_("git upload-pack [<options>] <dir>"),
+	NULL
+};
 
 /* Remember to update object flag allocation in object.h */
 #define THEY_HAVE	(1u << 11)
@@ -52,26 +56,28 @@ static int keepalive = 5;
 static int use_sideband;
 static int advertise_refs;
 static int stateless_rpc;
+static const char *pack_objects_hook;
 
 static void reset_timeout(void)
 {
 	alarm(timeout);
 }
 
-static ssize_t send_client_data(int fd, const char *data, ssize_t sz)
+static void send_client_data(int fd, const char *data, ssize_t sz)
 {
-	if (use_sideband)
-		return send_sideband(1, fd, data, sz, use_sideband);
+	if (use_sideband) {
+		send_sideband(1, fd, data, sz, use_sideband);
+		return;
+	}
 	if (fd == 3)
 		/* emergency quit */
 		fd = 2;
 	if (fd == 2) {
 		/* XXX: are we happy to lose stuff here? */
 		xwrite(fd, data, sz);
-		return sz;
+		return;
 	}
 	write_or_die(fd, data, sz);
-	return sz;
 }
 
 static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
@@ -93,6 +99,14 @@ static void create_pack_file(void)
 	int i;
 	FILE *pipe_fd;
 
+	if (!pack_objects_hook)
+		pack_objects.git_cmd = 1;
+	else {
+		argv_array_push(&pack_objects.args, pack_objects_hook);
+		argv_array_push(&pack_objects.args, "git");
+		pack_objects.use_shell = 1;
+	}
+
 	if (shallow_nr) {
 		argv_array_push(&pack_objects.args, "--shallow-file");
 		argv_array_push(&pack_objects.args, "");
@@ -115,7 +129,6 @@ static void create_pack_file(void)
 	pack_objects.in = -1;
 	pack_objects.out = -1;
 	pack_objects.err = -1;
-	pack_objects.git_cmd = 1;
 
 	if (start_command(&pack_objects))
 		die("git upload-pack: unable to fork git-pack-objects");
@@ -174,8 +187,7 @@ static void create_pack_file(void)
 
 		if (ret < 0) {
 			if (errno != EINTR) {
-				error("poll failed, resuming: %s",
-				      strerror(errno));
+				error_errno("poll failed, resuming");
 				sleep(1);
 			}
 			continue;
@@ -230,9 +242,7 @@ static void create_pack_file(void)
 			}
 			else
 				buffered = -1;
-			sz = send_client_data(1, data, sz);
-			if (sz < 0)
-				goto fail;
+			send_client_data(1, data, sz);
 		}
 
 		/*
@@ -259,9 +269,7 @@ static void create_pack_file(void)
 	/* flush the data */
 	if (0 <= buffered) {
 		data[0] = buffered;
-		sz = send_client_data(1, data, 1);
-		if (sz < 0)
-			goto fail;
+		send_client_data(1, data, 1);
 		fprintf(stderr, "flushed.\n");
 	}
 	if (use_sideband)
@@ -813,56 +821,43 @@ static int upload_pack_config(const char *var, const char *value, void *unused)
 		keepalive = git_config_int(var, value);
 		if (!keepalive)
 			keepalive = -1;
+	} else if (current_config_scope() != CONFIG_SCOPE_REPO) {
+		if (!strcmp("uploadpack.packobjectshook", var))
+			return git_config_string(&pack_objects_hook, var, value);
 	}
 	return parse_hide_refs_config(var, value, "uploadpack");
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
-	char *dir;
-	int i;
+	const char *dir;
 	int strict = 0;
-
-	git_setup_gettext();
+	struct option options[] = {
+		OPT_BOOL(0, "stateless-rpc", &stateless_rpc,
+			 N_("quit after a single request/response exchange")),
+		OPT_BOOL(0, "advertise-refs", &advertise_refs,
+			 N_("exit immediately after initial ref advertisement")),
+		OPT_BOOL(0, "strict", &strict,
+			 N_("do not try <directory>/.git/ if <directory> is no Git directory")),
+		OPT_INTEGER(0, "timeout", &timeout,
+			    N_("interrupt transfer after <n> seconds of inactivity")),
+		OPT_END()
+	};
 
 	packet_trace_identity("upload-pack");
-	git_extract_argv0_path(argv[0]);
 	check_replace_refs = 0;
 
-	for (i = 1; i < argc; i++) {
-		char *arg = argv[i];
+	argc = parse_options(argc, argv, NULL, options, upload_pack_usage, 0);
 
-		if (arg[0] != '-')
-			break;
-		if (!strcmp(arg, "--advertise-refs")) {
-			advertise_refs = 1;
-			continue;
-		}
-		if (!strcmp(arg, "--stateless-rpc")) {
-			stateless_rpc = 1;
-			continue;
-		}
-		if (!strcmp(arg, "--strict")) {
-			strict = 1;
-			continue;
-		}
-		if (starts_with(arg, "--timeout=")) {
-			timeout = atoi(arg+10);
-			daemon_mode = 1;
-			continue;
-		}
-		if (!strcmp(arg, "--")) {
-			i++;
-			break;
-		}
-	}
+	if (argc != 1)
+		usage_with_options(upload_pack_usage, options);
 
-	if (i != argc-1)
-		usage(upload_pack_usage);
+	if (timeout)
+		daemon_mode = 1;
 
 	setup_path();
 
-	dir = argv[i];
+	dir = argv[0];
 
 	if (!enter_repo(dir, strict))
 		die("'%s' does not appear to be a git repository", dir);
diff --git a/usage.c b/usage.c
index 82ff13163b..1dad03fb5c 100644
--- a/usage.c
+++ b/usage.c
@@ -109,19 +109,11 @@ void NORETURN die(const char *err, ...)
 	va_end(params);
 }
 
-void NORETURN die_errno(const char *fmt, ...)
+static const char *fmt_with_err(char *buf, int n, const char *fmt)
 {
-	va_list params;
-	char fmt_with_err[1024];
 	char str_error[256], *err;
 	int i, j;
 
-	if (die_is_recursing()) {
-		fputs("fatal: recursion detected in die_errno handler\n",
-			stderr);
-		exit(128);
-	}
-
 	err = strerror(errno);
 	for (i = j = 0; err[i] && j < sizeof(str_error) - 1; ) {
 		if ((str_error[j++] = err[i++]) != '%')
@@ -136,13 +128,37 @@ void NORETURN die_errno(const char *fmt, ...)
 		}
 	}
 	str_error[j] = 0;
-	snprintf(fmt_with_err, sizeof(fmt_with_err), "%s: %s", fmt, str_error);
+	snprintf(buf, n, "%s: %s", fmt, str_error);
+	return buf;
+}
+
+void NORETURN die_errno(const char *fmt, ...)
+{
+	char buf[1024];
+	va_list params;
+
+	if (die_is_recursing()) {
+		fputs("fatal: recursion detected in die_errno handler\n",
+			stderr);
+		exit(128);
+	}
 
 	va_start(params, fmt);
-	die_routine(fmt_with_err, params);
+	die_routine(fmt_with_err(buf, sizeof(buf), fmt), params);
 	va_end(params);
 }
 
+int error_errno(const char *fmt, ...)
+{
+	char buf[1024];
+	va_list params;
+
+	va_start(params, fmt);
+	error_routine(fmt_with_err(buf, sizeof(buf), fmt), params);
+	va_end(params);
+	return -1;
+}
+
 #undef error
 int error(const char *err, ...)
 {
@@ -154,6 +170,16 @@ int error(const char *err, ...)
 	return -1;
 }
 
+void warning_errno(const char *warn, ...)
+{
+	char buf[1024];
+	va_list params;
+
+	va_start(params, warn);
+	warn_routine(fmt_with_err(buf, sizeof(buf), warn), params);
+	va_end(params);
+}
+
 void warning(const char *warn, ...)
 {
 	va_list params;
diff --git a/userdiff.c b/userdiff.c
index 6bf2505994..2125d6da26 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -148,6 +148,18 @@ PATTERNS("csharp",
 	 "[a-zA-Z_][a-zA-Z0-9_]*"
 	 "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
 	 "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"),
+IPATTERN("css",
+	 "![:;][[:space:]]*$\n"
+	 "^[_a-z0-9].*$",
+	 /* -- */
+	 /*
+	  * This regex comes from W3C CSS specs. Should theoretically also
+	  * allow ISO 10646 characters U+00A0 and higher,
+	  * but they are not handled in this regex.
+	  */
+	 "-?[_a-zA-Z][-_a-zA-Z0-9]*" /* identifiers */
+	 "|-?[0-9]+|\\#[0-9a-fA-F]+" /* numbers */
+),
 { "default", NULL, -1, { NULL, 0 } },
 };
 #undef PATTERNS
diff --git a/vcs-svn/line_buffer.c b/vcs-svn/line_buffer.c
index 57cc1cec03..e416caf8a4 100644
--- a/vcs-svn/line_buffer.c
+++ b/vcs-svn/line_buffer.c
@@ -53,9 +53,9 @@ long buffer_tmpfile_prepare_to_read(struct line_buffer *buf)
 {
 	long pos = ftell(buf->infile);
 	if (pos < 0)
-		return error("ftell error: %s", strerror(errno));
+		return error_errno("ftell error");
 	if (fseek(buf->infile, 0, SEEK_SET))
-		return error("seek error: %s", strerror(errno));
+		return error_errno("seek error");
 	return pos;
 }
 
diff --git a/vcs-svn/sliding_window.c b/vcs-svn/sliding_window.c
index f11d490995..06d273c9e8 100644
--- a/vcs-svn/sliding_window.c
+++ b/vcs-svn/sliding_window.c
@@ -12,7 +12,7 @@ static int input_error(struct line_buffer *file)
 {
 	if (!buffer_ferror(file))
 		return error("delta preimage ends early");
-	return error("cannot read delta preimage: %s", strerror(errno));
+	return error_errno("cannot read delta preimage");
 }
 
 static int skip_or_whine(struct line_buffer *file, off_t gap)
diff --git a/vcs-svn/svndiff.c b/vcs-svn/svndiff.c
index 74c97c4543..75c753162a 100644
--- a/vcs-svn/svndiff.c
+++ b/vcs-svn/svndiff.c
@@ -64,13 +64,13 @@ static int write_strbuf(struct strbuf *sb, FILE *out)
 {
 	if (fwrite(sb->buf, 1, sb->len, out) == sb->len)	/* Success. */
 		return 0;
-	return error("cannot write delta postimage: %s", strerror(errno));
+	return error_errno("cannot write delta postimage");
 }
 
 static int error_short_read(struct line_buffer *input)
 {
 	if (buffer_ferror(input))
-		return error("error reading delta: %s", strerror(errno));
+		return error_errno("error reading delta");
 	return error("invalid delta: unexpected end of file");
 }
 
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index 31d1d83d45..e4b395963b 100644
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -501,7 +501,7 @@ static void init(int report_fd)
 int svndump_init(const char *filename)
 {
 	if (buffer_init(&input, filename))
-		return error("cannot open %s: %s", filename ? filename : "NULL", strerror(errno));
+		return error_errno("cannot open %s", filename ? filename : "NULL");
 	init(REPORT_FILENO);
 	return 0;
 }
@@ -509,7 +509,7 @@ int svndump_init(const char *filename)
 int svndump_init_fd(int in_fd, int back_fd)
 {
 	if(buffer_fdinit(&input, xdup(in_fd)))
-		return error("cannot open fd %d: %s", in_fd, strerror(errno));
+		return error_errno("cannot open fd %d", in_fd);
 	init(xdup(back_fd));
 	return 0;
 }
diff --git a/walker.c b/walker.c
index 08773d419f..2c86e406f9 100644
--- a/walker.c
+++ b/walker.c
@@ -9,10 +9,14 @@
 
 static unsigned char current_commit_sha1[20];
 
-void walker_say(struct walker *walker, const char *fmt, const char *hex)
+void walker_say(struct walker *walker, const char *fmt, ...)
 {
-	if (walker->get_verbosely)
-		fprintf(stderr, fmt, hex);
+	if (walker->get_verbosely) {
+		va_list ap;
+		va_start(ap, fmt);
+		vfprintf(stderr, fmt, ap);
+		va_end(ap);
+	}
 }
 
 static void report_missing(const struct object *obj)
@@ -43,12 +47,12 @@ static int process_tree(struct walker *walker, struct tree *tree)
 		if (S_ISGITLINK(entry.mode))
 			continue;
 		if (S_ISDIR(entry.mode)) {
-			struct tree *tree = lookup_tree(entry.sha1);
+			struct tree *tree = lookup_tree(entry.oid->hash);
 			if (tree)
 				obj = &tree->object;
 		}
 		else {
-			struct blob *blob = lookup_blob(entry.sha1);
+			struct blob *blob = lookup_blob(entry.oid->hash);
 			if (blob)
 				obj = &blob->object;
 		}
diff --git a/walker.h b/walker.h
index 95e5765484..a869013e85 100644
--- a/walker.h
+++ b/walker.h
@@ -19,7 +19,8 @@ struct walker {
 };
 
 /* Report what we got under get_verbosely */
-void walker_say(struct walker *walker, const char *, const char *);
+__attribute__((format (printf, 2, 3)))
+void walker_say(struct walker *walker, const char *fmt, ...);
 
 /* Load pull targets from stdin */
 int walker_targets_stdin(char ***target, const char ***write_ref);
diff --git a/worktree.c b/worktree.c
index 89ebe67a50..5acfe4cd64 100644
--- a/worktree.c
+++ b/worktree.c
@@ -2,6 +2,8 @@
 #include "refs.h"
 #include "strbuf.h"
 #include "worktree.h"
+#include "dir.h"
+#include "wt-status.h"
 
 void free_worktrees(struct worktree **worktrees)
 {
@@ -9,8 +11,9 @@ void free_worktrees(struct worktree **worktrees)
 
 	for (i = 0; worktrees[i]; i++) {
 		free(worktrees[i]->path);
-		free(worktrees[i]->git_dir);
+		free(worktrees[i]->id);
 		free(worktrees[i]->head_ref);
+		free(worktrees[i]->lock_reason);
 		free(worktrees[i]);
 	}
 	free (worktrees);
@@ -74,13 +77,11 @@ static struct worktree *get_main_worktree(void)
 	struct worktree *worktree = NULL;
 	struct strbuf path = STRBUF_INIT;
 	struct strbuf worktree_path = STRBUF_INIT;
-	struct strbuf gitdir = STRBUF_INIT;
 	struct strbuf head_ref = STRBUF_INIT;
 	int is_bare = 0;
 	int is_detached = 0;
 
-	strbuf_addf(&gitdir, "%s", absolute_path(get_git_common_dir()));
-	strbuf_addbuf(&worktree_path, &gitdir);
+	strbuf_add_absolute_path(&worktree_path, get_git_common_dir());
 	is_bare = !strbuf_strip_suffix(&worktree_path, "/.git");
 	if (is_bare)
 		strbuf_strip_suffix(&worktree_path, "/.");
@@ -92,15 +93,17 @@ static struct worktree *get_main_worktree(void)
 
 	worktree = xmalloc(sizeof(struct worktree));
 	worktree->path = strbuf_detach(&worktree_path, NULL);
-	worktree->git_dir = strbuf_detach(&gitdir, NULL);
+	worktree->id = NULL;
 	worktree->is_bare = is_bare;
 	worktree->head_ref = NULL;
 	worktree->is_detached = is_detached;
+	worktree->is_current = 0;
 	add_head_info(&head_ref, worktree);
+	worktree->lock_reason = NULL;
+	worktree->lock_reason_valid = 0;
 
 done:
 	strbuf_release(&path);
-	strbuf_release(&gitdir);
 	strbuf_release(&worktree_path);
 	strbuf_release(&head_ref);
 	return worktree;
@@ -111,16 +114,13 @@ static struct worktree *get_linked_worktree(const char *id)
 	struct worktree *worktree = NULL;
 	struct strbuf path = STRBUF_INIT;
 	struct strbuf worktree_path = STRBUF_INIT;
-	struct strbuf gitdir = STRBUF_INIT;
 	struct strbuf head_ref = STRBUF_INIT;
 	int is_detached = 0;
 
 	if (!id)
 		die("Missing linked worktree name");
 
-	strbuf_addf(&gitdir, "%s/worktrees/%s",
-			absolute_path(get_git_common_dir()), id);
-	strbuf_addf(&path, "%s/gitdir", gitdir.buf);
+	strbuf_git_common_path(&path, "worktrees/%s/gitdir", id);
 	if (strbuf_read_file(&worktree_path, path.buf, 0) <= 0)
 		/* invalid gitdir file */
 		goto done;
@@ -128,7 +128,7 @@ static struct worktree *get_linked_worktree(const char *id)
 	strbuf_rtrim(&worktree_path);
 	if (!strbuf_strip_suffix(&worktree_path, "/.git")) {
 		strbuf_reset(&worktree_path);
-		strbuf_addstr(&worktree_path, absolute_path("."));
+		strbuf_add_absolute_path(&worktree_path, ".");
 		strbuf_strip_suffix(&worktree_path, "/.");
 	}
 
@@ -140,20 +140,39 @@ static struct worktree *get_linked_worktree(const char *id)
 
 	worktree = xmalloc(sizeof(struct worktree));
 	worktree->path = strbuf_detach(&worktree_path, NULL);
-	worktree->git_dir = strbuf_detach(&gitdir, NULL);
+	worktree->id = xstrdup(id);
 	worktree->is_bare = 0;
 	worktree->head_ref = NULL;
 	worktree->is_detached = is_detached;
+	worktree->is_current = 0;
 	add_head_info(&head_ref, worktree);
+	worktree->lock_reason = NULL;
+	worktree->lock_reason_valid = 0;
 
 done:
 	strbuf_release(&path);
-	strbuf_release(&gitdir);
 	strbuf_release(&worktree_path);
 	strbuf_release(&head_ref);
 	return worktree;
 }
 
+static void mark_current_worktree(struct worktree **worktrees)
+{
+	char *git_dir = xstrdup(absolute_path(get_git_dir()));
+	int i;
+
+	for (i = 0; worktrees[i]; i++) {
+		struct worktree *wt = worktrees[i];
+		const char *wt_git_dir = get_worktree_git_dir(wt);
+
+		if (!fspathcmp(git_dir, absolute_path(wt_git_dir))) {
+			wt->is_current = 1;
+			break;
+		}
+	}
+	free(git_dir);
+}
+
 struct worktree **get_worktrees(void)
 {
 	struct worktree **list = NULL;
@@ -173,7 +192,7 @@ struct worktree **get_worktrees(void)
 	if (dir) {
 		while ((d = readdir(dir)) != NULL) {
 			struct worktree *linked = NULL;
-			if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
+			if (is_dot_or_dotdot(d->d_name))
 				continue;
 
 			if ((linked = get_linked_worktree(d->d_name))) {
@@ -185,35 +204,177 @@ struct worktree **get_worktrees(void)
 	}
 	ALLOC_GROW(list, counter + 1, alloc);
 	list[counter] = NULL;
+
+	mark_current_worktree(list);
 	return list;
 }
 
-char *find_shared_symref(const char *symref, const char *target)
+const char *get_worktree_git_dir(const struct worktree *wt)
+{
+	if (!wt)
+		return get_git_dir();
+	else if (!wt->id)
+		return get_git_common_dir();
+	else
+		return git_common_path("worktrees/%s", wt->id);
+}
+
+static struct worktree *find_worktree_by_suffix(struct worktree **list,
+						const char *suffix)
+{
+	struct worktree *found = NULL;
+	int nr_found = 0, suffixlen;
+
+	suffixlen = strlen(suffix);
+	if (!suffixlen)
+		return NULL;
+
+	for (; *list && nr_found < 2; list++) {
+		const char	*path	 = (*list)->path;
+		int		 pathlen = strlen(path);
+		int		 start	 = pathlen - suffixlen;
+
+		/* suffix must start at directory boundary */
+		if ((!start || (start > 0 && is_dir_sep(path[start - 1]))) &&
+		    !fspathcmp(suffix, path + start)) {
+			found = *list;
+			nr_found++;
+		}
+	}
+	return nr_found == 1 ? found : NULL;
+}
+
+struct worktree *find_worktree(struct worktree **list,
+			       const char *prefix,
+			       const char *arg)
+{
+	struct worktree *wt;
+	char *path;
+
+	if ((wt = find_worktree_by_suffix(list, arg)))
+		return wt;
+
+	arg = prefix_filename(prefix, strlen(prefix), arg);
+	path = xstrdup(real_path(arg));
+	for (; *list; list++)
+		if (!fspathcmp(path, real_path((*list)->path)))
+			break;
+	free(path);
+	return *list;
+}
+
+int is_main_worktree(const struct worktree *wt)
 {
-	char *existing = NULL;
+	return !wt->id;
+}
+
+const char *is_worktree_locked(struct worktree *wt)
+{
+	assert(!is_main_worktree(wt));
+
+	if (!wt->lock_reason_valid) {
+		struct strbuf path = STRBUF_INIT;
+
+		strbuf_addstr(&path, worktree_git_path(wt, "locked"));
+		if (file_exists(path.buf)) {
+			struct strbuf lock_reason = STRBUF_INIT;
+			if (strbuf_read_file(&lock_reason, path.buf, 0) < 0)
+				die_errno(_("failed to read '%s'"), path.buf);
+			strbuf_trim(&lock_reason);
+			wt->lock_reason = strbuf_detach(&lock_reason, NULL);
+		} else
+			wt->lock_reason = NULL;
+		wt->lock_reason_valid = 1;
+		strbuf_release(&path);
+	}
+
+	return wt->lock_reason;
+}
+
+int is_worktree_being_rebased(const struct worktree *wt,
+			      const char *target)
+{
+	struct wt_status_state state;
+	int found_rebase;
+
+	memset(&state, 0, sizeof(state));
+	found_rebase = wt_status_check_rebase(wt, &state) &&
+		((state.rebase_in_progress ||
+		  state.rebase_interactive_in_progress) &&
+		 state.branch &&
+		 starts_with(target, "refs/heads/") &&
+		 !strcmp(state.branch, target + strlen("refs/heads/")));
+	free(state.branch);
+	free(state.onto);
+	return found_rebase;
+}
+
+int is_worktree_being_bisected(const struct worktree *wt,
+			       const char *target)
+{
+	struct wt_status_state state;
+	int found_rebase;
+
+	memset(&state, 0, sizeof(state));
+	found_rebase = wt_status_check_bisect(wt, &state) &&
+		state.branch &&
+		starts_with(target, "refs/heads/") &&
+		!strcmp(state.branch, target + strlen("refs/heads/"));
+	free(state.branch);
+	return found_rebase;
+}
+
+/*
+ * note: this function should be able to detect shared symref even if
+ * HEAD is temporarily detached (e.g. in the middle of rebase or
+ * bisect). New commands that do similar things should update this
+ * function as well.
+ */
+const struct worktree *find_shared_symref(const char *symref,
+					  const char *target)
+{
+	const struct worktree *existing = NULL;
 	struct strbuf path = STRBUF_INIT;
 	struct strbuf sb = STRBUF_INIT;
-	struct worktree **worktrees = get_worktrees();
+	static struct worktree **worktrees;
 	int i = 0;
 
+	if (worktrees)
+		free_worktrees(worktrees);
+	worktrees = get_worktrees();
+
 	for (i = 0; worktrees[i]; i++) {
+		struct worktree *wt = worktrees[i];
+
+		if (wt->is_detached && !strcmp(symref, "HEAD")) {
+			if (is_worktree_being_rebased(wt, target)) {
+				existing = wt;
+				break;
+			}
+			if (is_worktree_being_bisected(wt, target)) {
+				existing = wt;
+				break;
+			}
+		}
+
 		strbuf_reset(&path);
 		strbuf_reset(&sb);
-		strbuf_addf(&path, "%s/%s", worktrees[i]->git_dir, symref);
+		strbuf_addf(&path, "%s/%s",
+			    get_worktree_git_dir(wt),
+			    symref);
 
 		if (parse_ref(path.buf, &sb, NULL)) {
 			continue;
 		}
 
 		if (!strcmp(sb.buf, target)) {
-			existing = xstrdup(worktrees[i]->path);
+			existing = wt;
 			break;
 		}
 	}
 
 	strbuf_release(&path);
 	strbuf_release(&sb);
-	free_worktrees(worktrees);
 
 	return existing;
 }
diff --git a/worktree.h b/worktree.h
index b4b3dda792..90e1311fa7 100644
--- a/worktree.h
+++ b/worktree.h
@@ -3,11 +3,14 @@
 
 struct worktree {
 	char *path;
-	char *git_dir;
+	char *id;
 	char *head_ref;
+	char *lock_reason;	/* internal use */
 	unsigned char head_sha1[20];
 	int is_detached;
 	int is_bare;
+	int is_current;
+	int lock_reason_valid;
 };
 
 /* Functions for acting on the information about worktrees. */
@@ -23,16 +26,52 @@ struct worktree {
 extern struct worktree **get_worktrees(void);
 
 /*
+ * Return git dir of the worktree. Note that the path may be relative.
+ * If wt is NULL, git dir of current worktree is returned.
+ */
+extern const char *get_worktree_git_dir(const struct worktree *wt);
+
+/*
+ * 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);
+
+/*
+ * Return true if the given worktree is the main one.
+ */
+extern int is_main_worktree(const struct worktree *wt);
+
+/*
+ * Return the reason string if the given worktree is locked or NULL
+ * otherwise.
+ */
+extern const char *is_worktree_locked(struct worktree *wt);
+
+/*
  * Free up the memory for worktree(s)
  */
 extern void free_worktrees(struct worktree **);
 
 /*
  * Check if a per-worktree symref points to a ref in the main worktree
- * or any linked worktree, and return the path to the exising worktree
- * if it is.  Returns NULL if there is no existing ref.  The caller is
- * responsible for freeing the returned path.
+ * or any linked worktree, and return the worktree that holds the ref,
+ * or NULL otherwise. The result may be destroyed by the next call.
+ */
+extern const struct worktree *find_shared_symref(const char *symref,
+						 const char *target);
+
+int is_worktree_being_rebased(const struct worktree *wt, const char *target);
+int is_worktree_being_bisected(const struct worktree *wt, const char *target);
+
+/*
+ * Similar to git_path() but can produce paths for a specified
+ * worktree instead of current one
  */
-extern char *find_shared_symref(const char *symref, const char *target);
+extern const char *worktree_git_path(const struct worktree *wt,
+				     const char *fmt, ...)
+	__attribute__((format (printf, 2, 3)));
 
 #endif
diff --git a/wrap-for-bin.sh b/wrap-for-bin.sh
index db0ec6a737..22b6e4948f 100644
--- a/wrap-for-bin.sh
+++ b/wrap-for-bin.sh
@@ -17,6 +17,7 @@ fi
 GITPERLLIB='@@BUILD_DIR@@/perl/blib/lib'"${GITPERLLIB:+:$GITPERLLIB}"
 GIT_TEXTDOMAINDIR='@@BUILD_DIR@@/po/build/locale'
 PATH='@@BUILD_DIR@@/bin-wrappers:'"$PATH"
+
 export GIT_EXEC_PATH GITPERLLIB PATH GIT_TEXTDOMAINDIR
 
 if test -n "$GIT_TEST_GDB"
diff --git a/wrapper.c b/wrapper.c
index 9009f8bd3d..e7f1979968 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -227,6 +227,24 @@ int xopen(const char *path, int oflag, ...)
 	}
 }
 
+static int handle_nonblock(int fd, short poll_events, int err)
+{
+	struct pollfd pfd;
+
+	if (err != EAGAIN && err != EWOULDBLOCK)
+		return 0;
+
+	pfd.fd = fd;
+	pfd.events = poll_events;
+
+	/*
+	 * no need to check for errors, here;
+	 * a subsequent read/write will detect unrecoverable errors
+	 */
+	poll(&pfd, 1, -1);
+	return 1;
+}
+
 /*
  * xread() is the same a read(), but it automatically restarts read()
  * operations with a recoverable error (EAGAIN and EINTR). xread()
@@ -242,20 +260,8 @@ ssize_t xread(int fd, void *buf, size_t len)
 		if (nr < 0) {
 			if (errno == EINTR)
 				continue;
-			if (errno == EAGAIN || errno == EWOULDBLOCK) {
-				struct pollfd pfd;
-				pfd.events = POLLIN;
-				pfd.fd = fd;
-				/*
-				 * it is OK if this poll() failed; we
-				 * want to leave this infinite loop
-				 * only when read() returns with
-				 * success, or an expected failure,
-				 * which would be checked by the next
-				 * call to read(2).
-				 */
-				poll(&pfd, 1, -1);
-			}
+			if (handle_nonblock(fd, POLLIN, errno))
+				continue;
 		}
 		return nr;
 	}
@@ -273,8 +279,13 @@ ssize_t xwrite(int fd, const void *buf, size_t len)
 	    len = MAX_IO_SIZE;
 	while (1) {
 		nr = write(fd, buf, len);
-		if ((nr < 0) && (errno == EAGAIN || errno == EINTR))
-			continue;
+		if (nr < 0) {
+			if (errno == EINTR)
+				continue;
+			if (handle_nonblock(fd, POLLOUT, errno))
+				continue;
+		}
+
 		return nr;
 	}
 }
@@ -555,7 +566,7 @@ static int warn_if_unremovable(const char *op, const char *file, int rc)
 	if (!rc || errno == ENOENT)
 		return 0;
 	err = errno;
-	warning("unable to %s %s: %s", op, file, strerror(errno));
+	warning_errno("unable to %s %s", op, file);
 	errno = err;
 	return rc;
 }
@@ -591,7 +602,7 @@ int remove_or_warn(unsigned int mode, const char *file)
 
 void warn_on_inaccessible(const char *path)
 {
-	warning(_("unable to access '%s': %s"), path, strerror(errno));
+	warning_errno(_("unable to access '%s'"), path);
 }
 
 static int access_error_is_ok(int err, unsigned flag)
@@ -640,56 +651,28 @@ int xsnprintf(char *dst, size_t max, const char *fmt, ...)
 	return len;
 }
 
-static int write_file_v(const char *path, int fatal,
-			const char *fmt, va_list params)
+void write_file_buf(const char *path, const char *buf, size_t len)
 {
-	struct strbuf sb = STRBUF_INIT;
-	int fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0666);
-	if (fd < 0) {
-		if (fatal)
-			die_errno(_("could not open %s for writing"), path);
-		return -1;
-	}
-	strbuf_vaddf(&sb, fmt, params);
-	strbuf_complete_line(&sb);
-	if (write_in_full(fd, sb.buf, sb.len) != sb.len) {
-		int err = errno;
-		close(fd);
-		strbuf_release(&sb);
-		errno = err;
-		if (fatal)
-			die_errno(_("could not write to %s"), path);
-		return -1;
-	}
-	strbuf_release(&sb);
-	if (close(fd)) {
-		if (fatal)
-			die_errno(_("could not close %s"), path);
-		return -1;
-	}
-	return 0;
+	int fd = xopen(path, O_WRONLY | O_CREAT | O_TRUNC, 0666);
+	if (write_in_full(fd, buf, len) != len)
+		die_errno(_("could not write to %s"), path);
+	if (close(fd))
+		die_errno(_("could not close %s"), path);
 }
 
-int write_file(const char *path, const char *fmt, ...)
+void write_file(const char *path, const char *fmt, ...)
 {
-	int status;
 	va_list params;
+	struct strbuf sb = STRBUF_INIT;
 
 	va_start(params, fmt);
-	status = write_file_v(path, 1, fmt, params);
+	strbuf_vaddf(&sb, fmt, params);
 	va_end(params);
-	return status;
-}
 
-int write_file_gently(const char *path, const char *fmt, ...)
-{
-	int status;
-	va_list params;
+	strbuf_complete_line(&sb);
 
-	va_start(params, fmt);
-	status = write_file_v(path, 0, fmt, params);
-	va_end(params);
-	return status;
+	write_file_buf(path, sb.buf, sb.len);
+	strbuf_release(&sb);
 }
 
 void sleep_millisec(int millisec)
diff --git a/write_or_die.c b/write_or_die.c
index 49e80aa222..073443247a 100644
--- a/write_or_die.c
+++ b/write_or_die.c
@@ -82,26 +82,3 @@ void write_or_die(int fd, const void *buf, size_t count)
 		die_errno("write error");
 	}
 }
-
-int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg)
-{
-	if (write_in_full(fd, buf, count) < 0) {
-		check_pipe(errno);
-		fprintf(stderr, "%s: write error (%s)\n",
-			msg, strerror(errno));
-		return 0;
-	}
-
-	return 1;
-}
-
-int write_or_whine(int fd, const void *buf, size_t count, const char *msg)
-{
-	if (write_in_full(fd, buf, count) < 0) {
-		fprintf(stderr, "%s: write error (%s)\n",
-			msg, strerror(errno));
-		return 0;
-	}
-
-	return 1;
-}
diff --git a/wt-status.c b/wt-status.c
index 1ea2ebe4c0..6225a2d89f 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -15,6 +15,7 @@
 #include "column.h"
 #include "strbuf.h"
 #include "utf8.h"
+#include "worktree.h"
 
 static const char cut_line[] =
 "------------------------ >8 ------------------------\n";
@@ -262,7 +263,7 @@ static const char *wt_status_unmerged_status_string(int stagemask)
 	case 7:
 		return _("both modified:");
 	default:
-		die(_("bug: unhandled unmerged status %x"), stagemask);
+		die("BUG: unhandled unmerged status %x", stagemask);
 	}
 }
 
@@ -387,7 +388,7 @@ static void wt_status_print_change_data(struct wt_status *s,
 	status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 	what = wt_status_diff_status_string(status);
 	if (!what)
-		die(_("bug: unhandled diff status %c"), status);
+		die("BUG: unhandled diff status %c", status);
 	len = label_width - utf8_strwidth(what);
 	assert(len >= 0);
 	if (status == DIFF_STATUS_COPIED || status == DIFF_STATUS_RENAMED)
@@ -431,7 +432,8 @@ static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
 			d->worktree_status = p->status;
 		d->dirty_submodule = p->two->dirty_submodule;
 		if (S_ISGITLINK(p->two->mode))
-			d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
+			d->new_submodule_commits = !!oidcmp(&p->one->oid,
+							    &p->two->oid);
 	}
 }
 
@@ -946,10 +948,14 @@ static void show_merge_in_progress(struct wt_status *s,
 {
 	if (has_unmerged(s)) {
 		status_printf_ln(s, color, _("You have unmerged paths."));
-		if (s->hints)
+		if (s->hints) {
 			status_printf_ln(s, color,
-				_("  (fix conflicts and run \"git commit\")"));
+					 _("  (fix conflicts and run \"git commit\")"));
+			status_printf_ln(s, color,
+					 _("  (use \"git merge --abort\" to abort the merge)"));
+		}
 	} else {
+		s-> commitable = 1;
 		status_printf_ln(s, color,
 			_("All conflicts fixed but you are still merging."));
 		if (s->hints)
@@ -1060,7 +1066,7 @@ static void abbrev_sha1_in_line(struct strbuf *line)
 			strbuf_addf(split[1], "%s ", abbrev);
 			strbuf_reset(line);
 			for (i = 0; split[i]; i++)
-				strbuf_addf(line, "%s", split[i]->buf);
+				strbuf_addbuf(line, split[i]);
 		}
 	}
 	strbuf_list_free(split);
@@ -1262,13 +1268,13 @@ static void show_bisect_in_progress(struct wt_status *s,
 /*
  * Extract branch information from rebase/bisect
  */
-static char *read_and_strip_branch(const char *path)
+static char *get_branch(const struct worktree *wt, const char *path)
 {
 	struct strbuf sb = STRBUF_INIT;
 	unsigned char sha1[20];
 	const char *branch_name;
 
-	if (strbuf_read_file(&sb, git_path("%s", path), 0) <= 0)
+	if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
 		goto got_nothing;
 
 	while (sb.len && sb.buf[sb.len - 1] == '\n')
@@ -1360,40 +1366,62 @@ static void wt_status_get_detached_from(struct wt_status_state *state)
 	strbuf_release(&cb.buf);
 }
 
-void wt_status_get_state(struct wt_status_state *state,
-			 int get_detached_from)
+int wt_status_check_rebase(const struct worktree *wt,
+			   struct wt_status_state *state)
 {
 	struct stat st;
-	unsigned char sha1[20];
 
-	if (!stat(git_path_merge_head(), &st)) {
-		state->merge_in_progress = 1;
-	} else if (!stat(git_path("rebase-apply"), &st)) {
-		if (!stat(git_path("rebase-apply/applying"), &st)) {
+	if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
+		if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
 			state->am_in_progress = 1;
-			if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size)
+			if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
 				state->am_empty_patch = 1;
 		} else {
 			state->rebase_in_progress = 1;
-			state->branch = read_and_strip_branch("rebase-apply/head-name");
-			state->onto = read_and_strip_branch("rebase-apply/onto");
+			state->branch = get_branch(wt, "rebase-apply/head-name");
+			state->onto = get_branch(wt, "rebase-apply/onto");
 		}
-	} else if (!stat(git_path("rebase-merge"), &st)) {
-		if (!stat(git_path("rebase-merge/interactive"), &st))
+	} else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
+		if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
 			state->rebase_interactive_in_progress = 1;
 		else
 			state->rebase_in_progress = 1;
-		state->branch = read_and_strip_branch("rebase-merge/head-name");
-		state->onto = read_and_strip_branch("rebase-merge/onto");
+		state->branch = get_branch(wt, "rebase-merge/head-name");
+		state->onto = get_branch(wt, "rebase-merge/onto");
+	} else
+		return 0;
+	return 1;
+}
+
+int wt_status_check_bisect(const struct worktree *wt,
+			   struct wt_status_state *state)
+{
+	struct stat st;
+
+	if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
+		state->bisect_in_progress = 1;
+		state->branch = get_branch(wt, "BISECT_START");
+		return 1;
+	}
+	return 0;
+}
+
+void wt_status_get_state(struct wt_status_state *state,
+			 int get_detached_from)
+{
+	struct stat st;
+	unsigned char sha1[20];
+
+	if (!stat(git_path_merge_head(), &st)) {
+		state->merge_in_progress = 1;
+	} else if (wt_status_check_rebase(NULL, state)) {
+		;		/* all set */
 	} else if (!stat(git_path_cherry_pick_head(), &st) &&
 			!get_sha1("CHERRY_PICK_HEAD", sha1)) {
 		state->cherry_pick_in_progress = 1;
 		hashcpy(state->cherry_pick_head_sha1, sha1);
 	}
-	if (!stat(git_path("BISECT_LOG"), &st)) {
-		state->bisect_in_progress = 1;
-		state->branch = read_and_strip_branch("BISECT_START");
-	}
+	wt_status_check_bisect(NULL, state);
 	if (!stat(git_path_revert_head(), &st) &&
 	    !get_sha1("REVERT_HEAD", sha1)) {
 		state->revert_in_progress = 1;
@@ -1530,7 +1558,7 @@ void wt_status_print(struct wt_status *s)
 			else
 				printf(_("nothing to commit\n"));
 		} else
-			printf(_("nothing to commit, working directory clean\n"));
+			printf(_("nothing to commit, working tree clean\n"));
 	}
 }
 
diff --git a/wt-status.h b/wt-status.h
index c9b3b744e9..2ca93f6957 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -6,6 +6,8 @@
 #include "color.h"
 #include "pathspec.h"
 
+struct worktree;
+
 enum color_wt_status {
 	WT_STATUS_HEADER = 0,
 	WT_STATUS_UPDATED,
@@ -100,6 +102,10 @@ void wt_status_prepare(struct wt_status *s);
 void wt_status_print(struct wt_status *s);
 void wt_status_collect(struct wt_status *s);
 void wt_status_get_state(struct wt_status_state *state, int get_detached_from);
+int wt_status_check_rebase(const struct worktree *wt,
+			   struct wt_status_state *state);
+int wt_status_check_bisect(const struct worktree *wt,
+			   struct wt_status_state *state);
 
 void wt_shortstatus_print(struct wt_status *s);
 void wt_porcelain_print(struct wt_status *s);
diff --git a/xdiff-interface.c b/xdiff-interface.c
index 54236f24b9..f34ea762e4 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -100,9 +100,9 @@ static int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf)
 
 /*
  * Trim down common substring at the end of the buffers,
- * but leave at least ctx lines at the end.
+ * but end on a complete line.
  */
-static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx)
+static void trim_common_tail(mmfile_t *a, mmfile_t *b)
 {
 	const int blk = 1024;
 	long trimmed = 0, recovered = 0;
@@ -110,9 +110,6 @@ static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx)
 	char *bp = b->ptr + b->size;
 	long smaller = (a->size < b->size) ? a->size : b->size;
 
-	if (ctx)
-		return;
-
 	while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) {
 		trimmed += blk;
 		ap -= blk;
@@ -134,7 +131,8 @@ int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t co
 	if (mf1->size > MAX_XDIFF_SIZE || mf2->size > MAX_XDIFF_SIZE)
 		return -1;
 
-	trim_common_tail(&a, &b, xecfg->ctxlen);
+	if (!xecfg->ctxlen && !(xecfg->flags & XDL_EMIT_FUNCCONTEXT))
+		trim_common_tail(&a, &b);
 
 	return xdl_diff(&a, &b, xpp, xecfg, xecb);
 }
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index 4fb7e79410..7423f77fc8 100644
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -41,6 +41,8 @@ extern "C" {
 
 #define XDF_IGNORE_BLANK_LINES (1 << 7)
 
+#define XDF_COMPACTION_HEURISTIC (1 << 8)
+
 #define XDL_EMIT_FUNCNAMES (1 << 0)
 #define XDL_EMIT_FUNCCONTEXT (1 << 2)
 
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 2358a2d632..b3c6848875 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -400,9 +400,23 @@ static xdchange_t *xdl_add_change(xdchange_t *xscr, long i1, long i2, long chg1,
 }
 
 
+static int is_blank_line(xrecord_t **recs, long ix, long flags)
+{
+	return xdl_blankline(recs[ix]->ptr, recs[ix]->size, flags);
+}
+
+static int recs_match(xrecord_t **recs, long ixs, long ix, long flags)
+{
+	return (recs[ixs]->ha == recs[ix]->ha &&
+		xdl_recmatch(recs[ixs]->ptr, recs[ixs]->size,
+			     recs[ix]->ptr, recs[ix]->size,
+			     flags));
+}
+
 int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 	long ix, ixo, ixs, ixref, grpsiz, nrec = xdf->nrec;
 	char *rchg = xdf->rchg, *rchgo = xdfo->rchg;
+	unsigned int blank_lines;
 	xrecord_t **recs = xdf->recs;
 
 	/*
@@ -436,14 +450,14 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 
 		do {
 			grpsiz = ix - ixs;
+			blank_lines = 0;
 
 			/*
 			 * If the line before the current change group, is equal to
 			 * the last line of the current change group, shift backward
 			 * the group.
 			 */
-			while (ixs > 0 && recs[ixs - 1]->ha == recs[ix - 1]->ha &&
-			       xdl_recmatch(recs[ixs - 1]->ptr, recs[ixs - 1]->size, recs[ix - 1]->ptr, recs[ix - 1]->size, flags)) {
+			while (ixs > 0 && recs_match(recs, ixs - 1, ix - 1, flags)) {
 				rchg[--ixs] = 1;
 				rchg[--ix] = 0;
 
@@ -470,8 +484,9 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 			 * the line next of the current change group, shift forward
 			 * the group.
 			 */
-			while (ix < nrec && recs[ixs]->ha == recs[ix]->ha &&
-			       xdl_recmatch(recs[ixs]->ptr, recs[ixs]->size, recs[ix]->ptr, recs[ix]->size, flags)) {
+			while (ix < nrec && recs_match(recs, ixs, ix, flags)) {
+				blank_lines += is_blank_line(recs, ix, flags);
+
 				rchg[ixs++] = 0;
 				rchg[ix++] = 1;
 
@@ -498,6 +513,23 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 			rchg[--ix] = 0;
 			while (rchgo[--ixo]);
 		}
+
+		/*
+		 * If a group can be moved back and forth, see if there is a
+		 * blank line in the moving space. If there is a blank line,
+		 * make sure the last blank line is the end of the group.
+		 *
+		 * As we already shifted the group forward as far as possible
+		 * in the earlier loop, we need to shift it back only if at all.
+		 */
+		if ((flags & XDF_COMPACTION_HEURISTIC) && blank_lines) {
+			while (ixs > 0 &&
+			       !is_blank_line(recs, ix - 1, flags) &&
+			       recs_match(recs, ixs - 1, ix - 1, flags)) {
+				rchg[--ixs] = 1;
+				rchg[--ix] = 0;
+			}
+		}
 	}
 
 	return 0;
diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 993724b11c..49aa16ff78 100644
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -120,6 +120,16 @@ static long def_ff(const char *rec, long len, char *buf, long sz, void *priv)
 	return -1;
 }
 
+static long match_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri,
+			   char *buf, long sz)
+{
+	const char *rec;
+	long len = xdl_get_rec(xdf, ri, &rec);
+	if (!xecfg->find_func)
+		return def_ff(rec, len, buf, sz, xecfg->find_func_priv);
+	return xecfg->find_func(rec, len, buf, sz, xecfg->find_func_priv);
+}
+
 struct func_line {
 	long len;
 	char buf[80];
@@ -128,7 +138,6 @@ struct func_line {
 static long get_func_line(xdfenv_t *xe, xdemitconf_t const *xecfg,
 			  struct func_line *func_line, long start, long limit)
 {
-	find_func_t ff = xecfg->find_func ? xecfg->find_func : def_ff;
 	long l, size, step = (start > limit) ? -1 : 1;
 	char *buf, dummy[1];
 
@@ -136,9 +145,7 @@ static long get_func_line(xdfenv_t *xe, xdemitconf_t const *xecfg,
 	size = func_line ? sizeof(func_line->buf) : sizeof(dummy);
 
 	for (l = start; l != limit && 0 <= l && l < xe->xdf1.nrec; l += step) {
-		const char *rec;
-		long reclen = xdl_get_rec(&xe->xdf1, l, &rec);
-		long len = ff(rec, reclen, buf, size, xecfg->find_func_priv);
+		long len = match_func_rec(&xe->xdf1, xecfg, l, buf, size);
 		if (len >= 0) {
 			if (func_line)
 				func_line->len = len;
@@ -148,6 +155,18 @@ static long get_func_line(xdfenv_t *xe, xdemitconf_t const *xecfg,
 	return -1;
 }
 
+static int is_empty_rec(xdfile_t *xdf, long ri)
+{
+	const char *rec;
+	long len = xdl_get_rec(xdf, ri, &rec);
+
+	while (len > 0 && XDL_ISSPACE(*rec)) {
+		rec++;
+		len--;
+	}
+	return !len;
+}
+
 int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
 		  xdemitconf_t const *xecfg) {
 	long s1, s2, e1, e2, lctx;
@@ -164,7 +183,34 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
 		s2 = XDL_MAX(xch->i2 - xecfg->ctxlen, 0);
 
 		if (xecfg->flags & XDL_EMIT_FUNCCONTEXT) {
-			long fs1 = get_func_line(xe, xecfg, NULL, xch->i1, -1);
+			long fs1, i1 = xch->i1;
+
+			/* Appended chunk? */
+			if (i1 >= xe->xdf1.nrec) {
+				char dummy[1];
+				long i2 = xch->i2;
+
+				/*
+				 * We don't need additional context if
+				 * a whole function was added, possibly
+				 * starting with empty lines.
+				 */
+				while (i2 < xe->xdf2.nrec &&
+				       is_empty_rec(&xe->xdf2, i2))
+					i2++;
+				if (i2 < xe->xdf2.nrec &&
+				    match_func_rec(&xe->xdf2, xecfg, i2,
+						   dummy, sizeof(dummy)) >= 0)
+					goto post_context_calculation;
+
+				/*
+				 * Otherwise get more context from the
+				 * pre-image.
+				 */
+				i1 = xe->xdf1.nrec - 1;
+			}
+
+			fs1 = get_func_line(xe, xecfg, NULL, i1, -1);
 			if (fs1 < 0)
 				fs1 = 0;
 			if (fs1 < s1) {
@@ -173,7 +219,7 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
 			}
 		}
 
- again:
+ post_context_calculation:
 		lctx = xecfg->ctxlen;
 		lctx = XDL_MIN(lctx, xe->xdf1.nrec - (xche->i1 + xche->chg1));
 		lctx = XDL_MIN(lctx, xe->xdf2.nrec - (xche->i2 + xche->chg2));
@@ -185,6 +231,8 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
 			long fe1 = get_func_line(xe, xecfg, NULL,
 						 xche->i1 + xche->chg1,
 						 xe->xdf1.nrec);
+			while (fe1 > 0 && is_empty_rec(&xe->xdf1, fe1 - 1))
+				fe1--;
 			if (fe1 < 0)
 				fe1 = xe->xdf1.nrec;
 			if (fe1 > e1) {
@@ -198,11 +246,12 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
 			 * its new end.
 			 */
 			if (xche->next) {
-				long l = xche->next->i1;
+				long l = XDL_MIN(xche->next->i1,
+						 xe->xdf1.nrec - 1);
 				if (l <= e1 ||
 				    get_func_line(xe, xecfg, NULL, l, e1) < 0) {
 					xche = xche->next;
-					goto again;
+					goto post_context_calculation;
 				}
 			}
 		}
diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c
index 04e1a1ab2a..a613efc703 100644
--- a/xdiff/xpatience.c
+++ b/xdiff/xpatience.c
@@ -1,6 +1,6 @@
 /*
  *  LibXDiff by Davide Libenzi ( File Differential Library )
- *  Copyright (C) 2003-2009 Davide Libenzi, Johannes E. Schindelin
+ *  Copyright (C) 2003-2016 Davide Libenzi, Johannes E. Schindelin
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 62cb23dfd3..027192a1c7 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -200,8 +200,10 @@ int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags)
 				return 0;
 		}
 	} else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL) {
-		while (i1 < s1 && i2 < s2 && l1[i1++] == l2[i2++])
-			; /* keep going */
+		while (i1 < s1 && i2 < s2 && l1[i1] == l2[i2]) {
+			i1++;
+			i2++;
+		}
 	}
 
 	/*