From a9ca1ae3fb886ca5fc82612ba9b38ac6629ac294 Mon Sep 17 00:00:00 2001 From: luispcosta Date: Thu, 22 Oct 2015 11:30:37 +0100 Subject: [PATCH 1/2] Added new git push origin master --- aliases/available/general.aliases.bash | 2 +- aliases/available/git.aliases.bash | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash index bc884050..428af6e9 100644 --- a/aliases/available/general.aliases.bash +++ b/aliases/available/general.aliases.bash @@ -3,7 +3,7 @@ about-alias 'general aliases' # List directory contents alias sl=ls -alias ls='ls -G' # Compact view, show colors +alias ls='ls -alG' # Compact view, show colors alias la='ls -AF' # Compact view, show hidden alias ll='ls -al' alias l='ls -a' diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash index 4982686f..8a303a15 100644 --- a/aliases/available/git.aliases.bash +++ b/aliases/available/git.aliases.bash @@ -4,7 +4,7 @@ about-alias 'common git abbreviations' # Aliases alias gcl='git clone' alias ga='git add' -alias gall='git add .' +alias gall='git add -A' alias gf='git fetch --all --prune' alias gus='git reset HEAD' alias gm="git merge" @@ -20,6 +20,7 @@ alias gpp='git pull && git push' alias gup='git fetch && git rebase' alias gp='git push' alias gpo='git push origin' +alias gpom='git push origin master' alias gdv='git diff -w "$@" | vim -R -' alias gc='git commit -v' alias gca='git commit -v -a' From 1f5f2e246c49a861da37b34c3a1320ccc1ed9a01 Mon Sep 17 00:00:00 2001 From: luispcosta Date: Thu, 22 Oct 2015 11:42:40 +0100 Subject: [PATCH 2/2] Fixed back general aliases --- aliases/available/general.aliases.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash index 428af6e9..3f6b844f 100644 --- a/aliases/available/general.aliases.bash +++ b/aliases/available/general.aliases.bash @@ -3,7 +3,7 @@ about-alias 'general aliases' # List directory contents alias sl=ls -alias ls='ls -alG' # Compact view, show colors +alias ls='ls -G' # Compact view, show colors alias la='ls -AF' # Compact view, show hidden alias ll='ls -al' alias l='ls -a' @@ -53,8 +53,8 @@ then fi # Directory -alias md='mkdir -p' -alias rd='rmdir' +alias md='mkdir -p' +alias rd='rmdir' # Display whatever file is regular file or folder catt() { @@ -65,4 +65,4 @@ catt() { cat "$i" fi done -} +} \ No newline at end of file