@aanand Any chance of getting this merged in?

I'm looking for this feature at the moment as well

Needs rebasing - will check again after that.

@IanVS can you rebase?

I made some newbie git mistakes here, so I'm going to have to nuke this PR and make a new one. Should have a chance tonight.

@md5 I am doubly a newbie, then. I did my changes on master in my repo. I've not done a rebase before, but from what I can tell I need to have the changes in a feature branch. If you can explain what I should do or send me to a good resource so I can learn it, I'd really appreciate it.

The Github docs on rebasing are pretty good: https://help.github.com/articles/using-git-rebase/

Using a feature branch would have been nice, but changing branch names would require a new PR, which isn't necessary or useful in this case. The branch names you use in your repo only affect you, since nobody else is using it directly I'd assume.

I think the following should work. I'm assuming you haven't yet added docker/compose as an upstream; if you have added it, ignore that part and use the name of your corresponding remote if it isn't upstream:

git remote add upstream git@github.com:docker/compose.git
git fetch upstream
git checkout master
git rebase upstream/master
# Fix conflicts as needed
git push -f origin master

Then, once the PR is done, you'll want to reset your master back to be the same as upstream/master

git checkout master
git reset --hard upstream/master
git push -f origin master
git branch --set-upstream-to=upstream/master

You can leave out the --set-upstream-to command, but it's something I do to avoid inadvertently doing a git pull from the wrong remote into my master. I also do git config --global pull.ff only, so that git pull will never do a merge and I have to git merge non-fast-forward merges explicitly.

@md5 Thanks for taking the time to write out step-by-step instructions as well as the awesome tips (which I will definitely be using). That's just what I needed. I can feel my git-muscles strengthening already.

💪😣

@aanand I've rebased following instructions from @md5, hopefully it is ready for merge now?

@aanand Build / Tests are passing and this is fully rebased, anything else I need to do?

https://app.wercker.com/#build/54ffc0db82ba1add42131295

LGTM

cc @aanand @dnephin

LGTM