On Fri, Jun 27, 2014 at 8:42 PM, Jason Pyeron <jpye...@pdinc.us> wrote: > Sorry for the http://pastebin.com/1R68v6jt (changes the merge to > 1ca13ed2271d60ba93d40bcc8db17ced8545f172, and manually reconciles the merge), > but it was too long to be readable in the email. > > git blame HEAD -- src/Main/Forms/CipherShed.fbp | cut -c 1-8 | sort -u > > Gives: > ac812aa3 > b50a2fb1 > > git blame b60070f4d0879e277f44d174a163bbb292325fea -- > src/Main/Forms/TrueCrypt.fbp | cut -c 1-8 | sort -u > > Gives: > 07b2176f > 0eb8b4fa > 12c94add > a17c95a3 > a757b4d4 > cac6cd14 > d0a9dfa8 > d94128a9 > e6b1437a > f1bb489c > > If I use cherry pick (vs merge), I can maintain the big history in b60070f, > but > loose the small history in 1ca13ed > > [test] > / \ > / \ > [b60070f] [1ca13ed] > | | > | | > [65efd37] | > | \ | > | \ | > [d8da778] [39ebb06] > > How do I maintain all the history including the (line) changes in 1ca13ed?
I see the results, but my brain is not able to make sense of your goal yet. I'll try again later when I've had my coffee. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
