From 1b441e7654b6b1c8e766d68d548abd7e5597604e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20VANTOMME?= Date: Thu, 5 Apr 2018 00:20:21 +0200 Subject: [PATCH] Feat (git): add an alias displaying the commits yet to be applied to upstream (#1565) --- modules/git/README.md | 2 ++ modules/git/alias.zsh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/git/README.md b/modules/git/README.md index 1eba33c..1d4b7ba 100644 --- a/modules/git/README.md +++ b/modules/git/README.md @@ -82,6 +82,8 @@ zstyle ':prezto:module:git:alias' skip 'yes' - `gcR` removes the *HEAD* commit. - `gcs` displays various types of objects. - `gcl` lists lost commits. + - `gcy` displays commits yet to be applied to upstream in the short format. + - `gcY` displays commits yet to be applied to upstream. ### Conflict diff --git a/modules/git/alias.zsh b/modules/git/alias.zsh index a54a2e0..dde5b35 100644 --- a/modules/git/alias.zsh +++ b/modules/git/alias.zsh @@ -69,6 +69,8 @@ if ! zstyle -t ':prezto:module:git:alias' skip 'yes'; then alias gcR='git reset "HEAD^"' alias gcs='git show' alias gcl='git-commit-lost' + alias gcy='git cherry -v --abbrev' + alias gcY='git cherry -v' # Conflict (C) alias gCl='git --no-pager diff --name-only --diff-filter=U'