0112fc0dd59d
refactor shit
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Tue, 24 Jun 2014 09:47:11 -0400 |
parents | 328a3cd17f13 |
children | e6f6389e598f |
branches/tags | (none) |
files | gitconfig |
Changes
--- a/gitconfig Tue Jun 24 09:30:20 2014 -0400 +++ b/gitconfig Tue Jun 24 09:47:11 2014 -0400 @@ -78,6 +78,18 @@ addremove = !git add . && git add -u addrem = !git addremove + sl = "!sh -c 'git show --color=always $1 | less -R' -" + + find-merge = "!sh -c 'git log $1..master --merges -n1' -" + + fuck-up-history-from = pull --rebase + + + g = !git fuum + + ; BEGIN KALEIDOSCOPE SECTION + ; GAZE INTO THE ABYSS + ; Find all commits in the given ref that aren't also in master ; TODO: Make this take a second optional argument find-unmerged-commits = "!sh -c 'git log $1 --format='''%H''' --not master --' -" @@ -101,15 +113,11 @@ ksreview = "!sh -c 'git find-unmerged-commits $1 | xargs -n1 git ksshow' -" ksreviewfor = "!sh -c 'git find-unmerged-commits-for $1 $2 | xargs -n1 git ksshow' -" - sl = "!sh -c 'git show --color=always $1 | less -R' -" - - find-merge = "!sh -c 'git log $1..master --merges -n1' -" - - fuck-up-history-from = pull --rebase - + ; review takes a pull request URL and reviews it + ; only works if you have the PR-fetching turned on and shit review = "!sh -c 'git fetch upstream && git ksreviewfor `echo $1 | sed -Ee \"s_.*pull/([0-9]+)_refs/pull/upstream/\\1_\"` upstream/master' -" - g = !git fuum + ; END KALEIDOSCOPE SECTION [push] default = current