{"action":"created","issue":{"url":"https://api.github.com/repos/jzaefferer/jquery-validation/issues/1531","labels_url":"https://api.github.com/repos/jzaefferer/jquery-validation/issues/1531/labels{/name}","comments_url":"https://api.github.com/repos/jzaefferer/jquery-validation/issues/1531/comments","events_url":"https://api.github.com/repos/jzaefferer/jquery-validation/issues/1531/events","html_url":"https://github.com/jzaefferer/jquery-validation/pull/1531","id":96477066,"number":1531,"title":"Squashed/rebased #1373","user":{"login":"twolfson","id":902488,"avatar_url":"https://avatars.githubusercontent.com/u/902488?v=3","gravatar_id":"","url":"https://api.github.com/users/twolfson","html_url":"https://github.com/twolfson","followers_url":"https://api.github.com/users/twolfson/followers","following_url":"https://api.github.com/users/twolfson/following{/other_user}","gists_url":"https://api.github.com/users/twolfson/gists{/gist_id}","starred_url":"https://api.github.com/users/twolfson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/twolfson/subscriptions","organizations_url":"https://api.github.com/users/twolfson/orgs","repos_url":"https://api.github.com/users/twolfson/repos","events_url":"https://api.github.com/users/twolfson/events{/privacy}","received_events_url":"https://api.github.com/users/twolfson/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":8,"created_at":"2015-07-22T05:20:35Z","updated_at":"2015-11-25T21:28:21Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/jzaefferer/jquery-validation/pulls/1531","html_url":"https://github.com/jzaefferer/jquery-validation/pull/1531","diff_url":"https://github.com/jzaefferer/jquery-validation/pull/1531.diff","patch_url":"https://github.com/jzaefferer/jquery-validation/pull/1531.patch"},"body":"As requested by @jzaefferer in #1512, we have taken care of squashing/rebasing #1373 while maintaining appropriate authorship. To make this easier for future persons, these are the steps I took:\r\n\r\n```bash\r\n# Added upstream remote\r\ngit remote add upstream https://github.com/jzaefferer/jquery-validation\r\n\r\n# Installed `upstream-pr` branch\r\ngit config --add remote.upstream-pr.url $(git config --get remote.upstream.url) && git config --add remote.upstream-pr.fetch +refs/pull/*/head:refs/remotes/upstream/pr/*\r\n\r\n# Fetched upstream PRs\r\ngit fetch upstream-pr\r\n\r\n# Checked out PR in question\r\ngit checkout pr/1373\r\n\r\n# Checked out branch for squashing\r\ngit checkout pr/1373.squash\r\n\r\n# Squashed commits into 1 commit\r\n# Use `git log` to find commit where we diverged from `master\r\ngit rebase -i {{last commit from master}}\r\n# Select all but head commit as \"squash\"\r\n\r\n# Check out new branch to perform rebasing\r\ngit checkout pr/1373.rebased\r\n\r\n# Rebase 1 commit on top of `upstream/master`\r\ngit rebase -i upstream/master\r\n\r\n# Handle merge conflicts\r\ngit mergetool -y\r\n\r\n# Verify that diff aligns with current GitHub PR\r\n# Should see no changes here\r\ngit diff pr/1373.squash -- src/additional/accept.js\r\n# Should align with diff on GitHub\r\ngit diff upstream/master\r\n\r\n# Complete our rebase\r\ngit rebase --continue\r\n\r\n# All done, PR opened\r\n```\r\n\r\n/cc @jzaefferer"},"comment":{"url":"https://api.github.com/repos/jzaefferer/jquery-validation/issues/comments/159735219","html_url":"https://github.com/jzaefferer/jquery-validation/pull/1531#issuecomment-159735219","issue_url":"https://api.github.com/repos/jzaefferer/jquery-validation/issues/1531","id":159735219,"user":{"login":"twolfson","id":902488,"avatar_url":"https://avatars.githubusercontent.com/u/902488?v=3","gravatar_id":"","url":"https://api.github.com/users/twolfson","html_url":"https://github.com/twolfson","followers_url":"https://api.github.com/users/twolfson/followers","following_url":"https://api.github.com/users/twolfson/following{/other_user}","gists_url":"https://api.github.com/users/twolfson/gists{/gist_id}","starred_url":"https://api.github.com/users/twolfson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/twolfson/subscriptions","organizations_url":"https://api.github.com/users/twolfson/orgs","repos_url":"https://api.github.com/users/twolfson/repos","events_url":"https://api.github.com/users/twolfson/events{/privacy}","received_events_url":"https://api.github.com/users/twolfson/received_events","type":"User","site_admin":false},"created_at":"2015-11-25T21:28:21Z","updated_at":"2015-11-25T21:28:21Z","body":"@Arkni That patch worked great, thanks =)\r\n\r\n@staabm This PR should be good to go"}}