Andrew's git - gitweb.git/history

[gitweb.git] / git-merge.sh

2008-07-07	Merge branch 'dr/ceiling'	blob \| diff \| raw
2008-07-06	Merge git://repo.or.cz/git-gui	blob \| diff \| raw
2008-07-03	Merge branch 'j6t/mingw'	blob \| diff \| raw
2008-07-01	Merge branch 'ph/mergetool'	blob \| diff \| raw
2008-07-01	Merge branch 'jc/dashless' (early part)	blob \| diff \| raw
2008-07-01	Merge branch 'nd/dashless'	blob \| diff \| raw
2008-06-27	Merge branch 'maint-1.5.5' into maint	blob \| diff \| raw
2008-06-27	Merge branch 'maint-1.5.4' into maint-1.5.5	blob \| diff \| raw \| diff to current
2008-06-25	Merge branch 'lw/gitweb'	blob \| diff \| raw
2008-06-25	Merge branch 'lt/config-fsync'	blob \| diff \| raw
2008-06-25	Merge branch 'sr/tests'	blob \| diff \| raw
2008-06-25	Merge branch 'jh/clone-packed-refs'	blob \| diff \| raw
2008-06-25	Merge branch 'lw/perlish'	blob \| diff \| raw
2008-06-25	Merge branch 'jc/maint-combine-diff-pre-context' into...	blob \| diff \| raw
2008-06-25	Merge branch 'lt/maint-gitdir-relative' into maint	blob \| diff \| raw
2008-06-22	Merge branch 'rs/archive-ignore'	blob \| diff \| raw
2008-06-22	Merge branch 'lt/racy-empty'	blob \| diff \| raw
2008-06-22	Merge branch 'sn/static'	blob \| diff \| raw
2008-06-22	Merge branch 'jc/maint-combine-diff-pre-context'	blob \| diff \| raw
2008-06-22	Merge branch 'lt/maint-gitdir-relative'	blob \| diff \| raw
2008-06-22	Merge branch 'jk/test'	blob \| diff \| raw
2008-06-22	Merge branch 'pb/fast-export'	blob \| diff \| raw
2008-06-22	Merge branch 'mo/status-untracked'	blob \| diff \| raw
2008-06-22	Merge branch 'kh/update-ref'	blob \| diff \| raw
2008-06-22	Merge branch 'jn/web'	blob \| diff \| raw
2008-06-22	Merge branch 'rg/gitweb'	blob \| diff \| raw
2008-06-19	Merge branch 'maint'	blob \| diff \| raw
2008-06-19	git-merge.sh: fix typo in usage message: sucesses ...	blob \| diff \| raw
2008-06-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-06-16	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-06-11	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-06-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-06-09	Merge branch 'js/merge-recursive'	blob \| diff \| raw \| diff to current
2008-06-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-06-07	Merge 1.5.5.4 in	blob \| diff \| raw \| diff to current
2008-06-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-06-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-28	Merge 1.5.5.3 in	blob \| diff \| raw \| diff to current
2008-05-27	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-27	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-05-26	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-26	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'js/config-cb' v1.5.6-rc0	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'jc/add-n-u'	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'ar/t6031'	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'db/clone-in-c'	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'jc/apply-whitespace'	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'jc/unpack-trees-reword'	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'ar/batch-cat'	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'ap/svn'	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'js/cvsexportcommit'	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'js/ignore-submodule'	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'mo/cvsserver'	blob \| diff \| raw \| diff to current
2008-05-24	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-05-23	Merge branch 'pb/push'	blob \| diff \| raw \| diff to current
2008-05-23	Merge branch 'bc/repack'	blob \| diff \| raw \| diff to current
2008-05-23	Merge branch 'sp/ignorecase'	blob \| diff \| raw \| diff to current
2008-05-23	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-23	Merge branch 'maint-1.5.4' into maint v1.5.5.2	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'ar/add-unreadable'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'ds/branch-auto-rebase'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'sv/first-parent'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'np/pack'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'as/graph'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'jk/maint-send-email-compose'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'hb/maint-send-email-quote-recipients'	blob \| diff \| raw \| diff to current
2008-05-21	git-merge: exclude unnecessary options from OPTIONS_SPEC	blob \| diff \| raw \| diff to current
2008-05-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-15	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-05-15	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-05-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-14	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-05-14	Merge branch 'sb/committer'	blob \| diff \| raw \| diff to current
2008-05-14	Merge branch 'bd/tests'	blob \| diff \| raw \| diff to current
2008-05-14	Merge branch 'mv/format-cc'	blob \| diff \| raw \| diff to current
2008-05-14	Merge branch 'cc/hooks-doc'	blob \| diff \| raw \| diff to current
2008-05-12	Merge branch 'gp/bisect-fix'	blob \| diff \| raw \| diff to current
2008-05-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-11	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-05-11	Merge branch 'py/diff-submodule'	blob \| diff \| raw \| diff to current
2008-05-11	Merge branch 'lt/case-insensitive'	blob \| diff \| raw \| diff to current
2008-05-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-09	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-05-09	Merge branch 'sg/merge-options' (early part)	blob \| diff \| raw \| diff to current
2008-05-04	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-05-03	Merge commit 'sg/merge-options^' into jk/renamelimit	blob \| diff \| raw \| diff to current
2008-04-30	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-04-28	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-04-25	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-04-23	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-04-19	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-04-17	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-04-16	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-04-13	merge, pull: add '--(no-)log' command line option	blob \| diff \| raw \| diff to current
2008-04-13	add 'merge.stat' config variable	blob \| diff \| raw \| diff to current
2008-04-13	merge, pull: introduce '--(no-)stat' option	blob \| diff \| raw \| diff to current
2008-04-12	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-04-12	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
next