FM / RelNotes

/snap/gh/502/usr/share/doc/git/RelNotes/

/snap/gh/502/usr/share/doc/git/RelNotes

Name	Size	Mode	Actions
1.5.0.1.txt	1255	0644	edit dl rm
1.5.0.2.txt	2308	0644	edit dl rm
1.5.0.3.txt	1577	0644	edit dl rm
1.5.0.4.txt	462	0644	edit dl rm
1.5.0.5.txt	609	0644	edit dl rm
1.5.0.6.txt	484	0644	edit dl rm
1.5.0.7.txt	482	0644	edit dl rm
1.5.0.txt	18638	0644	edit dl rm
1.5.1.1.txt	2164	0644	edit dl rm
1.5.1.2.txt	1651	0644	edit dl rm
1.5.1.3.txt	1566	0644	edit dl rm
1.5.1.4.txt	843	0644	edit dl rm
1.5.1.5.txt	1430	0644	edit dl rm
1.5.1.6.txt	1519	0644	edit dl rm
1.5.1.txt	13288	0644	edit dl rm
1.5.2.1.txt	1457	0644	edit dl rm
1.5.2.2.txt	2086	0644	edit dl rm
1.5.2.3.txt	796	0644	edit dl rm
1.5.2.4.txt	802	0644	edit dl rm
1.5.2.5.txt	928	0644	edit dl rm
1.5.2.txt	7355	0644	edit dl rm
1.5.3.1.txt	326	0644	edit dl rm
1.5.3.2.txt	1931	0644	edit dl rm
1.5.3.3.txt	896	0644	edit dl rm
1.5.3.4.txt	1208	0644	edit dl rm
1.5.3.5.txt	3376	0644	edit dl rm
1.5.3.6.txt	1432	0644	edit dl rm
1.5.3.7.txt	1584	0644	edit dl rm
1.5.3.8.txt	783	0644	edit dl rm
1.5.3.txt	14030	0644	edit dl rm
1.5.4.1.txt	524	0644	edit dl rm
1.5.4.2.txt	1530	0644	edit dl rm
1.5.4.3.txt	997	0644	edit dl rm
1.5.4.4.txt	2617	0644	edit dl rm
1.5.4.5.txt	2241	0644	edit dl rm
1.5.4.6.txt	1440	0644	edit dl rm
1.5.4.7.txt	342	0644	edit dl rm
1.5.4.txt	14424	0644	edit dl rm
1.5.5.1.txt	1499	0644	edit dl rm
1.5.5.2.txt	772	0644	edit dl rm
1.5.5.3.txt	305	0644	edit dl rm
1.5.5.4.txt	140	0644	edit dl rm
1.5.5.5.txt	449	0644	edit dl rm
1.5.5.6.txt	342	0644	edit dl rm
1.5.5.txt	7596	0644	edit dl rm
1.5.6.1.txt	793	0644	edit dl rm
1.5.6.2.txt	1457	0644	edit dl rm
1.5.6.3.txt	2113	0644	edit dl rm
1.5.6.4.txt	1573	0644	edit dl rm
1.5.6.5.txt	1041	0644	edit dl rm
1.5.6.6.txt	342	0644	edit dl rm
1.5.6.txt	3843	0644	edit dl rm
1.6.0.1.txt	1188	0644	edit dl rm
1.6.0.2.txt	2840	0644	edit dl rm
1.6.0.3.txt	4318	0644	edit dl rm
1.6.0.4.txt	1293	0644	edit dl rm
1.6.0.5.txt	2014	0644	edit dl rm
1.6.0.6.txt	1193	0644	edit dl rm
1.6.0.txt	10049	0644	edit dl rm
1.6.1.1.txt	1976	0644	edit dl rm
1.6.1.2.txt	1640	0644	edit dl rm
1.6.1.3.txt	847	0644	edit dl rm
1.6.1.4.txt	1593	0644	edit dl rm
1.6.1.txt	10322	0644	edit dl rm
1.6.2.1.txt	597	0644	edit dl rm
1.6.2.2.txt	1508	0644	edit dl rm
1.6.2.3.txt	781	0644	edit dl rm
1.6.2.4.txt	1351	0644	edit dl rm
1.6.2.5.txt	688	0644	edit dl rm
1.6.2.txt	5892	0644	edit dl rm
1.6.3.1.txt	343	0644	edit dl rm
1.6.3.2.txt	2271	0644	edit dl rm
1.6.3.3.txt	1379	0644	edit dl rm
1.6.3.4.txt	1206	0644	edit dl rm
1.6.3.txt	6791	0644	edit dl rm
1.6.4.1.txt	1906	0644	edit dl rm
1.6.4.2.txt	1210	0644	edit dl rm
1.6.4.3.txt	1146	0644	edit dl rm
1.6.4.4.txt	1034	0644	edit dl rm
1.6.4.5.txt	605	0644	edit dl rm
1.6.4.txt	5357	0644	edit dl rm
1.6.5.1.txt	549	0644	edit dl rm
1.6.5.2.txt	581	0644	edit dl rm
1.6.5.3.txt	2485	0644	edit dl rm
1.6.5.4.txt	1275	0644	edit dl rm
1.6.5.5.txt	1891	0644	edit dl rm
1.6.5.6.txt	791	0644	edit dl rm
1.6.5.7.txt	771	0644	edit dl rm
1.6.5.8.txt	900	0644	edit dl rm
1.6.5.9.txt	581	0644	edit dl rm
1.6.5.txt	6294	0644	edit dl rm
1.6.6.1.txt	1230	0644	edit dl rm
1.6.6.2.txt	1599	0644	edit dl rm
1.6.6.3.txt	751	0644	edit dl rm
1.6.6.txt	9463	0644	edit dl rm
1.7.0.1.txt	1287	0644	edit dl rm
1.7.0.2.txt	1476	0644	edit dl rm
1.7.0.3.txt	1176	0644	edit dl rm
1.7.0.4.txt	888	0644	edit dl rm
1.7.0.5.txt	915	0644	edit dl rm
1.7.0.6.txt	365	0644	edit dl rm
1.7.0.7.txt	467	0644	edit dl rm
1.7.0.8.txt	452	0644	edit dl rm
1.7.0.9.txt	219	0644	edit dl rm
1.7.0.txt	8765	0644	edit dl rm
1.7.1.1.txt	3825	0644	edit dl rm
1.7.1.2.txt	1069	0644	edit dl rm
1.7.1.3.txt	452	0644	edit dl rm
1.7.1.4.txt	219	0644	edit dl rm
1.7.1.txt	2941	0644	edit dl rm
1.7.2.1.txt	806	0644	edit dl rm
1.7.2.2.txt	695	0644	edit dl rm
1.7.2.3.txt	1355	0644	edit dl rm
1.7.2.4.txt	452	0644	edit dl rm
1.7.2.5.txt	219	0644	edit dl rm
1.7.2.txt	5978	0644	edit dl rm
1.7.3.1.txt	425	0644	edit dl rm
1.7.3.2.txt	149	0644	edit dl rm
1.7.3.3.txt	2075	0644	edit dl rm
1.7.3.4.txt	1639	0644	edit dl rm
1.7.3.5.txt	1454	0644	edit dl rm
1.7.3.txt	2642	0644	edit dl rm
1.7.4.1.txt	899	0644	edit dl rm
1.7.4.2.txt	2290	0644	edit dl rm
1.7.4.3.txt	1245	0644	edit dl rm
1.7.4.4.txt	1288	0644	edit dl rm
1.7.4.5.txt	127	0644	edit dl rm
1.7.4.txt	6502	0644	edit dl rm
1.7.5.1.txt	1905	0644	edit dl rm
1.7.5.2.txt	2189	0644	edit dl rm
1.7.5.3.txt	1101	0644	edit dl rm
1.7.5.4.txt	754	0644	edit dl rm
1.7.5.txt	5329	0644	edit dl rm
1.7.6.1.txt	2248	0644	edit dl rm
1.7.6.2.txt	245	0644	edit dl rm
1.7.6.3.txt	792	0644	edit dl rm
1.7.6.4.txt	1264	0644	edit dl rm
1.7.6.5.txt	969	0644	edit dl rm
1.7.6.6.txt	587	0644	edit dl rm
1.7.6.txt	5507	0644	edit dl rm
1.7.7.1.txt	2432	0644	edit dl rm
1.7.7.2.txt	1630	0644	edit dl rm
1.7.7.3.txt	696	0644	edit dl rm
1.7.7.4.txt	444	0644	edit dl rm
1.7.7.5.txt	481	0644	edit dl rm
1.7.7.6.txt	791	0644	edit dl rm
1.7.7.7.txt	334	0644	edit dl rm
1.7.7.txt	5408	0644	edit dl rm
1.7.8.1.txt	1438	0644	edit dl rm
1.7.8.2.txt	2925	0644	edit dl rm
1.7.8.3.txt	431	0644	edit dl rm
1.7.8.4.txt	921	0644	edit dl rm
1.7.8.5.txt	606	0644	edit dl rm
1.7.8.6.txt	621	0644	edit dl rm
1.7.8.txt	6351	0644	edit dl rm
1.7.9.1.txt	2461	0644	edit dl rm
1.7.9.2.txt	2706	0644	edit dl rm
1.7.9.3.txt	1958	0644	edit dl rm
1.7.9.4.txt	887	0644	edit dl rm
1.7.9.5.txt	731	0644	edit dl rm
1.7.9.6.txt	432	0644	edit dl rm
1.7.9.7.txt	371	0644	edit dl rm
1.7.9.txt	4373	0644	edit dl rm
1.7.10.1.txt	3073	0644	edit dl rm
1.7.10.2.txt	3445	0644	edit dl rm
1.7.10.3.txt	1876	0644	edit dl rm
1.7.10.4.txt	1056	0644	edit dl rm
1.7.10.5.txt	397	0644	edit dl rm
1.7.10.txt	9025	0644	edit dl rm
1.7.11.1.txt	224	0644	edit dl rm
1.7.11.2.txt	2291	0644	edit dl rm
1.7.11.3.txt	2314	0644	edit dl rm
1.7.11.4.txt	1171	0644	edit dl rm
1.7.11.5.txt	1292	0644	edit dl rm
1.7.11.6.txt	3436	0644	edit dl rm
1.7.11.7.txt	1959	0644	edit dl rm
1.7.11.txt	5506	0644	edit dl rm
1.7.12.1.txt	5800	0644	edit dl rm
1.7.12.2.txt	1767	0644	edit dl rm
1.7.12.3.txt	1330	0644	edit dl rm
1.7.12.4.txt	712	0644	edit dl rm
1.7.12.txt	5336	0644	edit dl rm
1.8.0.1.txt	2454	0644	edit dl rm
1.8.0.2.txt	1250	0644	edit dl rm
1.8.0.3.txt	424	0644	edit dl rm
1.8.0.txt	11073	0644	edit dl rm
1.8.1.1.txt	3577	0644	edit dl rm
1.8.1.2.txt	991	0644	edit dl rm
1.8.1.3.txt	1740	0644	edit dl rm
1.8.1.4.txt	337	0644	edit dl rm
1.8.1.5.txt	1940	0644	edit dl rm
1.8.1.6.txt	1563	0644	edit dl rm
1.8.1.txt	9624	0644	edit dl rm
1.8.2.1.txt	4561	0644	edit dl rm
1.8.2.2.txt	2438	0644	edit dl rm
1.8.2.3.txt	672	0644	edit dl rm
1.8.2.txt	22140	0644	edit dl rm
1.8.3.1.txt	433	0644	edit dl rm
1.8.3.2.txt	2406	0644	edit dl rm
1.8.3.3.txt	1778	0644	edit dl rm
1.8.3.4.txt	700	0644	edit dl rm
1.8.3.txt	18336	0644	edit dl rm
1.8.4.1.txt	3012	0644	edit dl rm
1.8.4.2.txt	3294	0644	edit dl rm
1.8.4.3.txt	2208	0644	edit dl rm
1.8.4.4.txt	342	0644	edit dl rm
1.8.4.5.txt	421	0644	edit dl rm
1.8.4.txt	21237	0644	edit dl rm
1.8.5.1.txt	254	0644	edit dl rm
1.8.5.2.txt	656	0644	edit dl rm
1.8.5.3.txt	859	0644	edit dl rm
1.8.5.4.txt	1912	0644	edit dl rm
1.8.5.5.txt	1466	0644	edit dl rm
1.8.5.6.txt	1686	0644	edit dl rm
1.8.5.txt	20348	0644	edit dl rm
1.9.0.txt	15197	0644	edit dl rm
1.9.1.txt	2409	0644	edit dl rm
1.9.2.txt	2807	0644	edit dl rm
1.9.3.txt	635	0644	edit dl rm
1.9.4.txt	607	0644	edit dl rm
1.9.5.txt	1678	0644	edit dl rm
2.0.0.txt	15911	0644	edit dl rm
2.0.1.txt	5171	0644	edit dl rm
2.0.2.txt	1350	0644	edit dl rm
2.0.3.txt	592	0644	edit dl rm
2.0.4.txt	153	0644	edit dl rm
2.0.5.txt	1678	0644	edit dl rm
2.1.0.txt	17336	0644	edit dl rm
2.1.1.txt	1806	0644	edit dl rm
2.1.2.txt	768	0644	edit dl rm
2.1.3.txt	970	0644	edit dl rm
2.1.4.txt	1678	0644	edit dl rm
2.2.0.txt	13338	0644	edit dl rm
2.2.1.txt	1674	0644	edit dl rm
2.2.2.txt	2357	0644	edit dl rm
2.2.3.txt	284	0644	edit dl rm
2.3.0.txt	12859	0644	edit dl rm
2.3.1.txt	1998	0644	edit dl rm
2.3.2.txt	3009	0644	edit dl rm
2.3.3.txt	1522	0644	edit dl rm
2.3.4.txt	1150	0644	edit dl rm
2.3.5.txt	1767	0644	edit dl rm
2.3.6.txt	400	0644	edit dl rm
2.3.7.txt	761	0644	edit dl rm
2.3.8.txt	814	0644	edit dl rm
2.3.9.txt	284	0644	edit dl rm
2.3.10.txt	711	0644	edit dl rm
2.4.0.txt	22110	0644	edit dl rm
2.4.1.txt	1654	0644	edit dl rm
2.4.2.txt	1954	0644	edit dl rm
2.4.3.txt	3067	0644	edit dl rm
2.4.4.txt	1230	0644	edit dl rm
2.4.5.txt	1066	0644	edit dl rm
2.4.6.txt	744	0644	edit dl rm
2.4.7.txt	2213	0644	edit dl rm
2.4.8.txt	704	0644	edit dl rm
2.4.9.txt	284	0644	edit dl rm
2.4.10.txt	711	0644	edit dl rm
2.4.11.txt	424	0644	edit dl rm
2.4.12.txt	479	0644	edit dl rm
2.5.0.txt	26120	0644	edit dl rm
2.5.1.txt	2861	0644	edit dl rm
2.5.2.txt	2654	0644	edit dl rm
2.5.3.txt	565	0644	edit dl rm
2.5.4.txt	709	0644	edit dl rm
2.5.5.txt	420	0644	edit dl rm
2.5.6.txt	475	0644	edit dl rm
2.6.0.txt	16434	0644	edit dl rm
2.6.1.txt	705	0644	edit dl rm
2.6.2.txt	2678	0644	edit dl rm
2.6.3.txt	4904	0644	edit dl rm
2.6.4.txt	2163	0644	edit dl rm
2.6.5.txt	2542	0644	edit dl rm
2.6.6.txt	420	0644	edit dl rm
2.6.7.txt	475	0644	edit dl rm
2.7.0.txt	17497	0644	edit dl rm
2.7.1.txt	3533	0644	edit dl rm
2.7.2.txt	1739	0644	edit dl rm
2.7.3.txt	2601	0644	edit dl rm
2.7.4.txt	420	0644	edit dl rm
2.7.5.txt	544	0644	edit dl rm
2.7.6.txt	951	0644	edit dl rm
2.8.0.txt	19681	0644	edit dl rm
2.8.1.txt	255	0644	edit dl rm
2.8.2.txt	2704	0644	edit dl rm
2.8.3.txt	4426	0644	edit dl rm
2.8.4.txt	3061	0644	edit dl rm
2.8.5.txt	475	0644	edit dl rm
2.8.6.txt	122	0644	edit dl rm
2.9.0.txt	21833	0644	edit dl rm
2.9.1.txt	4930	0644	edit dl rm
2.9.2.txt	427	0644	edit dl rm
2.9.3.txt	7465	0644	edit dl rm
2.9.4.txt	4384	0644	edit dl rm
2.9.5.txt	122	0644	edit dl rm
2.10.0.txt	30131	0644	edit dl rm
2.10.1.txt	5730	0644	edit dl rm
2.10.2.txt	5298	0644	edit dl rm
2.10.3.txt	2353	0644	edit dl rm
2.10.4.txt	124	0644	edit dl rm
2.10.5.txt	561	0644	edit dl rm
2.11.0.txt	27992	0644	edit dl rm
2.11.1.txt	6814	0644	edit dl rm
2.11.2.txt	479	0644	edit dl rm
2.11.3.txt	124	0644	edit dl rm
2.11.4.txt	561	0644	edit dl rm
2.12.0.txt	22092	0644	edit dl rm
2.12.1.txt	1611	0644	edit dl rm
2.12.2.txt	3614	0644	edit dl rm
2.12.3.txt	2539	0644	edit dl rm
2.12.4.txt	124	0644	edit dl rm
2.12.5.txt	561	0644	edit dl rm
2.13.0.txt	28222	0644	edit dl rm
2.13.1.txt	5026	0644	edit dl rm
2.13.2.txt	2178	0644	edit dl rm
2.13.3.txt	2389	0644	edit dl rm
2.13.4.txt	1078	0644	edit dl rm
2.13.5.txt	124	0644	edit dl rm
2.13.6.txt	561	0644	edit dl rm
2.13.7.txt	780	0644	edit dl rm
2.14.0.txt	22730	0644	edit dl rm
2.14.1.txt	124	0644	edit dl rm
2.14.2.txt	4486	0644	edit dl rm
2.14.3.txt	4010	0644	edit dl rm
2.14.4.txt	167	0644	edit dl rm
2.15.0.txt	21971	0644	edit dl rm
2.15.1.txt	3434	0644	edit dl rm
2.15.2.txt	1894	0644	edit dl rm
2.16.0.txt	20745	0644	edit dl rm
2.16.1.txt	305	0644	edit dl rm
2.16.2.txt	1083	0644	edit dl rm
2.16.3.txt	1756	0644	edit dl rm
2.16.4.txt	167	0644	edit dl rm
2.17.0.txt	17884	0644	edit dl rm
2.17.1.txt	617	0644	edit dl rm

