From 785ab635d0d611af2834388ebf07a6d6681c4550 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Tue, 26 Apr 2022 13:45:16 +0300
Subject: [PATCH] Git: add upstream alias

---
 home/.config/nvim/ftplugin/java.lua | 2 +-
 home/.gitconfig                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua
index 227b83d2..72bac9ac 100644
--- a/home/.config/nvim/ftplugin/java.lua
+++ b/home/.config/nvim/ftplugin/java.lua
@@ -4,7 +4,7 @@ local workspace_dir = nvim_local_dir .. '/jdtls-workspaces/' .. project_name
 
 require('jdtls').start_or_attach({
     cmd = {
-        'java', '-Declipse.application=org.eclipse.jdt.ls.core.id1',
+        '/usr/lib/jvm/java-17-openjdk-amd64/bin/java', '-Declipse.application=org.eclipse.jdt.ls.core.id1',
         '-Dosgi.bundles.defaultStartLevel=4',
         '-Declipse.product=org.eclipse.jdt.ls.core.product',
         '-Dlog.protocol=true', '-Dlog.level=ALL', '-Xms1g',
diff --git a/home/.gitconfig b/home/.gitconfig
index 5e94d484..1794bddd 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -38,6 +38,7 @@
 
 [alias]
 	mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1
+	upstream = !git push -u origin HEAD
 
 [color]
 	pager = no