Created
September 5, 2013 16:24
-
-
Save gabrtv/6452526 to your computer and use it in GitHub Desktop.
Example: Finishing a feature with HubFlow
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
gabriel@delta:~/workspace/deis$ git hf feature finish | |
Fetching origin | |
remote: Counting objects: 1, done. | |
remote: Total 1 (delta 0), reused 1 (delta 0) | |
Unpacking objects: 100% (1/1), done. | |
From github.com:opdemand/deis | |
b22cf85..242ac17 develop -> origin/develop | |
Switched to branch 'develop' | |
Your branch is behind 'origin/develop' by 2 commits, and can be fast-forwarded. | |
Updating b22cf85..242ac17 | |
Fast-forward | |
celerytasks/chef.py | 17 +++++++++++++---- | |
1 file changed, 13 insertions(+), 4 deletions(-) | |
Already up-to-date. | |
remote: warning: Deleting a non-existent ref. | |
To git@github.com:opdemand/deis.git | |
- [deleted] feature/chef-api-retries | |
Deleted branch feature/chef-api-retries (was 9433bf2). | |
Summary of actions: | |
- The latest changes from 'origin' were merged into 'master' and 'develop' | |
- The feature branch 'feature/chef-api-retries' was merged into 'develop' | |
- Feature branch 'feature/chef-api-retries' has been removed | |
- Feature branch 'origin/feature/chef-api-retries' has been removed | |
- You are now on branch 'develop' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment