Guest User

Untitled

a guest
Jan 16th, 2018
140
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.22 KB | None | 0 0
  1. [user]
  2. name = Miroslav Sustek
  3. email = miroslav.sustek@shopsys.com
  4.  
  5. [core]
  6. # "true" on Windows; "input" on Linux
  7. autocrlf = input
  8.  
  9. [push]
  10. default = simple
  11.  
  12. [merge]
  13. # show "merged common ancestors" (base version of both sides) section in git conflict
  14. conflictstyle = diff3
  15.  
  16. [alias]
  17. f = fetch
  18. # updates your branch with upstream (if fast-forward is possible)
  19. ff = !git merge --ff-only `git rev-parse --symbolic-full-name --abbrev-ref=strict HEAD@{u}`
  20. fp = fetch --prune
  21. st = status
  22. cm = commit
  23. cma = commit --amend
  24. br = branch
  25. co = checkout
  26. cp = cherry-pick
  27. df = diff
  28. rb = rebase
  29. rbi = rebase --interactive --autosquash
  30. rbc = rebase --continue
  31. rh = reset --hard
  32. su = submodule update
  33. # graph for current branch
  34. l = log --graph --decorate --pretty=oneline --abbrev-commit
  35. # graph for all branches
  36. ll = log --graph --decorate --pretty=oneline --abbrev-commit --all
  37. # graph for all branches including commit time and author
  38. lll = log --graph --decorate --all --date-order \"--pretty=format:%C(yellow)%h%C(reset)%C(auto)%d %s %C(green)(%ai%x08%x08%x08%x08%x08%x08)%C(reset) %C(blue)<%an>%C(reset)\"
  39. # log for current branch showing diffs (-m is for showing mergecommits too)
  40. ld = log -p -m
  41. # log for current branch showing summary of changed files (-m is for showing mergecommits too)
  42. ls = log --stat -m
  43. # number of commits for each person
  44. stats = shortlog -n -s --no-merges
  45. # remove remote branch (remote must be named origin), usage: git rmb test
  46. rmb = !sh -c 'git push origin :$1' -
  47. # shows local > tracked remote
  48. brt = for-each-ref --format=\"%(refname:short) > %(upstream:short)\" refs/heads
  49. # get upstream tracked branch or error
  50. brtracked = rev-parse --symbolic-full-name --abbrev-ref=strict HEAD@{u}
  51. # list all branches already merged to origin/master
  52. brmerged = branch --list --all --merged origin/master
  53. # commit all changes to a WIP commit
  54. wip = !git add $(git rev-parse --show-toplevel) && git commit -m WIP
  55. # reset last WIP commit
  56. unwip = "!sh -c 'if [ -n \"$(git log -n 1 --format=\\\"format:%s\\\"|grep WIP)\" ]; then git reset --soft HEAD~1; else echo \"No WIP to unwip\"; fi'"
Add Comment
Please, Sign In to add comment