Andrew's git - gitweb.git/history

[gitweb.git] / t / t7600-merge.sh

2008-11-02	Merge git://repo.or.cz/git-gui	blob \| diff \| raw
2008-11-02	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2008-10-31	Merge branch 'maint'	blob \| diff \| raw
2008-10-31	Merge branch 'ar/maint-mksnpath' into ar/mksnpath	blob \| diff \| raw
2008-10-27	Merge branch 'ar/maint-mksnpath' into HEAD	blob \| diff \| raw
2008-10-26	Merge branch 'maint'	blob \| diff \| raw
2008-10-22	Merge branch 'jk/diff-convfilter'	blob \| diff \| raw
2008-10-22	Merge branch 'js/maint-fetch-update-head'	blob \| diff \| raw
2008-10-22	Merge branch 'jc/maint-co-track'	blob \| diff \| raw
2008-10-22	Merge branch 'rs/alloc-ref'	blob \| diff \| raw
2008-10-22	Merge branch 'jk/fix-ls-files-other'	blob \| diff \| raw
2008-10-21	Merge branch 'jc/maint-reset-remove-unmerged-new'	blob \| diff \| raw
2008-10-21	Merge branch 'maint'	blob \| diff \| raw
2008-10-21	Merge branch 'maint'	blob \| diff \| raw
2008-10-21	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2008-10-19	Merge branch 'sh/maint-rebase3'	blob \| diff \| raw
2008-10-19	Merge branch 'tr/workflow-doc'	blob \| diff \| raw
2008-10-19	Merge branch 'mv/clonev'	blob \| diff \| raw
2008-10-19	Merge branch 'ml/cygwin-filemode'	blob \| diff \| raw
2008-10-19	Merge branch 'gb/refactor-pathinfo'	blob \| diff \| raw
2008-10-19	Merge branch 'dp/checkattr'	blob \| diff \| raw
2008-10-19	Merge branch 'gb/formatpatch-autonbr'	blob \| diff \| raw
2008-10-19	Merge branch 'sp/describe-lwtag'	blob \| diff \| raw
2008-10-19	Merge branch 'ae/preservemerge'	blob \| diff \| raw
2008-10-19	Merge branch 'mv/merge-noff'	blob \| diff \| raw
2008-10-19	Merge branch 'ns/rebase-noverify'	blob \| diff \| raw \| diff to current
2008-10-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-19	Merge branch 'pb/rename-rowin32'	blob \| diff \| raw \| diff to current
2008-10-18	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-18	Merge branch 'db/maint-checkout-b' into maint	blob \| diff \| raw \| diff to current
2008-10-18	Merge branch 'pb/commit-where'	blob \| diff \| raw \| diff to current
2008-10-17	Merge branch 'jk/maint-ls-files-other' into jk/fix...	blob \| diff \| raw \| diff to current
2008-10-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-14	Add testcase to ensure merging an early part of a branc...	blob \| diff \| raw \| diff to current
2008-10-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'js/objc-funchdr'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'pb/gitweb'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'dm/svn-branch'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'bc/xdiffnl'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'dp/cywginstat'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'lt/time-reject-fractional-seconds'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'jc/add-ita'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'mw/sendemail'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'mv/merge-refresh'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-08	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-03	builtin-commit: use reduce_heads() only when appropriate	blob \| diff \| raw \| diff to current
2008-10-03	builtin-merge: refresh the index before calling a strategy	blob \| diff \| raw \| diff to current
2008-10-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-01	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-30	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-29	Merge branch 'maint' into bc/master-diff-hunk-header-fix	blob \| diff \| raw \| diff to current
2008-09-29	Merge branch 'jc/better-conflict-resolution'	blob \| diff \| raw \| diff to current
2008-09-26	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'mv/merge-recursive'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'jc/safe-c-l-d'	blob \| diff \| raw \| diff to current
2008-09-25	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-23	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-23	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| diff \| raw \| diff to current
2008-09-22	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-22	Merge branch 'db/maint-checkout-b'	blob \| diff \| raw \| diff to current
2008-09-21	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| diff \| raw \| diff to current
2008-09-20	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| diff \| raw \| diff to current
2008-09-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-19	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| diff \| raw \| diff to current
2008-09-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-19	Merge branch 'jc/diff-prefix'	blob \| diff \| raw \| diff to current
2008-09-19	Merge branch 'np/pack'	blob \| diff \| raw \| diff to current
2008-09-19	Merge branch 'tr/rev-list-reverse'	blob \| diff \| raw \| diff to current
2008-09-19	Merge branch 'cc/bisect'	blob \| diff \| raw \| diff to current
2008-09-19	Merge branch 'jc/maint-name-hash-clear' into maint	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'dp/maint-rebase-fix'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'jc/maint-checkout-keep-remove'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'jc/maint-diff-quiet'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'jc/maint-name-hash-clear'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'jc/maint-template-permbits'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'mh/maint-honor-no-ssl-verify'	blob \| diff \| raw \| diff to current
2008-09-13	Sync with 1.6.0.2	blob \| diff \| raw \| diff to current
2008-09-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-10	Merge branch 'jc/maint-hide-cr-in-diff-from-less' into...	blob \| diff \| raw \| diff to current
2008-09-10	Merge branch 'jc/maint-checkout-fix' into maint	blob \| diff \| raw \| diff to current
2008-09-10	Merge branch 'np/maint-safer-pack' into maint	blob \| diff \| raw \| diff to current
2008-09-10	Merge branch 'ho/dashless'	blob \| diff \| raw \| diff to current
2008-09-08	Merge branch 'ar/autospell'	blob \| diff \| raw \| diff to current
2008-09-08	Merge branch 'jc/cc-ld-dynpath'	blob \| diff \| raw \| diff to current
2008-09-08	Merge branch 'jc/hide-cr-in-diff-from-less'	blob \| diff \| raw \| diff to current
2008-09-08	Merge branch 'jc/maint-checkout-fix'	blob \| diff \| raw \| diff to current
2008-09-07	Merge updated git-gui and gitk that call each other	blob \| diff \| raw \| diff to current
2008-09-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-06	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2008-09-05	Merge branch 'jc/maint-log-grep'	blob \| diff \| raw \| diff to current
2008-09-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-03	Merge branch 'nd/worktree' into maint	blob \| diff \| raw \| diff to current
2008-09-03	Merge branch 'ho/dashless' into maint	blob \| diff \| raw \| diff to current
2008-09-03	tests: use "git xyzzy" form (t7200 - t9001)	blob \| diff \| raw \| diff to current
next