configs/scatterd-dotfiles
1
0
Fork 0
Code Issues 2 Pull requests 1 Projects Releases Packages Wiki Activity Actions
scatterd-dotfiles/gitconfig

34 lines
1.1 KiB
Text
Raw Normal View History

Introduces `git_template` for init templating Inspired by http://tbaggery.com/2011/08/08/effortless-ctags-with-git.html * Make `ctags` executable configurable * Adds `git ctags` * Runs `ctag` on `commit` / `branch` / `checkout` * Extensible via `~/.git_template.local/hooks/{pre,post}-*` * explain `git_template` under `git` section
2014-07-18 09:58:50 -04:00
[init]
templatedir = ~/.git_template
adding a global .gitconfig that by default tracks branches (so you can 'git push' from a branch it only pushes to the tracking branch you're in) and also provides a tighter, more colorful git log
2011-10-24 10:30:50 -04:00
[push]
Git push to current, not upstream The primary use case for me is to `git push staging` and `git push production` from the master branch using our typical git workflow: https://github.com/thoughtbot/guides/tree/master/protocol#deploy
2013-07-10 23:16:27 -07:00
default = current
Add basic git aliases * Fast commits. * Fast rebase of origin into feature branch. * Fast merge feature branch into master. * Fast branch creation. * Fast branch deletion. Conflicts: gitconfig
2012-09-26 23:44:35 -07:00
[color]
Use `color.ui = auto` setting to color git output
2013-04-04 07:22:47 -07:00
ui = auto
Add basic git aliases * Fast commits. * Fast rebase of origin into feature branch. * Fast merge feature branch into master. * Fast branch creation. * Fast branch deletion. Conflicts: gitconfig
2012-09-26 23:44:35 -07:00
[alias]
Add aliases for most common git commands
2013-01-17 22:55:39 -08:00
aa = add --all
ap = add --patch
Change the 'git commit --amend' alias to 'git ca'
2013-03-08 14:58:53 -05:00
ca = commit --amend
Add basic git aliases * Fast commits. * Fast rebase of origin into feature branch. * Fast merge feature branch into master. * Fast branch creation. * Fast branch deletion. Conflicts: gitconfig
2012-09-26 23:44:35 -07:00
ci = commit -v
Add aliases for most common git commands
2013-01-17 22:55:39 -08:00
co = checkout
Make it easy to checkout GitHub pull requests This alias makes the following workflow possible: Look at changes: git co-pr 123 git diff origin/master Bundle, validate tests are passing: bundle rake Rebase interactively, squash, and potentially improve commit messages: git rebase -i master Merge code into master: git checkout master git merge pr/123 --ff-only Push: git push origin master Clean up: git branch -D pr/123
2014-07-16 15:00:39 -07:00
co-pr = !sh -c 'git fetch origin pull/$1/head:pr/$1 && git checkout pr/$1' -
Add basic git aliases * Fast commits. * Fast rebase of origin into feature branch. * Fast merge feature branch into master. * Fast branch creation. * Fast branch deletion. Conflicts: gitconfig
2012-09-26 23:44:35 -07:00
create-branch = !sh -c 'git push origin HEAD:refs/heads/$1 && git fetch origin && git branch --track $1 origin/$1 && cd . && git checkout $1' -
Introduces `git_template` for init templating Inspired by http://tbaggery.com/2011/08/08/effortless-ctags-with-git.html * Make `ctags` executable configurable * Adds `git ctags` * Runs `ctag` on `commit` / `branch` / `checkout` * Extensible via `~/.git_template.local/hooks/{pre,post}-*` * explain `git_template` under `git` section
2014-07-18 09:58:50 -04:00
ctags = "!sh -c '[ -f .git/hooks/ctags ] || git init; .git/hooks/ctags' git-ctags"
Add `git rename-branch` alias * Extract `git current-branch` alias. * Re-use `git current-branch` in two places.
2015-01-25 16:48:36 -08:00
current-branch = !sh -c 'git rev-parse --abbrev-ref HEAD' -
Automatically prune remote branches when fetching * Removes the need to occasionally run `git remote prune`. * Remove branches when fetching instead of deleting other branches. https://trello.com/c/ePlghTll/249-configure-git-to-prune-on-fetch
2014-04-21 10:25:20 -04:00
delete-branch = !sh -c 'git push origin :refs/heads/$1 && git branch -D $1' -
Always merge with `ff = only` @jferris: This has the effect that Git will never implicitly do a merge commit, including while doing git pull. If I'm unexpectedly out of sync when I git pull, I get this message: > fatal: Not possible to fast-forward, aborting. At that point, I know that I've forgotten to do something in my normal workflow, and I retrace my steps. @gylaz: I like the value of seeing a failure message if a pull (or just merge) fails due to not being able to get fast-forwarded. Then I can look to see whose changes went out, that I may have not expected to be there.
2013-04-06 16:06:35 -07:00
merge-branch = !git checkout master && git merge @{-1}
Use `gh`, not `hub` [gh] is a [hub] reimplementation that's much faster and is now the official Github CLI. It appears that "hub" is [deprecated]. [gh]: https://github.com/jingweno/gh [hub]: https://github.com/github/hub [deprecated]: github/hub#475 Matches thoughtbot/laptop: https://github.com/thoughtbot/laptop/commit/d9a9dfe09bf5898172c752c87be7c5ae6537c5f2
2014-09-30 15:43:41 -07:00
pr = !gh pull-request
Add `git rename-branch` alias * Extract `git current-branch` alias. * Re-use `git current-branch` in two places.
2015-01-25 16:48:36 -08:00
rename-branch = !sh -c 'old=$(git current-branch) && git branch -m $old $1 && git push origin --set-upstream $1 && git push origin --delete $old' -
Add aliases for most common git commands
2013-01-17 22:55:39 -08:00
st = status
`git up` alias and `git up -i` documentation
2013-04-14 10:57:44 -07:00
up = !git fetch origin && git rebase origin/master
Add basic git aliases * Fast commits. * Fast rebase of origin into feature branch. * Fast merge feature branch into master. * Fast branch creation. * Fast branch deletion. Conflicts: gitconfig
2012-09-26 23:44:35 -07:00
[core]
excludesfile = ~/.gitignore
autocrlf = input
Always merge with `ff = only` @jferris: This has the effect that Git will never implicitly do a merge commit, including while doing git pull. If I'm unexpectedly out of sync when I git pull, I get this message: > fatal: Not possible to fast-forward, aborting. At that point, I know that I've forgotten to do something in my normal workflow, and I retrace my steps. @gylaz: I like the value of seeing a failure message if a pull (or just merge) fails due to not being able to get fast-forwarded. Then I can look to see whose changes went out, that I may have not expected to be there.
2013-04-06 16:06:35 -07:00
[merge]
ff = only
Add a commit message template Using the `commit.template` setting, read in a commit message template for each commit. This template is commented out so the commit message author doesn't need to delete it. The template serves as a reminder on how to write a better commit message. The bullets are taken from Caleb's blog post[1]. There is no _problem_ per se -- we are writing good messages these days -- but it's handy to be reminded of things to think about. For example, people often forget to note whether there are any side effects. This message does not show on `git commit --amend`, only normal `git commit`. [1] http://bit.ly/13HWyiy
2013-09-12 10:30:48 +02:00
[commit]
template = ~/.gitmessage
Automatically prune remote branches when fetching * Removes the need to occasionally run `git remote prune`. * Remove branches when fetching instead of deleting other branches. https://trello.com/c/ePlghTll/249-configure-git-to-prune-on-fetch
2014-04-21 10:25:20 -04:00
[fetch]
prune = true
Include local gitconfig at the end of .gitconfig Allows for customizing git's commit message template and overriding fetch.prune.
2014-10-18 21:43:16 -07:00
[include]
path = ~/.gitconfig.local
Reference in a new issue Copy permalink