Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trast
authorJunio C Hamano <gitster@pobox.com>
Sun, 24 Jan 2010 18:58:57 +0000 (10:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Jan 2010 18:58:57 +0000 (10:58 -0800)
* 'doc-style/for-next' of git://repo.or.cz/git/trast:
Documentation: merge: use MERGE_HEAD to refer to the remote branch
Documentation: simplify How Merge Works
Documentation: merge: add a section about fast-forward
Documentation: emphasize when git merge terminates early
Documentation: merge: add an overview
Documentation: merge: move merge strategy list to end
Documentation: suggest `reset --merge` in How Merge Works section
Documentation: merge: move configuration section to end
Documentation: emphasise 'git shortlog' in its synopsis
Documentation: show-files is now called git-ls-files
Documentation: tiny git config manual tweaks
Documentation: git gc packs refs by default now

Conflicts:
Documentation/config.txt

1  2 
Documentation/git-ls-files.txt
Documentation/git-merge.txt
Simple merge
Simple merge