Skip to content

Instantly share code, notes, and snippets.

@NuckChorris

NuckChorris/git-rebase-todo

Last active December 14, 2018 13:27
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save NuckChorris/11157382 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save NuckChorris/11157382 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. NuckChorris revised this gist Apr 21, 2014. 1 changed file with 10 additions and 10 deletions.
    20 changes: 10 additions & 10 deletions git-rebase-todo
    View file
    Original file line number Diff line number Diff line change
    @@ -1,18 +1,18 @@
    r 0e47d9c asdf
    s 3ac11d1 asdf
    p d36076e Intriguing!
    reword 0e47d9c asdf
    squash 3ac11d1 asdf
    pick d36076e Intriguing!
    pick 49ebfed Policy.
    pick 9d2983b Adding a 404 error page.
    pick edfbc9c Adding hackish search index.
    pick 48b5273 site map, json search index and addition to header
    pick 201827e made help index prettier.
    s bac9c44 I broke it
    s 839a5e1 I broke it still
    s e04b015 I broke it still
    s 528bbd5 im fixing it
    s 58262e8 im fixing it
    s 1825ece I fixed it.
    pick cad0848 Got enough commits there Lucy? Removing useless newlines.
    squash bac9c44 I broke it
    squash 839a5e1 I broke it still
    squash e04b015 I broke it still
    squash 528bbd5 im fixing it
    squash 58262e8 im fixing it
    squash 1825ece I fixed it.
    reword cad0848 Got enough commits there Lucy? Removing useless newlines.

    # Rebase 4c8bb6c..cad0848 onto 4c8bb6c
    #
  2. NuckChorris created this gist Apr 21, 2014.
    33 changes: 33 additions & 0 deletions git-rebase-todo
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,33 @@
    r 0e47d9c asdf
    s 3ac11d1 asdf
    p d36076e Intriguing!
    pick 49ebfed Policy.
    pick 9d2983b Adding a 404 error page.
    pick edfbc9c Adding hackish search index.
    pick 48b5273 site map, json search index and addition to header
    pick 201827e made help index prettier.
    s bac9c44 I broke it
    s 839a5e1 I broke it still
    s e04b015 I broke it still
    s 528bbd5 im fixing it
    s 58262e8 im fixing it
    s 1825ece I fixed it.
    pick cad0848 Got enough commits there Lucy? Removing useless newlines.

    # Rebase 4c8bb6c..cad0848 onto 4c8bb6c
    #
    # Commands:
    # p, pick = use commit
    # r, reword = use commit, but edit the commit message
    # e, edit = use commit, but stop for amending
    # s, squash = use commit, but meld into previous commit
    # f, fixup = like "squash", but discard this commit's log message
    # x, exec = run command (the rest of the line) using shell
    #
    # These lines can be re-ordered; they are executed from top to bottom.
    #
    # If you remove a line here THAT COMMIT WILL BE LOST.
    #
    # However, if you remove everything, the rebase will be aborted.
    #
    # Note that empty commits are commented out