Update HACKING with update git aliases. #151

Merged
merged 1 commit into from Mar 3, 2014

Projects

None yet

3 participants

@mitechie
Member
mitechie commented Mar 1, 2014
  • Update the fetch-pr alias per suggestion from Gary to add the +ref.
  • Rename the juju-sync to sync-juju to start the trend of available sync-* commands
  • Add a sync-trunk which will do a rebase from your develop branch.
  • Update docs on how to keep your feature branch up to date based on the latest upstream trunk.
@jujugui
Member
jujugui commented Mar 1, 2014

Test PASSed.
Refer to this link for build results: http://ci.jujugui.org:8080/job/juju-gui/483/

@jujugui
Member
jujugui commented Mar 1, 2014

Test PASSed.
Refer to this link for build results: http://ci.jujugui.org:8080/job/juju-gui/484/

@hatched hatched commented on the diff Mar 2, 2014
HACKING.rst
+ # Rebase develop (trunk) into the current feature branch.
+ sync-trunk = rebase develop
@hatched
hatched Mar 2, 2014 Member

Maybe this should really be sync-juju && git rebase -i develop

@mitechie
mitechie Mar 3, 2014 Member

Can you flesh out the change here? Why -i on the rebase? Do you want to edit it mid-stream? It's in develop, you shouldn't be changing the commits at all. sync-juju will leave you on the develop branch so that && rebase -i won't work either. We could update sync-juju to drop you back into your original branch I suppose.

@hatched
hatched Mar 3, 2014 Member

Yeah that's a good point. I always use -i so I can see what it's doing, but as far as a basic alias is concerned the -i is probably overkill.

@mitechie
Member
mitechie commented Mar 3, 2014

:shipit:

@hatched
Member
hatched commented Mar 3, 2014

👍

@jujugui
Member
jujugui commented Mar 3, 2014

Status: merge request accepted. Url: http://ci.jujugui.org:8080/job/juju-gui-merge

@jujugui jujugui merged commit 39052df into juju:develop Mar 3, 2014

1 check passed

default Merged build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment