| Commit message (Expand) | Author | Age |
|---|
| * | merge: use editor by default in interactive sessions | Junio C Hamano | 2012-01-23 |
| * | Merge branch 'jc/merge-sans-branch' | Junio C Hamano | 2011-04-01 |
| |\ |
|
| | * | merge: merge with the default upstream branch without argument | Junio C Hamano | 2011-03-24 |
| * | | doc: drop author/documentation sections from most pages | Jeff King | 2011-03-11 |
| |/ |
|
| * | Merge branch 'jh/notes-merge' | Junio C Hamano | 2010-12-08 |
| |\ |
|
| | * | Provide 'git merge --abort' as a synonym to 'git reset --merge' | Johan Herland | 2010-11-17 |
| * | | Fix a formatting error in git-merge.txt | Nathan W. Panike | 2010-10-29 |
| |/ |
|
| * | merge: --log appends shortlog to message if specified | Tay Ray Chuan | 2010-05-10 |
| * | Docs: Add -X option to git-merge's synopsis. | Marc Branchaud | 2010-04-12 |
| * | Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trast | Junio C Hamano | 2010-01-24 |
| |\ |
|
| | * | Documentation: merge: use MERGE_HEAD to refer to the remote branch | Jonathan Nieder | 2010-01-24 |
| | * | Documentation: simplify How Merge Works | Jonathan Nieder | 2010-01-24 |
| | * | Documentation: merge: add a section about fast-forward | Jonathan Nieder | 2010-01-24 |
| | * | Documentation: emphasize when git merge terminates early | Jonathan Nieder | 2010-01-24 |
| | * | Documentation: merge: add an overview | Jonathan Nieder | 2010-01-24 |
| | * | Documentation: merge: move merge strategy list to end | Jonathan Nieder | 2010-01-24 |
| | * | Documentation: suggest `reset --merge` in How Merge Works section | Jonathan Nieder | 2010-01-24 |
| | * | Documentation: merge: move configuration section to end | Jonathan Nieder | 2010-01-24 |
| * | | Merge remote branch 'remotes/trast-doc/for-next' | Junio C Hamano | 2010-01-20 |
| |\ \
| |/ |
|
| | * | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 2010-01-10 |
| | * | Documentation: format full commands in typewriter font | Thomas Rast | 2010-01-10 |
| | * | Documentation: warn prominently against merging with dirty trees | Thomas Rast | 2010-01-09 |
| | * | Documentation/git-merge: reword references to "remote" and "pull" | Thomas Rast | 2010-01-09 |
| * | | Teach --[no-]rerere-autoupdate option to merge, revert and friends | Junio C Hamano | 2009-12-04 |
| |/ |
|
| * | modernize fetch/merge/pull examples | Clemens Buchacher | 2009-10-21 |
| * | Documentation: clarify mergeoptions description | Jonathan Nieder | 2009-10-09 |
| * | Documentation: git fmt-merge-msg does not have to be a script | Jonathan Nieder | 2009-10-09 |
| * | Documentation: merge: one <remote> is required | Paul Bolle | 2009-08-12 |
| * | Grammar fix for "git merge" man page | Wincent Colaiuta | 2009-03-26 |
| * | Grammar fixes to "merge" and "patch-id" docs | Wincent Colaiuta | 2009-03-25 |
| * | Documentation: remove extra quoting/emphasis around literal texts | Chris Johnsen | 2009-03-17 |
| * | Improve language in git-merge.txt and related docs | Ralf Wildenhues | 2008-12-09 |
| * | Merge branch 'jc/better-conflict-resolution' | Shawn O. Pearce | 2008-09-29 |
| |\ |
|
| | * | Fix AsciiDoc errors in merge documentation | Johan Herland | 2008-09-04 |
| | * | git-merge documentation: describe how conflict is presented | Junio C Hamano | 2008-08-31 |
| * | | git-merge documentation: more details about resolving conflicts | Dan Hensgen | 2008-08-22 |
| |/ |
|
| * | Make the DESCRIPTION match <x>... items in the SYNOPSIS | Abhijit Menon-Sen | 2008-07-30 |
| * | Update my e-mail address | Junio C Hamano | 2008-07-21 |
| * | Documentation/git-merge.txt: Partial rewrite of How Merge Works | Petr Baudis | 2008-07-19 |
| * | Documentation: mention ORIG_HEAD in am, merge, and rebase | Brian Gernhardt | 2008-07-08 |
| * | manpages: italicize git command names (which were in teletype font) | Jonathan Nieder | 2008-07-05 |
| * | Documentation formatting and cleanup | Jonathan Nieder | 2008-07-01 |
| * | Documentation: be consistent about "git-" versus "git " | Jonathan Nieder | 2008-07-01 |
| * | documentation: move git(7) to git(1) | Christian Couder | 2008-06-06 |
| * | merge, pull: introduce '--(no-)stat' option | SZEDER Gábor | 2008-04-12 |
| * | doc: moved merge.* config variables into separate merge-config.txt | SZEDER Gábor | 2008-04-12 |
| * | Fix incorrect wording in git-merge.txt. | Matthieu Moy | 2008-03-03 |
| * | Documentation: fix and clarify grammar in git-merge docs. | Dave Peticolas | 2008-01-16 |
| * | Documentation: rename gitlink macro to linkgit | Dan McGee | 2008-01-06 |
| * | Documentation: describe 'union' low-level merge driver | Junio C Hamano | 2007-12-22 |
