diff options
| author | Anton Bobov <abobov@gmail.com> | 2020-02-08 23:23:28 +0500 |
|---|---|---|
| committer | Anton Bobov <abobov@gmail.com> | 2020-02-08 23:39:36 +0500 |
| commit | 89d08f8344c521977d027e2c2831540f72674915 (patch) | |
| tree | 886574361601a214b7970985c47ddd298f0fc0bf /files/.gitconfig | |
| parent | 090b5e21fe47e6102d21a1a39612953f8c643bba (diff) | |
Updates.
Diffstat (limited to 'files/.gitconfig')
| -rw-r--r-- | files/.gitconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/files/.gitconfig b/files/.gitconfig index b85bb0e..4f2cd25 100644 --- a/files/.gitconfig +++ b/files/.gitconfig @@ -12,8 +12,9 @@ [grep] lineNumber = true [merge] - tool = vimdiff + conflictstyle = diff3 stat = true + tool = vimdiff [core] pager = less -+$LESS -FRX excludesfile = ~/.gitignore @@ -37,6 +38,7 @@ f = !sh -c 'git branch | grep -F "feature/$1" | xargs -r -n 1 git co' - st = status stashlist = stash list --date=short + stash-all = stash save --include-untracked sha = rev-parse --short addnw = !sh -c 'git diff --unified=0 --ignore-all-space --no-color "$@" | git apply --cached --ignore-whitespace --unidiff-zero -' branch-name = "!git rev-parse --abbrev-ref HEAD" @@ -47,6 +49,8 @@ update-submodules = submodule update --init --recursive upgrade-submodules = submodule update --init --remote wc = whatchanged -p --abbrev-commit --pretty=medium + undo = reset --soft HEAD~ + whoami = config user.email [advice] statusHints = false detachedHead = false |