Mercurial > repos > other > linux

annotate gitconfig @ 153:078d269af1ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove "quiet" in Nano since it is noisy Versions have updated enough that the server isn't noisy and the desktop *is* noisy because "quiet" has gone!
author IBBoard <dev@ibboard.co.uk>
date Tue, 11 Jan 2022 21:01:39 +0000
parents 510c38f1cfc2
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
1 [user]
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
2 name = IBBoard
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
3 email = dev@ibboard.co.uk
124
c3320f06d412 Add a minimal global gitignore
IBBoard <dev@ibboard.co.uk>
parents: 65
diff changeset
4 [core]
c3320f06d412 Add a minimal global gitignore
IBBoard <dev@ibboard.co.uk>
parents: 65
diff changeset
5 excludesfile = ~/.gitignore
4
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
6 [branch]
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
7 autosetupmerge = true
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
8 [diff]
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
9 [merge]
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
10 tool = meld
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
11 [mergetool "meld"]
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
12 cmd = meld \\\"$BASE\\\" \\\"$LOCAL\\\" \\\"$REMOTE\\\"
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
13 [diff]
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
14 tool = meld
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
15 [difftool "meld"]
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
16 cmd = meld \"\" \"\"
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
17 [difftool]
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
18 prompt = false
29
9bce7362e609 Default to simple git push for fairly sane behaviour
IBBoard <dev@ibboard.co.uk>
parents: 13
diff changeset
19 [push]
9bce7362e609 Default to simple git push for fairly sane behaviour
IBBoard <dev@ibboard.co.uk>
parents: 13
diff changeset
20 default = simple
65
dc844728d1d4 Add an include to allow username overrides on other systems
IBBoard <dev@ibboard.co.uk>
parents: 29
diff changeset
21 [include]
dc844728d1d4 Add an include to allow username overrides on other systems
IBBoard <dev@ibboard.co.uk>
parents: 29
diff changeset
22 path = ~/.gitconfig-override
152
510c38f1cfc2 Add helpful Git defaults for branch, pull/merge and publishing
IBBoard <dev@ibboard.co.uk>
parents: 124
diff changeset
23 [pull]
510c38f1cfc2 Add helpful Git defaults for branch, pull/merge and publishing
IBBoard <dev@ibboard.co.uk>
parents: 124
diff changeset
24 rebase = true
510c38f1cfc2 Add helpful Git defaults for branch, pull/merge and publishing
IBBoard <dev@ibboard.co.uk>
parents: 124
diff changeset
25 [alias]
510c38f1cfc2 Add helpful Git defaults for branch, pull/merge and publishing
IBBoard <dev@ibboard.co.uk>
parents: 124
diff changeset
26 publish = push -u origin HEAD
510c38f1cfc2 Add helpful Git defaults for branch, pull/merge and publishing
IBBoard <dev@ibboard.co.uk>
parents: 124
diff changeset
27 # dadd = "!dvc_add() { DVC_FILES=$(echo $@ | sed 's/\( |$\)/.dvc /g'); dvc add $@ && git add .gitignore $DVC_FILES; }; dvc_add"
510c38f1cfc2 Add helpful Git defaults for branch, pull/merge and publishing
IBBoard <dev@ibboard.co.uk>
parents: 124
diff changeset
28 [init]
510c38f1cfc2 Add helpful Git defaults for branch, pull/merge and publishing
IBBoard <dev@ibboard.co.uk>
parents: 124
diff changeset
29 defaultBranch = main