Created
April 12, 2015 09:45
-
-
Save anton0xf/c546151200a9cf51461d to your computer and use it in GitHub Desktop.
git rebase update of submodule
This file contains hidden or 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
| anton0xf $ git --version | |
| git version 2.0.4 | |
| anton0xf $ gfg | |
| * 95002c1 2015-04-12 anton0xf update submodule (feature) | |
| * d36a796 2015-04-12 anton0xf some work in feature | |
| | * 77b64be 2015-04-12 anton0xf some changes in trunk (HEAD, trunk) | |
| |/ | |
| * 133aca2 2015-04-12 anton0xf add submodule1 (master) | |
| * 2e8fe6f 2015-04-12 anton0xf init | |
| anton0xf $ git submodule status | |
| ca83507129c3a430c3bfe826f01340cadcfb701d submodule1 (ca83507) | |
| anton0xf $ cd submodule1 | |
| anton0xf $ gfg | |
| * d5bfd29 2015-04-12 anton0xf update (origin/master, origin/HEAD, master) | |
| * ca83507 2015-04-12 anton0xf init (HEAD) | |
| anton0xf $ cd .. | |
| anton0xf $ git checkout feature | |
| M submodule1 | |
| Switched to branch 'feature' | |
| anton0xf $ git submodule update | |
| Submodule path 'submodule1': checked out 'd5bfd29ae8bf006661750b47775c1820991c1101' | |
| anton0xf $ git rebase trunk | |
| First, rewinding head to replay your work on top of it... | |
| Applying: some work in feature | |
| Applying: update submodule | |
| anton0xf $ gfg | |
| * 633d946 2015-04-12 anton0xf update submodule (HEAD, feature) | |
| * be0ff3c 2015-04-12 anton0xf some work in feature | |
| * 77b64be 2015-04-12 anton0xf some changes in trunk (trunk) | |
| * 133aca2 2015-04-12 anton0xf add submodule1 (master) | |
| * 2e8fe6f 2015-04-12 anton0xf init | |
| anton0xf $ git submodule status | |
| d5bfd29ae8bf006661750b47775c1820991c1101 submodule1 (heads/master) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment