| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | merge: --log appends shortlog to message if specified | Tay Ray Chuan | 2010-05-10 | 1 | -1/+6 |
| * | Docs: Add -X option to git-merge's synopsis. | Marc Branchaud | 2010-04-12 | 1 | -1/+2 |
| * | Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trast | Junio C Hamano | 2010-01-24 | 1 | -78/+100 |
| |\ |
|
| | * | Documentation: merge: use MERGE_HEAD to refer to the remote branch | Jonathan Nieder | 2010-01-24 | 1 | -6/+8 |
| | * | Documentation: simplify How Merge Works | Jonathan Nieder | 2010-01-24 | 1 | -36/+16 |
| | * | Documentation: merge: add a section about fast-forward | Jonathan Nieder | 2010-01-24 | 1 | -13/+18 |
| | * | Documentation: emphasize when git merge terminates early | Jonathan Nieder | 2010-01-24 | 1 | -10/+21 |
| | * | Documentation: merge: add an overview | Jonathan Nieder | 2010-01-24 | 1 | -2/+26 |
| | * | Documentation: merge: move merge strategy list to end | Jonathan Nieder | 2010-01-24 | 1 | -2/+2 |
| | * | Documentation: suggest `reset --merge` in How Merge Works section | Jonathan Nieder | 2010-01-24 | 1 | -3/+3 |
| | * | Documentation: merge: move configuration section to end | Jonathan Nieder | 2010-01-24 | 1 | -9/+9 |
| * | | Merge remote branch 'remotes/trast-doc/for-next' | Junio C Hamano | 2010-01-20 | 1 | -25/+29 |
| |\ \
| |/ |
|
| | * | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 2010-01-10 | 1 | -3/+3 |
| | * | Documentation: format full commands in typewriter font | Thomas Rast | 2010-01-10 | 1 | -7/+7 |
| | * | Documentation: warn prominently against merging with dirty trees | Thomas Rast | 2010-01-09 | 1 | -0/+4 |
| | * | Documentation/git-merge: reword references to "remote" and "pull" | Thomas Rast | 2010-01-09 | 1 | -17/+17 |
| * | | Teach --[no-]rerere-autoupdate option to merge, revert and friends | Junio C Hamano | 2009-12-04 | 1 | -1/+6 |
| |/ |
|
| * | modernize fetch/merge/pull examples | Clemens Buchacher | 2009-10-21 | 1 | -0/+33 |
| * | Documentation: clarify mergeoptions description | Jonathan Nieder | 2009-10-09 | 1 | -2/+2 |
| * | Documentation: git fmt-merge-msg does not have to be a script | Jonathan Nieder | 2009-10-09 | 1 | -3/+4 |
| * | Documentation: merge: one <remote> is required | Paul Bolle | 2009-08-12 | 1 | -1/+1 |
| * | Grammar fix for "git merge" man page | Wincent Colaiuta | 2009-03-26 | 1 | -1/+1 |
| * | Grammar fixes to "merge" and "patch-id" docs | Wincent Colaiuta | 2009-03-25 | 1 | -1/+1 |
| * | Documentation: remove extra quoting/emphasis around literal texts | Chris Johnsen | 2009-03-17 | 1 | -3/+3 |
| * | Improve language in git-merge.txt and related docs | Ralf Wildenhues | 2008-12-09 | 1 | -17/+17 |
| * | Merge branch 'jc/better-conflict-resolution' | Shawn O. Pearce | 2008-09-29 | 1 | -0/+65 |
| |\ |
|
| | * | Fix AsciiDoc errors in merge documentation | Johan Herland | 2008-09-04 | 1 | -4/+4 |
| | * | git-merge documentation: describe how conflict is presented | Junio C Hamano | 2008-08-31 | 1 | -0/+65 |
| * | | git-merge documentation: more details about resolving conflicts | Dan Hensgen | 2008-08-22 | 1 | -6/+18 |
| |/ |
|
| * | Make the DESCRIPTION match <x>... items in the SYNOPSIS | Abhijit Menon-Sen | 2008-07-30 | 1 | -2/+2 |
| * | Update my e-mail address | Junio C Hamano | 2008-07-21 | 1 | -1/+1 |
| * | Documentation/git-merge.txt: Partial rewrite of How Merge Works | Petr Baudis | 2008-07-19 | 1 | -47/+29 |
| * | Documentation: mention ORIG_HEAD in am, merge, and rebase | Brian Gernhardt | 2008-07-08 | 1 | -1/+3 |
| * | manpages: italicize git command names (which were in teletype font) | Jonathan Nieder | 2008-07-05 | 1 | -8/+8 |
| * | Documentation formatting and cleanup | Jonathan Nieder | 2008-07-01 | 1 | -6/+8 |
| * | Documentation: be consistent about "git-" versus "git " | Jonathan Nieder | 2008-07-01 | 1 | -5/+5 |
| * | documentation: move git(7) to git(1) | Christian Couder | 2008-06-06 | 1 | -1/+1 |
| * | merge, pull: introduce '--(no-)stat' option | SZEDER Gábor | 2008-04-12 | 1 | -1/+1 |
| * | doc: moved merge.* config variables into separate merge-config.txt | SZEDER Gábor | 2008-04-12 | 1 | -12/+1 |
| * | Fix incorrect wording in git-merge.txt. | Matthieu Moy | 2008-03-03 | 1 | -1/+2 |
| * | Documentation: fix and clarify grammar in git-merge docs. | Dave Peticolas | 2008-01-16 | 1 | -6/+6 |
| * | Documentation: rename gitlink macro to linkgit | Dan McGee | 2008-01-06 | 1 | -4/+4 |
| * | Documentation: describe 'union' low-level merge driver | Junio C Hamano | 2007-12-22 | 1 | -1/+2 |
| * | Merge branch 'maint' into HEAD | Junio C Hamano | 2007-10-30 | 1 | -5/+6 |
| |\ |
|
| | * | git-merge: document but discourage the historical syntax | Junio C Hamano | 2007-10-30 | 1 | -5/+6 |
| * | | Merge branch 'lh/merge' | Junio C Hamano | 2007-10-03 | 1 | -0/+4 |
| |\ \
| |/
|/| |
|
| | * | git-merge: add support for branch.<name>.mergeoptions | Lars Hjemli | 2007-09-23 | 1 | -0/+4 |
| * | | Fix spelling of overridden in documentation | Shawn Bohrer | 2007-09-25 | 1 | -1/+1 |
| |/ |
|
| * | Try to be consistent with capitalization in the documentation | Steve Hoelzer | 2007-08-01 | 1 | -5/+5 |
| * | Update git-merge documentation. | Jakub Narebski | 2007-07-12 | 1 | -0/+15 |
