Created
May 30, 2013 18:46
-
-
Save terriyu/5680126 to your computer and use it in GitHub Desktop.
Tried mixed reset on Git. I abandoned a patch and needed to make a new one, but I still had commits on my patch branch, so I needed to reset.
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 log --oneline | head | |
| 34508cc Add test to check samples are returned time-sorted | |
| 0e367c4 Add support policy to installation instructions | |
| e653b21 Fix nova notifier tests | |
| 0136d1a Merge "Imported Translations from Transifex" | |
| b20d4ea Explicitly set downloadcache in tox.ini. | |
| d16b084 Imported Translations from Transifex | |
| e7c86e3 Merge "hbase metaquery support" | |
| 57eab05 Merge "Update oslo, use new configuration generator" | |
| 7c6c0bf Merge "Allow specifying a listen IP" | |
| 3aa5bfc Merge "doc: fix hyphens instead of underscores for 'os*' conf options" | |
| $ git reset --mixed 0e367c4 | |
| Unstaged changes after reset: | |
| M tests/storage/base.py | |
| $ git log --oneline | head | |
| 0e367c4 Add support policy to installation instructions | |
| e653b21 Fix nova notifier tests | |
| 0136d1a Merge "Imported Translations from Transifex" | |
| b20d4ea Explicitly set downloadcache in tox.ini. | |
| d16b084 Imported Translations from Transifex | |
| e7c86e3 Merge "hbase metaquery support" | |
| 57eab05 Merge "Update oslo, use new configuration generator" | |
| 7c6c0bf Merge "Allow specifying a listen IP" | |
| 3aa5bfc Merge "doc: fix hyphens instead of underscores for 'os*' conf options" | |
| 315fb82 Merge "ImagePollster record duplicate counter during one poll" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment