Fall back to three-way merge when applying a patch.
[gitweb.git] / Documentation / git-applymbox.txt
2005-10-06 Fall back to three-way merge when applying a patch.
2005-10-05 Merge branch 'fixes'
2005-10-05 Some typos and light editing of various manpages
2005-09-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-25 Merge branch 'fixes'
2005-09-24 Merge 'fixes' branch.
2005-09-23 Merge branch 'fixes'
2005-09-21 Merge branch 'fixes'
2005-09-20 [PATCH] Documentation: Update all files to use the...
2005-09-04 Merge branch 'master' of .
2005-09-03 Document hooks.
2005-08-30 Merge refs/heads/master from paulus
2005-08-30 Merge refs/heads/master from .
2005-08-30 Accumulated documentation updates.
2005-08-23 Merge refs/heads/master from .
2005-08-23 Add placeholders for missing documents.