Andrew's git / gitweb.git / history
?
Merge branch 'maint'
[gitweb.git] / Documentation / git-merge-index.txt
2007-03-22 Merge git://git2.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2007-03-20 Merge git://git2.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2007-03-13 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-03-12 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw
2007-03-06 Merge branch 'master' of git://repo.or.cz/git-gui into... blob | diff | raw
2007-02-25 Merge git://repo.or.cz/git-gui into maint blob | diff | raw
2007-02-21 Merge branch 'master' of git://repo.or.cz/git-gui into... blob | diff | raw
2007-02-18 Merge git://git./pub/scm/gitk/gitk into maint blob | diff | raw
2007-02-14 Merge branch 'jc/diff-apply-patch' blob | diff | raw
2007-02-14 Merge branch 'jc/merge-base' (early part) blob | diff | raw
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-02-12 Merge git-gui blob | diff | raw
2007-01-31 Merge branch 'master' of git://linux-nfs.org/~bfields/git blob | diff | raw
2007-01-30 Merge branch 'master' into sp/gfi blob | diff | raw
2007-01-18 Documentation: sync git.txt command list and manual... blob | diff | raw
2007-01-15 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2007-01-14 Merge branch 'master' into sp/fast-import blob | diff | raw | diff to current
2007-01-09 Merge branch 'maint' blob | diff | raw | diff to current
2007-01-05 Merge branch 'maint' blob | diff | raw | diff to current
2006-12-27 Merge branch 'master' into js/shallow blob | diff | raw | diff to current
2006-12-22 Merge branch 'maint' blob | diff | raw | diff to current
2006-12-20 Merge branch 'maint' blob | diff | raw | diff to current
2006-12-18 Merge branch 'jn/web' (early part) blob | diff | raw | diff to current
2006-12-14 Merge branch 'maint' blob | diff | raw | diff to current
2006-12-14 Merge branch 'jc/diff--cached' blob | diff | raw | diff to current
2006-12-13 Merge branch 'jc/read-tree-ignore' blob | diff | raw | diff to current
2006-12-13 Merge branch 'ew/rerere' blob | diff | raw | diff to current
2006-12-13 Merge branch 'np/addcommit' blob | diff | raw | diff to current
2006-12-13 Merge branch 'lh/branch-rename' blob | diff | raw | diff to current
2006-12-13 Merge branch 'jc/commit-careful' blob | diff | raw | diff to current
2006-12-13 Merge branch 'ap/clone-origin' blob | diff | raw | diff to current
2006-12-13 Merge branch 'jc/numstat' blob | diff | raw | diff to current
2006-12-13 Merge branch 'rr/cvsexportcommit' blob | diff | raw | diff to current
2006-12-13 Merge branch 'ap/branch' blob | diff | raw | diff to current
2006-12-13 Merge branch 'js/merge' blob | diff | raw | diff to current
2006-12-13 Merge branch 'master' into js/merge blob | diff | raw | diff to current
2006-12-13 Get rid of the dependency on RCS' merge program blob | diff | raw | diff to current
2006-11-29 Merge master.kernel.org:/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-11-08 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-09-01 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-08-13 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-06-18 Merge early part of branch 'jc/fetchupload' blob | diff | raw | diff to current
2006-06-18 Merge branch 'jc/rw-prefix' blob | diff | raw | diff to current
2006-06-13 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-06-10 Merge git://git.kernel.org/pub/scm/git/gitweb blob | diff | raw | diff to current
2006-06-07 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-06-04 Merge branch 'new' of git://git./gitk/gitk into next blob | diff | raw | diff to current
2006-06-04 Merge branch 'vb/sendemail' into next blob | diff | raw | diff to current
2006-06-04 Merge branch 'lt/tree-2' blob | diff | raw | diff to current
2006-06-04 Merge branch 'sp/reflog' blob | diff | raw | diff to current
2006-06-04 Merge branch 'ff/svnimport' blob | diff | raw | diff to current
2006-06-04 Merge branch 'jc/fmt-patch' blob | diff | raw | diff to current
2006-06-04 Documentation: Spelling fixes blob | diff | raw | diff to current
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
next