From cafd44754d03cf5c7c4394bef5e3f4ee7c8d7ef6 Mon Sep 17 00:00:00 2001 From: Martin Delille Date: Sat, 27 Aug 2022 14:48:14 +0200 Subject: [PATCH 1/4] Add gcfx: git commit --fixup --- plugins/git/README.md | 1 + plugins/git/git.plugin.zsh | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/git/README.md b/plugins/git/README.md index 4c005ad2f..894312046 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -58,6 +58,7 @@ plugins=(... git) | `gcpa` | `git cherry-pick --abort` | | `gcpc` | `git cherry-pick --continue` | | `gclean` | `git clean --interactive -d` | +| `gcfx` | `git commit --fixup` | | `gcl` | `git clone --recurse-submodules` | | `gccd` | `git clone --recurse-submodules "$@" && cd "$(basename $\_ .git)"` | | `gcam` | `git commit --all --message` | diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 146f4a512..5f5819ee7 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -164,6 +164,7 @@ alias gcp='git cherry-pick' alias gcpa='git cherry-pick --abort' alias gcpc='git cherry-pick --continue' alias gclean='git clean --interactive -d' +alias gcfx='git commit --fixup' alias gcl='git clone --recurse-submodules' function gccd() { From e8be3c170d9346fa2dd0fce151ea6f6fc0250bc6 Mon Sep 17 00:00:00 2001 From: Martin Delille Date: Sat, 20 Feb 2021 18:59:24 +0100 Subject: [PATCH 2/4] Add glom: git log --oneline --decorate --color $(git_main_branch) --- plugins/git/README.md | 1 + plugins/git/git.plugin.zsh | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/git/README.md b/plugins/git/README.md index 894312046..81be6f663 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -105,6 +105,7 @@ plugins=(... git) | `glo` | `git log --oneline --decorate` | | `glog` | `git log --oneline --decorate --graph` | | `gloga` | `git log --oneline --decorate --graph --all` | +| `glom` | `git log --oneline --decorate --color $(git_main_branch)..` | | `glp` | `git log --pretty=` | | `glg` | `git log --stat` | | `glgp` | `git log --stat --patch` | diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 5f5819ee7..242471552 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -237,6 +237,7 @@ alias glol='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgre alias glo='git log --oneline --decorate' alias glog='git log --oneline --decorate --graph' alias gloga='git log --oneline --decorate --graph --all' +alias glom='git log --oneline --decorate --color $(git_main_branch)..' # Pretty log messages function _git_log_prettily(){ From 20ee241c001711ca9dfdf352de9fbe5037bb4138 Mon Sep 17 00:00:00 2001 From: Martin Delille Date: Sun, 6 Jun 2021 13:17:02 +0200 Subject: [PATCH 3/4] Add gsuri: git submodule update --recursive --init --- plugins/git/README.md | 1 + plugins/git/git.plugin.zsh | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/git/README.md b/plugins/git/README.md index 81be6f663..255a7bf2a 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -196,6 +196,7 @@ plugins=(... git) | `gsb` | `git status --short -b` | | `gsi` | `git submodule init` | | `gsu` | `git submodule update` | +| `gsuri` | `git submodule update --recursive --init` | | `gsd` | `git svn dcommit` | | `git-svn-dcommit-push` | `git svn dcommit && git push github $(git_main_branch):svntrunk` | | `gsr` | `git svn rebase` | diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 242471552..967ece898 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -382,6 +382,7 @@ alias gss='git status --short' alias gsb='git status --short --branch' alias gsi='git submodule init' alias gsu='git submodule update' +alias gsuri='git submodule update --recursive --init' alias gsd='git svn dcommit' alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk' alias gsr='git svn rebase' From 1cffd3507b29cbf1d4f3cb0e63d4f767da7aff25 Mon Sep 17 00:00:00 2001 From: Martin Delille Date: Sun, 6 Jun 2021 16:32:20 +0200 Subject: [PATCH 4/4] Add grbmi/grbmia: git rebase $(git_main_branch) --interactive / --autosquash --- plugins/git/README.md | 2 ++ plugins/git/git.plugin.zsh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/plugins/git/README.md b/plugins/git/README.md index 255a7bf2a..7567c5297 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -150,6 +150,8 @@ plugins=(... git) | `grba` | `git rebase --abort` | | `grbc` | `git rebase --continue` | | `grbi` | `git rebase --interactive` | +| `grbmi` | `git rebase $(git_main_branch) --interactive` | +| `grbmia` | `git rebase $(git_main_branch) --interactive --autosquash` | | `grbo` | `git rebase --onto` | | `grbs` | `git rebase --skip` | | `grbd` | `git rebase $(git_develop_branch)` | diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 967ece898..2e617d068 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -338,6 +338,8 @@ alias grbs='git rebase --skip' alias grbd='git rebase $(git_develop_branch)' alias grbm='git rebase $(git_main_branch)' alias grbom='git rebase origin/$(git_main_branch)' +alias grbmi='git rebase $(git_main_branch) --interactive' +alias grbmia='git rebase $(git_main_branch) --interactive --autosquash' alias grf='git reflog' alias gr='git remote' alias grv='git remote --verbose'