[user] email = laurent.drogou@rca.fr name = ladro [core] editor = vim [alias] st = status br = branch -a ch = checkout rt = reset --hard HEAD unstage = reset HEAD 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 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" ca = "!git add . && git pl && git commit -a -m " pl = "!git pull origin $(git currentbranch)" plall = "!git pull origin $(git currentbranch) && git fetch --all" ps = "!git push origin $(git currentbranch)" psf = "!git push -f origin $(git currentbranch)" co = "!git add . && git commit -a -m " clearpom = "!git reset HEAD */pom.xml ; git checkout */pom.xml ; git reset HEAD pom.xml ; git checkout pom.xml" fixup = !sh -c 'SHA=$(git rev-parse $1) && git commit --fixup $SHA && git rebase -i --autosquash $SHA~' - [color] branch = auto diff = auto status = auto interactive = auto