{"action":"created","comment":{"url":"https://api.github.com/repos/gushphp/gush/pulls/comments/44768507","id":44768507,"diff_hunk":"@@ -28,18 +30,69 @@ protected function configure()\n     {\n         $this\n             ->setName('branch:sync')\n-            ->setDescription('Syncs local branch with its upstream version')\n-            ->addArgument('branch_name', InputArgument::OPTIONAL, 'Branch name to sync')\n+            ->setDescription('Synchronises a local branch with a remote branch')\n+            ->addArgument('source_branch', InputArgument::OPTIONAL, 'Remote branch-name to use as (new) base')\n+            ->addArgument('source_remote', InputArgument::OPTIONAL, 'Remote to pull from (defaults to [your-username])')\n             ->addArgument(\n-                'remote',\n+                'dest_remote',","path":"src/Command/Branch/BranchSyncCommand.php","position":22,"original_position":22,"commit_id":"39cb75baa242728a0aad2997d7139c8533ceae45","original_commit_id":"39cb75baa242728a0aad2997d7139c8533ceae45","user":{"login":"pierredup","id":144858,"avatar_url":"https://avatars.githubusercontent.com/u/144858?v=3","gravatar_id":"","url":"https://api.github.com/users/pierredup","html_url":"https://github.com/pierredup","followers_url":"https://api.github.com/users/pierredup/followers","following_url":"https://api.github.com/users/pierredup/following{/other_user}","gists_url":"https://api.github.com/users/pierredup/gists{/gist_id}","starred_url":"https://api.github.com/users/pierredup/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pierredup/subscriptions","organizations_url":"https://api.github.com/users/pierredup/orgs","repos_url":"https://api.github.com/users/pierredup/repos","events_url":"https://api.github.com/users/pierredup/events{/privacy}","received_events_url":"https://api.github.com/users/pierredup/received_events","type":"User","site_admin":false},"body":"This is a BC break. Can't you rather add both `remote` and `dest_remote` with a deprecation warning when using `remote`?","created_at":"2015-11-13T10:26:34Z","updated_at":"2015-11-13T10:26:34Z","html_url":"https://github.com/gushphp/gush/pull/519#discussion_r44768507","pull_request_url":"https://api.github.com/repos/gushphp/gush/pulls/519","_links":{"self":{"href":"https://api.github.com/repos/gushphp/gush/pulls/comments/44768507"},"html":{"href":"https://github.com/gushphp/gush/pull/519#discussion_r44768507"},"pull_request":{"href":"https://api.github.com/repos/gushphp/gush/pulls/519"}}},"pull_request":{"url":"https://api.github.com/repos/gushphp/gush/pulls/519","id":48680580,"html_url":"https://github.com/gushphp/gush/pull/519","diff_url":"https://github.com/gushphp/gush/pull/519.diff","patch_url":"https://github.com/gushphp/gush/pull/519.patch","issue_url":"https://api.github.com/repos/gushphp/gush/issues/519","number":519,"state":"open","locked":false,"title":"Introduce operations for syncing and rebasing","user":{"login":"sstok","id":904790,"avatar_url":"https://avatars.githubusercontent.com/u/904790?v=3","gravatar_id":"","url":"https://api.github.com/users/sstok","html_url":"https://github.com/sstok","followers_url":"https://api.github.com/users/sstok/followers","following_url":"https://api.github.com/users/sstok/following{/other_user}","gists_url":"https://api.github.com/users/sstok/gists{/gist_id}","starred_url":"https://api.github.com/users/sstok/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sstok/subscriptions","organizations_url":"https://api.github.com/users/sstok/orgs","repos_url":"https://api.github.com/users/sstok/repos","events_url":"https://api.github.com/users/sstok/events{/privacy}","received_events_url":"https://api.github.com/users/sstok/received_events","type":"User","site_admin":false},"body":"|Q            |A   |\r\n|---          |--- |\r\n|Fixed Tickets|#483|\r\n|License      |MIT |\r\n\r\nThis is a work in progress, but I decided to open the pr already to get early feedback :+1:\r\nIn the end this will make it possible to sync using three ways:\r\n\r\n* FORCE: `git reset --hard remote/source-branch`\r\n* SMART:  Determines what is best, rebase, push or rebase with --onto\r\n* SMART_MERGE_ONLY: Same as SMART but uses merge instead of rebase for pulling-in changes.\r\n\r\nThe sync-operation is also used for pull:squash, rebase (coming soon) and switch base.\r\nIt ensures both the local and remote branch are in sync.\r\n\r\n","created_at":"2015-10-25T15:29:06Z","updated_at":"2015-11-13T10:26:34Z","closed_at":null,"merged_at":null,"merge_commit_sha":"ac50f58972a65720876efecbc3a2c5c41e7b6593","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/gushphp/gush/pulls/519/commits","review_comments_url":"https://api.github.com/repos/gushphp/gush/pulls/519/comments","review_comment_url":"https://api.github.com/repos/gushphp/gush/pulls/comments{/number}","comments_url":"https://api.github.com/repos/gushphp/gush/issues/519/comments","statuses_url":"https://api.github.com/repos/gushphp/gush/statuses/39cb75baa242728a0aad2997d7139c8533ceae45","head":{"label":"sstok:483-pull-request-squash-should-use-a-temp-branch-instead-of-the-local-branch","ref":"483-pull-request-squash-should-use-a-temp-branch-instead-of-the-local-branch","sha":"39cb75baa242728a0aad2997d7139c8533ceae45","user":{"login":"sstok","id":904790,"avatar_url":"https://avatars.githubusercontent.com/u/904790?v=3","gravatar_id":"","url":"https://api.github.com/users/sstok","html_url":"https://github.com/sstok","followers_url":"https://api.github.com/users/sstok/followers","following_url":"https://api.github.com/users/sstok/following{/other_user}","gists_url":"https://api.github.com/users/sstok/gists{/gist_id}","starred_url":"https://api.github.com/users/sstok/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sstok/subscriptions","organizations_url":"https://api.github.com/users/sstok/orgs","repos_url":"https://api.github.com/users/sstok/repos","events_url":"https://api.github.com/users/sstok/events{/privacy}","received_events_url":"https://api.github.com/users/sstok/received_events","type":"User","site_admin":false},"repo":{"id":19689159,"name":"gush","full_name":"sstok/gush","owner":{"login":"sstok","id":904790,"avatar_url":"https://avatars.githubusercontent.com/u/904790?v=3","gravatar_id":"","url":"https://api.github.com/users/sstok","html_url":"https://github.com/sstok","followers_url":"https://api.github.com/users/sstok/followers","following_url":"https://api.github.com/users/sstok/following{/other_user}","gists_url":"https://api.github.com/users/sstok/gists{/gist_id}","starred_url":"https://api.github.com/users/sstok/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sstok/subscriptions","organizations_url":"https://api.github.com/users/sstok/orgs","repos_url":"https://api.github.com/users/sstok/repos","events_url":"https://api.github.com/users/sstok/events{/privacy}","received_events_url":"https://api.github.com/users/sstok/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/sstok/gush","description":"Open Source & Enterprise FAST project maintainance/contributing","fork":true,"url":"https://api.github.com/repos/sstok/gush","forks_url":"https://api.github.com/repos/sstok/gush/forks","keys_url":"https://api.github.com/repos/sstok/gush/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sstok/gush/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sstok/gush/teams","hooks_url":"https://api.github.com/repos/sstok/gush/hooks","issue_events_url":"https://api.github.com/repos/sstok/gush/issues/events{/number}","events_url":"https://api.github.com/repos/sstok/gush/events","assignees_url":"https://api.github.com/repos/sstok/gush/assignees{/user}","branches_url":"https://api.github.com/repos/sstok/gush/branches{/branch}","tags_url":"https://api.github.com/repos/sstok/gush/tags","blobs_url":"https://api.github.com/repos/sstok/gush/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sstok/gush/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sstok/gush/git/refs{/sha}","trees_url":"https://api.github.com/repos/sstok/gush/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sstok/gush/statuses/{sha}","languages_url":"https://api.github.com/repos/sstok/gush/languages","stargazers_url":"https://api.github.com/repos/sstok/gush/stargazers","contributors_url":"https://api.github.com/repos/sstok/gush/contributors","subscribers_url":"https://api.github.com/repos/sstok/gush/subscribers","subscription_url":"https://api.github.com/repos/sstok/gush/subscription","commits_url":"https://api.github.com/repos/sstok/gush/commits{/sha}","git_commits_url":"https://api.github.com/repos/sstok/gush/git/commits{/sha}","comments_url":"https://api.github.com/repos/sstok/gush/comments{/number}","issue_comment_url":"https://api.github.com/repos/sstok/gush/issues/comments{/number}","contents_url":"https://api.github.com/repos/sstok/gush/contents/{+path}","compare_url":"https://api.github.com/repos/sstok/gush/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sstok/gush/merges","archive_url":"https://api.github.com/repos/sstok/gush/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sstok/gush/downloads","issues_url":"https://api.github.com/repos/sstok/gush/issues{/number}","pulls_url":"https://api.github.com/repos/sstok/gush/pulls{/number}","milestones_url":"https://api.github.com/repos/sstok/gush/milestones{/number}","notifications_url":"https://api.github.com/repos/sstok/gush/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sstok/gush/labels{/name}","releases_url":"https://api.github.com/repos/sstok/gush/releases{/id}","created_at":"2014-05-12T07:09:35Z","updated_at":"2015-05-07T10:15:10Z","pushed_at":"2015-11-12T15:59:31Z","git_url":"git://github.com/sstok/gush.git","ssh_url":"git@github.com:sstok/gush.git","clone_url":"https://github.com/sstok/gush.git","svn_url":"https://github.com/sstok/gush","homepage":"http://gushphp.org","size":4219,"stargazers_count":0,"watchers_count":0,"language":"PHP","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":1,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"base":{"label":"gushphp:master","ref":"master","sha":"1560db696aab6c4f99220823a6b617964c3f794c","user":{"login":"gushphp","id":6666950,"avatar_url":"https://avatars.githubusercontent.com/u/6666950?v=3","gravatar_id":"","url":"https://api.github.com/users/gushphp","html_url":"https://github.com/gushphp","followers_url":"https://api.github.com/users/gushphp/followers","following_url":"https://api.github.com/users/gushphp/following{/other_user}","gists_url":"https://api.github.com/users/gushphp/gists{/gist_id}","starred_url":"https://api.github.com/users/gushphp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gushphp/subscriptions","organizations_url":"https://api.github.com/users/gushphp/orgs","repos_url":"https://api.github.com/users/gushphp/repos","events_url":"https://api.github.com/users/gushphp/events{/privacy}","received_events_url":"https://api.github.com/users/gushphp/received_events","type":"Organization","site_admin":false},"repo":{"id":16789051,"name":"gush","full_name":"gushphp/gush","owner":{"login":"gushphp","id":6666950,"avatar_url":"https://avatars.githubusercontent.com/u/6666950?v=3","gravatar_id":"","url":"https://api.github.com/users/gushphp","html_url":"https://github.com/gushphp","followers_url":"https://api.github.com/users/gushphp/followers","following_url":"https://api.github.com/users/gushphp/following{/other_user}","gists_url":"https://api.github.com/users/gushphp/gists{/gist_id}","starred_url":"https://api.github.com/users/gushphp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gushphp/subscriptions","organizations_url":"https://api.github.com/users/gushphp/orgs","repos_url":"https://api.github.com/users/gushphp/repos","events_url":"https://api.github.com/users/gushphp/events{/privacy}","received_events_url":"https://api.github.com/users/gushphp/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/gushphp/gush","description":"Project Maintenance & Contributing Automation","fork":false,"url":"https://api.github.com/repos/gushphp/gush","forks_url":"https://api.github.com/repos/gushphp/gush/forks","keys_url":"https://api.github.com/repos/gushphp/gush/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gushphp/gush/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gushphp/gush/teams","hooks_url":"https://api.github.com/repos/gushphp/gush/hooks","issue_events_url":"https://api.github.com/repos/gushphp/gush/issues/events{/number}","events_url":"https://api.github.com/repos/gushphp/gush/events","assignees_url":"https://api.github.com/repos/gushphp/gush/assignees{/user}","branches_url":"https://api.github.com/repos/gushphp/gush/branches{/branch}","tags_url":"https://api.github.com/repos/gushphp/gush/tags","blobs_url":"https://api.github.com/repos/gushphp/gush/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gushphp/gush/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gushphp/gush/git/refs{/sha}","trees_url":"https://api.github.com/repos/gushphp/gush/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gushphp/gush/statuses/{sha}","languages_url":"https://api.github.com/repos/gushphp/gush/languages","stargazers_url":"https://api.github.com/repos/gushphp/gush/stargazers","contributors_url":"https://api.github.com/repos/gushphp/gush/contributors","subscribers_url":"https://api.github.com/repos/gushphp/gush/subscribers","subscription_url":"https://api.github.com/repos/gushphp/gush/subscription","commits_url":"https://api.github.com/repos/gushphp/gush/commits{/sha}","git_commits_url":"https://api.github.com/repos/gushphp/gush/git/commits{/sha}","comments_url":"https://api.github.com/repos/gushphp/gush/comments{/number}","issue_comment_url":"https://api.github.com/repos/gushphp/gush/issues/comments{/number}","contents_url":"https://api.github.com/repos/gushphp/gush/contents/{+path}","compare_url":"https://api.github.com/repos/gushphp/gush/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gushphp/gush/merges","archive_url":"https://api.github.com/repos/gushphp/gush/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gushphp/gush/downloads","issues_url":"https://api.github.com/repos/gushphp/gush/issues{/number}","pulls_url":"https://api.github.com/repos/gushphp/gush/pulls{/number}","milestones_url":"https://api.github.com/repos/gushphp/gush/milestones{/number}","notifications_url":"https://api.github.com/repos/gushphp/gush/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gushphp/gush/labels{/name}","releases_url":"https://api.github.com/repos/gushphp/gush/releases{/id}","created_at":"2014-02-13T02:14:36Z","updated_at":"2015-11-12T17:04:59Z","pushed_at":"2015-11-12T15:59:32Z","git_url":"git://github.com/gushphp/gush.git","ssh_url":"git@github.com:gushphp/gush.git","clone_url":"https://github.com/gushphp/gush.git","svn_url":"https://github.com/gushphp/gush","homepage":"http://gushphp.org","size":6374,"stargazers_count":251,"watchers_count":251,"language":"PHP","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":43,"mirror_url":null,"open_issues_count":16,"forks":43,"open_issues":16,"watchers":251,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/gushphp/gush/pulls/519"},"html":{"href":"https://github.com/gushphp/gush/pull/519"},"issue":{"href":"https://api.github.com/repos/gushphp/gush/issues/519"},"comments":{"href":"https://api.github.com/repos/gushphp/gush/issues/519/comments"},"review_comments":{"href":"https://api.github.com/repos/gushphp/gush/pulls/519/comments"},"review_comment":{"href":"https://api.github.com/repos/gushphp/gush/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/gushphp/gush/pulls/519/commits"},"statuses":{"href":"https://api.github.com/repos/gushphp/gush/statuses/39cb75baa242728a0aad2997d7139c8533ceae45"}}}}