]> git.ipfire.org Git - thirdparty/git.git/history - git-merge-ours.sh
projects / thirdparty / git.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Document a couple of missing command-line options.
[thirdparty/git.git] / git-merge-ours.sh
2005-11-03  Junio C Hamanogit-merge-ours: make sure our index matches HEAD blob | commitdiff | raw
2005-11-03  Junio C HamanoAdd 'ours' merge strategy. blob | commitdiff | raw | diff to current
Unnamed repository; edit this file 'description' to name the repository.