Andrew's git - gitweb.git/history

[gitweb.git] / git-merge.sh

2007-05-07	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw
2007-05-07	Merge branch 'maint'	blob \| diff \| raw
2007-05-07	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-05-07	Merge git://git2./pub/scm/gitk/gitk into maint	blob \| diff \| raw \| diff to current
2007-05-06	Merge branch 'maint'	blob \| diff \| raw
2007-05-04	Merge branch 'maint'	blob \| diff \| raw
2007-05-02	Merge branch 'maint'	blob \| diff \| raw
2007-05-02	Merge branch 'gfi-maint' into gfi-master	blob \| diff \| raw
2007-05-01	Merge branch 'maint'	blob \| diff \| raw
2007-04-29	Merge branch 'maint'	blob \| diff \| raw
2007-04-29	Merge branch 'gfi-maint' into gfi-master	blob \| diff \| raw
2007-04-27	Merge branch 'maint'	blob \| diff \| raw
2007-04-26	Merge branch 'maint'	blob \| diff \| raw
2007-04-25	Merge branch 'maint'	blob \| diff \| raw
2007-04-24	Merge branch 'maint'	blob \| diff \| raw
2007-04-22	Merge branch 'maint'	blob \| diff \| raw
2007-04-20	Merge branch 'maint'	blob \| diff \| raw
2007-04-19	Merge branch 'maint'	blob \| diff \| raw
2007-04-18	Merge branch 'maint'	blob \| diff \| raw
2007-04-18	Merge branch 'fl/cvsserver'	blob \| diff \| raw
2007-04-18	Merge branch 'maint'	blob \| diff \| raw
2007-04-18	Merge branch 'maint'	blob \| diff \| raw
2007-04-18	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw
2007-04-18	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-04-16	Merge branch 'maint'	blob \| diff \| raw
2007-04-16	Merge branch 'maint'	blob \| diff \| raw
2007-04-15	Merge git://git2./pub/scm/gitk/gitk into maint	blob \| diff \| raw \| diff to current
2007-04-14	Merge branch 'maint'	blob \| diff \| raw
2007-04-13	Merge branch 'maint'	blob \| diff \| raw
2007-04-12	Merge branch 'maint'	blob \| diff \| raw
2007-04-10	Merge branch 'maint'	blob \| diff \| raw
2007-04-09	Merge branch 'jc/push'	blob \| diff \| raw
2007-04-09	Merge branch 'jc/merge-subtree'	blob \| diff \| raw
2007-04-09	Merge branch 'js/fetch-progress'	blob \| diff \| raw \| diff to current
2007-04-07	A new merge stragety 'subtree'.	blob \| diff \| raw
2007-04-04	Merge 1.5.0.7 in	blob \| diff \| raw \| diff to current
2007-03-30	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-03-28	Merge branch 'maint' to synchronize with 1.5.0.6	blob \| diff \| raw \| diff to current
2007-03-26	Merge branch 'jc/fpl'	blob \| diff \| raw \| diff to current
2007-03-25	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-03-25	Merge branch 'js/remote-show-push'	blob \| diff \| raw \| diff to current
2007-03-25	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-03-24	Merge branch 'master' into jc/bisect	blob \| diff \| raw \| diff to current
2007-03-24	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-03-22	Merge git://git2.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2007-03-22	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-03-22	git-merge: Put FETCH_HEAD data in merge commit message	blob \| diff \| raw \| diff to current
2007-03-20	Merge git://git2.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2007-03-19	Merge branch 'fl/cvsserver'	blob \| diff \| raw \| diff to current
2007-03-19	Merge branch 'sp/run-command'	blob \| diff \| raw \| diff to current
2007-03-18	Merge branch 'ar/diff'	blob \| diff \| raw \| diff to current
2007-03-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-03-16	git-merge: finish when git-read-tree fails	blob \| diff \| raw \| diff to current
2007-03-14	Merge branch 'jc/repack'	blob \| diff \| raw \| diff to current
2007-03-14	Merge branch 'jc/fetch'	blob \| diff \| raw \| diff to current
2007-03-14	Merge branch 'jb/per-user-exclude'	blob \| diff \| raw \| diff to current
2007-03-14	Merge branch 'pb/branch-track'	blob \| diff \| raw \| diff to current
2007-03-13	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-03-12	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-03-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-03-12	git-merge: warn when -m provided on a fast forward	blob \| diff \| raw \| diff to current
2007-03-06	Merge branch 'master' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-03-05	Merge branch 'js/fetch-progress' (early part)	blob \| diff \| raw \| diff to current
2007-03-05	Merge branch 'js/symlink'	blob \| diff \| raw \| diff to current
2007-03-04	Merge branch 'js/diff-ni' (early part)	blob \| diff \| raw \| diff to current
2007-03-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-03-03	git-merge: fail correctly when we cannot fast forward.	blob \| diff \| raw \| diff to current
2007-03-02	Merge branch 'js/commit-format'	blob \| diff \| raw \| diff to current
2007-02-28	Merge branch 'js/bundle'	blob \| diff \| raw \| diff to current
2007-02-28	Merge branch 'mc/sendmail'	blob \| diff \| raw \| diff to current
2007-02-27	Merge branch 'np/types' into jc/fetch	blob \| diff \| raw \| diff to current
2007-02-26	Merge branch 'jc/merge-symlink' into maint	blob \| diff \| raw \| diff to current
2007-02-25	Merge git://repo.or.cz/git-gui into maint	blob \| diff \| raw \| diff to current
2007-02-24	Evil Merge branch 'jc/status' (early part) into js...	blob \| diff \| raw \| diff to current
2007-02-24	Merge branch 'js/apply'	blob \| diff \| raw \| diff to current
2007-02-24	Merge branch 'js/no-limit-boundary'	blob \| diff \| raw \| diff to current
2007-02-24	Merge branch 'js/etc-config'	blob \| diff \| raw \| diff to current
2007-02-23	Merge branches 'lt/crlf' and 'jc/apply-config'	blob \| diff \| raw \| diff to current
2007-02-21	Merge branch 'master' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-02-21	Merge branch 'fk/autoconf'	blob \| diff \| raw \| diff to current
2007-02-21	Merge branch 'js/name-rev-fix'	blob \| diff \| raw \| diff to current
2007-02-20	Merge branch 'js/diff-color-check'	blob \| diff \| raw \| diff to current
2007-02-20	Merge branch 'jc/fetch-notags'	blob \| diff \| raw \| diff to current
2007-02-19	Merge branch 'ap/cvsserver'	blob \| diff \| raw \| diff to current
2007-02-18	Merge git://git./pub/scm/gitk/gitk into maint	blob \| diff \| raw \| diff to current
2007-02-16	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-02-16	git-merge: minor fix for no_trivial_merge_strategies.	blob \| diff \| raw \| diff to current
2007-02-14	Merge branch 'js/reverse'	blob \| diff \| raw \| diff to current
2007-02-14	Merge branch 'jc/diff-apply-patch'	blob \| diff \| raw \| diff to current
2007-02-14	Merge branch 'jc/merge-base' (early part)	blob \| diff \| raw \| diff to current
2007-02-13	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-02-13	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-02-12	Merge git-gui	blob \| diff \| raw \| diff to current
2007-02-04	Merge branch 'master' into np/dreflog	blob \| diff \| raw \| diff to current
2007-01-31	Merge branch 'master' of git://linux-nfs.org/~bfields/git	blob \| diff \| raw \| diff to current
2007-01-30	Merge branch 'master' into sp/gfi	blob \| diff \| raw \| diff to current
2007-01-29	[PATCH] Rename git-repo-config to git-config.	blob \| diff \| raw \| diff to current
2007-01-26	git-merge: leave sensible reflog message when used...	blob \| diff \| raw \| diff to current
2007-01-15	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2007-01-15	Merge branch 'master' of git://git./git/git	blob \| diff \| raw \| diff to current
next