summary refs log tree commit diff stats
path: root/tag-git
diff options
context:
space:
mode:
authorAlan Pearce2014-08-01 21:58:41 +0100
committerAlan Pearce2014-08-01 21:58:41 +0100
commit648a40e503df5cd27e04b84502e4aad5c493b782 (patch)
tree7ad10eec1e806221626e1804fdfe8d88323f72db /tag-git
parent90676d96644c8d4f6f172d7658f00d597fec4194 (diff)
downloadnixfiles-648a40e503df5cd27e04b84502e4aad5c493b782.tar.lz
nixfiles-648a40e503df5cd27e04b84502e4aad5c493b782.tar.zst
nixfiles-648a40e503df5cd27e04b84502e4aad5c493b782.zip
Git: Alias up to merge in FETCH_HEAD
This means I can leave the fetching to the pure prompt background task
and merge in the result after I see an indicator
Diffstat (limited to 'tag-git')
-rw-r--r--tag-git/config/git/config1
1 files changed, 1 insertions, 0 deletions
diff --git a/tag-git/config/git/config b/tag-git/config/git/config
index 58255433..886112cc 100644
--- a/tag-git/config/git/config
+++ b/tag-git/config/git/config
@@ -9,6 +9,7 @@
 [push]
 	default = current
 [alias]
+	up = merge FETCH_HEAD
 	st = status -sb
 	ci = commit
 	br = branch