Andrew's git - gitweb.git/history - Documentation/merge-config.txt

[gitweb.git] / Documentation / merge-config.txt

2008-10-21	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2008-10-18	Merge branch 'pb/commit-where'	blob \| diff \| raw
2008-10-09	Merge branch 'lt/time-reject-fractional-seconds'	blob \| diff \| raw
2008-10-09	Merge branch 'jc/add-ita'	blob \| diff \| raw
2008-09-29	Merge branch 'jc/better-conflict-resolution'	blob \| diff \| raw
2008-09-25	Merge branch 'mv/merge-recursive'	blob \| diff \| raw
2008-09-25	Merge branch 'jc/alternate-push'	blob \| diff \| raw
2008-09-25	Merge branch 'am/status'	blob \| diff \| raw
2008-09-25	Merge branch 'pb/autocorrect-wrapper'	blob \| diff \| raw
2008-09-25	Merge branch 'mv/commit-tree'	blob \| diff \| raw
2008-09-25	Merge branch 'jc/apply-include-exclude'	blob \| diff \| raw
2008-09-25	Merge branch 'jc/safe-c-l-d'	blob \| diff \| raw
2008-09-25	Merge branch 'ho/dirstat-by-file'	blob \| diff \| raw
2008-09-25	Merge git://repo.or.cz/git-gui	blob \| diff \| raw
2008-09-19	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| diff \| raw
2008-09-19	Merge branch 'jc/diff-prefix'	blob \| diff \| raw
2008-09-19	Merge branch 'np/pack'	blob \| diff \| raw
2008-09-19	Merge branch 'bw/shortref'	blob \| diff \| raw
2008-09-19	Merge branch 'rs/decorate'	blob \| diff \| raw
2008-09-19	Merge branch 'tr/rev-list-reverse'	blob \| diff \| raw
2008-09-19	Merge branch 'cc/bisect'	blob \| diff \| raw
2008-09-19	Merge branch 'jc/setlinebuf-setvbuf'	blob \| diff \| raw
2008-09-19	Merge branch 'dp/maint-rebase-fix' into maint	blob \| diff \| raw
2008-09-19	Merge branch 'jc/maint-checkout-keep-remove' into maint	blob \| diff \| raw
2008-09-19	Merge branch 'jc/maint-diff-quiet' into maint	blob \| diff \| raw
2008-09-19	Merge branch 'jc/maint-name-hash-clear' into maint	blob \| diff \| raw
2008-09-19	Merge branch 'jc/maint-template-permbits' into maint	blob \| diff \| raw
2008-09-19	Merge branch 'mh/maint-honor-no-ssl-verify' into maint	blob \| diff \| raw
2008-09-16	Merge branch 'dp/maint-rebase-fix'	blob \| diff \| raw
2008-09-16	Merge branch 'jc/maint-checkout-keep-remove'	blob \| diff \| raw
2008-09-16	Merge branch 'jc/maint-diff-quiet'	blob \| diff \| raw
2008-09-16	Merge branch 'jc/maint-name-hash-clear'	blob \| diff \| raw
2008-09-16	Merge branch 'jc/maint-template-permbits'	blob \| diff \| raw
2008-09-16	Merge branch 'mh/maint-honor-no-ssl-verify'	blob \| diff \| raw
2008-09-13	Sync with 1.6.0.2	blob \| diff \| raw
2008-09-12	Merge branch 'ho/maint-dashless' into maint	blob \| diff \| raw
2008-09-12	Fix some manual typos.	blob \| diff \| raw
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' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2008-08-30	Merge branch 'jc/post-simplify' (early part) into tr...	blob \| diff \| raw \| diff to current
2008-08-28	Merge branch 'mv/merge-custom'	blob \| diff \| raw \| diff to current
2008-08-27	Merge branch 'jc/add-addremove'	blob \| diff \| raw \| diff to current
2008-08-21	Merge branch 'jc/add-stop-at-symlink'	blob \| diff \| raw \| diff to current
2008-08-21	Merge branch 'cc/merge-base-many'	blob \| diff \| raw \| diff to current
2008-08-20	Merge branch 'dp/hash-literally'	blob \| diff \| raw \| diff to current
2008-08-20	Merge branch 'ph/enable-threaded'	blob \| diff \| raw \| diff to current
2008-08-20	Merge branch 'jk/pager-swap'	blob \| diff \| raw \| diff to current
2008-08-20	Merge branch 'rs/imap'	blob \| diff \| raw \| diff to current
2008-08-17	Merge git-gui 0.11.0	blob \| diff \| raw \| diff to current
2008-08-17	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-08-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-13	Merge branch 'jc/post-simplify' into tr/rev-list-docs	blob \| diff \| raw \| diff to current
2008-08-13	Merge branch 'jc/post-simplify' into tr/filter-branch	blob \| diff \| raw \| diff to current
2008-08-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-06	Sync with 1.5.6.5	blob \| diff \| raw \| diff to current
2008-08-06	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-08-06	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-08-06	Merge branch 'rs/archive-parse-options'	blob \| diff \| raw \| diff to current
2008-08-06	Documentation: typos / spelling fixes	blob \| diff \| raw \| diff to current
2008-07-30	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-07-27	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-07-15	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-07-08	Merge branch 'jc/blame' (early part) into HEAD	blob \| diff \| raw \| diff to current
2008-07-08	Merge branch 'lt/racy-empty' into maint	blob \| diff \| raw \| diff to current
2008-07-06	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-06-27	Merge branch 'maint-1.5.5' into maint	blob \| diff \| raw \| diff to current
2008-06-25	Merge branch 'jc/maint-combine-diff-pre-context' into...	blob \| diff \| raw \| diff to current
2008-06-22	Merge branch 'lt/racy-empty'	blob \| diff \| raw \| diff to current
2008-06-22	Merge branch 'jc/maint-combine-diff-pre-context'	blob \| diff \| raw \| diff to current
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-25	Merge branch 'js/config-cb' v1.5.6-rc0	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 'ar/batch-cat'	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'ap/svn'	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-21	Merge branch '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
next