Skip to content

Commit

Permalink
cleanup error output
Browse files Browse the repository at this point in the history
  • Loading branch information
0xMF committed Mar 15, 2024
1 parent dfe41c7 commit 224c0bf
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions shells/0xMF/git.ksh
Original file line number Diff line number Diff line change
Expand Up @@ -1417,38 +1417,38 @@ unalias gfr glum gin gout incoming outgoing 2>/dev/null
#alias gfr='git fetch;git rebase remotes/origin/master'
function gfr {
git fetch
if ! git rebase remotes/origin/master 2>/dev/null; then
if ! git rebase remotes/origin/dev 2>/dev/null; then
git rebase remotes/origin/main 2>/dev/null
if ! git rebase remotes/origin/master; then
if ! git rebase remotes/origin/dev; then
git rebase remotes/origin/main
fi
fi
fi 2>/dev/null
}

#alias glum='git pull upstream master'
function glum {
if ! git pull upstream/master 2>/dev/null; then
if ! git pull upstream/dev 2>/dev/null; then
git pull upstream/main 2>/dev/null
if ! git pull upstream/master; then
if ! git pull upstream/dev; then
git pull upstream/main
fi
fi
fi 2>/dev/null
}

#alias gin='git log --all --color=always origin/master ^master'
function gin {
if ! git log --all --color=always origin/master ^master 2>/dev/null; then
if ! git log --all --color=always origin/dev ^dev 2>/dev/null; then
git log --all --color=always origin/main ^main 2>/dev/null
if ! git log --all --color=always origin/master ^master; then
if ! git log --all --color=always origin/dev ^dev; then
git log --all --color=always origin/main ^main
fi
fi
fi 2>/dev/null
}

#alias gout='git log --all --color=always master ^origin/master'
function gout {
if ! git log --all --color=always origin/master ^origin/master 2>/dev/null; then
if ! git log --all --color=always origin/dev ^origin/dev 2>/dev/null; then
git log --all --color=always origin/main ^origin/main 2>/dev/null
if ! git log --all --color=always origin/master ^origin/master; then
if ! git log --all --color=always origin/dev ^origin/dev; then
git log --all --color=always origin/main ^origin/main
fi
fi
fi 2>/dev/null
}

#alias incoming='git log --all --color=always origin/master ^master'
Expand Down

0 comments on commit 224c0bf

Please sign in to comment.