.profile: copy some code and comments from Debian /etc/skel

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index f64739f6dbe2dfe5e0d64de5075c5478b9e8927c..e4fc7b27261054d225bb737f77e0a92639acc12d 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -7,13 +7,14 @@
        dump = cat-file -p
        file = cat-file -t
        type = cat-file -t
-       camend = commit --amend --reuse-message=HEAD
+       camend = commit --amend --no-edit
        checkin = commit
        ci = commit
        co = checkout
        d = diff
        dc = diff --cached
        dshow = show --decorate
+       incoming = !git remote update --prune; git log ..@{upstream}
        l = log --decorate
        l1 = log --decorate --oneline
        l5 = log --decorate -5
@@ -24,8 +25,9 @@
        lr1 = log --decorate --reverse --oneline
        lr5 = log --decorate --reverse -5
        null-merge = merge --strategy=ours
+       outgoing = log @{upstream}..
        remotes = remote -v
-       ri = "!f() { git rebase --interactive --autosquash --preserve-merges ${1:-\"@{u\\}\"}; }; f"
+       ri = "!f() { git rebase --interactive --autosquash --preserve-merges ${1:-\"@{upstream\\}\"}; }; f"
        #root = !pwd
        root = rev-parse --show-toplevel
        st = status --short