Edit: /snap/gh/502/usr/share/doc/git/RelNotes/2.6.0.txt (16434B)

Git 2.6 Release Notes
=====================

Updates since v2.5
------------------

UI, Workflows & Features

* An asterisk as a substring (as opposed to the entirety) of a path
   component for both side of a refspec, e.g.
   "refs/heads/o*:refs/remotes/heads/i*", is now allowed.

* New userdiff pattern definition for fountain screenwriting markup
   format has been added.

* "git log" and friends learned a new "--date=format:..." option to
   format timestamps using system's strftime(3).

* "git fast-import" learned to respond to the get-mark command via
   its cat-blob-fd interface.

* "git rebase -i" learned "drop commit-object-name subject" command
   as another way to skip replaying of a commit.

* A new configuration variable can enable "--follow" automatically
   when "git log" is run with one pathspec argument.

* "git status" learned to show a more detailed information regarding
   the "rebase -i" session in progress.

* "git cat-file" learned "--batch-all-objects" option to enumerate all
   available objects in the repository more quickly than "rev-list
   --all --objects" (the output includes unreachable objects, though).

* "git fsck" learned to ignore errors on a set of known-to-be-bad
   objects, and also allows the warning levels of various kinds of
   non-critical breakages to be tweaked.

* "git rebase -i"'s list of todo is made configurable.

