Peter J. Holzer
eea9e7b27d
Merge branch 'master' into wsr_shared
2023-03-05 15:07:38 +01:00
Peter J. Holzer
1db95b2996
Set pull.rebase to false globally (finally!)
2023-03-05 15:02:50 +01:00
Peter J. Holzer
76af3fcca0
Merge branch 'master' into wsr_shared
2022-09-10 23:06:38 +02:00
Peter J. Holzer
866eb19d97
Turn off color for history graph
2022-04-23 01:17:48 +02:00
Peter J. Holzer
90e126ab82
Remove my name and email from shared config
2019-09-04 17:48:01 +02:00
Peter J. Holzer
d076880470
Order hist strictly by date
...
By default git tries to keep different branches together, but I find
that more confusing than helpful.
2018-04-09 12:00:22 +02:00
Peter J. Holzer
cc05dd833e
Merge branch 'wsr' of github.com:hjp/dot into wsr
...
Conflicts:
.gitconfig
2018-01-09 14:48:24 +01:00
Peter J. Holzer
15d203b27d
Set push.default to current for compatibility
2018-01-09 14:43:19 +01:00
Peter J. Holzer
dfabce5c14
Set push.default to upstream
...
The default changed from matching to simple in git 2.0, but simple was
only introduced in git 1.7.11, and we have older gits, so I can't just
set it to that. upstream is the closest in functionality, and I think I
don't need the extra security of simple, so I'll just set it
unconditionally to upstream instead of checking the git version.
2017-12-14 12:39:32 +01:00
Peter J. Holzer
6b10b8dba3
Set work email address
2017-08-16 16:36:17 +02:00
Peter J. Holzer
003391d197
Add .gitconfig
2017-02-13 20:25:22 +01:00