mathieu/config
1
1
Fork 0
Code Issues Pull Requests Releases Activity

[git] fix alias definition

Browse Source
This commit is contained in:
Mathieu Maret 2016-10-18 11:06:09 +02:00
parent e85f153a7b
commit dc2092ac77
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
.gitconfig
View File

@ -9,7 +9,6 @@
[pack] [pack]
threads = 0 threads = 0
[alias] [alias]
lg = log -M --decorate --graph
st = status st = status
ci = commit ci = commit
co = checkout co = checkout
@ -21,22 +20,23 @@
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
lolp = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit lolp = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
ls = ls-files ls = ls-files
dt =difftool # to have diff with meld dt = difftool # to have diff with meld
mylog = log --committer=\"$(git config user.name)\" mylog = log --committer=\"$(git config user.name)\"
#[diff "odf"] please = push --force-with-lease
# textconv=odt2txt
#[diff "odt"]
# textconv=odt2txt
# Remove last commit but keep changes # Remove last commit but keep changes
undo = git reset --soft HEAD^ undo = reset --soft HEAD^
# last commit
lasts = log --pretty=oneline --abbrev-commit --graph --decorate
# last commit from last pull
lastpull = !git lasts HEAD --stat --no-merges
revertpart = reset -p HEAD^ revertpart = reset -p HEAD^
diffword = diff --color-words=. diffword = diff --color-words=.
save = stash save -u save = stash save -u
[branch]
#New branch track remote
#autoSetupMerge = always
[diff "odf"]
textconv=odt2txt
[diff "odt"]
textconv=odt2txt
[difftool "meld"] [difftool "meld"]
path = /usr/bin/meld path = /usr/bin/meld
trustExitCode = false trustExitCode = false
@ -49,9 +49,12 @@
path = /usr/bin/meld path = /usr/bin/meld
trustExitCode = false trustExitCode = false
[mergetool] [mergetool]
# do not keep .ori file after a merge
keepBackup = false keepBackup = false
[merge] [merge]
tool = meld tool = meld
# tool = vimdiff
# conflictstyle = diff3
[push] [push]
default = simple default = simple
[credential] [credential]