From acacfec924fe68a184a9111eba0e99aa89b9015b Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@users.noreply.github.com>
Date: Wed, 25 Apr 2018 15:14:33 +0300
Subject: Remove unneeded option in glol and glola (#6059)

---
 plugins/git/git.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index fa0c06500..fd55be138 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -180,8 +180,8 @@ alias glgg='git log --graph'
 alias glgga='git log --graph --decorate --all'
 alias glgm='git log --graph --max-count=10'
 alias glo='git log --oneline --decorate'
-alias glol="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
-alias glola="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all"
+alias glol="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'"
+alias glola="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all"
 alias glog='git log --oneline --decorate --graph'
 alias gloga='git log --oneline --decorate --graph --all'
 alias glp="_git_log_prettily"
-- 
cgit v1.2.3-70-g09d2


From 2642f0a8b4d037cd178356132e5dc59c9e90c631 Mon Sep 17 00:00:00 2001
From: Chuan Jin <chuan.jin.813@gmail.com>
Date: Mon, 21 May 2018 01:02:53 +0200
Subject: Add git log with date (#6789)

---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index fd55be138..34598fb35 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -181,6 +181,8 @@ alias glgga='git log --graph --decorate --all'
 alias glgm='git log --graph --max-count=10'
 alias glo='git log --oneline --decorate'
 alias glol="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'"
+alias glod="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'"
+alias glods="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short"
 alias glola="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all"
 alias glog='git log --oneline --decorate --graph'
 alias gloga='git log --oneline --decorate --graph --all'
-- 
cgit v1.2.3-70-g09d2


From 0808c0f6efaaf988ea6530645394d97fef810f01 Mon Sep 17 00:00:00 2001
From: Matteo Giaccone <matteo.giaccone@acmos.net>
Date: Tue, 12 Jun 2018 18:23:31 +0200
Subject: Remove default for git reset (#4993)

The command will do the same as before, but now you can also specify
a path.

Example:
grh branch-name
grhh tag-name
---
 plugins/git/git.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 34598fb35..413d780e1 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -211,8 +211,8 @@ alias grbc='git rebase --continue'
 alias grbi='git rebase -i'
 alias grbm='git rebase master'
 alias grbs='git rebase --skip'
-alias grh='git reset HEAD'
-alias grhh='git reset HEAD --hard'
+alias grh='git reset'
+alias grhh='git reset --hard'
 alias grmv='git remote rename'
 alias grrm='git remote remove'
 alias grset='git remote set-url'
-- 
cgit v1.2.3-70-g09d2


From b6ca933a02ed780c8ed776e74b141e45a5389f98 Mon Sep 17 00:00:00 2001
From: Michal Juriš <michaljuris@gmail.com>
Date: Sat, 30 Jun 2018 22:25:53 +0200
Subject: Add alias for 'git rebase develop' (#6006)

---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 413d780e1..04ff22164 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -208,6 +208,7 @@ alias gra='git remote add'
 alias grb='git rebase'
 alias grba='git rebase --abort'
 alias grbc='git rebase --continue'
+alias grbd='git rebase develop'
 alias grbi='git rebase -i'
 alias grbm='git rebase master'
 alias grbs='git rebase --skip'
-- 
cgit v1.2.3-70-g09d2


From 1691cf8a99e437a6f7860334105207640cd46978 Mon Sep 17 00:00:00 2001
From: Tushar Tiwari <tushart91@gmail.com>
Date: Mon, 13 Aug 2018 15:11:25 -0400
Subject: Add alias for git add --verbose (#3167)

Add alias `gav='git add -v'`
fixes #6793
---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 04ff22164..d093dcc83 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -44,6 +44,7 @@ alias ga='git add'
 alias gaa='git add --all'
 alias gapa='git add --patch'
 alias gau='git add --update'
+alias gav='git add --verbose'
 alias gap='git apply'
 
 alias gb='git branch'
-- 
cgit v1.2.3-70-g09d2


From 035d78120cb41297068967d3205a23bee22b9543 Mon Sep 17 00:00:00 2001
From: Peter Bittner <django@bittner.it>
Date: Wed, 15 Aug 2018 19:44:06 +0200
Subject: Add Git alias for `git diff --staged` (#7064)

---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index d093dcc83..93b835b77 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -89,6 +89,7 @@ alias gd='git diff'
 alias gdca='git diff --cached'
 alias gdcw='git diff --cached --word-diff'
 alias gdct='git describe --tags `git rev-list --tags --max-count=1`'
+alias gds='git diff --staged'
 alias gdt='git diff-tree --no-commit-id --name-only -r'
 alias gdw='git diff --word-diff'
 
-- 
cgit v1.2.3-70-g09d2


From 652356b9b99b26317478a8756893f896abbed6cd Mon Sep 17 00:00:00 2001
From: Joel Wallis Jucá <joelwallis@gmail.com>
Date: Thu, 23 Aug 2018 17:04:42 -0300
Subject: git: add the `git show` alias `gsh` (#5591)

---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 93b835b77..36f0ff448 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -226,6 +226,7 @@ alias grv='git remote -v'
 
 alias gsb='git status -sb'
 alias gsd='git svn dcommit'
+alias gsh='git show'
 alias gsi='git submodule init'
 alias gsps='git show --pretty=short --show-signature'
 alias gsr='git svn rebase'
-- 
cgit v1.2.3-70-g09d2


From e93378aacd313a11b83da1d0d7480c1840cd2532 Mon Sep 17 00:00:00 2001
From: Kris Kalavantavanich <krismath.K@gmail.com>
Date: Wed, 29 Aug 2018 20:18:20 +0700
Subject: [plugins/git] Updated git clone alias (#6893)

* Updated git clone alias

`git clone --recursive` has been deprecated in favor of `--recurse-submodules`.
See: https://stackoverflow.com/questions/3796927
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 36f0ff448..916866ff5 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -71,7 +71,7 @@ alias gcam='git commit -a -m'
 alias gcsm='git commit -s -m'
 alias gcb='git checkout -b'
 alias gcf='git config --list'
-alias gcl='git clone --recursive'
+alias gcl='git clone --recurse-submodules'
 alias gclean='git clean -fd'
 alias gpristine='git reset --hard && git clean -dfx'
 alias gcm='git checkout master'
-- 
cgit v1.2.3-70-g09d2


From 3d2542f41b8de36877b419f6e74e954d4db06a97 Mon Sep 17 00:00:00 2001
From: Poyoman <big-bug@laposte.net>
Date: Wed, 12 Sep 2018 15:52:42 +0200
Subject: git: add pull rebase --autostash aliases (#6791)

---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 916866ff5..e6e7125f7 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -248,6 +248,8 @@ alias gunignore='git update-index --no-assume-unchanged'
 alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
 alias gup='git pull --rebase'
 alias gupv='git pull --rebase -v'
+alias gupa='git pull --rebase --autostash'
+alias gupav='git pull --rebase --autostash -v'
 alias glum='git pull upstream master'
 
 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
-- 
cgit v1.2.3-70-g09d2


From 69ba6e435970546cd6612941ba0569bbe6847bdb Mon Sep 17 00:00:00 2001
From: Gant Laborde <gantman@gmail.com>
Date: Wed, 12 Sep 2018 16:28:59 +0200
Subject: git: add alias to `git stash --all` (#5511)

Stash tracked, ignored and untracked files. Leaves the working directory absolutely clean.
---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index e6e7125f7..2efb4b881 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -239,6 +239,7 @@ alias gstd='git stash drop'
 alias gstl='git stash list'
 alias gstp='git stash pop'
 alias gsts='git stash show --text'
+alias gstall='git stash --all'
 alias gsu='git submodule update'
 
 alias gts='git tag -s'
-- 
cgit v1.2.3-70-g09d2


From d5f0a0a413146761bfee5f2a206c68cdb577159f Mon Sep 17 00:00:00 2001
From: "Jefferson F. Pires" <jeffersfp@gmail.com>
Date: Wed, 12 Sep 2018 11:57:48 -0300
Subject: git: add glols alias for glol --stat (#5871)

---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 2efb4b881..3a549be3e 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -183,6 +183,7 @@ alias glgga='git log --graph --decorate --all'
 alias glgm='git log --graph --max-count=10'
 alias glo='git log --oneline --decorate'
 alias glol="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'"
+alias glols="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --stat"
 alias glod="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'"
 alias glods="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short"
 alias glola="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all"
-- 
cgit v1.2.3-70-g09d2


From a3afeca3ebb613d5290c481a9766e11d95f3d9bb Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Wed, 12 Sep 2018 18:38:21 +0200
Subject: git: add gbD alias to force-delete branch (#5844)

---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 3a549be3e..a65826852 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -51,6 +51,7 @@ alias gb='git branch'
 alias gba='git branch -a'
 alias gbd='git branch -d'
 alias gbda='git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -d'
+alias gbD='git branch -D'
 alias gbl='git blame -b -w'
 alias gbnm='git branch --no-merged'
 alias gbr='git branch --remote'
-- 
cgit v1.2.3-70-g09d2


From 0db7da0cd5c72611e8f9bdf184bafe15f9f09668 Mon Sep 17 00:00:00 2001
From: Yago Nobre <yagonobre@users.noreply.github.com>
Date: Wed, 12 Sep 2018 14:05:57 -0300
Subject: git: add push force aliases (#6297)

* gpf to --force-with-lease
* gpf! to --force
---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index a65826852..1d548d12d 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -202,6 +202,8 @@ alias gma='git merge --abort'
 
 alias gp='git push'
 alias gpd='git push --dry-run'
+alias gpf='git push --force-with-lease'
+alias gpf!='git push --force'
 alias gpoat='git push origin --all && git push origin --tags'
 compdef _git gpoat=git-push
 alias gpu='git push upstream'
-- 
cgit v1.2.3-70-g09d2


From 5ee93f4f1542123413e9ff9a3b79394937e85881 Mon Sep 17 00:00:00 2001
From: Luis Ferrer-Labarca <ferrerluis97@gmail.com>
Date: Wed, 12 Sep 2018 13:08:12 -0400
Subject: git: add git rm aliases (#5433)

* grm for 'git rm'
* grmc for 'git rm --cached'
---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 1d548d12d..16bf9e0db 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -220,6 +220,8 @@ alias grbm='git rebase master'
 alias grbs='git rebase --skip'
 alias grh='git reset'
 alias grhh='git reset --hard'
+alias grm='git rm'
+alias grmc='git rm --cached'
 alias grmv='git remote rename'
 alias grrm='git remote remove'
 alias grset='git remote set-url'
-- 
cgit v1.2.3-70-g09d2


From 509a5549008c178e982bc8f728a07a2e2dbc58a9 Mon Sep 17 00:00:00 2001
From: Max Gautier <mgautier@student.42.fr>
Date: Wed, 12 Sep 2018 19:35:10 +0200
Subject: git: use color auto for ref names in git log (#5729)

Allow the ref names to have differents colors if they are remote refs
or local refs, and another color for HEAD
(use the same coloring scheme as --decorate option)
---
 plugins/git/git.plugin.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 16bf9e0db..45a706173 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -183,11 +183,11 @@ alias glgg='git log --graph'
 alias glgga='git log --graph --decorate --all'
 alias glgm='git log --graph --max-count=10'
 alias glo='git log --oneline --decorate'
-alias glol="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'"
-alias glols="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --stat"
-alias glod="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'"
-alias glods="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short"
-alias glola="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all"
+alias glol="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'"
+alias glols="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --stat"
+alias glod="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'"
+alias glods="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short"
+alias glola="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all"
 alias glog='git log --oneline --decorate --graph'
 alias gloga='git log --oneline --decorate --graph --all'
 alias glp="_git_log_prettily"
-- 
cgit v1.2.3-70-g09d2


From 3c16466a14516eb3c177e7eb0553adbe16f39890 Mon Sep 17 00:00:00 2001
From: neeasade <neeasade@users.noreply.github.com>
Date: Sun, 20 Jan 2019 13:19:07 -0600
Subject: git: quote branch name in ggpull and ggpush (#7472)

---
 plugins/git/git.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 45a706173..2251bae2e 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -155,10 +155,10 @@ compdef _git ggu=git-checkout
 alias ggpur='ggu'
 compdef _git ggpur=git-checkout
 
-alias ggpull='git pull origin $(git_current_branch)'
+alias ggpull='git pull origin "$(git_current_branch)"'
 compdef _git ggpull=git-checkout
 
-alias ggpush='git push origin $(git_current_branch)'
+alias ggpush='git push origin "$(git_current_branch)"'
 compdef _git ggpush=git-checkout
 
 alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
-- 
cgit v1.2.3-70-g09d2


From 308b046875f745abb87b3ef9f0382029fe37b452 Mon Sep 17 00:00:00 2001
From: Gianluca Recchia <gianluca.recchia97@gmail.com>
Date: Sun, 30 Dec 2018 03:10:49 +0100
Subject: Use stash 'push' or 'save' depending on Git version

A utility function now parses the output of git --version and set the
alias for git stash to 'git stash push' iff the current version of Git
is greater than 2.13; it falls back to 'git stash save' otherwise.
---
 plugins/git/git.plugin.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 2251bae2e..17e4d4b9d 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -33,6 +33,11 @@ function work_in_progress() {
   fi
 }
 
+function _omz_git_stash_command() {
+  [[ `git --version 2>/dev/null` =~ '^git version ([[:digit:]]+.[[:digit:]]+)' && "$match[1]" >= '2.13' ]] \
+  && echo push || echo save
+}
+
 #
 # Aliases
 # (sorted alphabetically)
@@ -238,7 +243,7 @@ alias gsps='git show --pretty=short --show-signature'
 alias gsr='git svn rebase'
 alias gss='git status -s'
 alias gst='git status'
-alias gsta='git stash save'
+alias gsta="git stash $(_omz_git_stash_command)"
 alias gstaa='git stash apply'
 alias gstc='git stash clear'
 alias gstd='git stash drop'
-- 
cgit v1.2.3-70-g09d2


From 932d611c90b979078f4cdd37a20e2bf12e400a84 Mon Sep 17 00:00:00 2001
From: Bartlomiej Tartanus <bartektartanus@gmail.com>
Date: Wed, 30 Jan 2019 16:22:14 +0100
Subject: git: properly indent ggfl function (#7556)

Fixes (probably MacOS) issue:
> ggfl
zsh: command not found: ggfl
---
 plugins/git/git.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 2251bae2e..12400ede4 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -112,8 +112,8 @@ ggf() {
   git push --force origin "${b:=$1}"
 }
 ggfl() {
-[[ "$#" != 1 ]] && local b="$(git_current_branch)"
-git push --force-with-lease origin "${b:=$1}"
+  [[ "$#" != 1 ]] && local b="$(git_current_branch)"
+  git push --force-with-lease origin "${b:=$1}"
 }
 compdef _git ggf=git-checkout
 
-- 
cgit v1.2.3-70-g09d2


From 9509fd6a9193e32e5c2d460786253ba0e98fd741 Mon Sep 17 00:00:00 2001
From: Tieme van Veen <tiemevanveen@hotmail.com>
Date: Sun, 10 Mar 2019 17:38:06 +0100
Subject: Add git reset to origin alias to git plugin (#7630)

---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 12400ede4..4277ac664 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -220,6 +220,7 @@ alias grbm='git rebase master'
 alias grbs='git rebase --skip'
 alias grh='git reset'
 alias grhh='git reset --hard'
+alias groh='git reset origin/$(git_current_branch) --hard'
 alias grm='git rm'
 alias grmc='git rm --cached'
 alias grmv='git remote rename'
-- 
cgit v1.2.3-70-g09d2


From f6a9a0a49855666f3311a2db040b9b27969da2bc Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 25 Mar 2019 18:46:18 +0100
Subject: git: fix grt on path with spaces

Fixes #7682
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 4277ac664..6fc9b078b 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -226,7 +226,7 @@ alias grmc='git rm --cached'
 alias grmv='git remote rename'
 alias grrm='git remote remove'
 alias grset='git remote set-url'
-alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
+alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
 alias gru='git reset --'
 alias grup='git remote update'
 alias grv='git remote -v'
-- 
cgit v1.2.3-70-g09d2


From 0e0789fb7aedd1afd8ae07dfc9609f6a7f2e407f Mon Sep 17 00:00:00 2001
From: Jakub Chábek <jakub@chabek.cz>
Date: Fri, 29 Mar 2019 22:56:59 +0100
Subject: git: delete branches in `gbda` only if there are any (#6079)

It doesn't make sense to run `git branch -d $BRANCH` if the `$BRANCH` is empty.
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 6fc9b078b..8eccc9cee 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -50,7 +50,7 @@ alias gap='git apply'
 alias gb='git branch'
 alias gba='git branch -a'
 alias gbd='git branch -d'
-alias gbda='git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -d'
+alias gbda='git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -r -n 1 git branch -d'
 alias gbD='git branch -D'
 alias gbl='git blame -b -w'
 alias gbnm='git branch --no-merged'
-- 
cgit v1.2.3-70-g09d2


From 4b82b8606442c5ff0235ea95d0fc11f151638dc3 Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Fri, 29 Mar 2019 22:59:37 +0100
Subject: git: add `--no-gpg-sign` to gwip (#6031)

---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 8eccc9cee..302377153 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -261,4 +261,4 @@ alias gupav='git pull --rebase --autostash -v'
 alias glum='git pull upstream master'
 
 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
-alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify -m "--wip-- [skip ci]"'
+alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"'
-- 
cgit v1.2.3-70-g09d2


From 93cbc1614c9900f310a48de69447e035df84e1cb Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 31 Mar 2019 15:56:35 +0200
Subject: git: use interactive mode in gclean

Fixes #7716
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 302377153..8482c4d54 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -73,7 +73,7 @@ alias gcsm='git commit -s -m'
 alias gcb='git checkout -b'
 alias gcf='git config --list'
 alias gcl='git clone --recurse-submodules'
-alias gclean='git clean -fd'
+alias gclean='git clean -id'
 alias gpristine='git reset --hard && git clean -dfx'
 alias gcm='git checkout master'
 alias gcd='git checkout develop'
-- 
cgit v1.2.3-70-g09d2


From 831fba4ee4bc28d1d0a3a3f94d5b4dcdfce04588 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 2 Apr 2019 19:05:52 +0200
Subject: Revert "git: delete branches in `gbda` only if there are any (#6079)"
 (#7724)

This reverts commit 0e0789fb7aedd1afd8ae07dfc9609f6a7f2e407f.
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 8482c4d54..5bef95bd5 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -50,7 +50,7 @@ alias gap='git apply'
 alias gb='git branch'
 alias gba='git branch -a'
 alias gbd='git branch -d'
-alias gbda='git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -r -n 1 git branch -d'
+alias gbda='git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -d'
 alias gbD='git branch -D'
 alias gbl='git blame -b -w'
 alias gbnm='git branch --no-merged'
-- 
cgit v1.2.3-70-g09d2


From 046d49f7827c994916a55d1531e70564682307af Mon Sep 17 00:00:00 2001
From: Asatur Meltonyan <asaturmeltonyan@gmail.com>
Date: Sun, 7 Apr 2019 16:17:22 +0400
Subject: git: add 'gtl' alias to list tags matching a pattern (#7629)

1. List the tags that match the pattern(s) passed through the argument.
2. Displays the first line of the annotation message along with the tag, or the line of the first commit message if the tag is not annotated.
3. Sorts and displays tags in descending order.
---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 5bef95bd5..a4b6eb977 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -251,6 +251,7 @@ alias gsu='git submodule update'
 
 alias gts='git tag -s'
 alias gtv='git tag | sort -V'
+alias gtl='gtl(){ git tag --sort=-v:refname -n -l ${1}* }; noglob gtl'
 
 alias gunignore='git update-index --no-assume-unchanged'
 alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
-- 
cgit v1.2.3-70-g09d2


From 1bd72f588cb2e4950ea513aa4315ce77c792e43b Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 9 Apr 2019 18:29:18 +0200
Subject: Update to inline conditional syntax

---
 plugins/git/git.plugin.zsh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 17e4d4b9d..fa2487a2c 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -33,11 +33,6 @@ function work_in_progress() {
   fi
 }
 
-function _omz_git_stash_command() {
-  [[ `git --version 2>/dev/null` =~ '^git version ([[:digit:]]+.[[:digit:]]+)' && "$match[1]" >= '2.13' ]] \
-  && echo push || echo save
-}
-
 #
 # Aliases
 # (sorted alphabetically)
@@ -243,7 +238,12 @@ alias gsps='git show --pretty=short --show-signature'
 alias gsr='git svn rebase'
 alias gss='git status -s'
 alias gst='git status'
-alias gsta="git stash $(_omz_git_stash_command)"
+
+# use the default stash push on git 2.13 and newer
+[[ "$(git --version 2>/dev/null)" =~ '^git version ([0-9]+.[0-9]+)' && "$match" -ge '2.13' ]] \
+  && alias gsta='git stash push'
+  || alias gsta='git stash save'
+
 alias gstaa='git stash apply'
 alias gstc='git stash clear'
 alias gstd='git stash drop'
-- 
cgit v1.2.3-70-g09d2


From b31106b3414f8b62589f25c25f6de6f921ee2efe Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 9 Apr 2019 18:35:09 +0200
Subject: git: minor syntax fix

---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 344419f1e..ef4697906 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -242,7 +242,7 @@ alias gst='git status'
 
 # use the default stash push on git 2.13 and newer
 [[ "$(git --version 2>/dev/null)" =~ '^git version ([0-9]+.[0-9]+)' && "$match" -ge '2.13' ]] \
-  && alias gsta='git stash push'
+  && alias gsta='git stash push' \
   || alias gsta='git stash save'
 
 alias gstaa='git stash apply'
-- 
cgit v1.2.3-70-g09d2


From 7824dc637db296aebc88263d9f5a3ea36fd50bb5 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 10 Apr 2019 11:47:29 +0200
Subject: git: use is-at-least to test for git version

Fixes #7754
---
 plugins/git/git.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index ef4697906..b82d49b5e 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -241,7 +241,8 @@ alias gss='git status -s'
 alias gst='git status'
 
 # use the default stash push on git 2.13 and newer
-[[ "$(git --version 2>/dev/null)" =~ '^git version ([0-9]+.[0-9]+)' && "$match" -ge '2.13' ]] \
+autoload -Uz is-at-least
+is-at-least 2.13 "$(git --version 2>/dev/null | awk '{print $3}')" \
   && alias gsta='git stash push' \
   || alias gsta='git stash save'
 
-- 
cgit v1.2.3-70-g09d2