From e650e55b49daa901f263d2958cc61a6596e0eb80 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sun, 7 May 2023 16:11:34 +1000 Subject: [PATCH] Updated git configuration Moved to .config/git Added git-credentials to be encrypted --- .config/git/gitconfig | 61 +++++++++++++++++++++++++++++++++++++++++ .config/git/gitmessage | 2 +- .config/yadm/encrypt | 2 +- .gitconfig | 62 +----------------------------------------- 4 files changed, 64 insertions(+), 63 deletions(-) create mode 100644 .config/git/gitconfig mode change 100644 => 120000 .gitconfig diff --git a/.config/git/gitconfig b/.config/git/gitconfig new file mode 100644 index 0000000..6310e61 --- /dev/null +++ b/.config/git/gitconfig @@ -0,0 +1,61 @@ +# vim: set sw=2 sts=2 ts=2 noexpandtab : + +[color] + ui = auto + branch = auto + diff = auto + grep = auto + interactive = auto + status = auto + +[user] + email = ben@unkin.net + name = Ben Vincent + +[core] + autocrlf = false + excludesfile = ~/.config/git/global_ignore + whitespace = blank-at-eol,blank-at-eof,space-before-tab + +[init] + defaultBranch = master + +[push] + default = simple + +[rerere] + enabled = true + autoupdate = true + +[rebase] + # Automatically stash before a rebase and unstash afterwards. + autoStash = true + +[commit] + # Show diff when preparing commit message + verbose = true + template = ~/.config/git/gitmessage + +### +### Github specific +### +[github] + user = neoloc + +# read from given uri +# push to writable one +# http://bit.ly/g9c9Y2 +# +[url "http://github.com/"] + insteadOf = "gh:" + +[url "git@github.com:"] + pushInsteadOf = "https://github.com/" + pushInsteadOf = "http://github.com/" + pushInsteadOf = "gh:" + +[credential] + helper = store + +[pack] + threads = 2 diff --git a/.config/git/gitmessage b/.config/git/gitmessage index f3eaa69..950dfe7 100644 --- a/.config/git/gitmessage +++ b/.config/git/gitmessage @@ -1,7 +1,7 @@ -# vi:ft=gitcommit:tw=72:sw=2:ts=2:expandtab:spell # If applied, this commit will... # Why is this change needed? # How does it address the issue? # Provide links to any relevant tickets, articles or other resources +# vi:ft=gitcommit:tw=72:sw=2:ts=2:expandtab:spell diff --git a/.config/yadm/encrypt b/.config/yadm/encrypt index 8f2a124..23ff0ba 100644 --- a/.config/yadm/encrypt +++ b/.config/yadm/encrypt @@ -2,4 +2,4 @@ .ssh/id_rsa.pub .ssh/config .ssh/config.d/* -.git-credentials +.config/git/git-credentials diff --git a/.gitconfig b/.gitconfig deleted file mode 100644 index 6310e61..0000000 --- a/.gitconfig +++ /dev/null @@ -1,61 +0,0 @@ -# vim: set sw=2 sts=2 ts=2 noexpandtab : - -[color] - ui = auto - branch = auto - diff = auto - grep = auto - interactive = auto - status = auto - -[user] - email = ben@unkin.net - name = Ben Vincent - -[core] - autocrlf = false - excludesfile = ~/.config/git/global_ignore - whitespace = blank-at-eol,blank-at-eof,space-before-tab - -[init] - defaultBranch = master - -[push] - default = simple - -[rerere] - enabled = true - autoupdate = true - -[rebase] - # Automatically stash before a rebase and unstash afterwards. - autoStash = true - -[commit] - # Show diff when preparing commit message - verbose = true - template = ~/.config/git/gitmessage - -### -### Github specific -### -[github] - user = neoloc - -# read from given uri -# push to writable one -# http://bit.ly/g9c9Y2 -# -[url "http://github.com/"] - insteadOf = "gh:" - -[url "git@github.com:"] - pushInsteadOf = "https://github.com/" - pushInsteadOf = "http://github.com/" - pushInsteadOf = "gh:" - -[credential] - helper = store - -[pack] - threads = 2 diff --git a/.gitconfig b/.gitconfig new file mode 120000 index 0000000..ea6a143 --- /dev/null +++ b/.gitconfig @@ -0,0 +1 @@ +/home/ben/.config/git/gitconfig \ No newline at end of file