summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
AgeCommit message (Expand)Author
2007-11-22git-merge-ours: make it a builtin.Thomas Harning
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-03-25Use diff* with --exit-code in git-am, git-rebase and git-merge-oursAlex Riesen
2005-11-03git-merge-ours: make sure our index matches HEADJunio C Hamano
2005-11-03Add 'ours' merge strategy.Junio C Hamano