StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>I personally like to inspect the difference in revision trees:</p> <pre><code>git log --graph --left-right --cherry-pick --oneline branch1...branch2 </code></pre> <p>Also, in the 'magic' department there is</p> <pre><code>git show-branch git show-branch branch1 branch2 git show-branch --all # which does all of the above and more </code></pre> <p>And finally,</p> <pre><code>git merge-base branch1 branch2 </code></pre> <p>to name the <em>base</em> revision that would be merged <em>from</em></p> <hr> <p>Notes:</p> <ul> <li>replace <code>branch1</code> and <code>branch2</code> as appropriate for your project</li> <li>you can alias those commands if you like them: <a href="http://progit.org/book/ch2-7.html#git_aliases" rel="nofollow">http://progit.org/book/ch2-7.html#git_aliases</a></li> <li>the <code>--cherry-pick</code> options carries a rare kind of <code>magic</code>: </li> </ul> <blockquote> <pre><code>--cherry-pick </code></pre> <p>Omit any commit that introduces the same change as another commit on the "other side" when the set of commits are limited with symmetric difference. </p> <p>For example, if you have two branches, A and B, a usual way to list all commits on only one side of them is with --left-right, like the example above in the description of that option. It however shows the commits that were cherry-picked from the other branch (for example, "3rd on b" may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output.</p> </blockquote>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload