Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Add git "ours" and "theirs" aliases

  • Loading branch information...
commit 6921f7a89221324d2070211ba4f78afbc4272444 1 parent b3f22eb
@booch authored
Showing with 2 additions and 0 deletions.
  1. +2 −0  gitconfig
View
2  gitconfig
@@ -62,6 +62,7 @@
new = !sh -c 'git log $1@{1}..$1@{0} "$@"'
next = !git add . && git rebase --continue
oneline = log --oneline
+ ours = "!f() { git co --ours $@ && git add $@; }; f"
p = pair
patch = log -p --no-walk # Generate patch file from a commit.
pick = cherry-pick
@@ -74,6 +75,7 @@
stat = status
svn-pull = !git svn fetch && git svn rebase
svn-push = !git svn dcommit
+ theirs = "!f() { git co --theirs $@ && git add $@; }; f"
today = log --stat --since='1 Day Ago' --graph --pretty=oneline --abbrev-commit --date=relative
uncommit = reset --soft HEAD^
undo = reset --hard
Please sign in to comment.
Something went wrong with that request. Please try again.