Merge branch 'fc/trivial'

A random collection of style fixes and minor doc updates.

* fc/trivial:
setup: trivial style fixes
run-command: trivial style fixes
diff: trivial style fix
revision: trivial style fixes
pretty: trivial style fix
describe: trivial style fixes
transport-helper: trivial style fix
sha1-name: trivial style cleanup
branch: trivial style fix
revision: add missing include
doc/pull: clarify the illustrations
t: replace pulls with merges
merge: simplify ff-only option

diff --combined t/t4200-rerere.sh
index 076e7709d2243bf3734a1e06ae94351dface230e,cf19eb78afa71f08a34804e1838d16bd3384d820..ed9c91e25b584c2241c238f9c6ffad9a3a327d2c
--- 1/t/t4200-rerere.sh
--- 2/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@@ -78,7 -78,7 +78,7 @@@ test_expect_success 'activate rerere, o
        test_might_fail git config --unset rerere.enabled &&
        test_must_fail git merge first &&
  
 -      sha1=$("$PERL_PATH" -pe "s/     .*//" .git/MERGE_RR) &&
 +      sha1=$(perl -pe "s/     .*//" .git/MERGE_RR) &&
        rr=.git/rr-cache/$sha1 &&
        grep "^=======\$" $rr/preimage &&
        ! test -f $rr/postimage &&
@@@ -91,7 -91,7 +91,7 @@@ test_expect_success 'rerere.enabled wor
        git reset --hard &&
        test_must_fail git merge first &&
  
 -      sha1=$("$PERL_PATH" -pe "s/     .*//" .git/MERGE_RR) &&
 +      sha1=$(perl -pe "s/     .*//" .git/MERGE_RR) &&
        rr=.git/rr-cache/$sha1 &&
        grep ^=======$ $rr/preimage
  '
@@@ -101,7 -101,7 +101,7 @@@ test_expect_success 'set up rr-cache' 
        git config rerere.enabled true &&
        git reset --hard &&
        test_must_fail git merge first &&
 -      sha1=$("$PERL_PATH" -pe "s/     .*//" .git/MERGE_RR) &&
 +      sha1=$(perl -pe "s/     .*//" .git/MERGE_RR) &&
        rr=.git/rr-cache/$sha1
  '
  
@@@ -172,7 -172,7 +172,7 @@@ test_expect_success 'first postimage wi
        git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
        git commit -q -a -m third &&
  
-       test_must_fail git pull . first &&
+       test_must_fail git merge first &&
        # rerere kicked in
        ! grep "^=======\$" a1 &&
        test_cmp expect a1
@@@ -185,7 -185,7 +185,7 @@@ test_expect_success 'rerere updates pos
  
  test_expect_success 'rerere clear' '
        rm $rr/postimage &&
 -      echo "$sha1     a1" | "$PERL_PATH" -pe "y/\012/\000/" >.git/MERGE_RR &&
 +      echo "$sha1     a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR &&
        git rerere clear &&
        ! test -d $rr
  '