git.oblomov.eu Git - git/history - Documentation/merge-config.txt

[git] / Documentation / merge-config.txt

2008-09-19	Junio C Hamano	Merge branch 'bw/shortref'	blob \| commitdiff \| raw
2008-09-19	Junio C Hamano	Merge branch 'rs/decorate'	blob \| commitdiff \| raw
2008-09-19	Junio C Hamano	Merge branch 'tr/rev-list-reverse'	blob \| commitdiff \| raw
2008-09-19	Junio C Hamano	Merge branch 'cc/bisect'	blob \| commitdiff \| raw
2008-09-19	Junio C Hamano	Merge branch 'jc/setlinebuf-setvbuf'	blob \| commitdiff \| raw
2008-09-16	Junio C Hamano	Merge branch 'dp/maint-rebase-fix'	blob \| commitdiff \| raw
2008-09-16	Junio C Hamano	Merge branch 'jc/maint-checkout-keep-remove'	blob \| commitdiff \| raw
2008-09-16	Junio C Hamano	Merge branch 'jc/maint-diff-quiet'	blob \| commitdiff \| raw
2008-09-16	Junio C Hamano	Merge branch 'jc/maint-name-hash-clear'	blob \| commitdiff \| raw
2008-09-16	Junio C Hamano	Merge branch 'jc/maint-template-permbits'	blob \| commitdiff \| raw
2008-09-16	Junio C Hamano	Merge branch 'mh/maint-honor-no-ssl-verify'	blob \| commitdiff \| raw
2008-09-13	Junio C Hamano	Sync with 1.6.0.2	blob \| commitdiff \| raw
2008-09-12	Junio C Hamano	Merge branch 'ho/maint-dashless' into maint	blob \| commitdiff \| raw
2008-09-12	Ralf Wildenhues	Fix some manual typos.	blob \| commitdiff \| raw
2008-09-07	Junio C Hamano	Merge updated git-gui and gitk that call each other	blob \| commitdiff \| raw \| diff to current
2008-09-06	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2008-08-30	Junio C Hamano	Merge branch 'jc/post-simplify' (early part) into tr...	blob \| commitdiff \| raw \| diff to current
2008-08-28	Junio C Hamano	Merge branch 'mv/merge-custom'	blob \| commitdiff \| raw \| diff to current
2008-08-27	Junio C Hamano	Merge branch 'jc/add-addremove'	blob \| commitdiff \| raw \| diff to current
2008-08-21	Junio C Hamano	Merge branch 'jc/add-stop-at-symlink'	blob \| commitdiff \| raw \| diff to current
2008-08-21	Junio C Hamano	Merge branch 'cc/merge-base-many'	blob \| commitdiff \| raw \| diff to current
2008-08-20	Junio C Hamano	Merge branch 'dp/hash-literally'	blob \| commitdiff \| raw \| diff to current
2008-08-20	Junio C Hamano	Merge branch 'ph/enable-threaded'	blob \| commitdiff \| raw \| diff to current
2008-08-20	Junio C Hamano	Merge branch 'jk/pager-swap'	blob \| commitdiff \| raw \| diff to current
2008-08-20	Junio C Hamano	Merge branch 'rs/imap'	blob \| commitdiff \| raw \| diff to current
2008-08-17	Junio C Hamano	Merge git-gui 0.11.0	blob \| commitdiff \| raw \| diff to current
2008-08-17	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-08-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-13	Junio C Hamano	Merge branch 'jc/post-simplify' into tr/rev-list-docs	blob \| commitdiff \| raw \| diff to current
2008-08-13	Junio C Hamano	Merge branch 'jc/post-simplify' into tr/filter-branch	blob \| commitdiff \| raw \| diff to current
2008-08-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-06	Junio C Hamano	Sync with 1.5.6.5	blob \| commitdiff \| raw \| diff to current
2008-08-06	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-08-06	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-08-06	Junio C Hamano	Merge branch 'rs/archive-parse-options'	blob \| commitdiff \| raw \| diff to current
2008-08-06	Mike Ralphson	Documentation: typos / spelling fixes	blob \| commitdiff \| raw \| diff to current
2008-07-30	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-07-27	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-07-15	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-07-08	Junio C Hamano	Merge branch 'jc/blame' (early part) into HEAD	blob \| commitdiff \| raw \| diff to current
2008-07-08	Junio C Hamano	Merge branch 'lt/racy-empty' into maint	blob \| commitdiff \| raw \| diff to current
2008-07-06	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-06-27	Junio C Hamano	Merge branch 'maint-1.5.5' into maint	blob \| commitdiff \| raw \| diff to current
2008-06-25	Junio C Hamano	Merge branch 'jc/maint-combine-diff-pre-context' into...	blob \| commitdiff \| raw \| diff to current
2008-06-22	Junio C Hamano	Merge branch 'lt/racy-empty'	blob \| commitdiff \| raw \| diff to current
2008-06-22	Junio C Hamano	Merge branch 'jc/maint-combine-diff-pre-context'	blob \| commitdiff \| raw \| diff to current
2008-06-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-06-16	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-06-11	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-06-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-06-09	Junio C Hamano	Merge branch 'js/merge-recursive'	blob \| commitdiff \| raw \| diff to current
2008-06-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-06-07	Junio C Hamano	Merge 1.5.5.4 in	blob \| commitdiff \| raw \| diff to current
2008-06-06	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-06-04	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-05-28	Junio C Hamano	Merge 1.5.5.3 in	blob \| commitdiff \| raw \| diff to current
2008-05-27	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-05-27	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-05-26	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-05-25	Junio C Hamano	Merge branch 'js/config-cb' v1.5.6-rc0	blob \| commitdiff \| raw \| diff to current
2008-05-25	Junio C Hamano	Merge branch 'db/clone-in-c'	blob \| commitdiff \| raw \| diff to current
2008-05-25	Junio C Hamano	Merge branch 'ar/batch-cat'	blob \| commitdiff \| raw \| diff to current
2008-05-25	Junio C Hamano	Merge branch 'ap/svn'	blob \| commitdiff \| raw \| diff to current
2008-05-24	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-05-23	Junio C Hamano	Merge branch 'pb/push'	blob \| commitdiff \| raw \| diff to current
2008-05-23	Junio C Hamano	Merge branch 'bc/repack'	blob \| commitdiff \| raw \| diff to current
2008-05-23	Junio C Hamano	Merge branch 'sp/ignorecase'	blob \| commitdiff \| raw \| diff to current
2008-05-23	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-05-21	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-05-21	Junio C Hamano	Merge branch 'ar/add-unreadable'	blob \| commitdiff \| raw \| diff to current
2008-05-21	Junio C Hamano	Merge branch 'ds/branch-auto-rebase'	blob \| commitdiff \| raw \| diff to current
2008-05-21	Junio C Hamano	Merge branch 'sv/first-parent'	blob \| commitdiff \| raw \| diff to current
2008-05-21	Junio C Hamano	Merge branch 'np/pack'	blob \| commitdiff \| raw \| diff to current
2008-05-21	Junio C Hamano	Merge branch 'as/graph'	blob \| commitdiff \| raw \| diff to current
2008-05-21	Junio C Hamano	Merge branch 'jk/maint-send-email-compose'	blob \| commitdiff \| raw \| diff to current
2008-05-21	Junio C Hamano	Merge branch 'hb/maint-send-email-quote-recipients'	blob \| commitdiff \| raw \| diff to current
2008-05-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-05-15	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-05-15	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-05-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-05-14	Junio C Hamano	Merge branch 'sb/committer'	blob \| commitdiff \| raw \| diff to current
2008-05-14	Junio C Hamano	Merge branch 'bd/tests'	blob \| commitdiff \| raw \| diff to current
2008-05-14	Junio C Hamano	Merge branch 'mv/format-cc'	blob \| commitdiff \| raw \| diff to current
2008-05-14	Junio C Hamano	Merge branch 'cc/hooks-doc'	blob \| commitdiff \| raw \| diff to current
2008-05-14	Junio C Hamano	Merge branch 'jk/renamelimit' (early part)	blob \| commitdiff \| raw \| diff to current
2008-05-12	Junio C Hamano	Merge branch 'gp/bisect-fix'	blob \| commitdiff \| raw \| diff to current
2008-05-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-05-11	Junio C Hamano	Merge branch 'py/diff-submodule'	blob \| commitdiff \| raw \| diff to current
2008-05-11	Junio C Hamano	Merge branch 'lt/case-insensitive'	blob \| commitdiff \| raw \| diff to current
2008-05-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-05-09	Junio C Hamano	Merge branch 'sg/merge-options' (early part)	blob \| commitdiff \| raw \| diff to current
2008-05-03	Jeff King	add merge.renamelimit config option	blob \| commitdiff \| raw \| diff to current
2008-05-03	Junio C Hamano	Merge commit 'sg/merge-options^' into jk/renamelimit	blob \| commitdiff \| raw \| diff to current
2008-04-13	SZEDER Gábor	fmt-merge-msg: add '--(no-)log' options and 'merge...	blob \| commitdiff \| raw \| diff to current
2008-04-13	SZEDER Gábor	add 'merge.stat' config variable	blob \| commitdiff \| raw \| diff to current
2008-04-13	SZEDER Gábor	doc: moved merge.* config variables into separate merge...	blob \| commitdiff \| raw \| diff to current

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom