chore: mise à jour de la conf git

This commit is contained in:
Laurent Drogou
2022-03-25 18:48:37 +01:00
parent 45d9f7ae80
commit 49edb64dc0

View File

@@ -1,34 +1,48 @@
[user] [user]
email = laurent.drogou@rca.fr email = laurent.drogou@rca.fr
name = ladro name = Laurent Drogou
[core] [core]
editor = vim editor = vim
[alias] [alias]
st = status st = status
br = branch -a br = branch
ch = checkout ch = checkout
rt = reset --hard HEAD rt = reset --hard HEAD
unstage = reset HEAD rto = "!git reset --hard origin/$(git currentbranch)"
lol = log --graph --decorate --pretty=format:'%C(red)%h%Creset -%C(yellow)%d%Creset %s %C(bold blue)%an%Creset %C(green)%cd' --abbrev-commit lol = log --graph --decorate --pretty=format:'%C(red)%h%Creset -%C(yellow)%d%Creset %s %C(bold blue)%an%Creset %C(green)%cd' --abbrev-commit
lola = log --graph --decorate --pretty=format:'%C(red)%h%Creset -%C(yellow)%d%Creset %s %C(bold blue)%an%Creset %C(green)%cd' --abbrev-commit --all lola = log --graph --decorate --pretty=format:'%C(red)%h%Creset -%C(yellow)%d%Creset %s %C(bold blue)%an%Creset %C(green)%cd' --abbrev-commit --all
lpush = "!git --no-pager log origin/$(git currentbranch)..HEAD --oneline"
lpull = "!git --no-pager log HEAD..origin/$(git currentbranch) --oneline"
whatsnew = "!git diff origin/$(git currentbranch)...HEAD"
wn = "!git diff origin/$(git currentbranch)...HEAD"
whatscoming = "!git diff HEAD...origin/$(git currentbranch)"
wc = "!git diff HEAD...origin/$(git currentbranch)"
currentbranch = "!git branch | grep \"^\\*\" | cut -d \" \" -f 2" currentbranch = "!git branch | grep \"^\\*\" | cut -d \" \" -f 2"
ca = "!git add . && git pl && git commit -a -m "
pl = "!git pull origin $(git currentbranch)" pl = "!git pull origin $(git currentbranch)"
plall = "!git pull origin $(git currentbranch) && git fetch --all"
ps = "!git push origin $(git currentbranch)" ps = "!git push origin $(git currentbranch)"
psf = "!git push -f origin $(git currentbranch)" psf = "!git push -f origin $(git currentbranch)"
co = "!git add . && git commit -a -m " can = "!git commit --amend --no-edit "
clearpom = "!git reset HEAD */pom.xml ; git checkout */pom.xml ; git reset HEAD pom.xml ; git checkout pom.xml" plm = "!git pull --rebase origin master"
fixup = !sh -c 'SHA=$(git rev-parse $1) && git commit --fixup $SHA && git rebase -i --autosquash $SHA~' -
[color] [color]
branch = auto branch = auto
diff = auto diff = auto
status = auto status = auto
interactive = auto interactive = auto
[gui]
spellingdictionary = none
[submodule]
recurse = true
recurse = true
recurse = true
recurse = true
recurse = true
recurse = true
recurse = true
recurse = true
recurse = true
recurse = true
[fetch]
recurseSubmodules = true
recurseSubmodules = true
recurseSubmodules = true
recurseSubmodules = true
recurseSubmodules = true
recurseSubmodules = true
recurseSubmodules = true
recurseSubmodules = true
recurseSubmodules = true