Andrew's git - gitweb.git/history

[gitweb.git] / git-merge.sh

2006-09-14	Merge branches 'maint' and 'jc/http'	blob \| diff \| raw
2006-09-01	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2006-08-28	Merge branch 'gl/web'	blob \| diff \| raw
2006-08-28	Merge branch 'js/c-merge-recursive'	blob \| diff \| raw
2006-08-23	Merge branch 'gl/cleanup' into gl/cleanup-next	blob \| diff \| raw
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	Merge branch 'master' into js/c-merge-recursive	blob \| diff \| raw
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-07-31	Merge branch 'js/read-tree' into js/c-merge-recursive	blob \| diff \| raw
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-25	Merge branch 'jc/clone-bind-failure'	blob \| diff \| raw \| diff to current
2006-07-25	Merge branch 'jt/format-patch'	blob \| diff \| raw \| diff to current
2006-07-25	Merge branch 'ew/apply'	blob \| diff \| raw \| diff to current
2006-07-25	Merge branch 'jc/read-tree'	blob \| diff \| raw \| diff to current
2006-07-25	Merge branch 'lt/objformat'	blob \| diff \| raw \| diff to current
2006-07-17	Merge branch 'sp/reflog' v1.4.2-rc1	blob \| diff \| raw \| diff to current
2006-07-14	Merge branch 'lt/unitype' into js/c-merge-recursive	blob \| diff \| raw \| diff to current
2006-07-14	recur vs recursive: help testing without touching too...	blob \| diff \| raw \| diff to current
2006-07-14	Status update on merge-recursive in C	blob \| diff \| raw \| diff to current
2006-07-11	Log ref changes made by git-merge and git-pull.	blob \| diff \| raw \| diff to current
2006-07-05	Merge branch 'jc/sha1'	blob \| diff \| raw \| diff to current
2006-07-05	Merge branch 'jc/diff-test'	blob \| diff \| raw \| diff to current
2006-07-05	Merge branch 'th/diff'	blob \| diff \| raw \| diff to current
2006-06-29	Merge branch 'jc/repack'	blob \| diff \| raw \| diff to current
2006-06-29	Merge branch 'js/patch'	blob \| diff \| raw \| diff to current
2006-06-27	Fix expr usage for FreeBSD	blob \| diff \| raw \| diff to current
2006-06-26	Merge branch 'jc/squash'	blob \| diff \| raw \| diff to current
2006-06-26	Merge branch 'js/diff'	blob \| diff \| raw \| diff to current
2006-06-24	git-merge --squash	blob \| diff \| raw \| diff to current
2006-06-24	Merge branch 'pb/error'	blob \| diff \| raw \| diff to current
2006-06-24	git-merge: Don't use -p when outputting summary	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-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-21	Merge branch 'master' into js/fmt-patch	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 branch 'jc/apply'	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/apply' into next	blob \| diff \| raw \| diff to current
2006-05-17	Merge branch 'jc/apply'	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-17	Merge branch 'np/pack'	blob \| diff \| raw \| diff to current
2006-05-16	Merge branch 'np/pack' into next	blob \| diff \| raw \| diff to current
2006-05-16	Merge branch 'se/tag'	blob \| diff \| raw \| diff to current
2006-05-16	Merge branch 'se/rev-parse'	blob \| diff \| raw \| diff to current
2006-05-16	Merge branch 'se/diff'	blob \| diff \| raw \| diff to current
2006-05-16	Merge branch 'jc/diff' into next	blob \| diff \| raw \| diff to current
2006-05-16	Merge branch 'master' into next	blob \| diff \| raw \| diff to current
2006-05-16	Merge branch 'jc/apply' into next	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 'ew/send-email' into next	blob \| diff \| raw \| diff to current
2006-05-15	Merge branch 'np/pack' into next	blob \| diff \| raw \| diff to current
2006-05-15	Merge branch 'lt/oneway' into next	blob \| diff \| raw \| diff to current
2006-05-15	Merge branch 'se/tag' into next	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 'jc/apply' into next	blob \| diff \| raw \| diff to current
2006-05-15	Merge branch 'lt/oneway' into next	blob \| diff \| raw \| diff to current
2006-05-15	Merge branch 'se/diff' into next	blob \| diff \| raw \| diff to current
2006-05-14	Convert some "apply --summary" users to "diff --summary".	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 branch 'sh/daemon'	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-21	Merge branch 'master' into jc/fmt-patch	blob \| diff \| raw \| diff to current
2006-04-20	Merge branch 'jc/fmt-patch' into next	blob \| diff \| raw \| diff to current
2006-04-20	Stop carrying Geert's similarity estimator.	blob \| diff \| raw \| diff to current
2006-04-20	Merge branch 'jc/fmt-patch' into next	blob \| diff \| raw \| diff to current
2006-04-19	Merge branch 'jc/unresolve' into next	blob \| diff \| raw \| diff to current
2006-04-19	Merge branch 'lt/xsha1'	blob \| diff \| raw \| diff to current
2006-04-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-04-19	git-merge: a bit more readable user guidance.	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-28	Merge branch ak/svn	blob \| diff \| raw \| diff to current
2006-03-27	Merge branch 'lt/diffgen' into next	blob \| diff \| raw \| diff to current
2006-03-26	Merge branches 'jc/clone' and 'jc/name'	blob \| diff \| raw \| diff to current
2006-03-26	Merge branch 'jc/merge'	blob \| diff \| raw \| diff to current
2006-03-26	Merge branch 'lt/diffgen' into next	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-26	Merge branch 'ew/email' into next	blob \| diff \| raw \| diff to current
2006-03-26	Merge branch 'lt/diffgen' into next	blob \| diff \| raw \| diff to current
2006-03-26	Merge branch 'rs/tar-tree' into next	blob \| diff \| raw \| diff to current
2006-03-24	Merge branch 'jc/name' into next	blob \| diff \| raw \| diff to current
next