annotate gitconfig @ 124:c3320f06d412

Add a minimal global gitignore We could add more, but this is intended for things that only I need to ignore (such as build directories that other people might do differently) rather than stuff that everyone wants to do (like ignoring .pyc files or log files in the project)
author IBBoard <dev@ibboard.co.uk>
date Wed, 13 Mar 2019 19:19:50 +0000
parents dc844728d1d4
children 510c38f1cfc2
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