Andrew's git - gitweb.git/history

[gitweb.git] / git-merge.sh

2006-04-07	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2006-04-07	Merge branch 'maint'	blob \| diff \| raw
2006-04-05	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2006-04-05	Merge branch 'fix'	blob \| diff \| raw
2006-04-04	Merge branch 'lt/fix-sol-pack'	blob \| diff \| raw
2006-04-04	Merge branch 'lt/fix-sol-pack' into next	blob \| diff \| raw
2006-04-02	Merge branch 'lt/fix-sol-pack' into next	blob \| diff \| raw
2006-03-31	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2006-03-28	Merge branch ak/svn	blob \| diff \| raw
2006-03-27	Merge branch 'lt/diffgen' into next	blob \| diff \| raw
2006-03-26	Merge branches 'jc/clone' and 'jc/name'	blob \| diff \| raw
2006-03-26	Merge branch 'jc/merge'	blob \| diff \| raw
2006-03-26	Merge branch 'lt/diffgen' into next	blob \| diff \| raw
2006-03-26	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-03-26	Merge branch 'ew/email' into next	blob \| diff \| raw
2006-03-26	Merge branch 'lt/diffgen' into next	blob \| diff \| raw
2006-03-26	Merge branch 'rs/tar-tree' into next	blob \| diff \| raw
2006-03-24	Merge branch 'jc/name' into next	blob \| diff \| raw
2006-03-22	Merge branch 'jc/pull' into next	blob \| diff \| raw
2006-03-22	Merge branch 'jc/revlist' into next	blob \| diff \| raw
2006-03-22	Merge branch 'jc/clone' into next	blob \| diff \| raw
2006-03-21	Merge branch 'jc/clone' into next	blob \| diff \| raw
2006-03-21	Merge branch 'jc/name' into next	blob \| diff \| raw
2006-03-21	Merge branch 'jc/name' into next	blob \| diff \| raw
2006-03-21	Merge branch 'jc/clone' into next	blob \| diff \| raw
2006-03-20	Merge branch 'jc/merge' into next	blob \| diff \| raw
2006-03-20	git-merge knows some strategies want to skip trivial...	blob \| diff \| raw
2006-03-15	Merge branch 'lt/diff' into next	blob \| diff \| raw \| diff to current
2006-03-15	Merge branch 'lt/diff' into next	blob \| diff \| raw \| diff to current
2006-03-13	Merge branch 'jc/pack'	blob \| diff \| raw \| diff to current
2006-03-13	Merge branch 'jc/fsck'	blob \| diff \| raw \| diff to current
2006-03-13	Merge branch 'jc/diff' into next	blob \| diff \| raw \| diff to current
2006-03-13	Merge branch 'jc/diff' into next	blob \| diff \| raw \| diff to current
2006-03-13	Merge branch 'jc/diff' into next	blob \| diff \| raw \| diff to current
2006-03-12	Merge branch 'jc/diff' into next	blob \| diff \| raw \| diff to current
2006-03-11	Merge branch 'fk/blame' into next	blob \| diff \| raw \| diff to current
2006-03-10	allow double click on current HEAD id after git-pull	blob \| diff \| raw \| diff to current
2006-03-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-03-02	Merge part of 'lt/rev-list' into 'fk/blame'	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-02	Merge early parts of 'np/delta' branch	blob \| diff \| raw \| diff to current
2006-03-01	Merge git-mv fixes from 'maint'	blob \| diff \| raw \| diff to current
2006-02-28	Merge part of np/delta	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 branch 'fix' into maint	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 branch 'np/delta' into next	blob \| diff \| raw \| diff to current
2006-02-24	Merge branch 'ar/win'	blob \| diff \| raw \| diff to current
2006-02-24	Merge branch 'jc/send-insane-refs'	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/fix-co-candy', 'jc/fix-rename-leak...	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 branch 'np/delta' into next	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	checkout - eye candy.	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	Keep Porcelainish from failing by broken ident after...	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-22	Merge branch 'js/portable'	blob \| diff \| raw \| diff to current
2006-02-21	Merge part of jc/portable branch	blob \| diff \| raw \| diff to current
2006-02-21	Merge branch 'lt/merge-tree'	blob \| diff \| raw \| diff to current
2006-02-21	Merge branch 'jc/ident'	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 'js/portable' 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-19	Merge branch 'jc/ident' into next	blob \| diff \| raw \| diff to current
2006-02-19	Keep Porcelainish from failing by broken ident after...	blob \| diff \| raw \| diff to current
2006-02-13	Merge branch 'jc/nostat'	blob \| diff \| raw \| diff to current
2006-02-12	Merge branch 'master'	blob \| diff \| raw \| diff to current
2006-02-12	Only call git-rerere if $GIT_DIR/rr-cache exists.	blob \| diff \| raw \| diff to current
2006-02-07	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-02-07	git-rerere: reuse recorded resolve.	blob \| diff \| raw \| diff to current
2006-02-04	Merge branches 'jc/sha1', 'jc/diff' and 'jc/ws'	blob \| diff \| raw \| diff to current
2006-02-04	git-merge: Properly quote $merge_msg variable.	blob \| diff \| raw \| diff to current
2006-01-30	Merge fixes up to GIT 1.1.6	blob \| diff \| raw \| diff to current
2006-01-28	merge: seed the commit message with list of conflicted...	blob \| diff \| raw \| diff to current
2005-12-26	Merge branch 'jc/checkout'	blob \| diff \| raw \| diff to current
2005-12-24	Merge fixes up to GIT 1.0.4	blob \| diff \| raw \| diff to current
2005-12-24	GIT 1.0.4 v1.0.4	blob \| diff \| raw \| diff to current
2005-12-23	merge --no-commit: tweak message	blob \| diff \| raw \| diff to current
next