* "git send-email" now performs alias-expansion on names that are
   given via --cccmd, etc.

* An environment variable GIT_REPLACE_REF_BASE tells Git to look into
   refs hierarchy other than refs/replace/ for the object replacement
   data.

* Allow untracked cache (experimental) to be used when sparse
   checkout (experimental) is also in use.

* "git pull --rebase" has been taught to pay attention to
   rebase.autostash configuration.

* The command-line completion script (in contrib/) has been updated.

* A negative !ref entry in multi-value transfer.hideRefs
   configuration can be used to say "don't hide this one".

* After "git am" without "-3" stops, running "git am -3" pays attention
   to "-3" only for the patch that caused the original invocation
   to stop.

* When linked worktree is used, simultaneous "notes merge" instances
   for the same ref in refs/notes/* are prevented from stomping on
   each other.

* "git send-email" learned a new option --smtp-auth to limit the SMTP
   AUTH mechanisms to be used to a subset of what the system library
   supports.

* A new configuration variable http.sslVersion can be used to specify
   what specific version of SSL/TLS to use to make a connection.

* "git notes merge" can be told with "--strategy=<how>" option how to
   automatically handle conflicts; this can now be configured by
   setting notes.mergeStrategy configuration variable.

* "git log --cc" did not show any patch, even though most of the time
   the user meant "git log --cc -p -m" to see patch output for commits
   with a single parent, and combined diff for merge commits.  The
   command is taught to DWIM "--cc" (without "--raw" and other forms
   of output specification) to "--cc -p -m".

* "git config --list" output was hard to parse when values consist of
   multiple lines.  "--name-only" option is added to help this.

* A handful of usability & cosmetic fixes to gitk and l10n updates.

* A completely empty e-mail address <> is now allowed in the authors
   file used by git-svn, to match the way it accepts the output from
   authors-prog.

Performance, Internal Implementation, Development Support etc.

* In preparation for allowing different "backends" to store the refs
   in a way different from the traditional "one ref per file in
   $GIT_DIR or in a $GIT_DIR/packed-refs file" filesystem storage,
   direct filesystem access to ref-like things like CHERRY_PICK_HEAD
   from scripts and programs has been reduced.

* Computation of untracked status indicator by bash prompt
   script (in contrib/) has been optimized.

* Memory use reduction when commit-slab facility is used to annotate
   sparsely (which is not recommended in the first place).

* Clean up refs API and make "git clone" less intimate with the
   implementation detail.

* "git pull" was reimplemented in C.

* The packet tracing machinery allows to capture an incoming pack
   data to a file for debugging.

* Move machinery to parse human-readable scaled numbers like 1k, 4M,
   and 2G as an option parameter's value from pack-objects to
   parse-options API, to make it available to other codepaths.

* "git verify-tag" and "git verify-commit" have been taught to share
   more code, and then learned to optionally show the verification
   message from the underlying GPG implementation.

* Various enhancements around "git am" reading patches generated by
   foreign SCM have been made.

* Ref listing by "git branch -l" and "git tag -l" commands has
   started to be rebuilt, based on the for-each-ref machinery.

* The code to perform multi-tree merges has been taught to repopulate
   the cache-tree upon a successful merge into the index, so that
   subsequent "diff-index --cached" (hence "status") and "write-tree"
   (hence "commit") will go faster.

The same logic in "git checkout" may now be removed, but that is a
   separate issue.

* Tests that assume how reflogs are represented on the filesystem too
   much have been corrected.

* "git am" has been rewritten in "C".

* git_path() and mkpath() are handy helper functions but it is easy
   to misuse, as the callers need to be careful to keep the number of
   active results below 4.  Their uses have been reduced.

* The "lockfile" API has been rebuilt on top of a new "tempfile" API.

* To prepare for allowing a different "ref" backend to be plugged in
   to the system, update_ref()/delete_ref() have been taught about
   ref-like things like MERGE_HEAD that are per-worktree (they will
   always be written to the filesystem inside $GIT_DIR).

* The gitmodules API that is accessed from the C code learned to
   cache stuff lazily.

Also contains various documentation updates and code clean-ups.

Fixes since v2.5
----------------

Unless otherwise noted, all the fixes since v2.5 in the maintenance
track are contained in this release (see the maintenance releases'
notes for details).

* "git subtree" (in contrib/) depended on "git log" output to be
   stable, which was a no-no.  Apply a workaround to force a
   particular date format.
   (merge e7aac44 da/subtree-date-confusion later to maint).

* An attempt to delete a ref by pushing into a repository whose HEAD
   symbolic reference points at an unborn branch that cannot be
   created due to ref D/F conflict (e.g. refs/heads/a/b exists, HEAD
   points at refs/heads/a) failed.
   (merge b112b14 jx/do-not-crash-receive-pack-wo-head later to maint).

* The low-level "git send-pack" did not honor 'user.signingkey'
   configuration variable when sending a signed-push.
   (merge d830d39 db/send-pack-user-signingkey later to maint).

* "sparse checkout" misbehaved for a path that is excluded from the
   checkout when switching between branches that differ at the path.
   (merge 7d78241 as/sparse-checkout-removal later to maint).

* An experimental "untracked cache" feature used uname(2) in a
   slightly unportable way.
   (merge 100e433 cb/uname-in-untracked later to maint).

* A "rebase" replays changes of the local branch on top of something
   else, as such they are placed in stage #3 and referred to as
   "theirs", while the changes in the new base, typically a foreign
   work, are placed in stage #2 and referred to as "ours".  Clarify
   the "checkout --ours/--theirs".
   (merge f303016 se/doc-checkout-ours-theirs later to maint).

* The "rev-parse --parseopt" mode parsed the option specification
   and the argument hint in a strange way to allow '=' and other
   special characters in the option name while forbidding them from
   the argument hint.  This made it impossible to define an option
   like "--pair <key>=<value>" with "pair=key=value" specification,
   which instead would have defined a "--pair=key <value>" option.
   (merge 2d893df ib/scripted-parse-opt-better-hint-string later to maint).

* Often a fast-import stream builds a new commit on top of the
   previous commit it built, and it often unconditionally emits a
   "from" command to specify the first parent, which can be omitted in
   such a case.  This caused fast-import to forget the tree of the
   previous commit and then re-read it from scratch, which was
   inefficient.  Optimize for this common case.
   (merge 0df3245 mh/fast-import-optimize-current-from later to maint).

* Running an aliased command from a subdirectory when the .git thing
   in the working tree is a gitfile pointing elsewhere did not work.
   (merge d95138e nd/export-worktree later to maint).

* "Is this subdirectory a separate repository that should not be
   touched?" check "git clean" was inefficient.  This was replaced
   with a more optimized check.
   (merge fbf2fec ee/clean-remove-dirs later to maint).

* The "new-worktree-mode" hack in "checkout" that was added in
   nd/multiple-work-trees topic has been removed by updating the
   implementation of new "worktree add".
   (merge 65f9b75 es/worktree-add-cleanup later to maint).

* Remove remaining cruft from  "git checkout --to", which
   transitioned to "git worktree add".
   (merge 114ff88 es/worktree-add later to maint).

* An off-by-one error made "git remote" to mishandle a remote with a
   single letter nickname.
   (merge bc598c3 mh/get-remote-group-fix later to maint).

* "git clone $URL", when cloning from a site whose sole purpose is to
   host a single repository (hence, no path after <scheme>://<site>/),
   tried to use the site name as the new repository name, but did not
   remove username or password when <site> part was of the form
   <user>@<pass>:<host>.  The code is taught to redact these.
   (merge adef956 ps/guess-repo-name-at-root later to maint).

* Running tests with the "-x" option to make them verbose had some
   unpleasant interactions with other features of the test suite.
   (merge 9b5fe78 jk/test-with-x later to maint).

* t1509 test that requires a dedicated VM environment had some
   bitrot, which has been corrected.
   (merge faacc5a ps/t1509-chroot-test-fixup later to maint).

* "git pull" in recent releases of Git has a regression in the code
   that allows custom path to the --upload-pack=<program>.  This has
   been corrected.

Note that this is irrelevant for 'master' with "git pull" rewritten
   in C.
   (merge 13e0e28 mm/pull-upload-pack later to maint).

* When trying to see that an object does not exist, a state errno
   leaked from our "first try to open a packfile with O_NOATIME and
   then if it fails retry without it" logic on a system that refuses
   O_NOATIME.  This confused us and caused us to die, saying that the
   packfile is unreadable, when we should have just reported that the
   object does not exist in that packfile to the caller.
   (merge dff6f28 cb/open-noatime-clear-errno later to maint).

* The codepath to produce error messages had a hard-coded limit to
   the size of the message, primarily to avoid memory allocation while
   calling die().
   (merge f4c3edc jk/long-error-messages later to maint).

* strbuf_read() used to have one extra iteration (and an unnecessary
   strbuf_grow() of 8kB), which was eliminated.
   (merge 3ebbd00 jh/strbuf-read-use-read-in-full later to maint).

* We rewrote one of the build scripts in Perl but this reimplements
   in Bourne shell.
   (merge 57cee8a sg/help-group later to maint).

* The experimental untracked-cache feature were buggy when paths with
   a few levels of subdirectories are involved.
   (merge 73f9145 dt/untracked-subdir later to maint).

* "interpret-trailers" helper mistook a single-liner log message that
   has a colon as the end of existing trailer.

* The "interpret-trailers" helper mistook a multi-paragraph title of
   a commit log message with a colon in it as the end of the trailer
   block.
   (merge 5c99995 cc/trailers-corner-case-fix later to maint).

* "git describe" without argument defaulted to describe the HEAD
   commit, but "git describe --contains" didn't.  Arguably, in a
   repository used for active development, such defaulting would not
   be very useful as the tip of branch is typically not tagged, but it
   is better to be consistent.
   (merge 2bd0706 sg/describe-contains later to maint).

* The client side codepaths in "git push" have been cleaned up
   and the user can request to perform an optional "signed push",
   i.e. sign only when the other end accepts signed push.
   (merge 68c757f db/push-sign-if-asked later to maint).

* Because the configuration system does not allow "alias.0foo" and
   "pager.0foo" as the configuration key, the user cannot use '0foo'
   as a custom command name anyway, but "git 0foo" tried to look these
   keys up and emitted useless warnings before saying '0foo is not a
   git command'.  These warning messages have been squelched.
   (merge 9e9de18 jk/fix-alias-pager-config-key-warnings later to maint).

* "git rev-list" does not take "--notes" option, but did not complain
   when one is given.
   (merge 2aea7a5 jk/rev-list-has-no-notes later to maint).

* When re-priming the cache-tree opportunistically while committing
   the in-core index as-is, we mistakenly invalidated the in-core
   index too aggressively, causing the experimental split-index code
   to unnecessarily rewrite the on-disk index file(s).
   (merge 475a344 dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update later to maint).

* "git archive" did not use zip64 extension when creating an archive
   with more than 64k entries, which nobody should need, right ;-)?
   (merge 88329ca rs/archive-zip-many later to maint).

* The code in "multiple-worktree" support that attempted to recover
   from an inconsistent state updated an incorrect file.
   (merge 82fde87 nd/fixup-linked-gitdir later to maint).

* On case insensitive systems, "git p4" did not work well with client
   specs.

* "git init empty && git -C empty log" said "bad default revision 'HEAD'",
   which was found to be a bit confusing to new users.
   (merge ce11360 jk/log-missing-default-HEAD later to maint).

* Recent versions of scripted "git am" has a performance regression in
   "git am --skip" codepath, which no longer exists in the built-in
   version on the 'master' front.  Fix the regression in the last
   scripted version that appear in 2.5.x maintenance track and older.
   (merge b9d6689 js/maint-am-skip-performance-regression later to maint).

* The branch descriptions that are set with "git branch --edit-description"
   option were used in many places but they weren't clearly documented.
   (merge 561d2b7 po/doc-branch-desc later to maint).

* Code cleanups and documentation updates.
   (merge 1c601af es/doc-clean-outdated-tools later to maint).
   (merge 3581304 kn/tag-doc-fix later to maint).
   (merge 3a59e59 kb/i18n-doc later to maint).
   (merge 45abdee sb/remove-unused-var-from-builtin-add later to maint).
   (merge 14691e3 sb/parse-options-codeformat later to maint).
   (merge 4a6ada3 ad/bisect-cleanup later to maint).
   (merge da4c5ad ta/docfix-index-format-tech later to maint).
   (merge ae25fd3 sb/check-return-from-read-ref later to maint).
   (merge b3325df nd/dwim-wildcards-as-pathspecs later to maint).
   (merge 7aa9b9b sg/wt-status-header-inclusion later to maint).
   (merge f04c690 as/docfix-reflog-expire-unreachable later to maint).
   (merge 1269847 sg/t3020-typofix later to maint).
   (merge 8b54c23 jc/calloc-pathspec later to maint).
   (merge a6926b8 po/po-readme later to maint).
   (merge 54d160e ss/fix-config-fd-leak later to maint).
   (merge b80fa84 ah/submodule-typofix-in-error later to maint).
   (merge 99885bc ah/reflog-typofix-in-error later to maint).
   (merge 9476c2c ah/read-tree-usage-string later to maint).
   (merge b8c1d27 ah/pack-objects-usage-strings later to maint).
   (merge 486e1e1 br/svn-doc-include-paths-config later to maint).
   (merge 1733ed3 ee/clean-test-fixes later to maint).
   (merge 5fcadc3 gb/apply-comment-typofix later to maint).
   (merge b894d3e mp/t7060-diff-index-test later to maint).
   (merge d238710 as/config-doc-markup-fix later to maint).

cmd: