aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.aliases3
-rw-r--r--.functions18
2 files changed, 21 insertions, 0 deletions
diff --git a/.aliases b/.aliases
index d629f13..ff04e6b 100644
--- a/.aliases
+++ b/.aliases
@@ -7,6 +7,9 @@ alias nb='cd ~/journals; vim index.md; cd -'
alias todo='cd ~/journals; vim gtd.md; cd -'
alias vimg='vim +Git +only'
+alias gmf='git diff --merge-base'
+alias gmfn='git diff --merge-base --name-only'
+
if [ -f /usr/bin/pacman ]; then
alias S='pacman -S'
alias Si='pacman -Si'
diff --git a/.functions b/.functions
index 9390af8..879804c 100644
--- a/.functions
+++ b/.functions
@@ -9,3 +9,21 @@ open () {
echo "No usable program is found"
fi
}
+
+greview () {
+ usage='usage: greview <base_branch>'
+ if [ $# -lt 1 ]; then
+ echo $usage
+ return
+ fi
+
+ base_branch=$1
+ # vim -p $(git diff --merge-base --name-only $base_branch) \
+ # "+tabdo Gvdiff $base_branch" \
+ # "+nmap <C-j> :tabnext<CR>" \
+ # "+nmap <C-k> :tabpreivous<CR>"
+
+ vim $(git diff --merge-base --name-only $base_branch) \
+ "+nmap <leader>gd :Gvdiffsplit $base_branch<CR>"
+
+}