git_helper Maintainability Develop

Gem Usage

gem install git_helper

Some of the commands in this gem can be used without any additional configuration. However, others utilize special GitHub or GitLab configuration. To provide access tokens for this, create a ~/.git_config.yml file. The contents should look like this:

:github_user: GITHUB-USERNAME
:github_token: GITHUB-TOKEN
:gitlab_user: GITLAB-USERNAME
:gitlab_token: GITLAB-TOKEN

To view the help screen, run:

git-helper --help

To see what version of git_helper you're running, run:

git-helper --version

Plugin Usage

As an additional option, you can set each of the following commands to be a git plugin, meaning you can call them in a way that feels even more git-native:

# As a Gem                              # As a Plugin
git-helper clean-branches               git clean-branches
git-helper pull-request --create        git pull-request --create

To do this, clone this repository from GitHub, and add the following line to your ~/.bash_profile:

export PATH=/your/path/to/this/repository/git_helper/plugins:$PATH

And then run source ~/.bash_profile.

Alias Usage

To make the commands even shorter, I recommend setting aliases. You can either set aliases through git itself, like this (only possible if you also use the plugin option):

git config --global alias.nb new-branch

And then running git nb maps to git new-branch, which through the plugin, maps to git-helper new-branch.

Or you can set the alias through your ~/.bashrc (which is my preferred method because it can make the command even shorter, and doesn't require the plugin usage). To do this, add lines like this to the ~/.bashrc file and run source ~/.bashrc:

alias gnb="git new-branch"

And then, running gnb maps to git new-branch, which again routes to git-helper new-branch.

For a full list of the git aliases I prefer to use, check out my Git Aliases gist.

If you're going to make using git workflows easier, might as well provide lots of options 😃.

Commands

change-remote

This can be used when switching the owners of a GitHub repo. When you switch a username, GitHub only makes some changes for you. With this command, you no longer have to manually walk through local repo and switch the remotes from each one into a remote with the new username.

This command will go through every directory in a directory, see if it is a git directory, and then will check to see if the old username is included in the remote URL of that git directory. If it is, then the command will change the remote URL to instead point to the new username's remote URL. To run the command, run:

git-helper change-remote OLD-OWNER NEW-OWNER

checkout-default

This command will check out the default branch of whatever repository you're currently in. It looks at what branch the origin/HEAD remote is pointed to on your local machine, versus querying GitHub/GitLab for that, so if your local machine's remotes aren't up to date, then this command won't work as expected. To run this command, run:

git-helper checkout-default

If your local branches aren't right (run git branch --remote to see), then run:

git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/CORRECT-DEFAULT-BRANCH-GOES-HERE

clean-branches

This command will bring you to the repository's default branch, git pull, git fetch -p, and will clean up your local branches on your machine by seeing which ones are existing on the remote, and updating yours accordingly. To run:

git-helper clean-branches

empty-commit

For some reason, I'm always forgetting the commands to create an empty commit. So with this command, it becomes easy. The commit message of this commit will be 'Empty commit'. To run the command, run:

git-helper empty-commit

merge-request

This command can be used to handily make new GitLab merge requests and to accept merge requests from the command line. The command uses the Ruby wrapper Gitlab to do this, so make sure you have a .git_config.yml file set up in the home directory of your computer. For instructions on how to do that, see Usage.

After setup is complete, you can call the file, and send in a flag indicating whether to create a pull request, -c, or to merge a pull request, -m.

git-helper merge-request -c
# OR
git-helper merge-request -m

If you're trying to create a merge request, the command will provide an autogenerated merge request title based on your branch name. It will separate the branch name by '_' if underscores are in the branch, or '-' if dashes are present. Then it will join the list of words together by spaces. If there's a pattern in the form of jira-123 or jira_123 in the first part of the branch name, then it'll add JIRA-123 to the first part of the pull request. You can respond 'yes' or 'no'. If you respond 'no', you can provide your own merge request title.

The command will also ask you if the default branch of the repository is the proper base branch to use. You can say 'yes' or 'no'. If you respond 'no', then you can give the command your chosen base base.

Lastly, it'll ask the user to apply any merge request templates found at any */merge_request_template.md file or any file in .gitlab/merge_request_templates/*.md. Applying any template is optional, and from the command's standpoint, a user can make an empty merge request if they desire. If a GitLab project automatically adds a template, then it may create a merge request with a default template anyway.

If you're requesting to merge a merge request, the command will ask you the number ID of the merge request you wish to accept. The command will also ask you what type of merge to do: regular merging or squashing. The commit message to use during the merge/squash will be the title of the pull request.

If you're getting stuck, you can run the command with a --help flag instead, to get some more information.

new-branch

This command is useful for making new branches in a repository on the command line. To run the command, run:

git-helper new-branch
# OR
git-helper new-branch NEW_BRANCH_NAME

The command either accepts a branch name right away or it will ask you for the name of your new branch. Make sure your input does not contain any spaces or special characters.

pull-request

This command can be used to handily make new GitHub pull requests and to merge pull requests from the command line. The command uses the Octokit::Client to do this, so make sure you have a .git_config.yml file set up in the home directory of your computer. For instructions on how to do that, see Usage.

After setup is complete, you can call the file, and send in a flag indicating whether to create a pull request, -c, or to merge a pull request, -m.

git-helper pull-request -c
# OR
git-helper pull-request -m

If you're trying to create a pull request, the command will provide an autogenerated pull request title based on your branch name. It will separate the branch name by '_' if underscores are in the branch, or '-' if dashes are present. Then it will join the list of words together by spaces. If there's a pattern in the form of jira-123 or jira_123 in the first part of the branch name, then it'll add JIRA-123 to the first part of the pull request. You can respond 'yes' or 'no'. If you respond 'no', you can provide your own pull request title.

The command will also ask you if the default branch of the repository is the proper base branch to use. You can say 'yes' or 'no'. If you respond 'no', then you can give the command your chosen base base.

Lastly, it'll ask the user to apply any pull request templates found at any */pull_request_template.md file or any file in .github/PULL_REQUEST_TEMPLATE/*.md. Applying any template is optional, and a user can make an empty pull request if they desire.

If you're requesting to merge a pull request, the command will ask you the number ID of the pull request you wish to merge. The command will also ask you what type of merge to do: regular merging, squashing, or rebasing. The commit message to use during the merge/squash/rebase will be the title of the pull request.

If you're getting stuck, you can run the command with a --help flag instead, to get some more information.

Contributing

To submit a feature request, bug ticket, etc, please submit an official GitHub Issue.

To report any security vulnerabilities, please view this project's Security Policy.

This repository does have a standard Code of Conduct.

Releasing

To make a new release of this gem:

  1. Merge the pull request via the big green button
  2. Run git tag vX.X.X and git push --tag
  3. Make a new release here
  4. Run gem build *.gemspec
  5. Run gem push *.gem to push the new gem to RubyGems
  6. Run rm *.gem to clean up your local repository

To set up your local machine to push to RubyGems via the API, see the RubyGems documentation.