Autogenerated HTML docs for v2.7.1-339-g0233b

RelNotes/2.7.2.txt

@@ -0,0 +1,27 @@
+Git v2.7.2 Release Notes
+========================
+
+Fixes since v2.7.1
+------------------
+
+ * The low-level merge machinery has been taught to use CRLF line
+   termination when inserting conflict markers to merged contents that
+   are themselves CRLF line-terminated.
+
+ * "git worktree" had a broken code that attempted to auto-fix
+   possible inconsistency that results from end-users moving a
+   worktree to different places without telling Git (the original
+   repository needs to maintain backpointers to its worktrees, but
+   "mv" run by end-users who are not familiar with that fact will
+   obviously not adjust them), which actually made things worse
+   when triggered.
+
+ * "git push --force-with-lease" has been taught to report if the push
+   needed to force (or fast-forwarded).
+
+ * The emulated "yes" command used in our test scripts has been
+   tweaked not to spend too much time generating unnecessary output
+   that is not used, to help those who test on Windows where it would
+   not stop until it fills the pipe buffer due to lack of SIGPIPE.
+
+Also includes tiny documentation and test updates.

RelNotes/2.8.0.txt

@@ -1,11 +1,21 @@
 Git 2.8 Release Notes
 =====================
 
+Backward compatibility note
+---------------------------
+
+The rsync:// transport has been removed.
+
+
 Updates since v2.7
 ------------------
 
 UI, Workflows & Features
 
+ * It turns out "git clone" over rsync transport has been broken when
+   the source repository has packed references for a long time, and
+   nobody noticed nor complained about it.
+
  * "branch --delete" has "branch -d" but "push --delete" does not.
 
  * "git blame" learned to produce the progress eye-candy when it takes
@@ -83,6 +93,11 @@ UI, Workflows & Features
    commit that is reachable from <branch> that does not match the
    given <pattern>.
 
+ * The "user.useConfigOnly" configuration variable can be used to
+   force the user to always set user.email & user.name configuration
+   variables, serving as a reminder for those who work on multiple
+   projects and do not want to put these in their $HOME/.gitconfig.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -126,6 +141,21 @@ Performance, Internal Implementation, Development Support etc.
    tests that take longer before other ones; this reduces the total
    wallclock time.
 
+ * Test scripts have been updated to remove assumptions that are not
+   portable between Git for POSIX and Git for Windows, or to skip ones
+   with expectations that are not satisfiable on Git for Windows.
+
+ * Some calls to strcpy(3) triggers a false warning from static
+   analysers that are less intelligent than humans, and reducing the
+   number of these false hits helps us notice real issues.  A few
+   calls to strcpy(3) in test-path-utils that are already safe has
+   been rewritten to avoid false wanings.
+
+ * Some calls to strcpy(3) triggers a false warning from static
+   analysers that are less intelligent than humans, and reducing the
+   number of these false hits helps us notice real issues.  A few
+   calls to strcpy(3) in "git rerere" that are already safe has been
+   rewritten to avoid false wanings.
 
 Also contains various documentation updates and code clean-ups.
 
@@ -267,9 +297,22 @@ notes for details).
    not stop until it fills the pipe buffer due to lack of SIGPIPE.
    (merge 6129c93 js/test-lib-windows-emulated-yes later to maint).
 
