feat(git): add meteor/merge aliases

Amolith created 1 week ago

Change summary

dot_config/git/config.tmpl | 2 ++
1 file changed, 2 insertions(+)

Detailed changes

dot_config/git/config.tmpl

@@ -5,6 +5,8 @@
 	l = log
 	d = diff
 	s = show
+	m = !meteor
+	me = merge
 	dl = -c diff.external=difft log -p --ext-diff
 	ds = -c diff.external=difft show --ext-diff
 	df = -c diff.external=difft diff