Andrew's git - gitweb.git/history

[gitweb.git] / git-merge.sh

2006-10-26	Merge branch 'jc/combined'	blob \| diff \| raw
2006-10-25	Merge branch 'maint'	blob \| diff \| raw
2006-10-25	Merge branch 'aw/cvsimport'	blob \| diff \| raw
2006-10-25	Merge for-each-ref to sync gitweb fully with 'next'	blob \| diff \| raw
2006-10-25	Merge branch 'jc/web-blame'	blob \| diff \| raw
2006-10-25	Merge branch 'maint'	blob \| diff \| raw
2006-10-24	Merge branch 'master' into jc/web	blob \| diff \| raw
2006-10-24	Merge branch 'maint'	blob \| diff \| raw
2006-10-23	Merge branch 'np/pack'	blob \| diff \| raw
2006-10-23	Merge branch 'maint'	blob \| diff \| raw
2006-10-22	git-merge: show usage if run without arguments	blob \| diff \| raw \| diff to current
2006-10-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-10-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-10-19	Merge branch 'mw/pathinfo'	blob \| diff \| raw \| diff to current
2006-10-19	Merge branch 'js/diff'	blob \| diff \| raw \| diff to current
2006-10-19	Merge branch 'jc/send-email'	blob \| diff \| raw \| diff to current
2006-10-19	Merge branch 'jc/grep'	blob \| diff \| raw \| diff to current
2006-10-19	Merge early part of branch 'jc/diff-apply-patch'	blob \| diff \| raw \| diff to current
2006-10-19	Merge branch 'jc/diff-numstat'	blob \| diff \| raw \| diff to current
2006-10-19	Merge branch 'pb/bisect'	blob \| diff \| raw \| diff to current
2006-10-19	Merge branch 'mw/send-email'	blob \| diff \| raw \| diff to current
2006-10-19	Merge branch 'rs/rebase'	blob \| diff \| raw \| diff to current
2006-10-19	Merge branch 'sb/fetch'	blob \| diff \| raw \| diff to current
2006-10-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-10-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-10-01	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-10-01	Merge branch 'sb/fetch' into jc/refs-and-fetch	blob \| diff \| raw \| diff to current
2006-10-01	Merge branch 'jc/gitpm'	blob \| diff \| raw \| diff to current
2006-10-01	merge and resolve: Output short hashes and .. in "Updat...	blob \| diff \| raw \| diff to current
2006-10-01	Merge branch 'jc/diff-stat'	blob \| diff \| raw \| diff to current
2006-10-01	Merge branch 'lt/web'	blob \| diff \| raw \| diff to current
2006-09-28	Merge branch 'jl/virtual'	blob \| diff \| raw \| diff to current
2006-09-28	Merge branch 'master' into lj/refs	blob \| diff \| raw \| diff to current
2006-09-28	Merge branch 'cc/branch-test'	blob \| diff \| raw \| diff to current
2006-09-28	Merge branch 'sp/void'	blob \| diff \| raw \| diff to current
2006-09-28	Merge branch 'jc/whitespace'	blob \| diff \| raw \| diff to current
2006-09-28	Merge branch 'jc/repack'	blob \| diff \| raw \| diff to current
2006-09-28	Merge branch 'jc/deprecate-recursive'	blob \| diff \| raw \| diff to current
2006-09-25	Deprecate merge-recursive.py	blob \| diff \| raw \| diff to current
2006-09-18	Merge part of branch 'jc/upload-pack'	blob \| diff \| raw \| diff to current
2006-09-14	Merge branches 'maint' and 'jc/http'	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-28	Merge branch 'gl/web'	blob \| diff \| raw \| diff to current
2006-08-28	Merge branch 'js/c-merge-recursive'	blob \| diff \| raw \| diff to current
2006-08-23	Merge branch 'gl/cleanup' into gl/cleanup-next	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	Merge branch 'master' into js/c-merge-recursive	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-31	Merge branch 'js/read-tree' into js/c-merge-recursive	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-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
next