|
|
@ -29,7 +29,12 @@ gia() { |
|
|
|
;; |
|
|
|
log) git log --oneline --decorate ;; |
|
|
|
"status") git status --short ;; |
|
|
|
"diff") git diff "$1" "$2" ;; |
|
|
|
"diff") |
|
|
|
case "$2" in |
|
|
|
--staged) git diff --staged "$3" ;; |
|
|
|
*) git diff "$3";; |
|
|
|
esac |
|
|
|
;; |
|
|
|
"log") git log ;; |
|
|
|
"reflog") git reflog ;; |
|
|
|
"merge") git merge --no-commit "$2" "$curbranch" ;; |
|
|
|