From 5dc1c1d5890b3a68bb5583e788cebde7a16cb68a Mon Sep 17 00:00:00 2001 From: Noah Gorny Date: Sat, 16 May 2020 11:53:49 +0300 Subject: [PATCH 1/2] alias: git: Add git pull / git push --force aliases --- aliases/available/git.aliases.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash index bff379ad..bf959121 100644 --- a/aliases/available/git.aliases.bash +++ b/aliases/available/git.aliases.bash @@ -22,6 +22,7 @@ alias gs='git status' alias gss='git status -s' alias gsu='git submodule update --init --recursive' alias gl='git pull' +alias gpl='git pull' alias glum='git pull upstream master' alias gpr='git pull --rebase' alias gpp='git pull && git push' @@ -84,6 +85,7 @@ alias gnew="git log HEAD@{1}..HEAD@{0}" alias gcaa="git commit -a --amend -C HEAD" # Rebase with latest remote master alias gprom="git fetch origin master && git rebase origin/master && git update-ref refs/heads/master origin/master" +alias gpf="git push --force" alias gpunch="git push --force-with-lease" alias ggui="git gui" alias gcsam="git commit -S -am" From d46fc18bd4ed763c787767dcb45452dfb6cdd0d4 Mon Sep 17 00:00:00 2001 From: Noah Gorny Date: Wed, 24 Jun 2020 15:13:33 +0300 Subject: [PATCH 2/2] alias: git: Add new pretty git log alias (ggf) --- aliases/available/git.aliases.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash index bf959121..83cd071a 100644 --- a/aliases/available/git.aliases.bash +++ b/aliases/available/git.aliases.bash @@ -69,6 +69,7 @@ alias gdel='git branch -D' alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/master' alias gll='git log --graph --pretty=oneline --abbrev-commit' alias gg="git log --graph --pretty=format:'%C(bold)%h%Creset%C(magenta)%d%Creset %s %C(yellow)<%an> %C(cyan)(%cr)%Creset' --abbrev-commit --date=relative" +alias ggf="git log --graph --date=short --pretty=format:'%C(auto)%h %Cgreen%an%Creset %Cblue%cd%Creset %C(auto)%d %s'" alias ggs="gg --stat" alias gsh="git show" alias gsl="git shortlog -sn"