| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | 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 |
| * | War on whitespace | Junio C Hamano | 2007-06-07 | 1 | -1/+1 |
| * | Add a configuration option to control diffstat after merge | Alex Riesen | 2007-05-24 | 1 | -1/+1 |
| * | Convert update-index references in docs to add. | Shawn O. Pearce | 2007-02-17 | 1 | -1/+1 |
| * | git merge documentation: -m is optional | Matthias Lederhofer | 2007-02-12 | 1 | -1/+1 |
| * | Documentation: sync git.txt command list and manual page title | Junio C Hamano | 2007-01-18 | 1 | -1/+1 |
| * | Use GIT_REFLOG_ACTION environment variable instead. | Shawn O. Pearce | 2006-12-28 | 1 | -6/+0 |
| * | git-merge: make it usable as the first class UI | Junio C Hamano | 2006-11-21 | 1 | -5/+13 |
| * | Assorted typo fixes | Pavel Roskin | 2006-07-09 | 1 | -1/+1 |
| * | Examples of resetting. | Junio C Hamano | 2005-12-16 | 1 | -0/+5 |
| * | git-merge documentation: conflicting merge leaves higher stages in index | Junio C Hamano | 2005-12-02 | 1 | -4/+6 |
| * | Documentation: Describe merge operation a bit better. | Junio C Hamano | 2005-11-28 | 1 | -0/+95 |
| * | Refactored merge options into separate merge-options.txt. | Jon Loeliger | 2005-11-06 | 1 | -1/+1 |
| * | Refactor merge strategies into separate includable file. | Jon Loeliger | 2005-11-06 | 1 | -0/+2 |
| * | Documentation: git-fetch/pull updates. | Junio C Hamano | 2005-11-05 | 1 | -1/+1 |
| * | Documentation: -merge and -pull: describe merge strategies. | Junio C Hamano | 2005-11-04 | 1 | -9/+2 |
| * | Documentation for git-fmt-merge-msg | Petr Baudis | 2005-11-01 | 1 | -0/+10 |
| * | Remove the version tags from the manpages | Junio C Hamano | 2005-10-10 | 1 | -1/+0 |
| * | [PATCH] Documentation: Update all files to use the new gitlink: macro | Sergey Vlasov | 2005-09-20 | 1 | -1/+1 |
| * | 'git-merge': Documentation. | Junio C Hamano | 2005-09-10 | 1 | -0/+52 |
