Andrew's git / gitweb.git / history
?
Fix earlier mismerges.
[gitweb.git] / Documentation / git-merge-index.txt
2006-06-04 Merge branch 'new' of git://git./gitk/gitk into next blob | diff | raw
2006-06-04 Merge branch 'vb/sendemail' into next blob | diff | raw
2006-06-04 Merge branch 'lt/tree-2' blob | diff | raw
2006-06-04 Merge branch 'sp/reflog' blob | diff | raw
2006-06-04 Merge branch 'ff/svnimport' blob | diff | raw
2006-06-04 Merge branch 'jc/fmt-patch' blob | diff | raw
2006-06-04 Documentation: Spelling fixes blob | diff | raw
2006-06-01 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-05-29 Merge branch 'jc/dirwalk-n-cache-tree' into jc/cache... blob | diff | raw | diff to current
2006-05-28 Merge branch 'jc/cache-tree' into next blob | diff | raw | diff to current
2006-05-20 Merge branch 'jc/cache-tree' into jc/dirwalk-n-cache... blob | diff | raw | diff to current
2006-05-20 Merge branch 'js/fetchconfig' blob | diff | raw | diff to current
2006-05-19 Merge part of 'js/fmt-patch' for RFC2822 dates into... blob | diff | raw | diff to current
2006-05-18 Merge branch 'maint' blob | diff | raw | diff to current
2006-05-17 Merge branch 'jc/gitlink' into next blob | diff | raw | diff to current
2006-05-17 Merge branch 'maint' blob | diff | raw | diff to current
2006-05-16 Merge branch 'jc/grep' blob | diff | raw | diff to current
2006-05-15 Merge branch 'jc/grep' into next blob | diff | raw | diff to current
2006-05-15 Merge branch 'fix' blob | diff | raw | diff to current
2006-05-15 Merge branch 'jc/grep' into next blob | diff | raw | diff to current
2006-05-15 Merge branch 'fix' blob | diff | raw | diff to current
2006-05-14 Merge branch 'fix' blob | diff | raw | diff to current
2006-05-14 Merge branch 'fix' blob | diff | raw | diff to current
2006-05-13 Merge branch 'lt/fix-config' into lt/config blob | diff | raw | diff to current
2006-05-10 Merge branch 'fix' blob | diff | raw | diff to current
2006-05-10 Merge branch 'jc/grep' into next blob | diff | raw | diff to current
2006-05-09 Merge branch 'jc/xsha1' blob | diff | raw | diff to current
2006-05-09 Merge branch 'np/delta' blob | diff | raw | diff to current
2006-05-09 Merge branch 'fix' blob | diff | raw | diff to current
2006-05-09 Merge branch 'jc/grep' into next blob | diff | raw | diff to current
2006-05-08 Merge branch 'jc/xsha1' into next blob | diff | raw | diff to current
2006-05-08 Merge branch 'jc/grep' into next blob | diff | raw | diff to current
2006-05-08 Merge branch 'fix' blob | diff | raw | diff to current
2006-05-07 Merge branch 'jc/gitlink' into next blob | diff | raw | diff to current
2006-05-07 Merge branch 'jc/cache-tree' into next blob | diff | raw | diff to current
2006-05-07 Merge branch 'fix' blob | diff | raw | diff to current
2006-05-07 Merge with git://kernel.org/pub/scm/git/git.git blob | diff | raw | diff to current
2006-05-06 Merge branch 'master' into js/fmt-patch blob | diff | raw | diff to current
2006-05-05 Merge branch 'jc/bindiff' into next blob | diff | raw | diff to current
2006-05-05 Merge branch 'fix' blob | diff | raw | diff to current
2006-05-05 Fix up docs where "--" isn't displayed correctly. blob | diff | raw | diff to current
2006-05-03 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-04-24 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-04-17 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-04-07 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-04-05 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-03-31 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-03-26 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-02-22 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-02-07 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-12-12 GIT 0.99.9m aka 1.0rc5 v0.99.9mv1.0rc5 blob | diff | raw | diff to current
2005-12-08 Use uniform description for the '--' option. blob | diff | raw | diff to current
2005-12-07 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-29 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-28 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-27 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-22 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-20 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-19 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-12 GIT 0.99.9h v0.99.9hv1.0rc1 blob | diff | raw | diff to current
2005-11-11 Change 'cache' to 'index' in the docs blob | diff | raw | diff to current
2005-11-07 GIT 0.99.9e v0.99.9e blob | diff | raw | diff to current
2005-10-31 GIT 0.99.9a v0.99.9a blob | diff | raw | diff to current
2005-10-27 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-10-23 Merge branch 'fixes' blob | diff | raw | diff to current
2005-10-21 Merge branch 'fixes' blob | diff | raw | diff to current
2005-10-18 Merge branch 'fixes' blob | diff | raw | diff to current
2005-10-16 Merge branch 'fixes' blob | diff | raw | diff to current
2005-10-16 Merge branch 'svn' of netz.smurf.noris.de/git/git blob | diff | raw | diff to current
2005-10-15 Merge branch 'fixes' blob | diff | raw | diff to current
2005-10-12 Merge branch 'fixes' blob | diff | raw | diff to current
2005-10-10 Merge branch 'fixes' blob | diff | raw | diff to current
2005-10-10 Remove the version tags from the manpages blob | diff | raw | diff to current
2005-09-27 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-09-25 Merge branch 'fixes' blob | diff | raw | diff to current
2005-09-24 Merge 'fixes' branch. blob | diff | raw | diff to current
2005-09-23 Merge branch 'fixes' blob | diff | raw | diff to current
2005-09-21 Merge branch 'fixes' blob | diff | raw | diff to current
2005-09-20 [PATCH] Documentation: Update all files to use the... blob | diff | raw | diff to current
2005-09-08 Big tool rename. blob | diff | raw | diff to current