From: Junio C Hamano Date: Sun, 24 Jan 2010 18:58:57 +0000 (-0800) Subject: Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trast X-Git-Tag: v1.7.0-rc0~7 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=77b3b7969d1a817e28639dc75305a9e301f0d4b4;p=git.git Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trast * '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 --- 77b3b7969d1a817e28639dc75305a9e301f0d4b4