> If genuinely a topic-branch, try the following: > > $ git checkout --track -b dev-something origin/master > > $ git config branch.dev-something.autosetuprebase always > > ^ I have this in my ~/.gitconfig to apply globally, BTW > > $ <make edit #1> > > $ git commit > > $ <send patch to mailing list / attach to ticket> > > $ <receive feedback, further edits> > > $ git commit > > (possibly git pull rebasing your working copy changes) > > $ git diff [options] origin/master [-- files and paths] > > or > > $ git diff dev-something...master > > For what [options] can give you (such as -c and --cc). > > Is that acceptable? Should we document such (with comments and feedback
OK for git pull rebasing when necessary. That will not hurt for these short-life branches. Maybe just a mention about that in the contribute page : http://cyrusimap.web.cmu.edu/mediawiki/index.php/Contribute Regards, Olivier.
