Use Daniel's read-tree in the merge strategy 'resolve'.
[gitweb.git] / Documentation / Makefile
2005-09-04 Merge branch 'master' of .
2005-09-03 Document hooks.
2005-09-02 Merge branch 'master' of .
2005-09-01 Add repository-layout document.
2005-08-30 Merge refs/heads/master from .
2005-08-30 Documentaion updates.
2005-08-30 Merge refs/heads/master from .
2005-08-30 Merge refs/heads/master from paulus
2005-08-30 Make sure howto/*.html is built as well.
2005-08-30 Merge refs/heads/master from .
2005-08-30 Allow asciidoc formatted documentation in howto/
2005-08-29 Merge refs/heads/portable from cs.berkeley.edu/~ejr...
2005-08-27 Merge refs/heads/master from .
2005-08-26 [PATCH] git bugfixes and cleanups, mainly Debian things
2005-08-25 Don't forget to build the howto-index file.
2005-08-25 Link howto documents from the main git.txt documentation.
2005-08-23 Merge refs/heads/master from .
2005-08-23 Tutorial updates.
2005-08-19 Merge from gitk
2005-08-18 Merge with gitk --parents change.
2005-08-18 Merge with master for gitk and doc updates.
2005-08-18 [PATCH] Add Makefile target glossary.html
2005-08-18 Merge with gitk
2005-08-15 Merge master changes into rc.
2005-08-15 Documentation updates.
2005-08-13 Merge master changes into release candidate branch.
2005-08-12 [PATCH] Use $DESTDIR instead of $dest
2005-08-12 Merge with gitk.
2005-08-10 Merge with gitk.
2005-08-09 Merge with gitk.
2005-08-08 Merge with gitk.
2005-08-07 Merge with gitk.
2005-08-06 Merge with gitk.
2005-08-05 Merge with gitk.
2005-07-31 Merge with gitk.
2005-07-29 Merge with gitk.
2005-07-18 Merge master.kernel.org:/pub/scm/gitk/gitk
2005-07-16 Merge git-tools repository under "tools" subdirectory
2005-07-15 Fix up "make doc"
2005-07-15 [PATCH] Add doc and install-doc targets to the Makefile
2005-07-13 [PATCH] Clean up diff option descriptions.
2005-07-06 Merge master.kernel.org:/pub/scm/gitk/gitk
2005-06-28 Merge rsync://rsync.kernel.org/pub/scm/gitk/gitk
2005-06-22 Do a cross-project merge of Paul Mackerras' gitk visualizer
2005-05-22 [PATCH] Docs - Makefile update
2005-05-19 [PATCH] manpage name conflict
2005-05-13 The Makefile is now aware of Documentation/ include...
2005-05-11 Merge ... http://members.cox.net/junkio/git-jc.git
2005-05-10 [PATCH 4/4] split core-git.txt and update