.profile: remove options -F and -X from LESS

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 598af7be712d6828a716ab612e6cf2cf2c106bdd..e9374d83c1f0e5aa94d9a93d54a9d117a140adad 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,5 +1,12 @@
 [alias]
+       alias = "!f() { [ $# = 2 ] && git config --global alias.\"$1\" \"$2\" && return 0 || echo \"Usage: git alias <new alias> <original command>\" >&2 && return 1; }; f"
+       aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'
        b = branch
+       branches = branch -a
+       cat = cat-file -p
+       dump = cat-file -p
+       file = cat-file -t
+       type = cat-file -t
        camend = commit --amend -C HEAD
        checkin = commit
        ci = commit
@@ -16,10 +23,14 @@
        lr = log --decorate --reverse
        lr1 = log --decorate --reverse --oneline
        lr5 = log --decorate --reverse -5
-       root = rev-parse --show-toplevel
+       null-merge = merge --strategy=ours
+       remotes = remote -v
+       ri = "!f() { git rebase --interactive --autosquash --preserve-merges ${1:-\"@{u\\}\"}; }; f"
        #root = !pwd
+       root = rev-parse --show-toplevel
        st = status --short
        stb = status --short --branch
+       tags = tag -l
        unstage = reset HEAD --
        wdiff = diff --word-diff
        wshow = show --word-diff --decorate