On Mon, Jan 25, 2010 at 11:56:55 +0100, Juliusz Chroboczek wrote: > > I have no idea what this is trying to do, but I'm pretty sure you don't > > need that. > > I'm trying to send a subset of my local commits to Chris. > > Until now, I've been using git-send-email. It's not interactive, > unfortunately, and won't automatically omit commits that are already > upstream, but it's useful enough. > > Since Git doesn't checksum e-mailed patches, Chris has been corrupting > my submissions (wrapping the commit logs). (Note that this is not > Chris's fault -- Git should prevent him from applying a corrupt patch > without some "--force" argument.) > > However, Git does checksum commits within a repository, so I'm trying > to set up things so that I can push to a branch called "for-chris", and > ask him to pull. > > Do you see a simpler way? > So say you have a local branch 'master' with some commits that should go to Chris, and some that shouldn't. And say 'origin' points to git://git.torproject.org/git/polipo.
You can create a branch 'for-chris' with 'git checkout -b for-chris'. Then run 'git rebase -i origin/master' and delete the lines corresponding to commits you don't want to include. If you have a lot more commits in master than you want in for-chris, it may be easier to create for-chris from upstream's master with 'git checkout -b for-chris origin/master' and then 'git cherry-pick $commit' for every commit you want to send. Then 'git push $remote for-chris', and 'git request-pull origin/master $url' (where $remote is the alias for your public repo in .git/config, and $url is the public url to that repo). Cheers, Julien ------------------------------------------------------------------------------ Throughout its 18-year history, RSA Conference consistently attracts the world's best and brightest in the field, creating opportunities for Conference attendees to learn about information security's most important issues through interactions with peers, luminaries and emerging and established companies. http://p.sf.net/sfu/rsaconf-dev2dev _______________________________________________ Polipo-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/polipo-users
