From 8656d384624afa1e0aaf3319ed352a4efa64e017 Mon Sep 17 00:00:00 2001
From: Noah Masur <noah.masur@take2games.com>
Date: Mon, 23 Nov 2020 18:13:50 -0500
Subject: [PATCH] changing prompt

---
 fish.configlink/functions/aliases.fish | 2 ++
 starship/starship.toml.configlink      | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/fish.configlink/functions/aliases.fish b/fish.configlink/functions/aliases.fish
index cbc4e6c..b55aadb 100644
--- a/fish.configlink/functions/aliases.fish
+++ b/fish.configlink/functions/aliases.fish
@@ -22,9 +22,11 @@ function aliases --description 'All aliases'
     abbr -a gl 'git log --graph --decorate --oneline -20'
     abbr -a gll 'git log --graph --decorate --oneline'
     abbr -a gco 'git checkout'
+    abbr -a gcom 'git checkout master'
     abbr -a gcob 'git checkout -b'
     abbr -a gb 'git branch'
     abbr -a grh 'git reset --hard'
+    abbr -a gm 'git merge'
     abbr -a ghb 'gh repo view -w'
 
     # Vim
diff --git a/starship/starship.toml.configlink b/starship/starship.toml.configlink
index 9dc15ce..b99dd74 100644
--- a/starship/starship.toml.configlink
+++ b/starship/starship.toml.configlink
@@ -2,6 +2,8 @@
 add_newline = false
 format = """\
   $directory\
+  $git_branch\
+  $git_commit \
   $character\
   """
 
@@ -13,8 +15,11 @@ truncate_to_repo = true
 truncation_length = 100
 
 [git_branch]
-truncation_length = 1
-truncation_symbol = ""
+format = "[$symbol$branch]($style)"
+
+[git_commit]
+commit_has_length = 7
+format = "[\\($hash\\)]($style)"
 
 [git_status]
 format = '([\[$all_status$ahead_behind\]]($style) )'