Add 'ours' merge strategy.
[gitweb.git] / Documentation / howto /
drwxr-xr-x   parent (dest: Documentation; base: 64da9e604eea25c9c20cfe12618285ccd0bf3cfe)
-rw-r--r-- 2032 make-dist.txt
-rw-r--r-- 2644 rebase-and-edit.txt
-rw-r--r-- 6449 rebase-from-internal-branch.txt
-rw-r--r-- 2876 rebuild-from-update-hook.txt
-rw-r--r-- 8362 revert-branch-rebase.txt
-rw-r--r-- 8287 using-topic-branches.txt