42 lines
1.3 KiB
Markdown
42 lines
1.3 KiB
Markdown
|
---
|
||
|
|
title: "Review commits in your feature branch"
|
||
|
|
kind: article
|
||
|
|
slug: review-commits-in-your-feature-branch
|
||
|
|
created_at: 2013-03-08
|
||
|
|
tags:
|
||
|
|
- git
|
||
|
|
- github
|
||
|
|
- hub
|
||
|
|
---
|
||
|
|
Github pull requests are awesome, but you can't use them all the time, mostly when working on code not hosted at github.
|
||
|
|
|
||
|
|
The following snippet makes it easy to see the commits in your current (head) branch that are not yet in the base branch.
|
||
|
|
|
||
|
|
To see what commits are made in your current feature branch, but which have not been merged into develop yet:
|
||
|
|
|
||
|
|
:::text
|
||
|
|
$ gpr develop
|
||
|
|
* 5246248 <ariejan@ariejan.net> (HEAD, origin/feature-branch, feature-branch) Implements the awesome feature (50 minutes ago)
|
||
|
|
* 4f55b7c <ariejan@ariejan.net> Write specs for awesome feature (2 hours ago)
|
||
|
|
|
||
|
|
## Snippets
|
||
|
|
|
||
|
|
To achieve this, add the following alias to `~/.gitconfig`:
|
||
|
|
|
||
|
|
:::ini
|
||
|
|
[alias]
|
||
|
|
lg = log --graph --pretty=format:'%Cred%h%Creset %Cblue<%ae>%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
|
||
|
|
|
||
|
|
And the following alias to your `~/.bashrc` or `~/.zshrc`:
|
||
|
|
|
||
|
|
:::bash
|
||
|
|
alias gpr="git --no-pager lg HEAD --not $1"
|
||
|
|
|
||
|
|
## Bonus tip
|
||
|
|
|
||
|
|
After reviewing the commits in your feature branch with `gpr`, use [`hub`][hub] to attach your code to a github issue:
|
||
|
|
|
||
|
|
:::bash
|
||
|
|
hub pull-request -i 42 -h ariejan:feature-branch -b you:develop
|
||
|
|
|
||
|
|
[hub]: http://defunkt.io/hub/
|