From 8597a319de554ee6901b63f442ccc2e826927513 Mon Sep 17 00:00:00 2001 From: David Runge Date: Sun, 12 Mar 2017 18:05:03 +0100 Subject: .gitconfig: Removing ammend alias. Properly setting merge tool to vimdiff. Adding signingkey. --- .gitconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitconfig b/.gitconfig index e5628d6..949669e 100644 --- a/.gitconfig +++ b/.gitconfig @@ -31,7 +31,6 @@ ca = commit -am # commit all with message ci = commit # commit amend = commit --amend # ammend your last commit - ammend = commit --amend # ammend your last commit # checkout co = checkout # checkout @@ -99,7 +98,7 @@ [merge] summary = true verbosity = 1 - tool = mvimdiff + tool = vimdiff [apply] whitespace = nowarn [branch] @@ -125,3 +124,4 @@ [user] email = dave@sleepmap.de name = David Runge + signingkey = F5A1A949 -- cgit v1.2.3-70-g09d2 From faa0856b24ee3f237376f6917a1f731864c37614 Mon Sep 17 00:00:00 2001 From: David Runge Date: Sun, 12 Mar 2017 18:07:38 +0100 Subject: .config/git/config: Moving to config to lower priority location. --- .config/git/config | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++ .gitconfig | 127 ----------------------------------------------------- 2 files changed, 127 insertions(+), 127 deletions(-) create mode 100644 .config/git/config delete mode 100644 .gitconfig diff --git a/.config/git/config b/.config/git/config new file mode 100644 index 0000000..949669e --- /dev/null +++ b/.config/git/config @@ -0,0 +1,127 @@ +# set your user tokens as environment variables, such as ~/.secrets +# See the README for examples. +[color] + ui = true +[color "branch"] + current = yellow reverse + local = yellow + remote = green +[color "diff"] + meta = yellow bold + frag = magenta bold + old = red + new = green +[alias] + # add + a = add # add + chunkyadd = add --patch # stage commits chunk by chunk + + # via http://blog.apiaxle.com/post/handy-git-tips-to-stop-you-getting-fired/ + snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}" + snapshots = !git stash list --grep snapshot + + #via http://stackoverflow.com/questions/5188320/how-can-i-get-a-list-of-git-branches-ordered-by-most-recent-commit + recent-branches = !git for-each-ref --count=15 --sort=-committerdate refs/heads/ --format='%(refname:short)' + + # branch + b = branch -v # branch (verbose) + + # commit + c = commit -m # commit with message + ca = commit -am # commit all with message + ci = commit # commit + amend = commit --amend # ammend your last commit + + # checkout + co = checkout # checkout + nb = checkout -b # create and switch to a new branch (mnemonic: "git new branch branchname...") + + # cherry-pick + cp = cherry-pick -x # grab a change from a branch + + # diff + d = diff # diff unstaged changes + dc = diff --cached # diff staged changes + last = diff HEAD^ # diff last committed change + + # log + l = log --graph --date=short + changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status + short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" + simple = log --pretty=format:\" * %s\" + shortnocolor = log --pretty=format:\"%h %cr %cn %s\" + + # pull + pl = pull # pull + + # push + ps = push # push + + # rebase + rc = rebase --continue # continue rebase + rs = rebase --skip # skip rebase + + # remote + r = remote -v # show remotes (verbose) + + # reset + unstage = reset HEAD # remove files from index (tracking) + uncommit = reset --soft HEAD^ # go back before last commit, with files in uncommitted state + filelog = log -u # show changes to a file + mt = mergetool # fire up the merge tool + + # stash + ss = stash # stash changes + sl = stash list # list stashes + sa = stash apply # apply stash (restore changes) + sd = stash drop # drop stashes (destory changes) + + # status + s = status # status + st = status # status + stat = status # status + + # tag + t = tag -n # show tags with lines of each tag message + + # svn helpers + svnr = svn rebase + svnd = svn dcommit + svnl = svn log --oneline --show-commit +[format] + pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(magenta) [%an]%Creset +[mergetool] + prompt = false +[mergetool "mvimdiff"] + cmd="mvim -c 'Gdiff' $MERGED" # use fugitive.vim for 3-way merge + keepbackup=false +[merge] + summary = true + verbosity = 1 + tool = vimdiff +[apply] + whitespace = nowarn +[branch] + autosetupmerge = true +[push] + # 'git push' will push the current branch to its tracking branch + # the usual default is to push all branches + default = tracking +[core] + autocrlf = false + editor = vim +[advice] + statusHints = false +[diff] + # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject + # instead of a/b/c/d as prefixes for patches + mnemonicprefix = true + algorithm = patience +[rerere] + # Remember my merges + # http://gitfu.wordpress.com/2008/04/20/git-rerere-rereremember-what-you-did-last-time/ + enabled = true +[user] + email = dave@sleepmap.de + name = David Runge + signingkey = F5A1A949 diff --git a/.gitconfig b/.gitconfig deleted file mode 100644 index 949669e..0000000 --- a/.gitconfig +++ /dev/null @@ -1,127 +0,0 @@ -# set your user tokens as environment variables, such as ~/.secrets -# See the README for examples. -[color] - ui = true -[color "branch"] - current = yellow reverse - local = yellow - remote = green -[color "diff"] - meta = yellow bold - frag = magenta bold - old = red - new = green -[alias] - # add - a = add # add - chunkyadd = add --patch # stage commits chunk by chunk - - # via http://blog.apiaxle.com/post/handy-git-tips-to-stop-you-getting-fired/ - snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}" - snapshots = !git stash list --grep snapshot - - #via http://stackoverflow.com/questions/5188320/how-can-i-get-a-list-of-git-branches-ordered-by-most-recent-commit - recent-branches = !git for-each-ref --count=15 --sort=-committerdate refs/heads/ --format='%(refname:short)' - - # branch - b = branch -v # branch (verbose) - - # commit - c = commit -m # commit with message - ca = commit -am # commit all with message - ci = commit # commit - amend = commit --amend # ammend your last commit - - # checkout - co = checkout # checkout - nb = checkout -b # create and switch to a new branch (mnemonic: "git new branch branchname...") - - # cherry-pick - cp = cherry-pick -x # grab a change from a branch - - # diff - d = diff # diff unstaged changes - dc = diff --cached # diff staged changes - last = diff HEAD^ # diff last committed change - - # log - l = log --graph --date=short - changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status - short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" - simple = log --pretty=format:\" * %s\" - shortnocolor = log --pretty=format:\"%h %cr %cn %s\" - - # pull - pl = pull # pull - - # push - ps = push # push - - # rebase - rc = rebase --continue # continue rebase - rs = rebase --skip # skip rebase - - # remote - r = remote -v # show remotes (verbose) - - # reset - unstage = reset HEAD # remove files from index (tracking) - uncommit = reset --soft HEAD^ # go back before last commit, with files in uncommitted state - filelog = log -u # show changes to a file - mt = mergetool # fire up the merge tool - - # stash - ss = stash # stash changes - sl = stash list # list stashes - sa = stash apply # apply stash (restore changes) - sd = stash drop # drop stashes (destory changes) - - # status - s = status # status - st = status # status - stat = status # status - - # tag - t = tag -n # show tags with lines of each tag message - - # svn helpers - svnr = svn rebase - svnd = svn dcommit - svnl = svn log --oneline --show-commit -[format] - pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(magenta) [%an]%Creset -[mergetool] - prompt = false -[mergetool "mvimdiff"] - cmd="mvim -c 'Gdiff' $MERGED" # use fugitive.vim for 3-way merge - keepbackup=false -[merge] - summary = true - verbosity = 1 - tool = vimdiff -[apply] - whitespace = nowarn -[branch] - autosetupmerge = true -[push] - # 'git push' will push the current branch to its tracking branch - # the usual default is to push all branches - default = tracking -[core] - autocrlf = false - editor = vim -[advice] - statusHints = false -[diff] - # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject - # instead of a/b/c/d as prefixes for patches - mnemonicprefix = true - algorithm = patience -[rerere] - # Remember my merges - # http://gitfu.wordpress.com/2008/04/20/git-rerere-rereremember-what-you-did-last-time/ - enabled = true -[user] - email = dave@sleepmap.de - name = David Runge - signingkey = F5A1A949 -- cgit v1.2.3-70-g09d2 From 5a0b1328190721faf4e6ae038461ad4b6984664a Mon Sep 17 00:00:00 2001 From: David Runge Date: Sun, 12 Mar 2017 18:08:28 +0100 Subject: .config/git/config: Removing personalizing git user information. --- .config/git/config | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.config/git/config b/.config/git/config index 949669e..5aae96f 100644 --- a/.config/git/config +++ b/.config/git/config @@ -121,7 +121,3 @@ # Remember my merges # http://gitfu.wordpress.com/2008/04/20/git-rerere-rereremember-what-you-did-last-time/ enabled = true -[user] - email = dave@sleepmap.de - name = David Runge - signingkey = F5A1A949 -- cgit v1.2.3-70-g09d2 From b5bcb362e3706a1bfddb92b0092f85a2bee0c433 Mon Sep 17 00:00:00 2001 From: David Runge Date: Sun, 12 Mar 2017 18:16:06 +0100 Subject: .gitignore: Adding further gnupg ignores and the high priority .gitconfig git configuration file (for local overrides). --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 9d1dac2..99b692f 100644 --- a/.gitignore +++ b/.gitignore @@ -198,12 +198,16 @@ svn/ .gem/ .gemrc .gimp-2.8/ +.gitconfig .gnaural/ .gnome2/ .gnupg/gpg.conf .gnupg/.* .gnupg/pubring* +.gnupg/secring* +.gnupg/tofu.db .gnupg/trustdb* +.gnupg/trustlist.txt .gnupg/private*/ .gnupg/crls.d/ .gnupg/random* -- cgit v1.2.3-70-g09d2