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

31 lines
643 B
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]
Use defaultBranch instead of git_template Git 2.28 now has a setting to change the default branch for new repositories. This sets init.defaultBranch to main and removes the HEAD file from the git template. The HEAD file will need to be removed from ~/.git_template manually, as rcup does not remove deleted files. https://github.blog/2020-07-27-highlights-from-git-2-28/#introducing-init-defaultbranch
2020-08-28 08:20:08 -04:00
defaultBranch = main
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
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
Add `git branches` command * Lists all remote branches * Sorts by last commit date, descending * Shows how long the branch has been around * Shows last commit author ``` $ git branches 6 days ago Dan Croak origin/HEAD 6 days ago Dan Croak origin/master 5 months ago Dan Croak origin/dc-rbenv-zsh 6 months ago Sean Doyle origin/sd-nvm-path 6 months ago Tute Costa origin/vim-multiple-cursors 7 months ago Sean Doyle origin/sd-vundle 8 months ago Sean Griffin origin/sg-disable-spring 9 months ago Mike Burns origin/mb-experimental-tag ```
2015-02-20 16:33:23 -05:00
branches = for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)\" refs/remotes
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
Add `git pf` alias Using `--force-with-lease` allows one to force push without the risk of unintentionally overwriting someone else's work. The git-push(1) man page states: > Usually, "git push" refuses to update a remote ref that is not an > ancestor of the local ref used to overwrite it. > > This option overrides this restriction if the current value of the > remote ref is the expected value. "git push" fails otherwise. > > --force-with-lease alone, without specifying the details, will protect > all remote refs that are going to be updated by requiring their > current value to be the same as the remote-tracking branch we have for > them. > > --@calleerlandsson > -- https://github.com/thoughtbot/guides/pull/363
2015-10-16 09:00:44 -04:00
pf = push --force-with-lease
Add aliases for most common git commands
2013-01-17 22:55:39 -08:00
st = status
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
Enable Git's autosquash feature by default. Autosquash makes it quicker and easier to squash or fixup commits during an interactive rebase. It can be enabled for each rebase using `git rebase -i --autosquash`, but it's easier to turn it on by default. Say I have this history: $ git log --oneline aaa1111 A first commit bbb2222 A second commit ccc3333 A third commit I make another change that I already know should be squashed into "A second commit". I can do this: $ git add . $ git commit --squash bbb2222 [my-branch ddd4444] squash! A second commit Then when I rebase: $ git rebase -i origin/my-branch The interactive rebase list will be set up ready to squash: pick aaa1111 A first commit pick bbb2222 A second commit squash ddd4444 squash! A second commit pick ccc3333 A third commit Since it's unlikely that anyone will be writing a commit message that begins `squash!` or `fixup!` when they don't want this behaviour, and the user still has a chance to review what's going to happen with the rebase, it's safe to have it always turned on.
2015-05-02 22:27:09 -04:00
[rebase]
autosquash = 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
git: Use `zebra` for moved line colors This change uses a git 2.15 feature to change the diff colors for lines that have been moved rather than added or deleted. It provides a cue to readers that a line's content has not changed. Adding this setting in gitconfig should not break earlier git. (Tested against 2.14 and the change had no effect.)
2018-01-03 16:45:22 -05:00
[diff]
colorMoved = zebra
Reference in a new issue Copy permalink