Code

Merge branch 'fc/doc-fast-forward'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:41:02 +0000 (16:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:41:02 +0000 (16:41 -0800)
commit4d8c3258880548510b1d23f0db517adb7dfd2486
treeeeb42aefe5555624063221d7ddc28a29f598ce7f
parent9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e
parenta75d7b54097ef0d0945cbe673a9940d6c561f95c
Merge branch 'fc/doc-fast-forward'

* fc/doc-fast-forward:
  Use 'fast-forward' all over the place

Conflicts:
builtin-merge.c
Documentation/config.txt
Documentation/git-push.txt
builtin-fetch.c
builtin-merge.c
builtin-push.c
builtin-receive-pack.c
git-pull.sh
git-rebase--interactive.sh
transport.c