.gitconfig: use long options

diff --git a/.gitconfig b/.gitconfig
index e9374d83c1f0e5aa94d9a93d54a9d117a140adad..f64739f6dbe2dfe5e0d64de5075c5478b9e8927c 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,12 +2,12 @@
        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
        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
+       branches = branch --all

        cat = cat-file -p
        dump = cat-file -p
        file = cat-file -t
        type = cat-file -t
        cat = cat-file -p
        dump = cat-file -p
        file = cat-file -t
        type = cat-file -t

-       camend = commit --amend -C HEAD
+       camend = commit --amend --reuse-message=HEAD

        checkin = commit
        ci = commit
        co = checkout
        checkin = commit
        ci = commit
        co = checkout


@@ -30,7 +30,7 @@
        root = rev-parse --show-toplevel
        st = status --short
        stb = status --short --branch
        root = rev-parse --show-toplevel
        st = status --short
        stb = status --short --branch

-       tags = tag -l
+       tags = tag --list

        unstage = reset HEAD --
        wdiff = diff --word-diff
        wshow = show --word-diff --decorate
        unstage = reset HEAD --
        wdiff = diff --word-diff
        wshow = show --word-diff --decorate