diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-24 10:58:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-24 10:58:57 -0800 |
| commit | 77b3b7969d1a817e28639dc75305a9e301f0d4b4 (patch) | |
| tree | 2380bdd4109ef47c82ecc27bf645f0ec47f233d6 /builtin-merge-recursive.c | |
| parent | 7ecee3314fdafd8015fd14bfb76ae4b601acc25e (diff) | |
| parent | 3588cf94812d47dd34b82039c7776f5225a947fb (diff) | |
| download | git-77b3b7969d1a817e28639dc75305a9e301f0d4b4.tar.gz | |
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
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions