Advertisement
Guest User

Untitled

a guest
Apr 25th, 2017
99
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 2.27 KB | None | 0 0
  1. [alias]
  2.     lol = log --graph --decorate --pretty=oneline --abbrev-commit
  3.     lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
  4.     lolat = log --graph --decorate --pretty=oneline --abbrev-commit --all --
  5.     qlol = log HEAD~30..HEAD --decorate --pretty=oneline --abbrev-commit
  6.     co = checkout
  7.     br = branch
  8.     st = status
  9.     sh = show
  10.     dif = diff
  11.     lg = log --color --graph --date=short --date=short --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar, %ad) %C(bold blue)<%an, %aE> %C(black)<%cN, %cE>%Creset' --abbrev-commit --all -n 20
  12.     lga = log --color --graph --date=short --date=short --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar, %ad) %C(bold blue)<%an, %aE> %C(black)<%cN, %cE>%Creset' --abbrev-commit --all
  13.     lgl = log HEAD~20..HEAD --color --graph --date=short --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar, %ad) %C(bold blue)<%an, %aE> %C(black)<%cN, %cE>%Creset' --abbrev-commit
  14.     lgln = log --color --graph --date=short --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar, %ad) %C(bold blue)<%an, %aE> %C(black)<%cN, %cE>%Creset' --abbrev-commit
  15.  
  16.     # Some tips from: http://blog.apiaxle.com/post/handy-git-tips-to-stop-you-getting-fired/
  17.     # 'git assume myfile' to make sure a modified file is ignored and not accidentally checked in
  18.     assume   = update-index --assume-unchanged
  19.     unassume = update-index --no-assume-unchanged
  20.     assumed  = "!git ls-files -v | grep ^h | cut -c 3-"
  21.     # Create a pretty snapshot of working tree without removing changes from your tree
  22.     snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
  23.     # Easier merging on conflicts -- 'ours' and 'theirs'
  24.     ours   = "!f() { git checkout --ours $@ && git add $@; }; f"
  25.     theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
  26.    
  27.     # Gerrit stuff
  28.     fetchGerritConfig = fetch origin refs/meta/config:refs/remotes/origin/meta/config
  29.  
  30. [color]
  31.     branch = auto
  32.     diff = auto
  33.     interactive = auto
  34.     status = auto
  35. [user]
  36.     email = EMAIL
  37.     name = XYZ
  38. [core]
  39.     excludesfile = ~/.gitignore_global
  40. # Diff-highlight readme: http://theunixtoolbox.com/git-diff-highlight/
  41. [pager]
  42.     log = diff-highlight | less
  43.     show = diff-highlight | less
  44.     diff = diff-highlight | less
  45. [interactive]
  46.     diffFilter = diff-highlight
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement