Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>There are no commits “on a branch” in git. There are only commits <em>reachable</em> from a branch. And that information is not a very good indicator of what branch that commit originally belonged to. So I see two ways to interpret your question:</p> <ul> <li>I want to find the first commit after the merge-base of <code>branch</code> and <code>master</code> that is on the side of branch.</li> <li>I want to find the first commit that is reachable from <code>branch</code>, but not from <code>master</code>.</li> </ul> <p>I am gonna assume you meant the second one. The answer to that is returned by this command:</p> <pre><code> git rev-list ^master mybranch | tail -n 1 </code></pre> <p><strong>Note:</strong> This is all gonna fail horribly if you branch off topic branches.</p> <hr> <p>I am a little bit confused as to what you want to achieve. If you want a whole branch to be represented by one commit, but still get a merge, You should do this:</p> <pre><code>git checkout mybranch git reset --soft `git merge-base mybranch master` git commit -m 'All of Mybranch' git checkout master git merge --no-ff mybranch </code></pre> <p>Note that this will start the squash at the first merge-base. This might not be what you want if you merged <code>master</code> into <code>mybranch</code> before. You can modify this to start at the first commit on mybranch, but not on master (might have wierd and unexpected results in complex histories) by replacing the second command with this:</p> <pre><code> git reset --soft `git rev-list ^master mybranch | tail -n 1`^ </code></pre>
    singulars
    1. This table or related slice is empty.
    1. POHow can I find the first commit of a branch?
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USCurt J. Sampson
    1. USChronial
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POHow can I find the first commit of a branch?
      singulars
      1. PTQuestion
    1. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTAcceptedByOriginator
    1. COThanks. I have added an explanation of what I want to do, see my edits.
      singulars
      1. PO
      1. USTamás Szelei
    2. COI assumed so – that is exactly what I explain in my answer.
      singulars
      1. PO
      1. USChronial
    3. COGreat, this works very well. Thank you.
      singulars
      1. PO
      1. USTamás Szelei
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

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