Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Autogenerated HTML docs for v1.8.4.1-600-g3d092

  • Loading branch information...
commit 238ce9c29632ff8714caddd1e0aee4f837ed3a30 1 parent aef7644
@gitster authored
View
13 RelNotes/1.8.4.2.txt
@@ -4,6 +4,19 @@ Git v1.8.4.2 Release Notes
Fixes since v1.8.4.1
--------------------
+ * "git branch --track" had a minor regression in v1.8.3.2 and later
+ that made it impossible to base your local work on anything but a
+ local branch of the upstream repository you are tracking from.
+
+ * "git ls-files -k" needs to crawl only the part of the working tree
+ that may overlap the paths in the index to find killed files, but
+ shared code with the logic to find all the untracked files, which
+ made it unnecessarily inefficient.
+
+ * When there is no sufficient overlap between old and new history
+ during a "git fetch" into a shallow repository, objects that the
+ sending side knows the receiving end has were unnecessarily sent.
+
* When running "fetch -q", a long silence while the sender side
computes the set of objects to send can be mistaken by proxies as
dropped connection. The server side has been taught to send a
View
4 RelNotes/1.8.5.txt
@@ -76,6 +76,10 @@ Foreign interfaces, subsystems and ports.
UI, Workflows & Features
+ * "git grep" and "git show" pays attention to "--textconv" option
+ when these commands are told to operate on blob objects (e.g. "git
+ grep -e pattern HEAD:Makefile").
+
* "git replace" helper no longer allows an object to be replaced with
another object of a different type to avoid confusion (you can
still manually craft such replacement using "git update-ref", as an
View
6 config.txt
@@ -724,6 +724,8 @@ branch.<name>.remote::
overridden by `branch.<name>.pushremote`. If no remote is
configured, or if you are not on any branch, it defaults to
`origin` for fetching and `remote.pushdefault` for pushing.
+ Additionally, `.` (a period) is the current local repository
+ (a dot-repository), see `branch.<name>.merge`'s final note below.
branch.<name>.pushremote::
When on branch <name>, it overrides `branch.<name>.remote` for
@@ -749,8 +751,8 @@ branch.<name>.merge::
Specify multiple values to get an octopus merge.
If you wish to setup 'git pull' so that it merges into <name> from
another branch in the local repository, you can point
- branch.<name>.merge to the desired branch, and use the special setting
- `.` (a period) for branch.<name>.remote.
+ branch.<name>.merge to the desired branch, and use the relative path
+ setting `.` (a period) for branch.<name>.remote.
branch.<name>.mergeoptions::
Sets default options for merging into branch <name>. The syntax and
View
6 git-config.html
@@ -2384,6 +2384,8 @@ <h3 id="_variables">Variables</h3>
overridden by <code>branch.&lt;name&gt;.pushremote</code>. If no remote is
configured, or if you are not on any branch, it defaults to
<code>origin</code> for fetching and <code>remote.pushdefault</code> for pushing.
+ Additionally, <code>.</code> (a period) is the current local repository
+ (a dot-repository), see <code>branch.&lt;name&gt;.merge</code>'s final note below.
</p>
</dd>
<dt class="hdlist1">
@@ -2419,8 +2421,8 @@ <h3 id="_variables">Variables</h3>
Specify multiple values to get an octopus merge.
If you wish to setup <em>git pull</em> so that it merges into &lt;name&gt; from
another branch in the local repository, you can point
- branch.&lt;name&gt;.merge to the desired branch, and use the special setting
- <code>.</code> (a period) for branch.&lt;name&gt;.remote.
+ branch.&lt;name&gt;.merge to the desired branch, and use the relative path
+ setting <code>.</code> (a period) for branch.&lt;name&gt;.remote.
</p>
</dd>
<dt class="hdlist1">
View
21 git-grep.html
@@ -746,7 +746,7 @@
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git grep</em> [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp]
+<pre class="content"><em>git grep</em> [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | --word-regexp]
[-v | --invert-match] [-h|-H] [--full-name]
[-E | --extended-regexp] [-G | --basic-regexp]
[-P | --perl-regexp]
@@ -874,6 +874,23 @@ <h2 id="_options">OPTIONS</h2>
</p>
</dd>
<dt class="hdlist1">
+--textconv
+</dt>
+<dd>
+<p>
+ Honor textconv filter settings.
+</p>
+</dd>
+<dt class="hdlist1">
+--no-textconv
+</dt>
+<dd>
+<p>
+ Do not honor textconv filter settings.
+ This is the default.
+</p>
+</dd>
+<dt class="hdlist1">
-i
</dt>
<dt class="hdlist1">
@@ -1308,7 +1325,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 2013-10-23 14:56:14 PDT
</div>
</div>
</body>
View
9 git-grep.txt
@@ -9,7 +9,7 @@ git-grep - Print lines matching a pattern
SYNOPSIS
--------
[verse]
-'git grep' [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp]
+'git grep' [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | --word-regexp]
[-v | --invert-match] [-h|-H] [--full-name]
[-E | --extended-regexp] [-G | --basic-regexp]
[-P | --perl-regexp]
@@ -80,6 +80,13 @@ OPTIONS
--text::
Process binary files as if they were text.
+--textconv::
+ Honor textconv filter settings.
+
+--no-textconv::
+ Do not honor textconv filter settings.
+ This is the default.
+
-i::
--ignore-case::
Ignore case differences between the patterns and the
View
9 gitcli.html
@@ -806,6 +806,13 @@ <h2 id="_description">DESCRIPTION</h2>
see <code>hello.c</code> in your working tree with the former, but with the latter
you will.</p></div>
</li>
+<li>
+<p>
+Just as the filesystem <em>.</em> (period) refers to the current directory,
+ using a <em>.</em> as a repository name in Git (a dot-repository) is a relative
+ path and means your current repository.
+</p>
+</li>
</ul></div>
<div class="paragraph"><p>Here are the rules regarding the "flags" that you should follow when you are
scripting Git:</p></div>
@@ -994,7 +1001,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-09-17 14:33:14 PDT
+Last updated 2013-10-23 14:56:14 PDT
</div>
</div>
</body>
View
4 gitcli.txt
@@ -59,6 +59,10 @@ working tree. After running `git add hello.c; rm hello.c`, you will _not_
see `hello.c` in your working tree with the former, but with the latter
you will.
+ * Just as the filesystem '.' (period) refers to the current directory,
+ using a '.' as a repository name in Git (a dot-repository) is a relative
+ path and means your current repository.
+
Here are the rules regarding the "flags" that you should follow when you are
scripting Git:
View
22 technical/api-diff.html
@@ -781,7 +781,8 @@ <h2 id="_calling_sequence">Calling sequence</h2>
<p>
Call <code>diff_setup_done()</code>; this inspects the options set up so far for
internal consistency and make necessary tweaking to it (e.g. if
- textual patch output was asked, recursive behaviour is turned on).
+ textual patch output was asked, recursive behaviour is turned on);
+ the callback set_default in diff_options can be used to tweak this more.
</p>
</li>
<li>
@@ -937,6 +938,23 @@ <h2 id="_data_structures">Data structures</h2>
operation, but some do not have anything to do with the diffcore
library.
</p>
+</dd>
+<dt class="hdlist1">
+<code>touched_flags</code>
+</dt>
+<dd>
+<p>
+ Records whether a flag has been changed due to user request
+ (rather than just set/unset by default).
+</p>
+</dd>
+<dt class="hdlist1">
+<code>set_default</code>
+</dt>
+<dd>
+<p>
+ Callback which allows tweaking the options in diff_setup_done().
+</p>
<div class="dlist"><dl>
<dt class="hdlist1">
BINARY, TEXT
@@ -1061,7 +1079,7 @@ <h2 id="_data_structures">Data structures</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2013-10-23 14:56:14 PDT
</div>
</div>
</body>
View
10 technical/api-diff.txt
@@ -28,7 +28,8 @@ Calling sequence
* Call `diff_setup_done()`; this inspects the options set up so far for
internal consistency and make necessary tweaking to it (e.g. if
- textual patch output was asked, recursive behaviour is turned on).
+ textual patch output was asked, recursive behaviour is turned on);
+ the callback set_default in diff_options can be used to tweak this more.
* As you find different pairs of files, call `diff_change()` to feed
modified files, `diff_addremove()` to feed created or deleted files,
@@ -115,6 +116,13 @@ Notable members are:
operation, but some do not have anything to do with the diffcore
library.
+`touched_flags`::
+ Records whether a flag has been changed due to user request
+ (rather than just set/unset by default).
+
+`set_default`::
+ Callback which allows tweaking the options in diff_setup_done().
+
BINARY, TEXT;;
Affects the way how a file that is seemingly binary is treated.

0 comments on commit 238ce9c

Please sign in to comment.
Something went wrong with that request. Please try again.