From 8fd7f9bfed753dbaa5543747569b4c2543aff03d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 17 Jul 2021 09:26:34 +0200
Subject: Merging upstream version 0.15.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 gita/cmds.json | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 gita/cmds.json

(limited to 'gita/cmds.json')

diff --git a/gita/cmds.json b/gita/cmds.json
new file mode 100644
index 0000000..947a4dd
--- /dev/null
+++ b/gita/cmds.json
@@ -0,0 +1,89 @@
+{
+"br":{
+  "cmd": "git branch -vv",
+  "help":"show local branches"},
+"clean":{
+  "cmd": "git clean -dfx",
+  "help": "remove all untracked files/folders"},
+"diff":{
+  "cmd": "git diff",
+  "help": "git show differences"},
+"difftool":{
+  "cmd": "git difftool",
+  "disable_async": true,
+  "help": "show differences using a tool"
+  },
+"fetch":{
+  "cmd": "git fetch",
+  "allow_all": true,
+  "help": "fetch remote update"
+  },
+"last":{
+  "cmd": "git log -1 HEAD",
+  "help": "show log information of HEAD"
+  },
+"log":
+  {"cmd": "git log",
+  "disable_async": true,
+  "help": "show logs"
+  },
+"merge":{
+  "cmd": "git merge @{u}",
+  "help": "merge remote updates"
+  },
+"mergetool":{
+  "cmd": "git mergetool",
+  "disable_async": true,
+  "help": "merge updates with a tool"
+  },
+"patch":{
+  "cmd": "git format-patch HEAD~",
+  "help": "make a patch"
+  },
+"pull":{
+  "cmd": "git pull",
+  "allow_all": true,
+  "help": "pull remote updates"
+  },
+"push":{
+  "cmd": "git push",
+  "help": "push the local updates"
+  },
+"rebase":{
+  "cmd": "git rebase",
+  "help": "rebase from master"
+  },
+"reflog":{
+  "cmd": "git reflog",
+  "help": "show ref logs"
+  },
+"remote":{
+  "cmd": "git remote -v",
+  "help": "show remote settings"
+  },
+"reset":{
+  "cmd": "git reset",
+  "help": "reset repo(s)"
+  },
+"show":{
+  "cmd": "git show",
+  "disable_async": true,
+  "help": "show detailed commit information"
+  },
+"stash":{
+  "cmd": "git stash",
+  "help": "store uncommited changes"
+  },
+"stat":{
+  "cmd": "git diff --stat",
+  "help": "show edit statistics"
+  },
+"st":{
+  "cmd": "git status",
+  "help": "show status"
+  },
+"tag":{
+  "cmd": "git tag -n",
+  "help": "show tags"
+  }
+}
-- 
cgit v1.2.3