- Fixed "ambiguous arguments" problem (GH-145)
- Updated Ruby support to 2.x (GH-140)
- Updated Gem libraries to latest versions (2016-03-18)
- Most notably, upgraded to Octokit 4.3 for support of the latest GitHub APIs
- Implemented support for GitHub two-factor authentication (GH-141)
- Added Faraday logging to help debug issues when communicating with GitHub
- Updated to replace '/' with '-' when generating the sync control filename. (GH-130)
- Deprecated support for Ruby 1.8. (Should continue to work, but now that OS X has moved to Ruby 2.0 there's no longer much reason to support such an old version and it was making tests break.)
- Fixed incompatibility with git 1.7 (GH-128)
- Locked down dependencies due to a change in the "faraday" packages.
- Added "extra safe" code for deleting on Windows (GH-121)
- Unknown variable for handling uncommited changes for sync (GH-123)
- git-sync -r now keeps rebase on instead of acting as a switch (GH-122)
- Changed git-pull-request to git-pull-req
- Changed git-sync to default to rebasing. (GH-112)
- git-sync now can take a branch name to check it out for work (GH-117)
- Change to use the "native" manpage-based help system for
git help
. (GH-113) git new-fb
now defaults to doing agit fetch
before creating the feature branch if a remote is defined. (GH-118)- Removed --interactive option from git-to-master
- Updated README and related files.
- Retries closing a pull request if it gets a 422. (GH-102)
- Fixed typo in merge error. (GH-114)
- Improved URI handling of repo names. (GH-108)
- Fixed undefined local variable error when asking about removing local integration branch.
- Fixed scoping in "git-sync"
- Adds
git pull-request {repoName}/{branchNumber}
(GH-92)- If a number is given to "git-pull-request", or a number with a server preceding it (e.g., "origin/23"), then this assumes that the number refers to an existing pull request identified by that number. In that case, the branch associated with the HEAD of the pull request is checked out.
- Adds
git to-master {repoName}/{branchNumber}
(GH-94)- If a number is given to "git-to-master", or a number with a server preceding it (e.g., "origin/23"), then this assumes that the number refers to an existing pull request identified by that number. In that case, the branch associated with the HEAD of the pull request is checked out before doing the rest of the "to-master".
git new-fb
changes to work better with integration branch (GH-99, GH-103 and GH-105)- Added pull-request URL to
git pull-request
output (GH-104) - Shows a cleaned up version of fetch's output. (GH-85)
- Changed to use HTTPS instead of HTTP by default for GitHub API usage.
- Implementation details
- GitProc::PullRequest has #checkout_pull_request to checkout the HEAD branch of a pull request at any "remote" that has been configured, setting the upstream to the pull request's BASE branch
- GitHubService module no longer uses module-level instance variables, which were causing problems with testing
- GitHub::PullRequest can now ask for a pull request by id
- Adds ability to set the upstream/tracking on a branch
- Upgrades to Octokit 1.24 and no longer overrides the Connection class (GH-74)
- Adds module GitHubTestHelper
- Made GitLib and AbstractMergeErrorBuilder classes instead of modules
- Extracted GitCofig and GitRemote out of GitLib
- Changed to use GitLogger as a logging fascade
- GitProcess now takes a GitLib instead of a directory
- GitHubService refactoring; includes extracting GitHubService::Configuration and GitHub::CreatePullRequest.
- Supports RSpec default module for GitRepoHelper. Any RSpec context can declare :git_repo_helper as metadata to get standard GitRepoHelper lifecycle support as part of GH-97.
- Refactored GitHubService into GitHubService::Configuration
- Refatored GitHub::PullRequest
- Refatored GitLib#branch(..) and GitLib#command(..)
- Fixed bug in git_status. GH-93
- Fixed bug caused by CLI conflict on -i. GH-13
- Adds option to make rebase the default for git-sync. GH-82
- git-sync is now "safer" when working with other people on the same branch. GH-80
- Interactive rebase is now an option for git-to-master. GH-13
- Simplified/improved arguments for git-pull-request GH-86
- Adds some more known statuses. GH-84, GH-88
- Do not try to fetch/push when doing sync if there is not remote. (GH-70)
- git-sync now merges in upstream changes. (GH-79)
- Simplified Windows installation instructions. (GH-76, GH-77)
- Gets rid of infinite loop in Highline library. (GH-72)
- Removes the last of the gem dependencies that require native code. This makes it fully compatible with systems like Windows.
- Adds an option to explicitly set the remote server name.
- Changes to dependencies to allow this to work on both Ruby 1.8 and 1.9
- Adds --keep option to git-to-master
- Fixes problem trying to add/remove an empty list of files
- Documentation updates
- Adds --keep option to git-to-master
- Fixes problem trying to add/remove an empty list of files
- Documentation updates
- Cleans up Gem dependencies
- Cleans up some error messages
- Improved documentation
- Adds support for spaces and renames in Status
- No longer complains if it can't find parking
- Prompts to remove the local version of the integration branch
- Adds help for handling changed files