{"action":"opened","issue":{"url":"https://api.github.com/repos/MDSplus/mdsplus/issues/48","labels_url":"https://api.github.com/repos/MDSplus/mdsplus/issues/48/labels{/name}","comments_url":"https://api.github.com/repos/MDSplus/mdsplus/issues/48/comments","events_url":"https://api.github.com/repos/MDSplus/mdsplus/issues/48/events","html_url":"https://github.com/MDSplus/mdsplus/issues/48","id":104320797,"number":48,"title":"@Gabriele","user":{"login":"zack-vii","id":6230702,"avatar_url":"https://avatars.githubusercontent.com/u/6230702?v=3","gravatar_id":"","url":"https://api.github.com/users/zack-vii","html_url":"https://github.com/zack-vii","followers_url":"https://api.github.com/users/zack-vii/followers","following_url":"https://api.github.com/users/zack-vii/following{/other_user}","gists_url":"https://api.github.com/users/zack-vii/gists{/gist_id}","starred_url":"https://api.github.com/users/zack-vii/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zack-vii/subscriptions","organizations_url":"https://api.github.com/users/zack-vii/orgs","repos_url":"https://api.github.com/users/zack-vii/repos","events_url":"https://api.github.com/users/zack-vii/events{/privacy}","received_events_url":"https://api.github.com/users/zack-vii/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":0,"created_at":"2015-09-01T17:52:43Z","updated_at":"2015-09-01T17:52:43Z","closed_at":null,"body":"Hey you guys,\r\n\r\nIts seems like you did a few merges without re-basing your branch first. \r\nTherefore the merge will cover several iterations, making it harder to keep track of the changes.\r\nIt is fine for the web interface, however, it messes up the GitHub GUI interface.\r\nCould someone clean this out before it reaches too far back?\r\nIt can be done by re-basing the MDSplus/alpha to the commit just prior to the first un-proper merge, i.e. 8c515333 , (mdsgetmsg.m: ...)\r\n\r\n git rebase 8c515333\r\n\r\nthe merge will be faulty since it contains a few commits multiple times. It will pause to tell you. You can continue with\r\n\r\n git rebase --continue\r\n\r\nBTW: if you want to cherry-pick you can also use\r\n\r\n git rebase -i 8c515333\r\n\r\nwhere -i stands for interactive. this will open an editor where you can rearrange and modify commits.\r\n\r\nThanks\r\ncheers\r\n-Timo "}}