about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorDavid Morgan <david.morgan@gmail.com>2016-07-28 07:01:52 +0000
committerDavid Morgan <david.morgan@gmail.com>2016-07-28 07:01:52 +0000
commit11ced413fd0698a98c5ab746167a13eb9df9d0f6 (patch)
tree48f8d6ca95fd3d193903482686a7b45f02f11834
parent1d3235224a677a21df813f67a5a464cef3064322 (diff)
downloaddotfiles-11ced413fd0698a98c5ab746167a13eb9df9d0f6.tar.gz
Add --rebase to alias
-rw-r--r--.bashrc2
1 files changed, 1 insertions, 1 deletions
diff --git a/.bashrc b/.bashrc
index d89c42f..024a0b1 100644
--- a/.bashrc
+++ b/.bashrc
@@ -374,7 +374,7 @@ alias hadd='run_cmd $(history -p ^diff^add)'
 
 alias dogs='run_cmd docker ps; run_cmd docker logs -f $(docker ps|sed 1d|awk '"'"'{print $1;}'"'"')'
 alias undock='sudo umount `mount|grep -o "/var/lib/docker/aufs/mnt/[a-z0-9]*"`'
-#alias gp="chdir ${VIEW_DIR} ; run_cmd git pull ; chdir"
+#alias gp="chdir ${VIEW_DIR} ; run_cmd git pull --rebase ; chdir"
 #alias gs="chdir ${VIEW_DIR} ; run_cmd git stash ; chdir"
 #alias gsp="chdir ${VIEW_DIR} ; run_cmd git stash pop ; chdir"
 #alias gstat="chdir ${VIEW_DIR} ; run_cmd git -c color.status=always status | less -RXF ; chdir"