{"thread":{"id":"42549","subject":"[ANNOUNCE] Git v2.9.0-rc2","startedAt":"2016-06-07T05:57:58Z","lastAt":"2016-06-07T05:57:58Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"288519","messageId":"xmqqwpm1sfq1.fsf@gitster.mtv.corp.google.com","threadId":"42549","inReplyTo":null,"subject":"[ANNOUNCE] Git v2.9.0-rc2","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-06-07T05:57:58Z","receivedAt":"2016-06-07T05:57:58Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"A release candidate Git v2.9.0-rc2 is now available for testing\nat the usual places.  It is comprised of 477 non-merge commits\nsince v2.8.0, contributed by 67 people, 27 of which are new faces.\n\nThe tarballs are found at:\n\n    https://www.kernel.org/pub/software/scm/git/testing/\n\nThe following public repositories all have a copy of the\n'v2.9.0-rc2' tag and the 'master' branch that the tag points at:\n\n  url = https://kernel.googlesource.com/pub/scm/git/git\n  url = git://repo.or.cz/alt-git.git\n  url = git://git.sourceforge.jp/gitroot/git-core/git.git\n  url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core\n  url = https://github.com/gitster/git\n\nNew contributors whose contributions weren't in v2.8.0 are as follows.\nWelcome to the Git development community!\n\n  Alexander Rinass, Armin Kunaschik, Benjamin Dopplinger,\n  Ben Woosley, Erwan Mathoniere, Gabriel Souza Franco, Jacob\n  Nisnevich, Jan Durovec, Jean-Noël Avila, Kazuki Yamaguchi,\n  Keller Fuchs, Laurent Arnoud, Li Peng, Marios Titas, Mehul Jain,\n  Michael Procter, Nikola Forró, Pablo Santiago Blum de Aguiar,\n  Pranit Bauva, Ray Zhang, René Nyffenegger, Santiago Torres,\n  Saurav Sachidanand, Shin Kojima, Sidhant Sharma [:tk], Stanislav\n  Kolotinskiy, and Xiaolong Ye.\n\nReturning contributors who helped this release are as follows.\nThanks for your continued support.\n\n  Adam Dinwoodie, Ævar Arnfjörð Bjarmason, Alexander Kuleshov,\n  brian m. carlson, Brian Norris, Christian Couder, David Aguilar,\n  David Turner, Dennis Kaarsemaker, Elia Pinto, Elijah Newren,\n  Eric Sunshine, Eric Wong, Felipe Contreras, Jacob Keller,\n  Jeff King, Jiang Xin, Johannes Schindelin, Johannes Sixt,\n  John Keeping, Junio C Hamano, Karsten Blees, Lars Schneider,\n  Linus Torvalds, Luke Diamand, Matthieu Moy, Michael Haggerty,\n  Michael J Gruber, Michael Rappazzo, Nguyễn Thái Ngọc\n  Duy, Ori Avtalion, Ralf Thielow, Ramsay Jones, René Scharfe,\n  Stefan Beller, Stephen P. Smith, Sven Strickroth, SZEDER Gábor,\n  Torsten Bögershausen, and Vasco Almeida.\n\n----------------------------------------------------------------\n\nGit 2.9 Release Notes (draft)\n=============================\n\nBackward compatibility notes\n----------------------------\n\nThe end-user facing Porcelain level commands in the \"git diff\" and\n\"git log\" family by default enable the rename detection; you can still\nuse \"diff.renames\" configuration variable to disable this.\n\nMerging two branches that have no common ancestor with \"git merge\" is\nby default forbidden now to prevent creating such an unusual merge by\nmistake.\n\nThe output formats of \"git log\" that indents the commit log message by\n4 spaces now expands HT in the log message by default.  You can use\nthe \"--no-expand-tabs\" option to disable this.\n\n\"git commit-tree\" plumbing command required the user to always sign\nits result when the user sets the commit.gpgsign configuration\nvariable, which was an ancient mistake, which this release corrects.\nA script that drives commit-tree, if it relies on this mistake, now\nneeds to read commit.gpgsign and pass the -S option as necessary.\n\n\nUpdates since v2.8\n------------------\n\nUI, Workflows & Features\n\n * Comes with git-multimail 1.3.1 (in contrib/).\n\n * The end-user facing commands like \"git diff\" and \"git log\"\n   now enable the rename detection by default.\n\n * The credential.helper configuration variable is cumulative and\n   there is no good way to override it from the command line.  As\n   a special case, giving an empty string as its value now serves\n   as the signal to clear the values specified in various files.\n\n * A new \"interactive.diffFilter\" configuration can be used to\n   customize the diff shown in \"git add -i\" sessions.\n\n * \"git p4\" now allows P4 author names to be mapped to Git author\n   names.\n\n * \"git rebase -x\" can be used without passing \"-i\" option.\n\n * \"git -c credential.<var>=<value> submodule\" can now be used to\n   propagate configuration variables related to credential helper\n   down to the submodules.\n\n * \"git tag\" can create an annotated tag without explicitly given an\n   \"-a\" (or \"-s\") option (i.e. when a tag message is given).  A new\n   configuration variable, tag.forceSignAnnotated, can be used to tell\n   the command to create signed tag in such a situation.\n\n * \"git merge\" used to allow merging two branches that have no common\n   base by default, which led to a brand new history of an existing\n   project created and then get pulled by an unsuspecting maintainer,\n   which allowed an unnecessary parallel history merged into the\n   existing project.  The command has been taught not to allow this by\n   default, with an escape hatch \"--allow-unrelated-histories\" option\n   to be used in a rare event that merges histories of two projects\n   that started their lives independently.\n\n * \"git pull\" has been taught to pass the \"--allow-unrelated-histories\"\n   option to underlying \"git merge\".\n\n * \"git apply -v\" learned to report paths in the patch that were\n   skipped via --include/--exclude mechanism or being outside the\n   current working directory.\n\n * Shell completion (in contrib/) updates.\n\n * The commit object name reported when \"rebase -i\" stops has been\n   shortened.\n\n * \"git worktree add\" can be given \"--no-checkout\" option to only\n   create an empty worktree without checking out the files.\n\n * \"git mergetools\" learned to drive ExamDiff.\n\n * \"git pull --rebase\" learned \"--[no-]autostash\" option, so that\n   the rebase.autostash configuration variable set to true can be\n   overridden from the command line.\n\n * When \"git log\" shows the log message indented by 4-spaces, the\n   remainder of a line after a HT does not align in the way the author\n   originally intended.  The command now expands tabs by default to help\n   such a case, and allows the users to override it with a new option,\n   \"--no-expand-tabs\".\n\n * \"git send-email\" now uses a more readable timestamps when\n   formulating a message ID.\n\n * \"git rerere\" can encounter two or more files with the same conflict\n   signature that have to be resolved in different ways, but there was\n   no way to record these separate resolutions.\n\n * \"git p4\" learned to record P4 jobs in Git commit that imports from\n   the history in Perforce.\n\n * \"git describe --contains\" often made a hard-to-justify choice of\n   tag to name a given commit, because it tried to come up\n   with a name with smallest number of hops from a tag, causing an old\n   commit whose close descendant that is recently tagged were not\n   described with respect to an old tag but with a newer tag.  It did\n   not help that its computation of \"hop\" count was further tweaked to\n   penalize being on a side branch of a merge.  The logic has been\n   updated to favor using the tag with the oldest tagger date, which\n   is a lot easier to explain to the end users: \"We describe a commit\n   in terms of the (chronologically) oldest tag that contains the\n   commit.\"\n\n * \"git clone\" learned the \"--shallow-submodules\" option.\n\n * HTTP transport clients learned to throw extra HTTP headers at the\n   server, specified via http.extraHeader configuration variable.\n\n * Patch output from \"git diff\" and friends has been tweaked to be\n   more readable by using a blank line as a strong hint that the\n   contents before and after it belong to logically separate units.\n\n * A new configuration variable core.hooksPath allows customizing\n   where the hook directory is.\n\n * An earlier addition of \"sanitize_submodule_env\" with 14111fc4 (git:\n   submodule honor -c credential.* from command line, 2016-02-29)\n   turned out to be a convoluted no-op; implement what it wanted to do\n   correctly, and stop filtering settings given via \"git -c var=val\".\n\n * \"git commit --dry-run\" reported \"No, no, you cannot commit.\" in one\n   case where \"git commit\" would have allowed you to commit, and this\n   improves it a little bit (\"git commit --dry-run --short\" still does\n   not give you the correct answer, for example).  This is a stop-gap\n   measure in that \"commit --short --dry-run\" still gives an incorrect\n   result.\n\n * The experimental \"multiple worktree\" feature gains more safety to\n   forbid operations on a branch that is checked out or being actively\n   worked on elsewhere, by noticing that e.g. it is being rebased.\n\n * \"git format-patch\" learned a new \"--base\" option to record what\n   (public, well-known) commit the original series was built on in\n   its output.\n\n * \"git commit\" learned to pay attention to the \"commit.verbose\"\n   configuration variable and act as if the \"--verbose\" option\n   was given from the command line.\n\n * Updated documentation gives hints to GMail users with two-factor\n   auth enabled that they need app-specific-password when using\n   \"git send-email\".\n\n * The manpage output of our documentation did not render well in\n   terminal; typeset literals in bold by default to make them stand\n   out more.\n\n * The mark-up in the top-level README.md file has been updated to\n   typeset CLI command names differently from the body text.\n\n\nPerformance, Internal Implementation, Development Support etc.\n\n * The embedded args argv-array in the child process is used to build\n   the command line to run pack-objects instead of using a separate\n   array of strings.\n\n * A test for tags has been restructured so that more parts of it can\n   easily be run on a platform without a working GnuPG.\n\n * The startup_info data, which records if we are working inside a\n   repository (among other things), are now uniformly available to Git\n   subcommand implementations, and Git avoids attempting to touch\n   references when we are not in a repository.\n\n * The command line argument parser for \"receive-pack\" has been\n   rewritten to use parse-options.\n\n * A major part of \"git submodule update\" has been ported to C to take\n   advantage of the recently added framework to run download tasks in\n   parallel.  Other updates to \"git submodule\" that move pieces of\n   logic to C continues.\n\n * Rename bunch of tests on \"git clone\" for better organization.\n\n * The tests that involve running httpd leaked the system-wide\n   configuration in /etc/gitconfig to the tested environment.\n\n * Build updates for MSVC.\n\n * The repository set-up sequence has been streamlined (the biggest\n   change is that there is no longer git_config_early()), so that we\n   do not attempt to look into refs/* when we know we do not have a\n   Git repository.\n\n * Code restructuring around the \"refs\" API to prepare for pluggable\n   refs backends.\n\n * Sources to many test helper binaries and the generated helpers\n   have been moved to t/helper/ subdirectory to reduce clutter at the\n   top level of the tree.\n\n * Unify internal logic between \"git tag -v\" and \"git verify-tag\"\n   commands by making one directly call into the other.\n\n * \"merge-recursive\" strategy incorrectly checked if a path that is\n   involved in its internal merge exists in the working tree.\n\n * The test scripts for \"git p4\" (but not \"git p4\" implementation\n   itself) has been updated so that they would work even on a system\n   where the installed version of Python is python 3.\n\n * As nobody maintains our in-tree git.spec.in and distros use their\n   own spec file, we stopped pretending that we support \"make rpm\".\n\n * Move from \"unsigned char[20]\" to \"struct object_id\" continues.\n\n * The code for warning_errno/die_errno has been refactored and a new\n   error_errno() reporting helper is introduced.\n   (merge 1da045f nd/error-errno later to maint).\n\n * Running tests with '-x' option to trace the individual command\n   executions is a useful way to debug test scripts, but some tests\n   that capture the standard error stream and check what the command\n   said can be broken with the trace output mixed in.  When running\n   our tests under \"bash\", however, we can redirect the trace output\n   to another file descriptor to keep the standard error of programs\n   being tested intact.\n\n * t0040 had too many unnecessary repetitions in its test data.  Teach\n   test-parse-options program so that a caller can tell what it\n   expects in its output, so that these repetitions can be cleaned up.\n\n * Add perf test for \"rebase -i\".\n\n * Common mistakes when writing gitlink: in our documentation are\n   found by \"make check-docs\".\n\n * t9xxx series has been updated primarily for readability, while\n   fixing small bugs in it.  A few scripted Porcelain commands have\n   also been updated to fix possible bugs around their use of\n   \"test -z\" and \"test -n\".\n\n * CI test was taught to run git-svn tests.\n\n * \"git cat-file --batch-all\" has been sped up, by taking advantage\n   of the fact that it does not have to read a list of objects, in two\n   ways.\n\n * test updates to make it more readable and maintainable.\n   (merge e6273f4 es/t1500-modernize later to maint).\n\n * \"make DEVELOPER=1\" worked as expected; setting DEVELOPER=1 in\n   config.mak didn't.\n   (merge 51dd3e8 mm/makefile-developer-can-be-in-config-mak later to maint).\n\n * The way how \"submodule--helper list\" signals unmatch error to its\n   callers has been updated.\n\n * A bash-ism \"local\" has been removed from \"git submodule\" scripted\n   Porcelain.\n\n\nAlso contains various documentation updates and code clean-ups.\n\n\nFixes since v2.8\n----------------\n\nUnless otherwise noted, all the fixes since v2.8 in the maintenance\ntrack are contained in this release (see the maintenance releases'\nnotes for details).\n\n * \"git config --get-urlmatch\", unlike other variants of the \"git\n   config --get\" family, did not signal error with its exit status\n   when there was no matching configuration.\n\n * The \"--local-env-vars\" and \"--resolve-git-dir\" options of \"git\n   rev-parse\" failed to work outside a repository when the command's\n   option parsing was rewritten in 1.8.5 era.\n\n * \"git index-pack --keep[=<msg>] pack-$name.pack\" simply did not work.\n\n * Fetching of history by naming a commit object name directly didn't\n   work across remote-curl transport.\n\n * A small memory leak in an error codepath has been plugged in xdiff\n   code.\n\n * strbuf_getwholeline() did not NUL-terminate the buffer on certain\n   corner cases in its error codepath.\n\n * \"git mergetool\" did not work well with conflicts that both sides\n   deleted.\n\n * \"git send-email\" had trouble parsing alias file in mailrc format\n   when lines in it had trailing whitespaces on them.\n\n * When \"git merge --squash\" stopped due to conflict, the concluding\n   \"git commit\" failed to read in the SQUASH_MSG that shows the log\n   messages from all the squashed commits.\n\n * \"git merge FETCH_HEAD\" dereferenced NULL pointer when merging\n   nothing into an unborn history (which is arguably unusual usage,\n   which perhaps was the reason why nobody noticed it).\n\n * When \"git worktree\" feature is in use, \"git branch -d\" allowed\n   deletion of a branch that is checked out in another worktree,\n   which was wrong.\n\n * When \"git worktree\" feature is in use, \"git branch -m\" renamed a\n   branch that is checked out in another worktree without adjusting\n   the HEAD symbolic ref for the worktree.\n\n * \"git diff -M\" used to work better when two originally identical\n   files A and B got renamed to X/A and X/B by pairing A to X/A and B\n   to X/B, but this was broken in the 2.0 timeframe.\n\n * \"git send-pack --all <there>\" was broken when its command line\n   option parsing was written in the 2.6 timeframe.\n\n * \"git format-patch --help\" showed `-s` and `--no-patch` as if these\n   are valid options to the command.  We already hide `--patch` option\n   from the documentation, because format-patch is about showing the\n   diff, and the documentation now hides these options as well.\n\n * When running \"git blame $path\" with unnormalized data in the index\n   for the path, the data in the working tree was blamed, even though\n   \"git add\" would not have changed what is already in the index, due\n   to \"safe crlf\" that disables the line-end conversion.  It has been\n   corrected.\n\n * A change back in version 2.7 to \"git branch\" broke display of a\n   symbolic ref in a non-standard place in the refs/ hierarchy (we\n   expect symbolic refs to appear in refs/remotes/*/HEAD to point at\n   the primary branch the remote has, and as .git/HEAD to point at the\n   branch we locally checked out).\n\n * A partial rewrite of \"git submodule\" in the 2.7 timeframe changed\n   the way the gitdir: pointer in the submodules point at the real\n   repository location to use absolute paths by accident.  This has\n   been corrected.\n\n * \"git commit\" misbehaved in a few minor ways when an empty message\n   is given via -m '', all of which has been corrected.\n\n * Support for CRAM-MD5 authentication method in \"git imap-send\" did\n   not work well.\n\n * Upcoming OpenSSL 1.1.0 will break compilation by updating a few API\n   elements we use in imap-send, which has been adjusted for the change.\n\n * The socks5:// proxy support added back in 2.6.4 days was not aware\n   that socks5h:// proxies behave differently from socks5:// proxies.\n\n * \"git config\" had a codepath that tried to pass a NULL to\n   printf(\"%s\"), which nobody seems to have noticed.\n\n * On Cygwin, object creation uses the \"create a temporary and then\n   rename it to the final name\" pattern, not \"create a temporary,\n   hardlink it to the final name and then unlink the temporary\"\n   pattern.\n\n   This is necessary to use Git on Windows shared directories, and is\n   already enabled for the MinGW and plain Windows builds.  It also\n   has been used in Cygwin packaged versions of Git for quite a while.\n   See http://thread.gmane.org/gmane.comp.version-control.git/291853\n\n * \"merge-octopus\" strategy did not ensure that the index is clean\n   when merge begins.\n\n * When \"git merge\" notices that the merge can be resolved purely at\n   the tree level (without having to merge blobs) and the resulting\n   tree happens to already exist in the object store, it forgot to\n   update the index, which left an inconsistent state that would\n   break later operations.\n\n * \"git submodule\" reports the paths of submodules the command\n   recurses into, but these paths were incorrectly reported when\n   the command was not run from the root level of the superproject.\n\n * The \"user.useConfigOnly\" configuration variable makes it an error\n   if users do not explicitly set user.name and user.email.  However,\n   its check was not done early enough and allowed another error to\n   trigger, reporting that the default value we guessed from the\n   system setting was unusable.  This was a suboptimal end-user\n   experience as we want the users to set user.name/user.email without\n   relying on the auto-detection at all.\n\n * \"git mv old new\" did not adjust the path for a submodule that lives\n   as a subdirectory inside old/ directory correctly.\n\n * \"git replace -e\" did not honour \"core.editor\" configuration.\n\n * \"git push\" from a corrupt repository that attempts to push a large\n   number of refs deadlocked; the thread to relay rejection notices\n   for these ref updates blocked on writing them to the main thread,\n   after the main thread at the receiving end notices that the push\n   failed and decides not to read these notices and return a failure.\n\n * mmap emulation on Windows has been optimized and work better without\n   consuming paging store when not needed.\n\n * A question by \"git send-email\" to ask the identity of the sender\n   has been updated.\n\n * UI consistency improvements for \"git mergetool\".\n\n * \"git rebase -m\" could be asked to rebase an entire branch starting\n   from the root, but failed by assuming that there always is a parent\n   commit to the first commit on the branch.\n\n * Fix a broken \"p4 lfs\" test.\n\n * Recent update to Git LFS broke \"git p4\" by changing the output from\n   its \"lfs pointer\" subcommand.\n\n * \"git fetch\" test t5510 was flaky while running a (forced) automagic\n   garbage collection.\n\n * Documentation updates to help contributors setting up Travis CI\n   test for their patches.\n\n * Some multi-byte encoding can have a backslash byte as a later part\n   of one letter, which would confuse \"highlight\" filter used in\n   gitweb.\n\n * \"git commit-tree\" plumbing command required the user to always sign\n   its result when the user sets the commit.gpgsign configuration\n   variable, which was an ancient mistake.  Rework \"git rebase\" that\n   relied on this mistake so that it reads commit.gpgsign and pass (or\n   not pass) the -S option to \"git commit-tree\" to keep the end-user\n   expectation the same, while teaching \"git commit-tree\" to ignore\n   the configuration variable.  This will stop requiring the users to\n   sign commit objects used internally as an implementation detail of\n   \"git stash\".\n\n * \"http.cookieFile\" configuration variable clearly wants a pathname,\n   but we forgot to treat it as such by e.g. applying tilde expansion.\n\n * Consolidate description of tilde-expansion that is done to\n   configuration variables that take pathname to a single place.\n\n * Correct faulty recommendation to use \"git submodule deinit .\" when\n   de-initialising all submodules, which would result in a strange\n   error message in a pathological corner case.\n\n * Many 'linkgit:<git documentation page>' references were broken,\n   which are all fixed with this.\n\n * \"git rerere\" can get confused by conflict markers deliberately left\n   by the inner merge step, because they are indistinguishable from\n   the real conflict markers left by the outermost merge which are\n   what the end user and \"rerere\" need to look at.  This was fixed by\n   making the conflict markers left by the inner merges a bit longer.\n   (merge 0f9fd5c jc/ll-merge-internal later to maint).\n\n * CI test was taught to build documentation pages.\n\n * \"git fsck\" learned to catch NUL byte in a commit object as\n   potential error and warn.\n\n * Portability enhancement for \"rebase -i\" to help platforms whose\n   shell does not like \"for i in <empty>\" (which is not POSIX-kosher).\n\n * On Windows, .git and optionally any files whose name starts with a\n   dot are now marked as hidden, with a core.hideDotFiles knob to\n   customize this behaviour.\n\n * Documentation for \"git merge --verify-signatures\" has been updated\n   to clarify that the signature of only the commit at the tip is\n   verified.  Also the phrasing used for signature and key validity is\n   adjusted to align with that used by OpenPGP.\n\n * A couple of bugs around core.autocrlf have been fixed.\n\n * Many commands normalize command line arguments from NFD to NFC\n   variant of UTF-8 on OSX, but commands in the \"diff\" family did\n   not, causing \"git diff $path\" to complain that no such path is\n   known to Git.  They have been taught to do the normalization.\n\n * \"git difftool\" learned to handle unmerged paths correctly in\n   dir-diff mode.\n\n * The \"are we talking with TTY, doing an interactive session?\"\n   detection has been updated to work better for \"Git for Windows\".\n\n * We forgot to add \"git log --decorate=auto\" to documentation when we\n   added the feature back in v2.1.0 timeframe.\n   (merge 462cbb4 rj/log-decorate-auto later to maint).\n\n * \"git fast-import --export-marks\" would overwrite the existing marks\n   file even when it makes a dump from its custom die routine.\n   Prevent it from doing so when we have an import-marks file but\n   haven't finished reading it.\n   (merge f4beed6 fc/fast-import-broken-marks-file later to maint).\n\n * \"git rebase -i\", after it fails to auto-resolve the conflict, had\n   an unnecessary call to \"git rerere\" from its very early days, which\n   was spotted recently; the call has been removed.\n   (merge 7063693 js/rebase-i-dedup-call-to-rerere later to maint).\n\n * Other minor clean-ups and documentation updates\n   (merge cd82b7a pa/cherry-pick-doc-typo later to maint).\n   (merge 2bb73ae rs/patch-id-use-skip-prefix later to maint).\n   (merge aa20cbc rs/apply-name-terminate later to maint).\n\n----------------------------------------------------------------\n\nChanges since v2.8.0 are as follows:\n\nAdam Dinwoodie (2):\n      config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES\n      commit: --amend -m '' silently fails to wipe message\n\nAlexander Kuleshov (1):\n      submodule-config: use hashmap_iter_first()\n\nAlexander Rinass (1):\n      diff: run arguments through precompose_argv\n\nArmin Kunaschik (2):\n      t4151: make sure argument to 'test -z' is given\n      t0008: 4 tests fail with ksh88\n\nBen Woosley (1):\n      git-rebase--merge: don't include absent parent as a base\n\nBenjamin Dopplinger (1):\n      README.md: format CLI commands with code syntax\n\nBrian Norris (3):\n      Documentation: config: improve word ordering for http.cookieFile\n      http: expand http.cookieFile as a path\n      config: consistently format $variables in monospaced font\n\nChristian Couder (5):\n      Documentation: talk about pager in api-trace.txt\n      builtin/apply: get rid of useless 'name' variable\n      builtin/apply: handle parse_binary() failure\n      builtin/apply: free patch when parse_chunk() fails\n      Git/SVN: die when there is no commit metadata\n\nDavid Aguilar (4):\n      mergetool: support delete/delete conflicts\n      mergetool: honor tempfile configuration when resolving delete conflicts\n      difftool: initialize variables for readability\n      difftool: handle unmerged files in dir-diff mode\n\nDavid Turner (5):\n      refs: move head_ref{,_submodule} to the common code\n      refs: move for_each_*ref* functions into common code\n      files-backend: break out ref reading\n      refs: move resolve_ref_unsafe into common code\n      refs: on symref reflog expire, lock symref not referrent\n\nDennis Kaarsemaker (1):\n      Makefile: remove dependency on git.spec\n\nElia Pinto (1):\n      api-trace.txt: fix typo\n\nElijah Newren (6):\n      merge-recursive: remove duplicate code\n      merge-recursive: do not check working copy when creating a virtual merge base\n      t7605: add a testcase demonstrating a bug with trivial merges\n      builtin/merge.c: fix a bug with trivial merges\n      merge-octopus: abort if index does not match HEAD\n      t6044: new merge testcases for when index doesn't match HEAD\n\nEric Sunshine (10):\n      lib-gpg: drop unnecessary \"missing GPG\" warning\n      t6302: normalize names and descriptions of signed tags\n      t6302: also test annotated in addition to signed tags\n      t6302: skip only signed tags rather than all tests when GPG is missing\n      git-format-patch.txt: don't show -s as shorthand for multiple options\n      t1500: be considerate to future potential tests\n      t1500: test_rev_parse: facilitate future test enhancements\n      t1500: avoid changing working directory outside of tests\n      t1500: avoid setting configuration options outside of tests\n      t1500: avoid setting environment variables outside of tests\n\nEric Wong (4):\n      send-email: more meaningful Message-ID\n      send-email: do not load Data::Dumper\n      pack-objects: warn on split packs disabling bitmaps\n      .mailmap: update to my shorter email address\n\nErwan Mathoniere (1):\n      Documentation: bold literals in man\n\nFelipe Contreras (1):\n      fast-import: do not truncate exported marks file\n\nGabriel Souza Franco (2):\n      fetch-pack: fix object_id of exact sha1\n      fetch-pack: update the documentation for \"<refs>...\" arguments\n\nJacob Keller (7):\n      submodule: don't pass empty string arguments to submodule--helper clone\n      submodule: check argc count for git submodule--helper clone\n      submodule: fix submodule--helper clone usage\n      submodule: fix segmentation fault in submodule--helper clone\n      quote: implement sq_quotef()\n      git: submodule honor -c credential.* from command line\n      xdiff: add recs_match helper function\n\nJacob Nisnevich (2):\n      mergetools: create mergetool_find_win32_cmd() helper function for winmerge\n      mergetools: add support for ExamDiff\n\nJan Durovec (2):\n      git-p4: clean-up code style in tests\n      git-p4: add P4 jobs to git commit message\n\nJeff King (55):\n      credential: let empty credential specs reset helper list\n      t1515: add tests for rev-parse out-of-repo helpers\n      add--interactive: allow custom diff highlighting programs\n      rev-parse: let some options run outside repository\n      strbuf_getwholeline: NUL-terminate getdelim buffer on error\n      setup: make startup_info available everywhere\n      setup: set startup_info->have_repository more reliably\n      remote: don't resolve HEAD in non-repository\n      mailmap: do not resolve blobs in a non-repository\n      grep: turn off gitlink detection for --no-index\n      use setup_git_directory() in test-* programs\n      setup: document check_repository_format()\n      wrap shared_repository global in get/set accessors\n      lazily load core.sharedrepository\n      check_repository_format_gently: stop using git_config_early\n      config: drop git_config_early\n      setup: refactor repo format reading and verification\n      init: use setup.c's repo version verification\n      setup: unify repository version callbacks\n      setup: drop repository_format_version global\n      verify_repository_format: mark messages for translation\n      send-email: ignore trailing whitespace in mailrc alias file\n      credential-cache--daemon: clarify \"exit\" action semantics\n      t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env\n      git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS\n      branch: fix shortening of non-remote symrefs\n      commit: do not ignore an empty message given by -m ''\n      config: lower-case first word of error strings\n      git_config_set_multivar_in_file: all non-zero returns are errors\n      git_config_set_multivar_in_file: handle \"unset\" errors\n      t5532: use write_script\n      send-pack: close demux pipe before finishing async process\n      run-command: teach async threads to ignore SIGPIPE\n      send-pack: isolate sigpipe in demuxer thread\n      fetch-pack: isolate sigpipe in demuxer thread\n      t5504: drop sigpipe=ok from push tests\n      remote.c: spell __attribute__ correctly\n      t5550: fix typo in $HTTPD_URL\n      t5550: break submodule config test into multiple sub-tests\n      submodule: export sanitized GIT_CONFIG_PARAMETERS\n      submodule--helper: move config-sanitizing to submodule.c\n      submodule: use prepare_submodule_repo_env consistently\n      submodule: stop sanitizing config options\n      t6302: simplify non-gpg cases\n      rebase--interactive: avoid empty list in shell for-loop\n      test-lib: set BASH_XTRACEFD automatically\n      t/lib-git-svn: drop $remote_git_svn and $git_svn_id\n      t9100,t3419: enclose all test code in single-quotes\n      t9107: use \"return 1\" instead of \"exit 1\"\n      t9107: switch inverted single/double quotes in test\n      t9103: modernize test style\n      always quote shell arguments to test -z/-n\n      cat-file: avoid noop calls to sha1_object_info_extended\n      cat-file: default to --buffer when --batch-all-objects is used\n      archive-tar: convert snprintf to xsnprintf\n\nJohannes Schindelin (16):\n      replace --edit: respect core.editor\n      name-rev: include taggerdate in considering the best name\n      win32mmap: set errno appropriately\n      mmap(win32): avoid copy-on-write when it is unnecessary\n      mmap(win32): avoid expensive fstat() call\n      http: support sending custom HTTP headers\n      tests: adjust the configuration for Apache 2.2\n      t5551: make the test for extra HTTP headers more robust\n      t3404: fix typo\n      submodule: ensure that -c http.extraheader is heeded\n      mingw: introduce the 'core.hideDotFiles' setting\n      mingw: remove unnecessary definition\n      Windows: only add a no-op pthread_sigmask() when needed\n      perf: let's disable symlinks when they are not available\n      perf: make the tests work in worktrees\n      perf: run \"rebase -i\" under perf\n\nJohannes Sixt (4):\n      Windows: shorten code by re-using convert_slashes()\n      Windows: add pthread_sigmask() that does nothing\n      t6044: replace seq by test_seq\n      rebase -i: remove an unnecessary 'rerere' invocation\n\nJohn Keeping (3):\n      config: fail if --get-urlmatch finds no value\n      Documentation/git-config: use bulleted list for exit codes\n      Documentation/git-config: fix --get-all description\n\nJunio C Hamano (77):\n      rerere: split conflict ID further\n      rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id\n      index-pack: correct --keep[=<msg>]\n      index-pack: add a helper function to derive .idx/.keep filename\n      rerere: handle leftover rr-cache/$ID directory and postimage files\n      rerere: delay the recording of preimage\n      rerere: allow multiple variants to exist\n      t4200: rerere a merge with two identical conflicts\n      rerere: do use multiple variants\n      apply: remove unused call to free() in gitdiff_{old,new}name()\n      merge: fix NULL pointer dereference when merging nothing into void\n      merge: refuse to create too cool a merge by default\n      pretty: enable --expand-tabs by default for selected pretty formats\n      pretty: allow tweaking tabwidth in --expand-tabs\n      submodule--helper: do not borrow absolute_path() result for too long\n      Git 2.8.1\n      First batch for post 2.8 cycle\n      pretty: test --expand-tabs\n      Makefile: fix misdirected redirections\n      Second batch for post 2.8 cycle\n      Makefile: stop pretending to support rpmbuild\n      rerere: gc and clear\n      rerere: move code related to \"forget\" together\n      rerere: split code to call ll_merge() further\n      rerere: adjust 'forget' to multi-variant world order\n      setup.c: do not feed NULL to \"%.*s\" even with precision 0\n      Third batch for post 2.8 cycle\n      http: differentiate socks5:// and socks5h://\n      t1020: do not overuse printf and use write_script\n      t3404: use write_script\n      Fourth batch for post 2.8 cycle\n      Start preparing for 2.8.2\n      fsck_commit_buffer(): do not special case the last validation\n      ll-merge: fix typo in comment\n      Prepare for 2.8.2\n      Makefile: clean *.o files we create\n      Fifth batch for post 2.8 cycle\n      t3033: avoid 'ambiguous refs' warning\n      pull: pass --allow-unrelated-histories to \"git merge\"\n      Sixth batch for post 2.8 cycle\n      send-email: fix grammo in the prompt that asks e-mail recipients\n      Seventh batch for post 2.8 cycle\n      Git 2.8.2\n      Eighth batch for 2.9\n      diff: undocument the compaction heuristic knobs for experimentation\n      Start preparing for 2.8.3\n      commit-tree: do not pay attention to commit.gpgsign\n      Ninth batch for 2.9\n      config: describe 'pathname' value type\n      Tenth batch for 2.9\n      Almost ready for 2.8.3\n      test-lib-functions.sh: remove misleading comment on test_seq\n      test-lib-functions.sh: rewrite test_seq without Perl\n      ll-merge: use a longer conflict marker for internal merge\n      t6036: remove pointless test that expects failure\n      Documentation: fix linkgit references\n      fsck: detect and warn a commit with embedded NUL\n      ci: validate \"linkgit:\" in documentation\n      test-parse-options: fix output when callback option fails\n      test-parse-options: --expect=<string> option to simplify tests\n      t0040: remove unused test helpers\n      t0040: convert a few tests to use test-parse-options --expect\n      Eleventh batch for 2.9\n      rerere: plug memory leaks upon \"rerere forget\" failure\n      Twelfth batch for 2.9\n      Thirteenth batch for 2.9\n      Git 2.8.3\n      rerere: remove an null statement\n      Git 2.9-rc0\n      t4204: do not let $name variable clobbered\n      Start preparing for 2.8.4\n      Final batch before 2.9-rc1\n      More topics for 2.8.4\n      Git 2.9-rc1\n      Almost ready for 2.9-rc2\n      Git 2.8.4\n      Git 2.9-rc2\n\nKarsten Blees (1):\n      mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)\n\nKazuki Yamaguchi (10):\n      branch -d: refuse deleting a branch which is currently checked out\n      refs: add a new function set_worktree_head_symref\n      branch -m: update all per-worktree HEADs\n      set_worktree_head_symref(): fix error message\n      imap-send: use HMAC() function provided by OpenSSL\n      imap-send: check NULL return of SSL_CTX_new()\n      imap-send: avoid deprecated TLSv1_method()\n      configure: remove checking for HMAC_CTX_cleanup\n      imap-send: check for NOLOGIN capability only when using LOGIN command\n      imap-send: fix CRAM-MD5 response calculation\n\nKeller Fuchs (1):\n      Documentation: clarify signature verification\n\nLars Schneider (8):\n      git-p4: map a P4 user to Git author name and email address\n      travis-ci: update Git-LFS and P4 to the latest version\n      travis-ci: express Linux/OS X dependency versions more clearly\n      git-p4: fix Git LFS pointer parsing\n      t9824: fix wrong reference value\n      Documentation: add setup instructions for Travis CI\n      travis-ci: build documentation\n      travis-ci: enable Git SVN tests t91xx on Linux\n\nLaurent Arnoud (1):\n      tag: add the option to force signing of annotated tags\n\nLi Peng (1):\n      typofix: assorted typofixes in comments, documentation and messages\n\nLinus Torvalds (1):\n      pretty: expand tabs in indented logs to make things line up properly\n\nLuke Diamand (3):\n      git-p4 tests: cd to / before running python\n      git-p4 tests: work with python3 as well as python2\n      git-p4 tests: time_in_seconds should use $PYTHON_PATH\n\nMarios Titas (2):\n      ident: check for useConfigOnly before auto-detection of name/email\n      ident: give \"please tell me\" message upon useConfigOnly error\n\nMatthieu Moy (13):\n      Documentation/diff-config: fix description of diff.renames\n      t4001-diff-rename: wrap file creations in a test\n      t: add tests for diff.renames (true/false/unset)\n      log: introduce init_log_defaults()\n      diff: activate diff.renames by default\n      lockfile: mark strings for translation\n      lockfile: improve error message when lockfile exists\n      git.spec.in: use README.md, not README\n      README.md: don't take 'commandname' literally\n      git-multimail: update to release 1.3.0\n      git-multimail: update to release 1.3.1\n      Makefile: move 'ifdef DEVELOPER' after config.mak* inclusion\n      Makefile: add $(DEVELOPER_CFLAGS) variable\n\nMehul Jain (9):\n      git-pull.c: introduce git_pull_config()\n      pull --rebase: add --[no-]autostash flag\n      t5520: use consistent capitalization in test titles\n      t5520: ensure consistent test conditions\n      t5520: use better test to check stderr output\n      t5520: factor out common \"successful autostash\" code\n      t5520: factor out common \"failing autostash\" code\n      t5520: reduce commom lines of code\n      t5520: test --[no-]autostash with pull.rebase=true\n\nMichael Haggerty (19):\n      t1430: test the output and error of some commands more carefully\n      t1430: clean up broken refs/tags/shadow\n      t1430: don't rely on symbolic-ref for creating broken symrefs\n      t1430: test for-each-ref in the presence of badly-named refs\n      t1430: improve test coverage of deletion of badly-named refs\n      resolve_missing_loose_ref(): simplify semantics\n      resolve_ref_unsafe(): use for loop to count up to MAXDEPTH\n      resolve_ref_unsafe(): ensure flags is always set\n      resolve_ref_1(): eliminate local variable\n      resolve_ref_1(): reorder code\n      resolve_ref_1(): eliminate local variable \"bad_name\"\n      read_raw_ref(): manage own scratch space\n      files-backend: inline resolve_ref_1() into resolve_ref_unsafe()\n      read_raw_ref(): change flags parameter to unsigned int\n      fsck_head_link(): remove unneeded flag variable\n      cmd_merge(): remove unneeded flag variable\n      checkout_paths(): remove unneeded flag variable\n      check_aliased_update(): check that dst_name is non-NULL\n      show_head_ref(): check the result of resolve_ref_namespace()\n\nMichael J Gruber (1):\n      completion: complete --cherry-mark for git log\n\nMichael Procter (1):\n      upload-pack: use argv_array for pack_objects\n\nMichael Rappazzo (1):\n      Documentation: add instructions to help setup gmail 2FA\n\nNguyễn Thái Ngọc Duy (62):\n      git-apply.txt: remove a space\n      git-apply.txt: mention the behavior inside a subdir\n      apply: report patch skipping in verbose mode\n      test helpers: move test-* to t/helper/ subdirectory\n      dir.c: remove dead function fnmatch_icase()\n      wrapper.c: delete dead function git_mkstemps()\n      dir.c: rename str(n)cmp_icase to fspath(n)cmp\n      path.c: add git_common_path() and strbuf_git_common_path()\n      worktree.c: store \"id\" instead of \"git_dir\"\n      worktree.c: make find_shared_symref() return struct worktree *\n      worktree.c: mark current worktree\n      path.c: refactor and add worktree_git_path()\n      wt-status.c: split rebase detection out of wt_status_get_state()\n      wt-status.c: make wt_status_check_rebase() work on any worktree\n      worktree.c: avoid referencing to worktrees[i] multiple times\n      worktree.c: check whether branch is rebased in another worktree\n      wt-status.c: split bisect detection out of wt_status_get_state()\n      worktree.c: check whether branch is bisected in another worktree\n      branch: do not rename a branch under bisect or rebase\n      remote.c: specify correct plural form in \"commit diverge\" message\n      usage.c: move format processing out of die_errno()\n      usage.c: add warning_errno() and error_errno()\n      bisect.c: use die_errno() and warning_errno()\n      builtin/am.c: use error_errno()\n      builtin/branch.c: use error_errno()\n      builtin/fetch.c: use error_errno()\n      builtin/help.c: use warning_errno()\n      builtin/mailsplit.c: use error_errno()\n      builtin/merge-file.c: use error_errno()\n      builtin/pack-objects.c: use die_errno() and warning_errno()\n      builtin/rm.c: use warning_errno()\n      builtin/update-index.c: prefer \"err\" to \"errno\" in process_lstat_error\n      builtin/upload-archive.c: use error_errno()\n      builtin/worktree.c: use error_errno()\n      check-racy.c: use error_errno()\n      combine-diff.c: use error_errno()\n      compat/win32/syslog.c: use warning_errno()\n      config.c: use error_errno()\n      connected.c: use error_errno()\n      copy.c: use error_errno()\n      credential-cache--daemon.c: use warning_errno()\n      diff-no-index.c: use error_errno()\n      editor.c: use error_errno()\n      entry.c: use error_errno()\n      fast-import.c: use error_errno()\n      gpg-interface.c: use error_errno()\n      grep.c: use error_errno()\n      http.c: use error_errno() and warning_errno()\n      ident.c: use warning_errno()\n      mailmap.c: use error_errno()\n      reachable.c: use error_errno()\n      rerere.c: use error_errno() and warning_errno()\n      run-command.c: use error_errno()\n      sequencer.c: use error_errno()\n      server-info.c: use error_errno()\n      sha1_file.c: use {error,die,warning}_errno()\n      transport-helper.c: use error_errno()\n      unpack-trees.c: use error_errno()\n      upload-pack.c: use error_errno()\n      vcs-svn: use error_errno()\n      wrapper.c: use warning_errno()\n      wrap-for-bin.sh: regenerate bin-wrappers when switching branches\n\nNikola Forró (1):\n      difftool/mergetool: make the form of yes/no questions consistent\n\nOri Avtalion (1):\n      Documentation: git diff --check detects conflict markers\n\nPablo Santiago Blum de Aguiar (1):\n      git-cherry-pick.txt: correct a small typo\n\nPranit Bauva (9):\n      t/t7502 : drop duplicate test\n      api-parse-options.txt: document OPT_CMDMODE()\n      t0040-test-parse-options.sh: fix style issues\n      test-parse-options: print quiet as integer\n      t0040-parse-options: improve test coverage\n      t/t7507: improve test coverage\n      parse-options.c: make OPTION_COUNTUP respect \"unspecified\" values\n      t7507-commit-verbose: improve test coverage by testing number of diffs\n      commit: add a commit.verbose config variable\n\nRalf Thielow (4):\n      completion: add option '--guides' to 'git help'\n      completion: add 'revisions' and 'everyday' to 'git help'\n      rebase-i: print an abbreviated hash when stop for editing\n      string_list: use string-list API in unsorted_string_list_lookup()\n\nRamsay Jones (3):\n      xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits\n      xdiff/xprepare: fix a memory leak\n      log: document the --decorate=auto option\n\nRay Zhang (1):\n      worktree: add: introduce --checkout option\n\nRené Nyffenegger (1):\n      Documentation: fix typo 'In such these cases'\n\nRené Scharfe (3):\n      apply: remove unused parameters from name_terminate()\n      patch-id: use starts_with() and skip_prefix()\n      perf: make the tests work without a worktree\n\nSZEDER Gábor (6):\n      diffcore: fix iteration order of identical files during rename detection\n      for-each-ref: fix description of '--contains' in manpage\n      test-lib: simplify '--option=value' parsing\n      t9824: fix broken &&-chain in a subshell\n      t5510: run auto-gc in the foreground\n      Documentation/git-send-email: fix typo in gmail 2FA section\n\nSantiago Torres (6):\n      builtin/verify-tag.c: ignore SIGPIPE in gpg-interface\n      t7030: test verifying multiple tags\n      verify-tag: update variable name and type\n      verify-tag: prepare verify_tag for libification\n      verify-tag: move tag verification code to tag.c\n      tag -v: verify directly rather than exec-ing verify-tag\n\nSaurav Sachidanand (1):\n      dir: store EXC_FLAG_* values in unsigned integers\n\nShin Kojima (1):\n      gitweb: apply fallback encoding before highlight\n\nSidhant Sharma [:tk] (1):\n      builtin/receive-pack.c: use parse_options API\n\nStanislav Kolotinskiy (1):\n      git-send-pack: fix --all option when used with directory\n\nStefan Beller (46):\n      submodule-config: keep update strategy around\n      submodule-config: drop check against NULL\n      fetching submodules: respect `submodule.fetchJobs` config option\n      submodule update: direct error message to stderr\n      run_processes_parallel: treat output of children as byte array\n      run_processes_parallel: rename parameters for the callbacks\n      git submodule update: have a dedicated helper for cloning\n      submodule helper: remove double 'fatal: ' prefix\n      submodule update: expose parallelism to the user\n      clone: allow an explicit argument for parallel submodule clones\n      clone tests: rename t57* => t56*\n      rebase: decouple --exec from --interactive\n      t3404: cleanup double empty lines between tests\n      submodule foreach: correct path display in recursive submodules\n      submodule update --init: correct path handling in recursive submodules\n      submodule status: correct path handling in recursive submodules\n      submodule update: align reporting path for custom command execution\n      submodule update: test recursive path reporting from subdirectory\n      t7407: make expectation as clear as possible\n      recursive submodules: test for relative paths\n      submodule--helper: fix potential NULL-dereference\n      submodule--helper clone: create the submodule path just once\n      notes: don't leak memory in git_config_get_notes_strategy\n      abbrev_sha1_in_line: don't leak memory\n      bundle: don't leak an fd in case of early return\n      credential-cache, send_request: close fd when done\n      submodule--helper, module_clone: always operate on absolute paths\n      submodule--helper, module_clone: catch fprintf failure\n      submodule: port resolve_relative_url from shell to C\n      submodule: port init from shell to C\n      xdiff: implement empty line chunk heuristic\n      mv: allow moving nested submodules\n      clone: add `--shallow-submodules` flag\n      config doc: improve exit code listing\n      config.c: drop local variable\n      submodule-config: don't shadow `cache`\n      submodule init: fail gracefully with a missing .gitmodules file\n      submodule--helper update-clone: abort gracefully on missing .gitmodules\n      submodule deinit test: fix broken && chain in subshell\n      submodule init: redirect stdout to stderr\n      t7300: mark test with SANITY\n      submodule deinit: require '--all' instead of '.' for all submodules\n      t3513: do not compress backup tar file\n      t6041: do not compress backup tar file\n      submodule--helper: offer a consistent API\n      submodule: remove bashism from shell script\n\nStephen P. Smith (1):\n      wt-status.c: set commitable bit if there is a meaningful merge.\n\nSven Strickroth (3):\n      commit: do not lose SQUASH_MSG contents\n      MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more\n      MSVC: use shipped headers instead of fallback definitions\n\nTorsten Bögershausen (6):\n      correct blame for files commited with CRLF\n      t0027: make commit_chk_wrnNNO() reliable\n      convert: allow core.autocrlf=input and core.eol=crlf\n      t0027: test cases for combined attributes\n      convert.c: ident + core.autocrlf didn't work\n      t5601: Remove trailing space in sed expression\n\nVasco Almeida (16):\n      l10n: fr: fix transcation of \"dir\"\n      l10n: fr: fix wrongly translated option name\n      l10n: fr: change \"id de clé\" to match \"id-clé\"\n      l10n: fr: don't translate \"merge\" as a parameter\n      i18n: index-pack: use plural string instead of normal one\n      i18n: builtin/branch.c: mark option for translation\n      i18n: unpack-trees: mark strings for translation\n      i18n: builtin/rm.c: remove a comma ',' from string\n      i18n: branch: unmark string for translation\n      i18n: branch: move comment for translators\n      i18n: git-parse-remote.sh: mark strings for translation\n      i18n: builtin/pull.c: mark placeholders for translation\n      i18n: builtin/pull.c: split strings marked for translation\n      i18n: remote: add comment for translators\n      Documentation/git-mailinfo: fix typo\n      i18n: unpack-trees: avoid substituting only a verb in sentences\n\nXiaolong Ye (4):\n      patch-ids: make commit_patch_id() a public helper function\n      format-patch: add '--base' option to record base tree info\n      format-patch: introduce --base=auto option\n      format-patch: introduce format.useAutoBase configuration\n\nbrian m. carlson (6):\n      sha1-name: introduce a get_oid() function\n      test-match-trees: convert to use struct object_id\n      match-trees: convert shift_tree() and shift_tree_by() to use object_id\n      struct name_entry: use struct object_id instead of unsigned char sha1[20]\n      tree-walk: convert tree_entry_extract() to use struct object_id\n      match-trees: convert several leaf functions to use struct object_id\n\nÆvar Arnfjörð Bjarmason (4):\n      githooks.txt: improve the intro section\n      githooks.txt: amend dangerous advice about 'update' hook ACL\n      githooks.txt: minor improvements to the grammar & phrasing\n      hooks: allow customizing where the hook directory is\n"}]}