aboutsummaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
Commit message (Expand)AuthorAge
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
* Use diff* with --exit-code in git-am, git-rebase and git-merge-oursAlex Riesen2007-03-24
* git-merge-ours: make sure our index matches HEADJunio C Hamano2005-11-03
* Add 'ours' merge strategy.Junio C Hamano2005-11-03