-
-
Save tubbo/d38f1e2d2ec9bc480b6f to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pick 8bbfbba Refactor PaymentTransaction to match graffles. | |
s e1742c8 transactions aren't reporting as voidable | |
s 360e700 Add optional message to {assert|refute}_state | |
s 3f8b27d Fix syntax error | |
s 7c04036 All tests pass for refund and void transactions | |
# Rebase d39ff43..7c04036 onto d39ff43 | |
# | |
# 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 | |
# | |
# If you remove a line here THAT COMMIT WILL BE LOST. | |
# However, if you remove everything, the rebase will be aborted. | |
# |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
d39ff43 HEAD@{0}: rebase -i (squash): updating HEAD | |
8bbfbba HEAD@{1}: checkout: moving from master to 8bbfbba | |
7c04036 HEAD@{2}: rebase: aborting | |
d39ff43 HEAD@{3}: rebase -i (squash): updating HEAD | |
8bbfbba HEAD@{4}: checkout: moving from master to 8bbfbba | |
7c04036 HEAD@{5}: rebase: aborting | |
d39ff43 HEAD@{6}: rebase -i (squash): updating HEAD | |
8bbfbba HEAD@{7}: checkout: moving from master to 8bbfbba | |
7c04036 HEAD@{8}: rebase: aborting | |
d39ff43 HEAD@{9}: rebase -i (squash): updating HEAD | |
8bbfbba HEAD@{10}: checkout: moving from master to 8bbfbba | |
7c04036 HEAD@{11}: rebase: aborting | |
7c04036 HEAD@{12}: rebase: aborting | |
8bbfbba HEAD@{13}: rebase -i (squash): updating HEAD | |
e1742c8 HEAD@{14}: checkout: moving from master to e1742c8 | |
7c04036 HEAD@{15}: commit: All tests pass for refund and void transactions |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
master♬ gri d39ff43 | |
fatal: ref HEAD is not a symbolic ref | |
Could not apply e1742c8... transactions aren't reporting as voidable |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
♬ git status | |
# Not currently on any branch. | |
# Changes to be committed: | |
# (use "git reset HEAD <file>..." to unstage) | |
# | |
# modified: app/models/payment_transaction.rb | |
# new file: db/migrate/20120504144821_rename_parent_transaction_id_to_parent_trans_id_on_payment_transactions.rb | |
# modified: db/schema.rb | |
# modified: test/test_helper.rb | |
# modified: test/unit/delinquent_account_test.rb | |
# modified: test/unit/payment_transaction_test.rb |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment