Andrew's git / gitweb.git / history
?
Merge branch 'tq/git-ssh-command'
[gitweb.git] / t / t6021-merge-criss-cross.sh
2006-11-01 Merge branch 'maint' blob | diff | raw
2006-11-01 Merge branch 'rs/cherry' blob | diff | raw
2006-11-01 Merge branch 'jc/refs-and-fetch' blob | diff | raw
2006-11-01 Merge branch 'lj/refs' blob | diff | raw
2006-10-31 Merge branch 'maint' blob | diff | raw
2006-10-29 Merge early part of branch 'np/index-pack' into sp... blob | diff | raw
2006-10-27 tests: merge-recursive is usable without Python blob | diff | raw
2006-09-01 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-08-13 Merge branch 'jc/upload-pack' blob | diff | raw | diff to current
2006-08-13 Merge branch 'th/diff-extra' blob | diff | raw | diff to current
2006-08-13 GIT 1.4.2 v1.4.2 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-08-08 Merge branch 'master' into pb/gitpm blob | diff | raw | diff to current
2006-07-30 Merge branch 'jn/make' blob | diff | raw | diff to current
2006-07-26 Merge branch 'pb/configure' blob | diff | raw | diff to current
2006-07-13 Merge branch 'ml/trace' blob | diff | raw | diff to current
2006-07-13 Merge branch 'js/merge-base' blob | diff | raw | diff to current
2006-07-13 Merge branch 'lt/prune' blob | diff | raw | diff to current
2006-07-13 Merge branch 'lt/merge-tree' blob | diff | raw | diff to current
2006-07-10 Merge branch 'jc/show-merge' blob | diff | raw | diff to current
2006-07-10 Fix more typos, primarily in the code 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-01 Merge git://git.kernel.org/pub/scm/gitk/gitk 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-07 Merge branch 'maint' 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-04-05 Merge branch 'fix' blob | diff | raw | diff to current
2006-04-04 Merge branch 'lt/fix-sol-pack' blob | diff | raw | diff to current
2006-04-04 Merge branch 'lt/fix-sol-pack' into next blob | diff | raw | diff to current
2006-04-02 Merge branch 'lt/fix-sol-pack' into next 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-03-04 Merge branch 'maint' blob | diff | raw | diff to current
2006-03-02 Merge branch 'maint' blob | diff | raw | diff to current
2006-03-02 Merge branch 'jc/tag' blob | diff | raw | diff to current
2006-03-02 Merge branch 'jc/tag' into next blob | diff | raw | diff to current
2006-03-02 Up to date with GIT 1.2.4 fixes blob | diff | raw | diff to current
2006-03-01 Merge git-mv fixes from 'maint' blob | diff | raw | diff to current
2006-02-26 Merge branch 'maint' blob | diff | raw | diff to current
2006-02-25 Merge branches 'jc/rev-list' and 'jc/pack-thin' blob | diff | raw | diff to current
2006-02-25 Merge branches 'jc/rev-list' and 'jc/pack-thin' blob | diff | raw | diff to current
2006-02-24 Merge fixes early for next maint series. blob | diff | raw | diff to current
2006-02-24 Merge branches 'jc/rev-list' and 'jc/pack-thin' into... blob | diff | raw | diff to current
2006-02-24 Merge fix bits from jc/rev-list blob | diff | raw | diff to current
2006-02-24 Merge fixes early for next maint series. blob | diff | raw | diff to current
2006-02-23 Merge part of pack-thin branch blob | diff | raw | diff to current
2006-02-23 Merge branches 'maint', 'jc/fix-co-candy' and 'jc/fix... blob | diff | raw | diff to current
2006-02-23 Merge branch 'ra/anno' blob | diff | raw | diff to current
2006-02-23 Merge fixes up to GIT 1.2.3 blob | diff | raw | diff to current
2006-02-22 Merge branch 'ra/anno' into next 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-22 Merge branch 'fix' blob | diff | raw | diff to current
2006-02-22 Merge branch 'jc/perl' blob | diff | raw | diff to current
2006-02-22 Merge branch 'jc/pack-reuse' blob | diff | raw | diff to current
2006-02-22 Merge branch 'jc/nostat' blob | diff | raw | diff to current
2006-02-21 Merge part of jc/portable branch blob | diff | raw | diff to current
2006-02-20 Merge branch 'jc/perl' into next blob | diff | raw | diff to current
2006-02-20 Merge branch 'ra/anno' into next blob | diff | raw | diff to current
2006-02-20 Merge branch 'jc/pack-thin' into next blob | diff | raw | diff to current
2006-02-20 Merge branch 'jc/pack-thin' into next blob | diff | raw | diff to current
2006-02-20 Merge branch 'jc/rev-list' into next blob | diff | raw | diff to current
2006-02-20 Merge branch 'jc/merge-msg' into next blob | diff | raw | diff to current
2006-02-19 Merge branch 'jc/mv' into next blob | diff | raw | diff to current
2006-02-19 Merge part of js/portable into next blob | diff | raw | diff to current
2006-02-19 Optionally work without python 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-07 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-12-04 GIT 0.99.9l aka 1.0rc4 v0.99.9lv1.0rc4 blob | diff | raw | diff to current
2005-12-03 New test case: Criss-cross merge blob | diff | raw | diff to current