+ [2014-08-29T10:28:37Z] tobiasvl should be easy to parse
+ [2014-08-29T10:29:55Z] stiang tobiasvl: actually I’m using https://github.com/kpdecker/jsdiff, which gives me an object that’s easy to work with. but I’ve been using diffChars, not diffWords. so compare the deleted line to the added line using diffWords, right?
+ [2014-08-29T10:34:38Z] tobiasvl stiang: hmm, the first Node example there seems to contain what you need?
+ [2014-08-29T10:34:59Z] tobiasvl part.removed
+ [2014-08-29T10:48:43Z] stiang tobiasvl: yes, the diff works as it should, but I was struggling with the logic to get the exact right output. but I believe I finally nailed it: https://gist.github.com/anonymous/0a55dc3b4581339f8b90

message no. 43660

Posted by Mr`Jim in #github at 2014-08-29T08:26:42Z

Essentially I want to 'reset' (wrong word) my feature branch to the upstream version, then cherry pick my one fill commit, and then commit + push + create pull request.
+ [2014-08-30T07:58:44Z] Nevik augur: not too sure but sounds to me like you just unpacked the objects, not the refs (or rather, not updating your existing refs)
+ [2014-08-30T07:59:05Z] augur Nevik: possibly
+ [2014-08-30T07:59:14Z] augur i mean, it worked with the hex id, right
+ [2014-08-30T07:59:17Z] Nevik i just look at the manpage every time i use bundles
+ [2014-08-30T07:59:21Z] Nevik because i dont use them often