Use git-merge instead of git-resolve in git-pull.
[gitweb.git] / Documentation / howto /
drwxr-xr-x   parent (dest: Documentation; base: f887564ab72e107bcdee3ba83c91e2bb4ae13ca7)
-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