search

ameyp / CscopeSublime

A Cscope plugin for Sublime Text 2 and 3
89 stars 37 forks source link

Pull my changes into the original branch #2

Closed squarY closed 11 years ago

ameyp commented 11 years ago

Actually, I would like to merge only two commits:

https://github.com/squarY/CscopeSublime/commit/e4c8361c6ee7413bf93a8efc49bcfcd8200f4426 https://github.com/squarY/CscopeSublime/commit/1ba62d628fb88cae708932444484bfbce166d4fc

Could you please create a pull request with just those two commits?

squarY commented 11 years ago

Sorry... If I create a new branch based on commit "1ba62d6" , then send a pull request for this branch. Is that OK?

ameyp commented 11 years ago

It's ok, I fetched your repo and cherry-picked the commits I wanted. Just working on getting the history to work with the changes I made recently :)

ameyp commented 11 years ago

Pulled changes with the following commits: https://github.com/ameyp/CscopeSublime/commit/e25175439f47f8f078d31ea5e1adff546376a710, https://github.com/ameyp/CscopeSublime/commit/bdee6d5e394bcfd9c7a273c300d79e35f75eae2c, https://github.com/ameyp/CscopeSublime/commit/16004a547cea0998c4d38494c353af5f2f1c87c6, https://github.com/ameyp/CscopeSublime/commit/e77b5e52f2cd8c05b0ee0b2eb313c3579b83bd72, https://github.com/ameyp/CscopeSublime/commit/27124206a31ef72f4ddfc5a20e027d2112ee7a1a