Skip to content

Instantly share code, notes, and snippets.

@rca

rca/README.md

Last active February 25, 2022 05:33
Show Gist options
  • Save rca/c6eed10f07204955daba821635b6fe6c to your computer and use it in GitHub Desktop.
Save rca/c6eed10f07204955daba821635b6fe6c to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. rca revised this gist Sep 26, 2019. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion README.md
    View file
    Original file line number Diff line number Diff line change
    @@ -50,7 +50,7 @@ $ git rebase --onto experiments/sso-login-app origin/env/dev-auth fix/rebase-ont
    \_______________________/ \_________________/ \_____________/
    | | |
    1. the commit that accidental | | |
    comits should be on top of* ----+ | |
    commits should be on top of ----+ | |
    | |
    2. the branch/commit that additional commits were | |
    accidentally made on top of --------------------------+ |
  2. rca revised this gist Sep 26, 2019. 1 changed file with 31 additions and 13 deletions.
    44 changes: 31 additions & 13 deletions README.md
    View file
    Original file line number Diff line number Diff line change
    @@ -5,7 +5,7 @@ Looking at the following git history, there are a few commits that were accident
    ```
    [0][~/Projects/openslate/thing(env/dev-auth:feb0ee9)]
    $ git log
    commit feb0ee98c8b77e929b9cc23442c5664c9d4986c9 (HEAD -> env/dev-auth) # this is `3.` in the command below
    commit feb0ee98c8b77e929b9cc23442c5664c9d4986c9 (HEAD -> env/dev-auth) # this is `0.` in the command below
    Author: Roberto Aguilar <[email protected]>
    Date: Thu Sep 26 00:25:15 2019 -0400
    @@ -34,18 +34,36 @@ Date: Thu Sep 26 00:01:42 2019 -0400
    ```


    In order to fix the problem `git rebase —onto` can be used, but it’s confusing. Here’s what the parameters mean:
    In order to fix the problem `git rebase —onto` can be used, but it’s confusing.

    The first thing to do is reset the desired branch to the HEAD of the accidental commits:

    ```
    $ git rebase --onto experiments/sso-login-app origin/env/dev-auth env/dev-auth
    \_______________________/ \_________________/ \__________/
    | | |
    1. the branch that will contain | | |
    the final resulting rebase -----+ | |
    | |
    2. the branch/commit that additional commits were | |
    accidentally made on top of --------------------------+ |
    |
    3. the local branch containing the accidental commits -----------------+
    ```
    $ git checkout env/dev-auth # this is `0.` from the git log above.
    $ git checkout -b fix/rebase-onto # create a temporary branch to house the resulting rebase
    ```

    Next, run `git rebase --onto`, which will rewrite `experiments/sso-login-app` to the final result:

    ```
    $ git rebase --onto experiments/sso-login-app origin/env/dev-auth fix/rebase-onto
    \_______________________/ \_________________/ \_____________/
    | | |
    1. the commit that accidental | | |
    comits should be on top of* ----+ | |
    | |
    2. the branch/commit that additional commits were | |
    accidentally made on top of --------------------------+ |
    |
    3. the local branch with accidental commits. |
    it will be refrenced to find the commits to move as |
    well as being re-written to have the final result ----------------------+
    ```

    Once `fix/rebase-onto` is confirmed to be correct:

    ```
    $ git checkout experiments/sso-login-app
    $ git reset --hard fix/rebase-onto
    $ git branch -D fix/rebase-onto
    ```
  3. rca revised this gist Sep 26, 2019. 1 changed file with 2 additions and 4 deletions.
    6 changes: 2 additions & 4 deletions README.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,6 +1,6 @@
    # git rebase onto fu

    Looking at the following git history:
    Looking at the following git history, there are a few commits that were accidentally made on top of `env/dev-auth` that should be on a feature branch named `experiments/sso-login-app` (`1.` in the command below):

    ```
    [0][~/Projects/openslate/thing(env/dev-auth:feb0ee9)]
    @@ -34,9 +34,7 @@ Date: Thu Sep 26 00:01:42 2019 -0400
    ```


    There are a few commits that were accidentally made on top of `env/dev-auth` that should have been made on
    a feature branch named `experiments/sso-login-app` (`1.` in the command below). In order to fix the
    problem `git rebase —onto` can be used, but it’s confusing. Here’s what the parameters mean:
    In order to fix the problem `git rebase —onto` can be used, but it’s confusing. Here’s what the parameters mean:


    ```
  4. rca revised this gist Sep 26, 2019. 1 changed file with 2 additions and 0 deletions.
    2 changes: 2 additions & 0 deletions README.md
    View file
    Original file line number Diff line number Diff line change
    @@ -39,6 +39,7 @@ a feature branch named `experiments/sso-login-app` (`1.` in the command below).
    problem `git rebase —onto` can be used, but it’s confusing. Here’s what the parameters mean:


    ```
    $ git rebase --onto experiments/sso-login-app origin/env/dev-auth env/dev-auth
    \_______________________/ \_________________/ \__________/
    | | |
    @@ -49,3 +50,4 @@ the final resulting rebase -----+ | |
    accidentally made on top of --------------------------+ |
    |
    3. the local branch containing the accidental commits -----------------+
    ```
  5. rca created this gist Sep 26, 2019.
    51 changes: 51 additions & 0 deletions README.md
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,51 @@
    # git rebase onto fu

    Looking at the following git history:

    ```
    [0][~/Projects/openslate/thing(env/dev-auth:feb0ee9)]
    $ git log
    commit feb0ee98c8b77e929b9cc23442c5664c9d4986c9 (HEAD -> env/dev-auth) # this is `3.` in the command below
    Author: Roberto Aguilar <[email protected]>
    Date: Thu Sep 26 00:25:15 2019 -0400
    Accidental commit 3
    commit 7592d4d1ab1a101ad654abc097672ab9bfecbd8a
    Author: Roberto Aguilar <[email protected]>
    Date: Thu Sep 26 00:24:50 2019 -0400
    Accidental commit 2
    commit 89fe221406158f5d069cbd669feddff28e307b4f
    Author: Roberto Aguilar <[email protected]>
    Date: Thu Sep 26 00:24:08 2019 -0400
    Accidental commit 1
    commit 58f4606f37359829c5b4f945a1a4c4a17c4428b4 (origin/env/dev-auth) # this is `2.` in the command below
    Merge: df3ebc5 3fee1eb
    Author: Roberto Aguilar <[email protected]>
    Date: Thu Sep 26 00:01:42 2019 -0400
    The commit that accidental commits were commited on top of
    [...]
    ```


    There are a few commits that were accidentally made on top of `env/dev-auth` that should have been made on
    a feature branch named `experiments/sso-login-app` (`1.` in the command below). In order to fix the
    problem `git rebase —onto` can be used, but it’s confusing. Here’s what the parameters mean:


    $ git rebase --onto experiments/sso-login-app origin/env/dev-auth env/dev-auth
    \_______________________/ \_________________/ \__________/
    | | |
    1. the branch that will contain | | |
    the final resulting rebase -----+ | |
    | |
    2. the branch/commit that additional commits were | |
    accidentally made on top of --------------------------+ |
    |
    3. the local branch containing the accidental commits -----------------+