From acacfec924fe68a184a9111eba0e99aa89b9015b Mon Sep 17 00:00:00 2001 From: George Kaklamanos 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 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 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š 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 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 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á 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 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 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 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" 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 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 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 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 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