Created
November 15, 2012 22:01
-
-
Save crilleengvall/4081625 to your computer and use it in GitHub Desktop.
Git commands....
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 checkout -b hotfix-1.2.1 master | |
Switched to a new branch "hotfix-1.2.1" | |
$ ./bump-version.sh 1.2.1 | |
Files modified successfully, version bumped to 1.2.1. | |
$ git commit -a -m "Bumped version number to 1.2.1" | |
[hotfix-1.2.1 41e61bb] Bumped version number to 1.2.1 | |
1 files changed, 1 insertions(+), 1 deletions(-) |
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 checkout -b release-1.2 develop | |
Switched to a new branch "release-1.2" | |
$ ./bump-version.sh 1.2 | |
Files modified successfully, version bumped to 1.2. | |
$ git commit -a -m "Bumped version number to 1.2" | |
[release-1.2 74d9424] Bumped version number to 1.2 | |
1 files changed, 1 insertions(+), 1 deletions(-) |
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 checkout -b myfeature develop | |
Switched to a new branch "myfeature" |
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 checkout master | |
Switched to branch 'master' | |
$ git merge --no-ff hotfix-1.2.1 | |
Merge made by recursive. | |
(Summary of changes) | |
$ git tag -a 1.2.1 | |
$ git checkout develop | |
Switched to branch 'develop' | |
$ git merge --no-ff hotfix-1.2.1 | |
Merge made by recursive. | |
(Summary of changes) | |
$ git branch -d hotfix-1.2.1 | |
Deleted branch hotfix-1.2.1 (was abbe5d6). |
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 checkout master | |
Switched to branch 'master' | |
$ git merge --no-ff release-1.2 | |
Merge made by recursive. | |
(Summary of changes) | |
$ git tag -a 1.2 | |
$ git checkout develop | |
Switched to branch 'develop' | |
$ git merge --no-ff release-1.2 | |
Merge made by recursive. | |
(Summary of changes) | |
$ git branch -d release-1.2 | |
Deleted branch release-1.2 (was ff452fe). |
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 checkout develop | |
Switched to branch 'develop' | |
$ git merge --no-ff myfeature | |
Updating ea1b82a..05e9557 | |
(Summary of changes) | |
$ git branch -d myfeature | |
Deleted branch myfeature (was 05e9557). | |
$ git push origin develop |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment