diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-03-23 05:40:15 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-03-23 05:40:15 +0000 |
| commit | 9a2fb2de47af2cda8265eddf4c01de0c0bee7810 (patch) | |
| tree | 457100abdf5cdf598bc9fe6f5f77742c7a461abb /git-rev-list.html | |
| parent | 78f25df845b9b3579ac0c29a415f8282599831d0 (diff) | |
| download | git-htmldocs-9a2fb2de47af2cda8265eddf4c01de0c0bee7810.tar.gz | |
Autogenerated HTML docs for v1.7.4.1-415-g5e839
Diffstat (limited to 'git-rev-list.html')
| -rw-r--r-- | git-rev-list.html | 44 |
1 files changed, 43 insertions, 1 deletions
diff --git a/git-rev-list.html b/git-rev-list.html index 671f962ab..521aadf2d 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -437,6 +437,9 @@ git-rev-list(1) Manual Page [ --parents ]
[ --timestamp ]
[ --left-right ]
+ [ --left-only ]
+ [ --right-only ]
+ [ --cherry-mark ]
[ --cherry-pick ]
[ --encoding[=<encoding>] ]
[ --(author|committer|grep)=<pattern> ]
@@ -747,6 +750,15 @@ ordering and formatting options, such as <em>--reverse</em>.</p></div> </p>
</dd>
<dt class="hdlist1">
+--cherry-mark
+</dt>
+<dd>
+<p>
+ Like <tt>--cherry-pick</tt> (see below) but mark equivalent commits
+ with <tt>=</tt> rather than omitting them, and inequivalent ones with <tt>+</tt>.
+</p>
+</dd>
+<dt class="hdlist1">
--cherry-pick
</dt>
<dd>
@@ -764,6 +776,36 @@ from branch A). With this option, such pairs of commits are excluded from the output.</p></div>
</dd>
<dt class="hdlist1">
+--left-only
+</dt>
+<dt class="hdlist1">
+--right-only
+</dt>
+<dd>
+<p>
+ List only commits on the respective side of a symmetric range,
+ i.e. only those which would be marked <tt><</tt> resp. <tt>></tt> by
+ <tt>--left-right</tt>.
+</p>
+<div class="paragraph"><p>For example, <tt>--cherry-pick --right-only A…B</tt> omits those
+commits from <tt>B</tt> which are in <tt>A</tt> or are patch-equivalent to a commit in
+<tt>A</tt>. In other words, this lists the <tt>+</tt> commits from <tt>git cherry A B</tt>.
+More precisely, <tt>--cherry-pick --right-only --no-merges</tt> gives the exact
+list.</p></div>
+</dd>
+<dt class="hdlist1">
+--cherry
+</dt>
+<dd>
+<p>
+ A synonym for <tt>--right-only --cherry-mark --no-merges</tt>; useful to
+ limit the output to the commits on our side and mark those that
+ have been applied to the other side of a forked history with
+ <tt>git log --cherry upstream…mybranch</tt>, similar to
+ <tt>git cherry upstream mybranch</tt>.
+</p>
+</dd>
+<dt class="hdlist1">
-g
</dt>
<dt class="hdlist1">
@@ -1945,7 +1987,7 @@ $ git log -2 --pretty=%h 4da45bef</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-03-15 23:30:14 UTC
+Last updated 2011-03-23 05:39:52 UTC
</div>
</div>
</body>
|