Skip to content

Instantly share code, notes, and snippets.

@WORMSS

WORMSS/gitcommands.md

Last active October 20, 2021 10:18
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save WORMSS/97da6baac7ccbc6f29b7455792824a3f to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save WORMSS/97da6baac7ccbc6f29b7455792824a3f to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. WORMSS revised this gist Oct 20, 2021. 1 changed file with 1 addition and 0 deletions.
    1 change: 1 addition & 0 deletions gitcommands.md
    View file
    Original file line number Diff line number Diff line change
    @@ -4,6 +4,7 @@ $ git fetch origin <sha>
    ```

    ## Git Octopus merge staging:
    Make sure the staging area is how you want the commit to be
    ```sh
    $ git write-tree
    <staging sha>
  2. WORMSS revised this gist Oct 20, 2021. 1 changed file with 5 additions and 1 deletion.
    6 changes: 5 additions & 1 deletion gitcommands.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,11 +1,15 @@
    ## Git Get Remote Sha:
    ```sh
    $ git fetch origin <sha>
    ```

    ## Git Octopus merge staging:
    ```sh
    $ git write-tree
    <staging sha>

    $ git commit-tree <staging sha> -p <parent1> -p <parent2> .... -m "Message"
    <commit sha>

    $ git reset --hard <commit sha>
    $ git reset --hard <commit sha>
    ```
  3. WORMSS renamed this gist Oct 20, 2021. 1 changed file with 0 additions and 0 deletions.
    0 gistfile1.txt → gitcommands.md
    View file
    File renamed without changes.
  4. WORMSS created this gist Oct 20, 2021.
    11 changes: 11 additions & 0 deletions gistfile1.txt
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,11 @@
    ## Git Get Remote Sha:
    $ git fetch origin <sha>

    ## Git Octopus merge staging:
    $ git write-tree
    <staging sha>

    $ git commit-tree <staging sha> -p <parent1> -p <parent2> .... -m "Message"
    <commit sha>

    $ git reset --hard <commit sha>