{"action":"created","issue":{"url":"https://api.github.com/repos/git-duet/git-duet/issues/25","labels_url":"https://api.github.com/repos/git-duet/git-duet/issues/25/labels{/name}","comments_url":"https://api.github.com/repos/git-duet/git-duet/issues/25/comments","events_url":"https://api.github.com/repos/git-duet/git-duet/issues/25/events","html_url":"https://github.com/git-duet/git-duet/pull/25","id":118151032,"number":25,"title":"support rebase and cherry-pick","user":{"login":"thewoolleyman","id":158,"avatar_url":"https://avatars.githubusercontent.com/u/158?v=3","gravatar_id":"","url":"https://api.github.com/users/thewoolleyman","html_url":"https://github.com/thewoolleyman","followers_url":"https://api.github.com/users/thewoolleyman/followers","following_url":"https://api.github.com/users/thewoolleyman/following{/other_user}","gists_url":"https://api.github.com/users/thewoolleyman/gists{/gist_id}","starred_url":"https://api.github.com/users/thewoolleyman/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/thewoolleyman/subscriptions","organizations_url":"https://api.github.com/users/thewoolleyman/orgs","repos_url":"https://api.github.com/users/thewoolleyman/repos","events_url":"https://api.github.com/users/thewoolleyman/events{/privacy}","received_events_url":"https://api.github.com/users/thewoolleyman/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":4,"created_at":"2015-11-20T23:45:06Z","updated_at":"2015-12-24T08:06:25Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/git-duet/git-duet/pulls/25","html_url":"https://github.com/git-duet/git-duet/pull/25","diff_url":"https://github.com/git-duet/git-duet/pull/25.diff","patch_url":"https://github.com/git-duet/git-duet/pull/25.patch"},"body":"Fixes issue https://github.com/git-duet/git-duet/issues/24\r\n\r\nFYI, I was unable to get the bats tests all running locally against master, I'm glad to provide tests if you can help me get the test environment going on my box."},"comment":{"url":"https://api.github.com/repos/git-duet/git-duet/issues/comments/167065103","html_url":"https://github.com/git-duet/git-duet/pull/25#issuecomment-167065103","issue_url":"https://api.github.com/repos/git-duet/git-duet/issues/25","id":167065103,"user":{"login":"glestaris","id":1753414,"avatar_url":"https://avatars.githubusercontent.com/u/1753414?v=3","gravatar_id":"","url":"https://api.github.com/users/glestaris","html_url":"https://github.com/glestaris","followers_url":"https://api.github.com/users/glestaris/followers","following_url":"https://api.github.com/users/glestaris/following{/other_user}","gists_url":"https://api.github.com/users/glestaris/gists{/gist_id}","starred_url":"https://api.github.com/users/glestaris/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/glestaris/subscriptions","organizations_url":"https://api.github.com/users/glestaris/orgs","repos_url":"https://api.github.com/users/glestaris/repos","events_url":"https://api.github.com/users/glestaris/events{/privacy}","received_events_url":"https://api.github.com/users/glestaris/received_events","type":"User","site_admin":false},"created_at":"2015-12-24T08:06:25Z","updated_at":"2015-12-24T08:06:25Z","body":"@jszwedko The problem we are seeing is that we lose information about the commiter in all the rebased commits. Just to give an example:\r\n\r\nI made a repo with `master` and `wip-docs` branches. `wip-docs` needs rebasing since `master` is updated after `wip-docs` was created:\r\n\r\n```\r\n$> g lola --pretty=format:\"%h %s\r\n    '%an' (author) and '%cn' (commiter)\"\r\n* 0e7578f Add getting started chapter in docs (HEAD, wip-docs)\r\n|     'Alice Brown' (author) and 'John Spith' (commiter)\r\n* a1ce86d Add docs and introduction chapter\r\n|     'Alice Brown' (author) and 'John Spith' (commiter)\r\n| * 32d3458 Add end-to-end tests (master)\r\n|/      'Alice Brown' (author) and 'John Spith' (commiter)\r\n* 636ee15 Update project title\r\n|     'Alice Brown' (author) and 'John Spith' (commiter)\r\n* 024e4e4 Add readme\r\n      'Alice Brown' (author) and 'John Spith' (commiter)\r\n```\r\n\r\nAfter running `git rebase master` in `wip-docs`, I get to this state:\r\n\r\n```\r\n* f5563e5 Add getting started chapter in docs (HEAD, wip-docs)\r\n|     'Alice Brown' (author) and 'George Lestaris' (commiter)\r\n* 2b89e95 Add docs and introduction chapter\r\n|     'Alice Brown' (author) and 'George Lestaris' (commiter)\r\n* 32d3458 Add end-to-end tests (master)\r\n|     'Alice Brown' (author) and 'John Spith' (commiter)\r\n* 636ee15 Update project title\r\n|     'Alice Brown' (author) and 'John Spith' (commiter)\r\n* 024e4e4 Add readme\r\n      'Alice Brown' (author) and 'John Spith' (commiter)\r\n```\r\n\r\nSo you are probably right that it has to do with `user.email` and `user.name` since this is what it applies to the commiter. However, `rebase` does not keep the commiter unchanged and now we have to go back to the rebased commits, `git duet` with the correct author/commiter and then run `git duet-commit --amend --no-edit --reset-author`.\r\n\r\nIs there any better way of doing it?\r\n\r\nThanks and sorry if this is now in the wrong PR. I am happy to create an issue if you prefer so :)"}}