+ * The documentation for "git clean" has been corrected; it mentioned
+   that .git/modules/* are removed by giving two "-f", which has never
+   been the case.
+   (merge 31e3c2d mm/clean-doc-fix later to maint).
+
+ * The vimdiff backend for "git mergetool" has been tweaked to arrange
+   and number buffers in the order that would match the expectation of
+   majority of people who read left to right, then top down and assign
+   buffers 1 2 3 4 "mentally" to local base remote merge windows based
+   on that order.
+   (merge 2300328 dw/mergetool-vim-window-shuffle later to maint).
+
  * Other minor clean-ups and documentation updates
    (merge 99487cf ss/user-manual later to maint).
    (merge e914ef0 ew/for-each-ref-doc later to maint).
    (merge 36fc7d8 sg/t6050-failing-editor-test-fix later to maint).
    (merge 60253a6 ss/clone-depth-single-doc later to maint).
    (merge bd02e97 lv/add-doc-working-tree later to maint).
+   (merge f562d7d ah/stripspace-optstring later to maint).

config.txt

@@ -2122,7 +2122,7 @@ pack.indexVersion::
 	larger than 2 GB.
 +
 If you have an old Git that does not understand the version 2 `*.idx` file,
-cloning or fetching over a non native protocol (e.g. "http" and "rsync")
+cloning or fetching over a non native protocol (e.g. "http")
 that will copy both `*.pack` file and corresponding `*.idx` file from the
 other side may give you a repository that cannot be accessed with your
 older version of Git. If the `*.pack` file is smaller than 2 GB, however,
@@ -2830,6 +2830,16 @@ user.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
+	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
+	along with a name, Git will prompt you to set up an email before
+	making new commits in a newly cloned repository.
+	Defaults to `false`.
+
 user.signingKey::
 	If linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the
 	key you want it to automatically when creating a signed tag or

git-bundle.html

@@ -762,7 +762,7 @@ <h2 id="_description">DESCRIPTION</h2>
 <div class="paragraph"><p>Some workflows require that one or more branches of development on one
 machine be replicated on another machine, but the two machines cannot
 be directly connected, and therefore the interactive Git protocols (git,
-ssh, rsync, http) cannot be used.  This command provides support for
+ssh, http) cannot be used.  This command provides support for
 <em>git fetch</em> and <em>git pull</em> to operate by packaging objects and references
 in an archive at the originating machine, then importing those into
 another repository using <em>git fetch</em> and <em>git pull</em>
@@ -973,7 +973,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2016-02-17 14:30:28 PST
 </div>
 </div>
 </body>

git-bundle.txt

@@ -20,7 +20,7 @@ DESCRIPTION
 Some workflows require that one or more branches of development on one
 machine be replicated on another machine, but the two machines cannot
 be directly connected, and therefore the interactive Git protocols (git,
-ssh, rsync, http) cannot be used.  This command provides support for
+ssh, http) cannot be used.  This command provides support for
 'git fetch' and 'git pull' to operate by packaging objects and references
 in an archive at the originating machine, then importing those into
 another repository using 'git fetch' and 'git pull'

git-clean.html

@@ -792,9 +792,7 @@ <h2 id="_options">OPTIONS</h2>
         to false, <em>git clean</em> will refuse to delete files or directories
         unless given -f, -n or -i. Git will refuse to delete directories
         with .git sub directory or file unless a second -f
-        is given. This affects also git submodules where the storage area
-        of the removed submodule under .git/modules/ is not removed until
-        -f is given twice.
+        is given.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -972,7 +970,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-03-06 15:45:51 PST
+Last updated 2016-02-17 14:30:28 PST
 </div>
 </div>
 </body>

git-clean.txt

@@ -37,9 +37,7 @@ OPTIONS
 	to false, 'git clean' will refuse to delete files or directories
 	unless given -f, -n or -i. Git will refuse to delete directories
 	with .git sub directory or file unless a second -f
-	is given. This affects also git submodules where the storage area
-	of the removed submodule under .git/modules/ is not removed until
-	-f is given twice.
+	is given.
 
 -i::
 --interactive::

git-clone.html

@@ -887,8 +887,7 @@ <h2 id="_options">OPTIONS</h2>
 <dd>
 <p>
         Operate quietly.  Progress is not reported to the standard
-        error stream. This flag is also passed to the &#8216;rsync&#8217;
-        command when given.
+        error stream.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -1110,9 +1109,8 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
 Depending on the transport protocol, some of this information may be
 absent.</p></div>
 <div class="paragraph"><p>Git supports ssh, git, http, and https protocols (in addition, ftp,
-and ftps can be used for fetching and rsync can be used for fetching
-and pushing, but these are inefficient and deprecated; do not use
-them).</p></div>
+and ftps can be used for fetching, but this is inefficient and
+deprecated; do not use it).</p></div>
 <div class="paragraph"><p>The native transport (i.e. git:// URL) does no authentication and
 should be used with caution on unsecured networks.</p></div>
 <div class="paragraph"><p>The following syntaxes may be used with them:</p></div>
@@ -1137,11 +1135,6 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
 ftp&#91;s&#93;://host.xz&#91;:port&#93;/path/to/repo.git/
 </p>
 </li>
-<li>
-<p>
-rsync://host.xz/path/to/repo.git/
-</p>
-</li>
 </ul></div>
 <div class="paragraph"><p>An alternative scp-like syntax may also be used with the ssh protocol:</p></div>
 <div class="ulist"><ul>
@@ -1300,7 +1293,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-01-20 15:22:32 PST
+Last updated 2016-02-17 14:30:28 PST
 </div>
 </div>
 </body>

git-clone.txt

@@ -115,8 +115,7 @@ objects from the source repository into a pack in the cloned repository.
 --quiet::
 -q::
 	Operate quietly.  Progress is not reported to the standard
-	error stream. This flag is also passed to the `rsync'
-	command when given.
+	error stream.
 
 --verbose::
 -v::

git-config.html

@@ -5673,7 +5673,7 @@ <h3 id="_variables">Variables</h3>
         larger than 2 GB.
 </p>
 <div class="paragraph"><p>If you have an old Git that does not understand the version 2 <code>*.idx</code> file,
-cloning or fetching over a non native protocol (e.g. "http" and "rsync")
+cloning or fetching over a non native protocol (e.g. "http")
 that will copy both <code>*.pack</code> file and corresponding <code>*.idx</code> file from the
 other side may give you a repository that cannot be accessed with your
 older version of Git. If the <code>*.pack</code> file is smaller than 2 GB, however,
@@ -6895,6 +6895,21 @@ <h3 id="_variables">Variables</h3>
 </p>
 </dd>
 <dt class="hdlist1">
+user.useConfigOnly
+</dt>
+<dd>
+<p>
+        Instruct Git to avoid trying to guess defaults for <em>user.email</em>
+        and <em>user.name</em>, 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 <code>true</code> in the global config
+        along with a name, Git will prompt you to set up an email before
+        making new commits in a newly cloned repository.
+        Defaults to <code>false</code>.
+</p>
+</dd>
+<dt class="hdlist1">
 user.signingKey
 </dt>
 <dd>

git-fetch.html

@@ -1142,9 +1142,8 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
 Depending on the transport protocol, some of this information may be
 absent.</p></div>
 <div class="paragraph"><p>Git supports ssh, git, http, and https protocols (in addition, ftp,
-and ftps can be used for fetching and rsync can be used for fetching
-and pushing, but these are inefficient and deprecated; do not use
-them).</p></div>
+and ftps can be used for fetching, but this is inefficient and
+deprecated; do not use it).</p></div>
 <div class="paragraph"><p>The native transport (i.e. git:// URL) does no authentication and
 should be used with caution on unsecured networks.</p></div>
 <div class="paragraph"><p>The following syntaxes may be used with them:</p></div>
@@ -1169,11 +1168,6 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
 ftp&#91;s&#93;://host.xz&#91;:port&#93;/path/to/repo.git/
 </p>
 </li>
-<li>
-<p>
-rsync://host.xz/path/to/repo.git/
-</p>
-</li>
 </ul></div>
 <div class="paragraph"><p>An alternative scp-like syntax may also be used with the ssh protocol:</p></div>
 <div class="ulist"><ul>

git-pull.html

@@ -1286,9 +1286,8 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
 Depending on the transport protocol, some of this information may be
 absent.</p></div>
 <div class="paragraph"><p>Git supports ssh, git, http, and https protocols (in addition, ftp,
-and ftps can be used for fetching and rsync can be used for fetching
-and pushing, but these are inefficient and deprecated; do not use
-them).</p></div>
+and ftps can be used for fetching, but this is inefficient and
+deprecated; do not use it).</p></div>
 <div class="paragraph"><p>The native transport (i.e. git:// URL) does no authentication and
 should be used with caution on unsecured networks.</p></div>
 <div class="paragraph"><p>The following syntaxes may be used with them:</p></div>
@@ -1313,11 +1312,6 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
 ftp&#91;s&#93;://host.xz&#91;:port&#93;/path/to/repo.git/
 </p>
 </li>
-<li>
-<p>
-rsync://host.xz/path/to/repo.git/
-</p>
-</li>
 </ul></div>
 <div class="paragraph"><p>An alternative scp-like syntax may also be used with the ssh protocol:</p></div>
 <div class="ulist"><ul>

git-push.html

@@ -1148,9 +1148,8 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
 Depending on the transport protocol, some of this information may be
 absent.</p></div>
 <div class="paragraph"><p>Git supports ssh, git, http, and https protocols (in addition, ftp,
-and ftps can be used for fetching and rsync can be used for fetching
-and pushing, but these are inefficient and deprecated; do not use
-them).</p></div>
+and ftps can be used for fetching, but this is inefficient and
+deprecated; do not use it).</p></div>
 <div class="paragraph"><p>The native transport (i.e. git:// URL) does no authentication and
 should be used with caution on unsecured networks.</p></div>
 <div class="paragraph"><p>The following syntaxes may be used with them:</p></div>
@@ -1175,11 +1174,6 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
 ftp&#91;s&#93;://host.xz&#91;:port&#93;/path/to/repo.git/
 </p>
 </li>
-<li>
-<p>
-rsync://host.xz/path/to/repo.git/
-</p>
-</li>
 </ul></div>
 <div class="paragraph"><p>An alternative scp-like syntax may also be used with the ssh protocol:</p></div>
 <div class="ulist"><ul>

git-repack.html

@@ -946,7 +946,7 @@ <h2 id="_configuration">Configuration</h2>
 <em>git pack-objects</em>; this typically results in slightly smaller packs,
 but the generated packs are incompatible with versions of Git older than
 version 1.4.4. If you need to share your repository with such ancient Git
-versions, either directly or via the dumb http or rsync protocol, then you
+versions, either directly or via the dumb http protocol, then you
 need to set the configuration variable <code>repack.UseDeltaBaseOffset</code> to
 "false" and repack. Access from old Git versions over the native protocol
 is unaffected by this option as the conversion is performed on the fly
@@ -970,7 +970,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-03-23 14:31:16 PDT
+Last updated 2016-02-17 14:30:28 PST
 </div>
 </div>
 </body>

git-repack.txt

@@ -133,7 +133,7 @@ By default, the command passes `--delta-base-offset` option to
 'git pack-objects'; this typically results in slightly smaller packs,
 but the generated packs are incompatible with versions of Git older than
 version 1.4.4. If you need to share your repository with such ancient Git
-versions, either directly or via the dumb http or rsync protocol, then you
+versions, either directly or via the dumb http protocol, then you
 need to set the configuration variable `repack.UseDeltaBaseOffset` to
 "false" and repack. Access from old Git versions over the native protocol
 is unaffected by this option as the conversion is performed on the fly

git.html

@@ -2911,11 +2911,6 @@ <h3 id="_other">other</h3>
 </li>
 <li>
 <p>
-<code>rsync</code>: git over rsync
-</p>
-</li>
-<li>
-<p>
 <code>http</code>: git over http, both "smart http" and "dumb http".
             Note that this does <em>not</em> include <code>https</code>; if you want both,
             you should specify both as <code>http:https</code>.
@@ -3037,7 +3032,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-01-04 15:32:36 PST
+Last updated 2016-02-17 14:30:28 PST
 </div>
 </div>
 </body>