Skip to content

Instantly share code, notes, and snippets.

@portante
Created March 10, 2017 02:35
Show Gist options
  • Select an option

  • Save portante/4754141ecf663ac49969142b059a52cd to your computer and use it in GitHub Desktop.

Select an option

Save portante/4754141ecf663ac49969142b059a52cd to your computer and use it in GitHub Desktop.
Example of update HIL class master branch with upstream master
$ git co -b update-class-master class/master
Branch update-class-master set up to track remote branch master from class.
Switched to a new branch 'update-class-master'
$ git branch --set-upstream-to=upstream/master
Branch update-class-master set up to track remote branch master from upstream.
$ git status
On branch update-class-master
Your branch is behind 'upstream/master' by 2 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
nothing to commit, working tree clean
$ git rebase
First, rewinding head to replay your work on top of it...
Fast-forwarded update-class-master to refs/remotes/upstream/master.
$ git status
On branch update-class-master
Your branch is up-to-date with 'upstream/master'.
nothing to commit, working tree clean
$ git branch --set-upstream-to=class/master
Branch update-class-master set up to track remote branch master from class.
$ git status
On branch update-class-master
Your branch is ahead of 'class/master' by 2 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
$ git lg -10
1 7441e0c (HEAD -> update-class-master, upstream/master) Merge pull request #739 from knikolla/keystone-ci
2 b4f0b2e Use upper contraints file for keystone, set version to newton
3 0d555c3 (origin/master, origin/HEAD, class/master, master) Merge pull request #699 from naved001/fix_303
4 9a90c39 Merge branch 'master' into fix_303
5 d635550 Introduce require_legal_bootdev()
6 454a212 Merge pull request #736 from henn/fix_keystone_ci
7 d3eb098 Fix the version of oslo.policy to prevent CI breakage.
8 6d055dc Cli: More precise detection of invalid arguments
9 3457cc5 Merge pull request #730 from naved001/restric-flask-sqlalchemy
10 84866a4 added comment explaining non-standar semver bound on flaskSQLAclhemy
@portante
Copy link
Copy Markdown
Author

The final step would be to do: git push class update-class-master:master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment