diff --git a/data/commands.json b/data/commands.json index ae2154a..df2b556 100644 --- a/data/commands.json +++ b/data/commands.json @@ -119,13 +119,25 @@ "desc": "Rebase commits from source branch to target branch" }, { - "command": "git stash", + "command": "git merge ", + "desc": "Merge commits from another branch into the one command is run on" + }, + { + "command": "git stash push -m 'Message/Stash Name'", "desc": "Stash changes without commiting" }, + { + "command": "git stash pop", + "desc": "Stash changes without commiting (add stash@{n} for specific stash from 'git stash list'" + }, { "command": "git reflog", "desc": "Show history of all changes" }, + { + "command": "git status", + "desc": "See what is changed right now" + }, { "command": "git remote set-url origin git@github.com:username/repo.git", "desc": "Change origin url (example from https to ssh)"