Created
July 15, 2015 16:35
-
-
Save kitsuyui/6c209bd7af7103e9f45b to your computer and use it in GitHub Desktop.
Git でややこしい操作する前にブランチに新しい名前をつければ混乱しない(と思う) ref: http://qiita.com/kitsuyui/items/1981708e007bf4cf5662
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 init | |
$ git commit --allow-empty -m 'Initial commit' | |
$ git checkout -B some-wip-feature | |
$ touch a | |
$ git add a | |
$ git commit -m 'Add a' | |
$ touch b | |
$ git add b | |
$ git commit -m 'Add b' | |
$ git checkout master | |
$ git checkout -B some-clean-feature | |
$ git merge --squash some-wip-feature | |
$ git commit -m 'Add some feature' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment