Permalink
Browse files

Autogenerated HTML docs for v1.8.1.1-347-g9591f

  • Loading branch information...
1 parent 60b372a commit e77c5d0bdc4c4f3ca9b8fc6f7147c3938be402a8 @gitster committed Jan 22, 2013
Showing with 98 additions and 31 deletions.
  1. +37 −2 RelNotes/1.8.2.txt
  2. +24 −6 git-p4.html
  3. +18 −4 git-p4.txt
  4. +10 −10 git-reset.html
  5. +9 −9 git-reset.txt
View
@@ -78,6 +78,13 @@ UI, Workflows & Features
been applied, but we probably would want to revisit this later, as
it hurts the common case of not failing at all.
+ * Input and preconditions to "git reset" has been loosened where
+ appropriate. "git reset $fromtree Makefile" requires $fromtree to
+ be any tree (it used to require it to be a commit), for example.
+ "git reset" (without options or parameters) used to error out when
+ you do not have any commits in your history, but it now gives you
+ an empty index (to match non-existent commit you are not even on).
+
* "git submodule" started learning a new mode to integrate with the
tip of the remote branch (as opposed to integrating with the commit
recorded in the superproject's gitlink).
@@ -90,6 +97,11 @@ Foreign Interface
* A new remote helper to interact with bzr has been added to contrib/.
+ * "git p4" got various bugfixes around its branch handling.
+
+ * The remote helper to interact with Hg in contrib/ has seen a few
+ fixes.
+
Performance, Internal Implementation, etc.
@@ -99,6 +111,11 @@ Performance, Internal Implementation, etc.
* Matching paths with common forms of pathspecs that contain wildcard
characters has been optimized further.
+ * "git reset" internals has been reworked and should be faster in
+ general. We tried to be careful not to break any behaviour but
+ there could be corner cases, especially when running the command
+ from a conflicted state, that we may have missed.
+
* The implementation of "imap-send" has been updated to reuse xml
quoting code from http-push codepath.
@@ -145,8 +162,10 @@ details).
* The attribute mechanism didn't allow limiting attributes to be
applied to only a single directory itself with "path/" like the
- exclude mechanism does.
- (merge 94bc671 ja/directory-attrs later to maint).
+ exclude mechanism does. The initial implementation of this that
+ was merged to 'maint' and 1.8.1.2 was with a severe performance
+ degradations and needs to merge a fix-up topic.
+ (merge 9db9eec nd/fix-directory-attrs-off-by-one later to maint).
* "git apply" misbehaved when fixing whitespace breakages by removing
excess trailing blank lines.
@@ -160,6 +179,14 @@ details).
streaming a zip archive, which confused some implementations of unzip.
(merge 5ea2c84 rs/zip-with-uncompressed-size-in-the-header later to maint).
+ * "git clean" showed what it was going to do, but sometimes end up
+ finding that it was not allowed to do so, which resulted in a
+ confusing output (e.g. after saying that it will remove an
+ untracked directory, it found an embedded git repository there
+ which it is not allowed to remove). It now performs the actions
+ and then reports the outcome more faithfully.
+ (merge f538a91 zk/clean-report-failure later to maint).
+
* When "git clone --separate-git-dir=$over_there" is interrupted, it
failed to remove the real location of the $GIT_DIR it created.
This was most visible when interrupting a submodule update.
@@ -185,6 +212,14 @@ details).
index, the cache-tree data structure got corrupted.
(merge eec3e7e nd/invalidate-i-t-a-cache-tree later to maint).
+ * "git clone" used to allow --bare and --separate-git-dir=$there
+ options at the same time, which was nonsensical.
+ (merge 95b63f1 nd/clone-no-separate-git-dir-with-bare later to maint).
+
+ * "git rebase --preserve-merges" lost empty merges in recent versions
+ of Git.
+ (merge 9869778 ph/rebase-preserve-all-merges later to maint).
+
* "git merge --no-edit" computed who were involved in the work done
on the side branch, even though that information is to be discarded
without getting seen in the editor.
View
@@ -877,6 +877,10 @@ <h3 id="_sync">Sync</h3>
will be fetched and consulted first during a <em>git p4 sync</em>. Since
importing directly from p4 is considerably slower than pulling changes
from a git remote, this can be useful in a multi-developer environment.</p></div>
+<div class="paragraph"><p>If there are multiple branches, doing <em>git p4 sync</em> will automatically
+use the "BRANCH DETECTION" algorithm to try to partition new changes
+into the right branch. This can be overridden with the <em>--branch</em>
+option to specify just a single branch to update.</p></div>
</div>
<div class="sect2">
<h3 id="_rebase">Rebase</h3>
@@ -953,9 +957,11 @@ <h3 id="_sync_options">Sync options</h3>
<dd>
<p>
Import changes into given branch. If the branch starts with
- <em>refs/</em>, it will be used as is, otherwise the path <em>refs/heads/</em>
- will be prepended. The default branch is <em>master</em>. If used
- with an initial clone, no HEAD will be checked out.
+ <em>refs/</em>, it will be used as is. Otherwise if it does not start
+ with <em>p4/</em>, that prefix is added. The branch is assumed to
+ name a remote tracking, but this can be modified using
+ <em>--import-local</em>, or by giving a full ref name. The default
+ branch is <em>master</em>.
</p>
<div class="paragraph"><p>This example imports a new remote "p4/proj2" into an existing
git repository:</p></div>
@@ -1166,6 +1172,16 @@ <h3 id="_submit_options">Submit options</h3>
skipped, or to quit trying to apply commits, without prompting.
</p>
</dd>
+<dt class="hdlist1">
+--branch &lt;branch&gt;
+</dt>
+<dd>
+<p>
+ After submitting, sync this named branch instead of the default
+ p4/master. See the "Sync options" section above for more
+ information.
+</p>
+</dd>
</dl></div>
</div>
<div class="sect2">
@@ -1304,8 +1320,10 @@ <h2 id="_branch_detection">BRANCH DETECTION</h2>
occur with:</p></div>
<div class="listingblock">
<div class="content">
-<pre><code>git config git-p4.branchList main:branch1
-git p4 clone --detect-branches //depot@all</code></pre>
+<pre><code>git init depot
+cd depot
+git config git-p4.branchList main:branch1
+git p4 clone --detect-branches //depot@all .</code></pre>
</div></div>
</div>
</div>
@@ -1625,7 +1643,7 @@ <h2 id="_implementation_details">IMPLEMENTATION DETAILS</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-09-18 15:30:10 PDT
+Last updated 2013-01-22 11:18:46 PST
</div>
</div>
</body>
View
@@ -112,6 +112,11 @@ will be fetched and consulted first during a 'git p4 sync'. Since
importing directly from p4 is considerably slower than pulling changes
from a git remote, this can be useful in a multi-developer environment.
+If there are multiple branches, doing 'git p4 sync' will automatically
+use the "BRANCH DETECTION" algorithm to try to partition new changes
+into the right branch. This can be overridden with the '--branch'
+option to specify just a single branch to update.
+
Rebase
~~~~~~
@@ -173,9 +178,11 @@ subsequent 'sync' operations.
--branch <branch>::
Import changes into given branch. If the branch starts with
- 'refs/', it will be used as is, otherwise the path 'refs/heads/'
- will be prepended. The default branch is 'master'. If used
- with an initial clone, no HEAD will be checked out.
+ 'refs/', it will be used as is. Otherwise if it does not start
+ with 'p4/', that prefix is added. The branch is assumed to
+ name a remote tracking, but this can be modified using
+ '--import-local', or by giving a full ref name. The default
+ branch is 'master'.
+
This example imports a new remote "p4/proj2" into an existing
git repository:
@@ -287,6 +294,11 @@ These options can be used to modify 'git p4 submit' behavior.
to bypass the prompt, causing conflicting commits to be automatically
skipped, or to quit trying to apply commits, without prompting.
+--branch <branch>::
+ After submitting, sync this named branch instead of the default
+ p4/master. See the "Sync options" section above for more
+ information.
+
Rebase options
~~~~~~~~~~~~~~
These options can be used to modify 'git p4 rebase' behavior.
@@ -394,8 +406,10 @@ the path elements in the p4 repository. The example above relied on the
presence of the p4 branch. Without p4 branches, the same result will
occur with:
----
+git init depot
+cd depot
git config git-p4.branchList main:branch1
-git p4 clone --detect-branches //depot@all
+git p4 clone --detect-branches //depot@all .
----
View
@@ -746,8 +746,8 @@
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git reset</em> [-q] [&lt;commit&gt;] [--] &lt;paths&gt;&#8230;
-<em>git reset</em> (--patch | -p) [&lt;commit&gt;] [--] [&lt;paths&gt;&#8230;]
+<pre class="content"><em>git reset</em> [-q] [&lt;tree-ish&gt;] [--] &lt;paths&gt;&#8230;
+<em>git reset</em> (--patch | -p) [&lt;tree-sh&gt;] [--] [&lt;paths&gt;&#8230;]
<em>git reset</em> [--soft | --mixed | --hard | --merge | --keep] [-q] [&lt;commit&gt;]</pre>
<div class="attribution">
</div></div>
@@ -756,18 +756,18 @@ <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>In the first and second form, copy entries from &lt;commit&gt; to the index.
+<div class="paragraph"><p>In the first and second form, copy entries from &lt;tree-ish&gt; to the index.
In the third form, set the current branch head (HEAD) to &lt;commit&gt;, optionally
-modifying index and working tree to match. The &lt;commit&gt; defaults to HEAD
-in all forms.</p></div>
+modifying index and working tree to match. The &lt;tree-ish&gt;/&lt;commit&gt; defaults
+to HEAD in all forms.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
-<em>git reset</em> [-q] [&lt;commit&gt;] [--] &lt;paths&gt;&#8230;
+<em>git reset</em> [-q] [&lt;tree-ish&gt;] [--] &lt;paths&gt;&#8230;
</dt>
<dd>
<p>
This form resets the index entries for all &lt;paths&gt; to their
- state at &lt;commit&gt;. (It does not affect the working tree, nor
+ state at &lt;tree-ish&gt;. (It does not affect the working tree, nor
the current branch.)
</p>
<div class="paragraph"><p>This means that <code>git reset &lt;paths&gt;</code> is the opposite of <code>git add
@@ -780,12 +780,12 @@ <h2 id="_description">DESCRIPTION</h2>
working tree in one go.</p></div>
</dd>
<dt class="hdlist1">
-<em>git reset</em> (--patch | -p) [&lt;commit&gt;] [--] [&lt;paths&gt;&#8230;]
+<em>git reset</em> (--patch | -p) [&lt;tree-ish&gt;] [--] [&lt;paths&gt;&#8230;]
</dt>
<dd>
<p>
Interactively select hunks in the difference between the index
- and &lt;commit&gt; (defaults to HEAD). The chosen hunks are applied
+ and &lt;tree-ish&gt; (defaults to HEAD). The chosen hunks are applied
in reverse to the index.
</p>
<div class="paragraph"><p>This means that <code>git reset -p</code> is the opposite of <code>git add -p</code>, i.e.
@@ -1348,7 +1348,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-11-13 14:31:09 PST
+Last updated 2013-01-22 11:18:46 PST
</div>
</div>
</body>
View
@@ -8,20 +8,20 @@ git-reset - Reset current HEAD to the specified state
SYNOPSIS
--------
[verse]
-'git reset' [-q] [<commit>] [--] <paths>...
-'git reset' (--patch | -p) [<commit>] [--] [<paths>...]
+'git reset' [-q] [<tree-ish>] [--] <paths>...
+'git reset' (--patch | -p) [<tree-sh>] [--] [<paths>...]
'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>]
DESCRIPTION
-----------
-In the first and second form, copy entries from <commit> to the index.
+In the first and second form, copy entries from <tree-ish> to the index.
In the third form, set the current branch head (HEAD) to <commit>, optionally
-modifying index and working tree to match. The <commit> defaults to HEAD
-in all forms.
+modifying index and working tree to match. The <tree-ish>/<commit> defaults
+to HEAD in all forms.
-'git reset' [-q] [<commit>] [--] <paths>...::
+'git reset' [-q] [<tree-ish>] [--] <paths>...::
This form resets the index entries for all <paths> to their
- state at <commit>. (It does not affect the working tree, nor
+ state at <tree-ish>. (It does not affect the working tree, nor
the current branch.)
+
This means that `git reset <paths>` is the opposite of `git add
@@ -34,9 +34,9 @@ Alternatively, using linkgit:git-checkout[1] and specifying a commit, you
can copy the contents of a path out of a commit to the index and to the
working tree in one go.
-'git reset' (--patch | -p) [<commit>] [--] [<paths>...]::
+'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]::
Interactively select hunks in the difference between the index
- and <commit> (defaults to HEAD). The chosen hunks are applied
+ and <tree-ish> (defaults to HEAD). The chosen hunks are applied
in reverse to the index.
+
This means that `git reset -p` is the opposite of `git add -p`, i.e.

0 comments on commit e77c5d0

Please sign in to comment.