~willdurand/public-inbox

dotfiles: git: include .gitlocal and move specific config to a new default file v1 APPLIED

William Durand: 2
 git: include .gitlocal and move specific config to a new default file
 Update README

 3 files changed, 18 insertions(+), 13 deletions(-)
Thanks!
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.sr.ht/~willdurand/public-inbox/patches/20255/mbox | git am -3
Learn more about email & git

[PATCH dotfiles 1/2] git: include .gitlocal and move specific config to a new default file Export this patch

I should have done that before.

Signed-off-by: William Durand <will+git@drnd.me>
---
 git/gitconfig        | 16 ++++------------
 git/gitlocal.default |  8 ++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 git/gitlocal.default

diff --git a/git/gitconfig b/git/gitconfig
index 2f03715..8c675be 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -65,18 +65,12 @@
	todo = grep -A 1 -i --heading "TODO:"
	status = status --no-ahead-behind

[hub]
	protocol = git

[push]
	default = current

[pull]
	rebase = merges

[commit]
	gpgsign = 1

[sendemail]
	smtpencryption = tls
	smtpserver = smtp.fastmail.com
@@ -108,13 +102,11 @@
[rerere]
	enabled = true

[credential]
	helper = osxkeychain

[cinnabar]
	helper = /usr/local/Cellar/git-cinnabar/0.5.5/libexec/git-cinnabar-helper

[init]
	defaultBranch = main

[format]
	signOff = yes

[include]
	path = ~/.gitlocal
diff --git a/git/gitlocal.default b/git/gitlocal.default
new file mode 100644
index 0000000..89df3bf
--- /dev/null
+++ b/git/gitlocal.default
@@ -0,0 +1,8 @@
[commit]
	gpgsign = 1

[credential]
	helper = osxkeychain

[cinnabar]
	helper = /usr/local/Cellar/git-cinnabar/0.5.5/libexec/git-cinnabar-helper
--
2.30.0

[PATCH dotfiles 2/2] Update README Export this patch

Minor changes, mentions gitlocal.

Signed-off-by: William Durand <will+git@drnd.me>
---
 README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0fbcd65..9e17a67 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,12 @@ This repository contains various configuration files I care about.
    $ cd dotfiles
    $ bin/install

You can tweak OSX by running the following script:
You can tweak MacOS by running the following script:

    $ bin/setup_osx

### Git

The `git` configuration supports a `~/.gitlocal` file that should contain
machine-specific configuration. The default file I use on almost all my machines
is `git/gitlocal.default` but it's not installed by default.
--
2.30.0
Thanks!