Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Autogenerated HTML docs for v1.8.4-554-g2b7ca9

  • Loading branch information...
commit 369e340f234cf9372003f0e912c6fa14f3e970fc 1 parent 79f4c7c
@gitster authored
View
47 RelNotes/1.8.4.1.txt
@@ -4,21 +4,24 @@ Git v1.8.4.1 Release Notes
Fixes since v1.8.4
------------------
- * Some people still use rather old versions of bash, which cannot
- grok some constructs like 'printf -v varname' the prompt and
- completion code started to use recently. The completion and
- prompt scripts have been adjusted to work better with these old
- versions of bash.
-
- * "git rebase -i" had a minor bug (the same could be in other
- programs, as the root cause is pretty generic) where the code
- feeds a random, data dependeant string to 'echo' and expects it
+ * Some old versions of bash do not grok some constructs like
+ 'printf -v varname' which the prompt and completion code started
+ to use recently. The completion and prompt scripts have been
+ adjusted to work better with these old versions of bash.
+
+ * In FreeBSD's and NetBSD's "sh", a return in a dot script in a
+ function returns from the function, not only in the dot script,
+ breaking "git rebase" on these platforms (regression introduced
+ in 1.8.4-rc1).
+
+ * "git rebase -i" and other scripted commands were feeding a
+ random, data dependant error message to 'echo' and expecting it
to come out literally.
- * "submodule.<name>.path" variable mistakenly set to the empty
+ * Setting the "submodule.<name>.path" variable to the empty
"true" caused the configuration parser to segfault.
- * Output from "git log --full-diff -- <pathspec>" looked strange,
+ * Output from "git log --full-diff -- <pathspec>" looked strange
because comparison was done with the previous ancestor that
touched the specified <pathspec>, causing the patches for paths
outside the pathspec to show more than the single commit has
@@ -43,8 +46,26 @@ Fixes since v1.8.4
shallow repository when a fetch operation tries to auto-follow
tags.
- * On platforms with fgetc() and friends defined as macros,
- the configuration parser did not compile.
+ * When send-email comes up with an error message to die with upon
+ failure to start an SSL session, it tried to read the error
+ string from a wrong place.
+
+ * A call to xread() was used without a loop to cope with short
+ read in the codepath to stream large blobs to a pack.
+
+ * On platforms with fgetc() and friends defined as macros, the
+ configuration parser did not compile.
+
+ * New versions of MediaWiki introduced a new API for returning
+ more than 500 results in response to a query, which would cause
+ the MediaWiki remote helper to go into an infinite loop.
+
+ * Subversion's serf access method (the only one available in
+ Subversion 1.8) for http and https URLs in skelta mode tells its
+ caller to open multiple files at a time, which made "git svn
+ fetch" complain that "Temp file with moniker 'svn_delta' already
+ in use" instead of fetching.
+
Also contains a handful of trivial code clean-ups, documentation
updates, updates to the test suite, etc.
View
3  RelNotes/1.8.5.txt
@@ -96,6 +96,9 @@ UI, Workflows & Features
* "git status" now omits the prefix to make its output a comment in a
commit log editor, which is not necessary for human consumption.
+ Scripts that parse the output of "git status" are advised to use
+ "git status --porcelain" instead, as its format is stable and easier
+ to parse.
* Make "foo^{tag}" to peel a tag to itself, i.e. no-op., and fail if
"foo" is not a tag. "git rev-parse --verify v1.0^{tag}" would be
View
22 config.txt
@@ -2214,7 +2214,14 @@ status.submodulesummary::
If this is set to a non zero number or true (identical to -1 or an
unlimited number), the submodule summary will be enabled and a
summary of commits for modified submodules will be shown (see
- --summary-limit option of linkgit:git-submodule[1]).
+ --summary-limit option of linkgit:git-submodule[1]). Please note
+ that the summary output command will be suppressed for all
+ submodules when `diff.ignoreSubmodules` is set to 'all' or only
+ for those submodules where `submodule.<name>.ignore=all`. To
+ also view the summary for ignored submodules you can either use
+ the --ignore-submodules=dirty command line option or the 'git
+ submodule summary' command, which shows a similar output but does
+ not honor these settings.
submodule.<name>.path::
submodule.<name>.url::
@@ -2249,7 +2256,8 @@ submodule.<name>.ignore::
submodules that have untracked files in their work tree as changed.
This setting overrides any setting made in .gitmodules for this submodule,
both settings can be overridden on the command line by using the
- "--ignore-submodules" option.
+ "--ignore-submodules" option. The 'git submodule' commands are not
+ affected by this setting.
tar.umask::
This variable can be used to restrict the permission bits of
@@ -2334,11 +2342,11 @@ user.name::
environment variables. See linkgit:git-commit-tree[1].
user.signingkey::
- If linkgit:git-tag[1] is not selecting the key you want it to
- automatically when creating a signed tag, you can override the
- default selection with this variable. This option is passed
- unchanged to gpg's --local-user parameter, so you may specify a key
- using any method that gpg supports.
+ 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
+ commit, you can override the default selection with this variable.
+ This option is passed unchanged to gpg's --local-user parameter,
+ so you may specify a key using any method that gpg supports.
web.browser::
Specify a web browser that may be used by some commands.
View
6 diff-config.txt
@@ -73,7 +73,11 @@ diff.ignoreSubmodules::
Sets the default value of --ignore-submodules. Note that this
affects only 'git diff' Porcelain, and not lower level 'diff'
commands such as 'git diff-files'. 'git checkout' also honors
- this setting when reporting uncommitted changes.
+ this setting when reporting uncommitted changes. Setting it to
+ 'all' disables the submodule summary normally shown by 'git commit'
+ and 'git status' when 'status.submodulesummary' is set unless it is
+ overridden by using the --ignore-submodules command line option.
+ The 'git submodule' commands are not affected by this setting.
diff.mnemonicprefix::
If set, 'git diff' uses a prefix pair that is different from the
View
5 git-cherry.html
@@ -756,8 +756,7 @@ <h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>The changeset (or "diff") of each commit between the fork-point and &lt;head&gt;
is compared against each commit between the fork-point and &lt;upstream&gt;.
-The commits are compared with their <em>patch id</em>, obtained from
-the <em>git patch-id</em> program.</p></div>
+The diffs are compared after removing any whitespace and line numbers.</p></div>
<div class="paragraph"><p>Every commit that doesn&#8217;t exist in the &lt;upstream&gt; branch
has its id (sha1) reported, prefixed by a symbol. The ones that have
equivalent change already
@@ -842,7 +841,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-15 11:39:58 PDT
</div>
</div>
</body>
View
3  git-cherry.txt
@@ -14,8 +14,7 @@ DESCRIPTION
-----------
The changeset (or "diff") of each commit between the fork-point and <head>
is compared against each commit between the fork-point and <upstream>.
-The commits are compared with their 'patch id', obtained from
-the 'git patch-id' program.
+The diffs are compared after removing any whitespace and line numbers.
Every commit that doesn't exist in the <upstream> branch
has its id (sha1) reported, prefixed by a symbol. The ones that have
View
38 git-config.html
@@ -3078,7 +3078,11 @@ <h3 id="_variables">Variables</h3>
Sets the default value of --ignore-submodules. Note that this
affects only <em>git diff</em> Porcelain, and not lower level <em>diff</em>
commands such as <em>git diff-files</em>. <em>git checkout</em> also honors
- this setting when reporting uncommitted changes.
+ this setting when reporting uncommitted changes. Setting it to
+ <em>all</em> disables the submodule summary normally shown by <em>git commit</em>
+ and <em>git status</em> when <em>status.submodulesummary</em> is set unless it is
+ overridden by using the --ignore-submodules command line option.
+ The <em>git submodule</em> commands are not affected by this setting.
</p>
</dd>
<dt class="hdlist1">
@@ -3285,6 +3289,11 @@ <h3 id="_variables">Variables</h3>
</li>
<li>
<p>
+diffmerge
+</p>
+</li>
+<li>
+<p>
diffuse
</p>
</li>
@@ -4764,6 +4773,11 @@ <h3 id="_variables">Variables</h3>
</li>
<li>
<p>
+diffmerge
+</p>
+</li>
+<li>
+<p>
diffuse
</p>
</li>
@@ -5807,7 +5821,14 @@ <h3 id="_variables">Variables</h3>
If this is set to a non zero number or true (identical to -1 or an
unlimited number), the submodule summary will be enabled and a
summary of commits for modified submodules will be shown (see
- --summary-limit option of <a href="git-submodule.html">git-submodule(1)</a>).
+ --summary-limit option of <a href="git-submodule.html">git-submodule(1)</a>). Please note
+ that the summary output command will be suppressed for all
+ submodules when <code>diff.ignoreSubmodules</code> is set to <em>all</em> or only
+ for those submodules where <code>submodule.&lt;name&gt;.ignore=all</code>. To
+ also view the summary for ignored submodules you can either use
+ the --ignore-submodules=dirty command line option or the <em>git
+ submodule summary</em> command, which shows a similar output but does
+ not honor these settings.
</p>
</dd>
<dt class="hdlist1">
@@ -5866,7 +5887,8 @@ <h3 id="_variables">Variables</h3>
submodules that have untracked files in their work tree as changed.
This setting overrides any setting made in .gitmodules for this submodule,
both settings can be overridden on the command line by using the
- "--ignore-submodules" option.
+ "--ignore-submodules" option. The <em>git submodule</em> commands are not
+ affected by this setting.
</p>
</dd>
<dt class="hdlist1">
@@ -6011,11 +6033,11 @@ <h3 id="_variables">Variables</h3>
</dt>
<dd>
<p>
- If <a href="git-tag.html">git-tag(1)</a> is not selecting the key you want it to
- automatically when creating a signed tag, you can override the
- default selection with this variable. This option is passed
- unchanged to gpg&#8217;s --local-user parameter, so you may specify a key
- using any method that gpg supports.
+ If <a href="git-tag.html">git-tag(1)</a> or <a href="git-commit.html">git-commit(1)</a> is not selecting the
+ key you want it to automatically when creating a signed tag or
+ commit, you can override the default selection with this variable.
+ This option is passed unchanged to gpg&#8217;s --local-user parameter,
+ so you may specify a key using any method that gpg supports.
</p>
</dd>
<dt class="hdlist1">
View
5 git-format-patch.html
@@ -1915,7 +1915,8 @@ <h4 id="_approach_2_configuration">Approach #2 (configuration)</h4>
<div class="paragraph"><p>In Thunderbird 3:
Edit..Preferences..Advanced..Config Editor. Search for
"mail.wrap_long_lines".
-Toggle it to make sure it is set to <code>false</code>.</p></div>
+Toggle it to make sure it is set to <code>false</code>. Also, search for
+"mailnews.wraplength" and set the value to 0.</p></div>
</li>
<li>
<p>
@@ -2099,7 +2100,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-09-04 13:35:44 PDT
+Last updated 2013-10-15 11:39:58 PDT
</div>
</div>
</body>
View
3  git-format-patch.txt
@@ -438,7 +438,8 @@ Edit..Preferences..Composition, wrap plain text messages at 0
In Thunderbird 3:
Edit..Preferences..Advanced..Config Editor. Search for
"mail.wrap_long_lines".
-Toggle it to make sure it is set to `false`.
+Toggle it to make sure it is set to `false`. Also, search for
+"mailnews.wraplength" and set the value to 0.
3. Disable the use of format=flowed:
Edit..Preferences..Advanced..Config Editor. Search for
View
5 git-merge.html
@@ -1655,6 +1655,11 @@ <h2 id="_configuration">CONFIGURATION</h2>
</li>
<li>
<p>
+diffmerge
+</p>
+</li>
+<li>
+<p>
diffuse
</p>
</li>
View
8 git-remote.html
@@ -750,7 +750,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
<em>git remote add</em> [-t &lt;branch&gt;] [-m &lt;master&gt;] [-f] [--[no-]tags] [--mirror=&lt;fetch|push&gt;] &lt;name&gt; &lt;url&gt;
<em>git remote rename</em> &lt;old&gt; &lt;new&gt;
<em>git remote remove</em> &lt;name&gt;
-<em>git remote set-head</em> &lt;name&gt; (-a | -d | &lt;branch&gt;)
+<em>git remote set-head</em> &lt;name&gt; (-a | --auto | -d | --delete | &lt;branch&gt;)
<em>git remote set-branches</em> [--add] &lt;name&gt; &lt;branch&gt;&#8230;
<em>git remote set-url</em> [--push] &lt;name&gt; &lt;newurl&gt; [&lt;oldurl&gt;]
<em>git remote set-url --add</em> [--push] &lt;name&gt; &lt;newurl&gt;
@@ -860,8 +860,8 @@ <h2 id="_commands">COMMANDS</h2>
<code>master</code>, then <code>origin</code> may be specified wherever you would normally
specify <code>origin/master</code>.
</p>
-<div class="paragraph"><p>With <code>-d</code>, the symbolic ref <code>refs/remotes/&lt;name&gt;/HEAD</code> is deleted.</p></div>
-<div class="paragraph"><p>With <code>-a</code>, the remote is queried to determine its <code>HEAD</code>, then the
+<div class="paragraph"><p>With <code>-d</code> or <code>--delete</code>, the symbolic ref <code>refs/remotes/&lt;name&gt;/HEAD</code> is deleted.</p></div>
+<div class="paragraph"><p>With <code>-a</code> or <code>--auto</code>, the remote is queried to determine its <code>HEAD</code>, then the
symbolic-ref <code>refs/remotes/&lt;name&gt;/HEAD</code> is set to the same branch. e.g., if the remote
<code>HEAD</code> is pointed at <code>next</code>, "<code>git remote set-head origin -a</code>" will set
the symbolic-ref <code>refs/remotes/origin/HEAD</code> to <code>refs/remotes/origin/next</code>. This will
@@ -1018,7 +1018,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-15 11:39:58 PDT
</div>
</div>
</body>
View
6 git-remote.txt
@@ -13,7 +13,7 @@ SYNOPSIS
'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>
'git remote rename' <old> <new>
'git remote remove' <name>
-'git remote set-head' <name> (-a | -d | <branch>)
+'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)
'git remote set-branches' [--add] <name> <branch>...
'git remote set-url' [--push] <name> <newurl> [<oldurl>]
'git remote set-url --add' [--push] <name> <newurl>
@@ -101,9 +101,9 @@ branch. For example, if the default branch for `origin` is set to
`master`, then `origin` may be specified wherever you would normally
specify `origin/master`.
+
-With `-d`, the symbolic ref `refs/remotes/<name>/HEAD` is deleted.
+With `-d` or `--delete`, the symbolic ref `refs/remotes/<name>/HEAD` is deleted.
+
-With `-a`, the remote is queried to determine its `HEAD`, then the
+With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the
symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote
`HEAD` is pointed at `next`, "`git remote set-head origin -a`" will set
the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will
View
37 git-replace.html
@@ -760,7 +760,11 @@ <h2 id="_description">DESCRIPTION</h2>
<div class="paragraph"><p>The name of the <em>replace</em> reference is the SHA-1 of the object that is
replaced. The content of the <em>replace</em> reference is the SHA-1 of the
replacement object.</p></div>
+<div class="paragraph"><p>The replaced object and the replacement object must be of the same type.
+This restriction can be bypassed using <code>-f</code>.</p></div>
<div class="paragraph"><p>Unless <code>-f</code> is given, the <em>replace</em> reference must not yet exist.</p></div>
+<div class="paragraph"><p>There is no other restriction on the replaced and replacement objects.
+Merge commits can be replaced by non-merge commits and vice versa.</p></div>
<div class="paragraph"><p>Replacement references will be used by default by all Git commands
except those doing reachability traversal (prune, pack transfer and
fsck).</p></div>
@@ -788,6 +792,9 @@ <h2 id="_options">OPTIONS</h2>
<dt class="hdlist1">
-f
</dt>
+<dt class="hdlist1">
+--force
+</dt>
<dd>
<p>
If an existing replace ref for the same object exists, it will
@@ -797,6 +804,9 @@ <h2 id="_options">OPTIONS</h2>
<dt class="hdlist1">
-d
</dt>
+<dt class="hdlist1">
+--delete
+</dt>
<dd>
<p>
Delete existing replace refs for the given objects.
@@ -805,6 +815,9 @@ <h2 id="_options">OPTIONS</h2>
<dt class="hdlist1">
-l &lt;pattern&gt;
</dt>
+<dt class="hdlist1">
+--list &lt;pattern&gt;
+</dt>
<dd>
<p>
List replace refs for objects that match the given pattern (or
@@ -817,6 +830,19 @@ <h2 id="_options">OPTIONS</h2>
</div>
</div>
<div class="sect1">
+<h2 id="_creating_replacement_objects">CREATING REPLACEMENT OBJECTS</h2>
+<div class="sectionbody">
+<div class="paragraph"><p><a href="git-filter-branch.html">git-filter-branch(1)</a>, <a href="git-hash-object.html">git-hash-object(1)</a> and
+<a href="git-rebase.html">git-rebase(1)</a>, among other git commands, can be used to create
+replacement objects from existing objects.</p></div>
+<div class="paragraph"><p>If you want to replace many blobs, trees or commits that are part of a
+string of commits, you may just want to create a replacement string of
+commits and then only replace the commit at the tip of the target
+string of commits with the commit at the tip of the replacement string
+of commits.</p></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_bugs">BUGS</h2>
<div class="sectionbody">
<div class="paragraph"><p>Comparing blobs or trees that have been replaced with those that
@@ -824,15 +850,16 @@ <h2 id="_bugs">BUGS</h2>
go back to a replaced commit will move the branch to the replacement
commit instead of the replaced commit.</p></div>
<div class="paragraph"><p>There may be other problems when using <em>git rev-list</em> related to
-pending objects. And of course things may break if an object of one
-type is replaced by an object of another type (for example a blob
-replaced by a commit).</p></div>
+pending objects.</p></div>
</div>
</div>
<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
-<div class="paragraph"><p><a href="git-tag.html">git-tag(1)</a>
+<div class="paragraph"><p><a href="git-hash-object.html">git-hash-object(1)</a>
+<a href="git-filter-branch.html">git-filter-branch(1)</a>
+<a href="git-rebase.html">git-rebase(1)</a>
+<a href="git-tag.html">git-tag(1)</a>
<a href="git-branch.html">git-branch(1)</a>
<a href="git.html">git(1)</a></p></div>
</div>
@@ -847,7 +874,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-15 11:39:58 PDT
</div>
</div>
</body>
View
29 git-replace.txt
@@ -20,8 +20,14 @@ The name of the 'replace' reference is the SHA-1 of the object that is
replaced. The content of the 'replace' reference is the SHA-1 of the
replacement object.
+The replaced object and the replacement object must be of the same type.
+This restriction can be bypassed using `-f`.
+
Unless `-f` is given, the 'replace' reference must not yet exist.
+There is no other restriction on the replaced and replacement objects.
+Merge commits can be replaced by non-merge commits and vice versa.
+
Replacement references will be used by default by all Git commands
except those doing reachability traversal (prune, pack transfer and
fsck).
@@ -49,18 +55,34 @@ achieve the same effect as the `--no-replace-objects` option.
OPTIONS
-------
-f::
+--force::
If an existing replace ref for the same object exists, it will
be overwritten (instead of failing).
-d::
+--delete::
Delete existing replace refs for the given objects.
-l <pattern>::
+--list <pattern>::
List replace refs for objects that match the given pattern (or
all if no pattern is given).
Typing "git replace" without arguments, also lists all replace
refs.
+CREATING REPLACEMENT OBJECTS
+----------------------------
+
+linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and
+linkgit:git-rebase[1], among other git commands, can be used to create
+replacement objects from existing objects.
+
+If you want to replace many blobs, trees or commits that are part of a
+string of commits, you may just want to create a replacement string of
+commits and then only replace the commit at the tip of the target
+string of commits with the commit at the tip of the replacement string
+of commits.
+
BUGS
----
Comparing blobs or trees that have been replaced with those that
@@ -69,12 +91,13 @@ go back to a replaced commit will move the branch to the replacement
commit instead of the replaced commit.
There may be other problems when using 'git rev-list' related to
-pending objects. And of course things may break if an object of one
-type is replaced by an object of another type (for example a blob
-replaced by a commit).
+pending objects.
SEE ALSO
--------
+linkgit:git-hash-object[1]
+linkgit:git-filter-branch[1]
+linkgit:git-rebase[1]
linkgit:git-tag[1]
linkgit:git-branch[1]
linkgit:git[1]
View
10 git-status.html
@@ -1048,7 +1048,13 @@ <h2 id="_configuration">CONFIGURATION</h2>
<div class="paragraph"><p>If <code>status.submodulesummary</code> is set to a non zero number or true (identical
to -1 or an unlimited number), the submodule summary will be enabled for
the long format and a summary of commits for modified submodules will be
-shown (see --summary-limit option of <a href="git-submodule.html">git-submodule(1)</a>).</p></div>
+shown (see --summary-limit option of <a href="git-submodule.html">git-submodule(1)</a>). Please note
+that the summary output from the status command will be suppressed for all
+submodules when <code>diff.ignoreSubmodules</code> is set to <em>all</em> or only for those
+submodules where <code>submodule.&lt;name&gt;.ignore=all</code>. To also view the summary for
+ignored submodules you can either use the --ignore-submodules=dirty command
+line option or the <em>git submodule summary</em> command, which shows a similar
+output but does not honor these settings.</p></div>
</div>
</div>
<div class="sect1">
@@ -1067,7 +1073,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-15 11:39:58 PDT
</div>
</div>
</body>
View
8 git-status.txt
@@ -210,7 +210,13 @@ directory.
If `status.submodulesummary` is set to a non zero number or true (identical
to -1 or an unlimited number), the submodule summary will be enabled for
the long format and a summary of commits for modified submodules will be
-shown (see --summary-limit option of linkgit:git-submodule[1]).
+shown (see --summary-limit option of linkgit:git-submodule[1]). Please note
+that the summary output from the status command will be suppressed for all
+submodules when `diff.ignoreSubmodules` is set to 'all' or only for those
+submodules where `submodule.<name>.ignore=all`. To also view the summary for
+ignored submodules you can either use the --ignore-submodules=dirty command
+line option or the 'git submodule summary' command, which shows a similar
+output but does not honor these settings.
SEE ALSO
--------
View
3  git.txt
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.8.4/git.html[documentation for release 1.8.4]
+* link:v1.8.4.1/git.html[documentation for release 1.8.4.1]
* release notes for
+ link:RelNotes/1.8.4.1.txt[1.8.4.1],
link:RelNotes/1.8.4.txt[1.8.4].
* link:v1.8.3.4/git.html[documentation for release 1.8.3.4]
View
5 gitmodules.html
@@ -843,7 +843,8 @@ <h2 id="_description">DESCRIPTION</h2>
the superproject, the setting there will override the one found in
.gitmodules.
Both settings can be overridden on the command line by using the
- "--ignore-submodule" option.
+ "--ignore-submodule" option. The <em>git submodule</em> commands are not
+ affected by this setting.
</p>
</dd>
</dl></div>
@@ -886,7 +887,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-15 11:39:58 PDT
</div>
</div>
</body>
View
3  gitmodules.txt
@@ -75,7 +75,8 @@ submodule.<name>.ignore::
the superproject, the setting there will override the one found in
.gitmodules.
Both settings can be overridden on the command line by using the
- "--ignore-submodule" option.
+ "--ignore-submodule" option. The 'git submodule' commands are not
+ affected by this setting.
EXAMPLES
View
10 howto/revert-a-faulty-merge.html
@@ -764,7 +764,7 @@
merge that brings these premature changes into the mainline, x are changes
unrelated to what the side branch did and already made on the mainline,
and W is the "revert of the merge M" (doesn&#8217;t W look M upside down?).
-IOW, "diff W<sup>..W" is similar to "diff -R M</sup>..M".</p></div>
+IOW, <code>"diff W^..W"</code> is similar to <code>"diff -R M^..M"</code>.</p></div>
<div class="paragraph"><p>Such a "revert" of a merge can be made with:</p></div>
<div class="literalblock">
<div class="content">
@@ -859,9 +859,9 @@
---A---B A'--B'--C'</code></pre>
</div></div>
<div class="paragraph"><p>where Y is the revert of W, A' and B' are rerolled A and B, and there may
-also be a further fix-up C' on the side branch. "diff Y<sup>..Y" is similar
-to "diff -R W</sup>..W" (which in turn means it is similar to "diff M<sup>..M"),
-and "diff A'</sup>..C'" by definition would be similar but different from that,
+also be a further fix-up C' on the side branch. <code>"diff Y^..Y"</code> is similar
+to <code>"diff -R W^..W"</code> (which in turn means it is similar to <code>"diff M^..M"</code>),
+and <code>"diff A'^..C'"</code> by definition would be similar but different from that,
because it is a rerolled series of the earlier change. There will be a
lot of overlapping changes that result in conflicts. So do not do "revert
of revert" blindly without thinking..</p></div>
@@ -1021,7 +1021,7 @@
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-23 13:47:44 PDT
+Last updated 2013-10-15 11:40:04 PDT
</div>
</div>
</body>
View
8 howto/revert-a-faulty-merge.txt
@@ -37,7 +37,7 @@ where A and B are on the side development that was not so good, M is the
merge that brings these premature changes into the mainline, x are changes
unrelated to what the side branch did and already made on the mainline,
and W is the "revert of the merge M" (doesn't W look M upside down?).
-IOW, "diff W^..W" is similar to "diff -R M^..M".
+IOW, `"diff W^..W"` is similar to `"diff -R M^..M"`.
Such a "revert" of a merge can be made with:
@@ -121,9 +121,9 @@ If you reverted the revert in such a case as in the previous example:
---A---B A'--B'--C'
where Y is the revert of W, A' and B' are rerolled A and B, and there may
-also be a further fix-up C' on the side branch. "diff Y^..Y" is similar
-to "diff -R W^..W" (which in turn means it is similar to "diff M^..M"),
-and "diff A'^..C'" by definition would be similar but different from that,
+also be a further fix-up C' on the side branch. `"diff Y^..Y"` is similar
+to `"diff -R W^..W"` (which in turn means it is similar to `"diff M^..M"`),
+and `"diff A'^..C'"` by definition would be similar but different from that,
because it is a rerolled series of the earlier change. There will be a
lot of overlapping changes that result in conflicts. So do not do "revert
of revert" blindly without thinking..
View
6 howto/setup-git-server-over-http.html
@@ -841,8 +841,8 @@ <h2 id="_step_1_setup_a_bare_git_repository">Step 1: setup a bare Git repository
<pre><code>$ cd my-new-repo.git
$ git --bare init</code></pre>
</div></div>
-<div class="paragraph"><p>Change the ownership to your web-server&#8217;s credentials. Use "grep <sup>User
-httpd.conf" and "grep </sup>Group httpd.conf" to find out:</p></div>
+<div class="paragraph"><p>Change the ownership to your web-server&#8217;s credentials. Use <code>"grep ^User
+httpd.conf"</code> and <code>"grep ^Group httpd.conf"</code> to find out:</p></div>
<div class="literalblock">
<div class="content">
<pre><code>$ chown -R www.www .</code></pre>
@@ -1057,7 +1057,7 @@ <h2 id="_troubleshooting">Troubleshooting:</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-23 13:47:43 PDT
+Last updated 2013-10-15 11:40:04 PDT
</div>
</div>
</body>
View
4 howto/setup-git-server-over-http.txt
@@ -81,8 +81,8 @@ Initialize a bare repository
$ git --bare init
-Change the ownership to your web-server's credentials. Use "grep ^User
-httpd.conf" and "grep ^Group httpd.conf" to find out:
+Change the ownership to your web-server's credentials. Use `"grep ^User
+httpd.conf"` and `"grep ^Group httpd.conf"` to find out:
$ chown -R www.www .
View
1  mergetools-diff.txt
@@ -2,6 +2,7 @@
* bc3
* codecompare
* deltawalker
+* diffmerge
* diffuse
* ecmerge
* emerge
View
1  mergetools-merge.txt
@@ -2,6 +2,7 @@
* bc3
* codecompare
* deltawalker
+* diffmerge
* diffuse
* ecmerge
* emerge
Please sign in to comment.
Something went wrong with that request. Please try again.