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