summary refs log tree commit diff
path: root/home/.config/git
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-07-20 13:47:38 -0400
committerJune McEnroe <june@causal.agency>2020-07-20 13:47:50 -0400
commite4ac888ae0369cf69cbd63515148077779a3230e (patch)
treed4249defc75956064d11998467a1163938b71d9a /home/.config/git
parentRead from stdin in order (diff)
downloadsrc-e4ac888ae0369cf69cbd63515148077779a3230e.tar.gz
src-e4ac888ae0369cf69cbd63515148077779a3230e.zip
Set pull.rebase true
Diffstat (limited to '')
-rw-r--r--home/.config/git/config3
1 files changed, 3 insertions, 0 deletions
diff --git a/home/.config/git/config b/home/.config/git/config
index 5c12c079..71799784 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -8,6 +8,9 @@
 [merge]
 	conflictStyle = diff3
 
+[pull]
+	rebase = true
+
 [rebase]
 	autosquash = true
 
y valueJune McEnroe 2018-03-05Use stdio in merge and metaJune McEnroe 2018-03-05Clean up spawn constantsJune McEnroe 2018-03-05Rename Tile timestamps {create,modify,access}TimeJune McEnroe 2018-03-05Pack message type enumsJune McEnroe 2018-03-05Undef COLOR_ constants in torus.hJune McEnroe 2018-03-05Generate tagsJune McEnroe 2017-10-03Simplify Makefile with pattern ruleJune McEnroe 2017-09-27Remove leading blank linesJune McEnroe 2017-09-27Add merge.c to READMEJune McEnroe 2017-09-03Assert client coords are valid after movementJune McEnroe 2017-09-03Relicense AGPLJune McEnroe 2017-09-01Revert "Add client readOnly mode"June McEnroe 2017-09-01Remove clientRemove call from clientCastJune McEnroe 2017-09-01Add client readOnly modeJune McEnroe 2017-08-31Clean up merge toolJune McEnroe 2017-08-31Choose B for tiles with equal modify timesJune McEnroe 2017-08-31Add quick data file merge toolJune McEnroe 2017-08-30Use only foreground color for selecting spawnJune McEnroe 2017-08-29Add four additional spawnsJune McEnroe 2017-08-28Add respawningJune McEnroe 2017-08-26Move license above includesJune McEnroe 2017-08-26Snapshot metadataJune McEnroe 2017-08-26Add meta.c to READMEJune McEnroe 2017-08-26Use MakefileJune McEnroe