Skip to content

Instantly share code, notes, and snippets.

@juniorbird
Created June 2, 2016 03:02
Show Gist options
  • Save juniorbird/5c387a54265566fac8dbad4a7a6478b2 to your computer and use it in GitHub Desktop.
Save juniorbird/5c387a54265566fac8dbad4a7a6478b2 to your computer and use it in GitHub Desktop.
Sample git rebase todo
pick 019325e 0.1.0
pick a4b689d Fetch all dependencies
squash 714a49d Matches keywords to Docker repos
pick d2d1ca3 parseDependencies returns an object of dependencies.
squash e3b6cd9 Clean up packageParser
squash 57acd67 Initial commit
squash 3f3e05e Rough out how we'll make Dockerfiles
squash 9e10b94 Can check for, make Docker files
squash a27b0ee Write docker files
pick a0980b8 Build Dockerfiles
# Rebase 9104a20..a0980b8 onto 9104a20 (10 command(s))
#
# 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
# d, drop = remove commit
#
# 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment