pull: avoid running both merge and rebase
[git] / templates /
drwxr-xr-x   ..
-rw-r--r-- 22 .gitignore
-rw-r--r-- 1750 Makefile
-rw-r--r-- 47 branches--
-rwxr-xr-x 478 hooks--applypatch-msg.sample
-rwxr-xr-x 896 hooks--commit-msg.sample
-rwxr-xr-x 3327 hooks--fsmonitor-watchman.sample
-rwxr-xr-x 189 hooks--post-update.sample
-rwxr-xr-x 424 hooks--pre-applypatch.sample
-rwxr-xr-x 1638 hooks--pre-commit.sample
-rwxr-xr-x 416 hooks--pre-merge-commit.sample
-rwxr-xr-x 1348 hooks--pre-push.sample
-rwxr-xr-x 4896 hooks--pre-rebase.sample
-rwxr-xr-x 544 hooks--pre-receive.sample
-rwxr-xr-x 1486 hooks--prepare-commit-msg.sample
-rwxr-xr-x 3610 hooks--update.sample
-rw-r--r-- 240 info--exclude
-rw-r--r-- 73 this--description