Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>I propose you a solution with <code>rebase onto</code>. Say we have the following repo :</p> <pre><code>user@HOST c:/_TEMP/FOO (AIOEC-393) $ git lga * 8c2d5c5 - (HEAD, AIOEC-393) commit5 (Yanflea 2 minutes ago) * 3c20e52 - commit4 (Yanflea 2 minutes ago) * c5383af - commit3 (Yanflea 2 minutes ago) * fb11e98 - commit2 (Yanflea 2 minutes ago) * e019261 - (develop) commit1 (Yanflea 2 minutes ago) * 0cfe064 - (master) Initial commit (Yanflea 2 minutes ago) </code></pre> <p>And you want to have all commits from <code>AIOEC-393</code> branch except <em>commit2</em>.</p> <p>Let's move to a 'temp' branch (so that <code>AIOEC-393</code> is not modified):</p> <pre><code>$ git checkout -b develop-target </code></pre> <p>and then use the <code>rebase onto</code> command using <em>commit2</em> as pivot :</p> <pre><code>$ git rebase --onto develop fb11e98 develop-target </code></pre> <p>Let's see the log :</p> <pre><code>user@HOST c:/_TEMP/FOO (develop-target) $ git lga * 7bcb162 - (HEAD, develop-target) commit5 (Yanflea 2 minutes ago) * 3c89459 - commit4 (Yanflea 2 minutes ago) * e6ed5f7 - commit3 (Yanflea 2 minutes ago) * e019261 - (develop) commit1 (Yanflea 2 minutes ago) * 0cfe064 - (master) Initial commit (Yanflea 2 minutes ago) </code></pre> <p>Now we just have to fast-forward from <code>develop</code> to <code>develop-target</code> (and then remove <code>develop-target</code>):</p> <pre><code>$ git checkout develop $ git rebase develop-target $ git branch -d develop-target </code></pre> <p>The log :</p> <pre><code>user@HOST c:/_TEMP/FOO (develop) $ git lga * 7bcb162 - (HEAD, develop) commit5 (Yanflea 2 minutes ago) * 3c89459 - commit4 (Yanflea 2 minutes ago) * e6ed5f7 - commit3 (Yanflea 2 minutes ago) * e019261 - commit1 (Yanflea 2 minutes ago) * 0cfe064 - (master) Initial commit (Yanflea 2 minutes ago) </code></pre>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    1. This table or related slice is empty.
 

Querying!

 
Guidance

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