shell-things/conf/gitconfig

[user]
#    name = Mikaela Suomalainen
#    email = mikaela+git@mikaela.info
#    signingkey = 0x99392F62BAE30723
#    ##wtop
#    #email = mikaela@unicus.com
#    #signingkey = 0x440D764E4F4A6C2D
[alias]
    cleandi = clean -di
    cleandix = clean -dix
    # From http://progit.org/book/ch2-7.html
    last = cat-file commit HEAD
    # From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
    mergen = merge --no-ff
    pulln = pull --no-ff
    pullen = pull --no-ff
    shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"

[core]
    editor = vim
    autocrlf = input
[color]
    # From git manpage and http://book.git-scm.com/5_customizing_git.html
    branch = true
    diff = true
    grep = true
    interactive = true
    pager = true
    showbranch = true
    status = true
    ui = true
[push]
    default = current
    gpgSign = if-asked
[credential]
    helper = cache --timeout=86400
[merge]
    ff = only
[format]
    signOff = true
[commit]
    gpgsign = true
[diff]
    compactionHeuristic = true
[pager]
#    log = diff-highlight | less
#    show = diff-highlight | less
#    diff = diff-highlight | less
[interactive]
#    diffFilter = diff-highlight
[gpg]
	program = gpg2
[gpgv]
	program = gpgv2
[tag]
	forceSignAnnotated = true
[pull]
	ff = only
gitconfig: avoid merge-commits & move user to top 2014-10-05 21:30:10 +02:00			`[user]`
			`# name = Mikaela Suomalainen`
gitconfig: update email address 2015-01-10 11:17:47 +01:00			`# email = mikaela+git@mikaela.info`
update gitconfig to include the new key 2019-11-23 22:30:06 +01:00			`# signingkey = 0x99392F62BAE30723`
Add my work try-out-practice GPG key 2019-11-20 10:15:39 +01:00			`# ##wtop`
gitconfig: update WTOP comments 2020-03-15 20:36:35 +01:00			`# #email = mikaela@unicus.com`
			`# #signingkey = 0x440D764E4F4A6C2D`
gitconfig: First commit. It doesn't have user nor github blocks, see http://help.github.com/ for help about adding them. I am probably soon committing my vimrc too. 2011-12-31 20:28:31 +01:00			`[alias]`
gitconfig: add alias cleandi & cleandix * d = also remove untracked directories * i = interactive * x = don't care about gitignore. 2014-06-30 14:05:27 +02:00			`cleandi = clean -di`
			`cleandix = clean -dix`
gitconfig: sort aliases & add mergen & pulln git merge & git pull with --no-ff 2014-10-08 22:28:16 +02:00			`# From http://progit.org/book/ch2-7.html`
			`last = cat-file commit HEAD`
			`# From https://github.com/blog/985-git-io-github-url-shortener#comment-15121`
			`mergen = merge --no-ff`
			`pulln = pull --no-ff`
gitconfig: add pullen alias same as pulln, I just feel like it should be there. 2014-10-09 21:17:16 +02:00			`pullen = pull --no-ff`
gitconfig: sort aliases & add mergen & pulln git merge & git pull with --no-ff 2014-10-08 22:28:16 +02:00			`shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"`

gitconfig: First commit. It doesn't have user nor github blocks, see http://help.github.com/ for help about adding them. I am probably soon committing my vimrc too. 2011-12-31 20:28:31 +01:00			`[core]`
gitconfig: add alias cleandi & cleandix * d = also remove untracked directories * i = interactive * x = don't care about gitignore. 2014-06-30 14:05:27 +02:00			`editor = vim`
gitconfig: Always use Unix line endings. 2014-06-08 10:53:10 +02:00			`autocrlf = input`
gitconfig: First commit. It doesn't have user nor github blocks, see http://help.github.com/ for help about adding them. I am probably soon committing my vimrc too. 2011-12-31 20:28:31 +01:00			`[color]`
gitconfig: fix retab. 2014-06-01 15:18:18 +02:00			`# From git manpage and http://book.git-scm.com/5_customizing_git.html`
			`branch = true`
			`diff = true`
			`grep = true`
			`interactive = true`
			`pager = true`
			`showbranch = true`
			`status = true`
			`ui = true`
gitconfig: push.default simple 2014-05-25 16:28:49 +02:00			`[push]`
gitconfig: fix retab. 2014-06-01 15:18:18 +02:00			`default = current`
gitconfig: more on signing 2016-04-10 10:50:38 +02:00			`gpgSign = if-asked`
gitconfig: cache passwords for 24 hours 2014-07-14 20:17:14 +02:00			`[credential]`
gitconfig: avoid merge-commits & move user to top 2014-10-05 21:30:10 +02:00			`helper = cache --timeout=86400`
			`[merge]`
			`ff = only`
gitconfig: add format.signoff true 2015-02-14 21:48:03 +01:00			`[format]`
gitconfig: more on signing 2016-04-10 10:50:38 +02:00			`signOff = true`
gitconfig: enable signing all commits 2016-04-09 12:04:48 +02:00			`[commit]`
			`gpgsign = true`
gitconfig: add new options closes #88 2016-06-20 18:00:04 +02:00			`[diff]`
			`compactionHeuristic = true`
			`[pager]`
			`# log = diff-highlight \| less`
			`# show = diff-highlight \| less`
			`# diff = diff-highlight \| less`
			`[interactive]`
			`# diffFilter = diff-highlight`
gitconfig: force gpg2 + sign annotated tags 2019-12-08 10:52:16 +01:00			`[gpg]`
gitconfig: pull.ff only This fixes a warning on `git pulling` and retains consistent behaviour across my other options that do ff unless there is letter n in the end 2020-06-13 21:12:12 +02:00			`program = gpg2`
gitconfig: force gpg2 + sign annotated tags 2019-12-08 10:52:16 +01:00			`[gpgv]`
gitconfig: pull.ff only This fixes a warning on `git pulling` and retains consistent behaviour across my other options that do ff unless there is letter n in the end 2020-06-13 21:12:12 +02:00			`program = gpgv2`
gitconfig: force gpg2 + sign annotated tags 2019-12-08 10:52:16 +01:00			`[tag]`
gitconfig: pull.ff only This fixes a warning on `git pulling` and retains consistent behaviour across my other options that do ff unless there is letter n in the end 2020-06-13 21:12:12 +02:00			`forceSignAnnotated = true`
			`[pull]`
			`ff = only`