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

[git] / Documentation / merge-config.txt

2012-11-20	Junio C Hamano	Merge branch 'jk/maint-gitweb-xss'	blob \| commitdiff \| raw
2012-11-20	Junio C Hamano	Merge branch 'rh/maint-gitweb-highlight-ext'	blob \| commitdiff \| raw
2012-11-20	Junio C Hamano	Merge branch 'pw/maint-p4-rcs-expansion-newline'	blob \| commitdiff \| raw
2012-11-20	Junio C Hamano	Merge branch 'ta/doc-cleanup'	blob \| commitdiff \| raw
2012-11-20	Junio C Hamano	Merge branch 'kb/preload-index-more'	blob \| commitdiff \| raw
2012-11-20	Junio C Hamano	Merge branch 'jk/maint-http-half-auth-fetch'	blob \| commitdiff \| raw
2012-11-20	Junio C Hamano	Merge branch 'mg/maint-pull-suggest-upstream-to' into...	blob \| commitdiff \| raw
2012-11-20	Junio C Hamano	Merge branch 'mm/maint-doc-commit-edit' into maint	blob \| commitdiff \| raw
2012-11-20	Junio C Hamano	Merge branch 'as/maint-doc-fix-no-post-rewrite' into...	blob \| commitdiff \| raw
2012-11-20	Junio C Hamano	Merge branch 'rs/lock-correct-ref-during-delete' into...	blob \| commitdiff \| raw
2012-11-20	Junio C Hamano	Merge branch 'rf/maint-mailmap-off-by-one' into maint	blob \| commitdiff \| raw
2012-11-20	Junio C Hamano	Merge branch 'jk/maint-diff-grep-textconv' into maint	blob \| commitdiff \| raw
2012-11-20	Junio C Hamano	Merge branch 'js/format-2047' into maint	blob \| commitdiff \| raw
2012-11-19	Junio C Hamano	Merge branch 'sz/maint-curl-multi-timeout' into maint	blob \| commitdiff \| raw
2012-11-19	Junio C Hamano	Merge branch 'po/maint-refs-replace-docs' into maint	blob \| commitdiff \| raw
2012-11-19	Junio C Hamano	Merge branch 'ph/pull-rebase-detached' into maint	blob \| commitdiff \| raw
2012-11-19	Junio C Hamano	Merge branch 'mm/maint-doc-remote-tracking' into maint	blob \| commitdiff \| raw
2012-11-15	Junio C Hamano	Merge branch 'jc/prettier-pretty-note'	blob \| commitdiff \| raw
2012-11-15	Junio C Hamano	Merge branch 'mg/maint-pull-suggest-upstream-to'	blob \| commitdiff \| raw
2012-11-15	Junio C Hamano	Merge branch 'mh/notes-string-list'	blob \| commitdiff \| raw
2012-11-15	Junio C Hamano	Merge branch 'mh/strbuf-split'	blob \| commitdiff \| raw
2012-11-15	Junio C Hamano	Merge branch 'mm/maint-doc-commit-edit'	blob \| commitdiff \| raw
2012-11-15	Junio C Hamano	Merge branch 'as/maint-doc-fix-no-post-rewrite'	blob \| commitdiff \| raw
2012-11-15	Junio C Hamano	Merge branch 'js/hp-nonstop'	blob \| commitdiff \| raw
2012-11-15	Junio C Hamano	Merge branch 'cr/cvsimport-local-zone'	blob \| commitdiff \| raw
2012-11-15	Junio C Hamano	Merge branch 'jc/same-encoding'	blob \| commitdiff \| raw
2012-11-15	Junio C Hamano	Merge branch 'ph/submodule-sync-recursive'	blob \| commitdiff \| raw
2012-11-15	Junio C Hamano	Merge branch 'jk/maint-diff-grep-textconv'	blob \| commitdiff \| raw
2012-11-15	Junio C Hamano	Merge branch 'jh/symbolic-ref-d'	blob \| commitdiff \| raw
2012-11-15	Junio C Hamano	Merge branch 'jc/maint-fetch-tighten-refname-check'	blob \| commitdiff \| raw
2012-11-09	Jeff King	Merge branch 'ph/maint-submodule-status-fix'	blob \| commitdiff \| raw
2012-11-09	Jeff King	Merge branch 'nd/builtin-to-libgit'	blob \| commitdiff \| raw
2012-11-09	Jeff King	Merge branch 'nd/tree-walk-enum-cleanup'	blob \| commitdiff \| raw
2012-11-09	Jeff King	Merge branch 'sz/maint-curl-multi-timeout'	blob \| commitdiff \| raw
2012-11-09	Jeff King	Merge branch 'fc/completion-send-email-with-format...	blob \| commitdiff \| raw
2012-11-09	Jeff King	Merge branch 'mo/cvs-server-cleanup'	blob \| commitdiff \| raw
2012-11-09	Jeff King	Merge branch 'km/send-email-compose-encoding'	blob \| commitdiff \| raw
2012-11-09	Jeff King	Merge branch 'js/format-2047'	blob \| commitdiff \| raw
2012-11-09	Jeff King	Merge branch 'rs/lock-correct-ref-during-delete'	blob \| commitdiff \| raw
2012-11-09	Jeff King	Merge branch 'nd/attr-match-optim-more'	blob \| commitdiff \| raw
2012-11-09	Jeff King	Merge branch 'mh/maint-parse-dirstat-fix'	blob \| commitdiff \| raw
2012-11-04	Jeff King	Merge branch 'tj/maint-doc-commit-sign'	blob \| commitdiff \| raw
2012-11-04	Jeff King	Merge branch 'pp/maint-doc-pager-config'	blob \| commitdiff \| raw
2012-11-04	Jeff King	Merge branch 'km/maint-doc-git-reset'	blob \| commitdiff \| raw
2012-11-04	Jeff King	Merge branch 'tb/maint-t9200-case-insensitive'	blob \| commitdiff \| raw
2012-11-04	Jeff King	Merge branch 'rf/maint-mailmap-off-by-one'	blob \| commitdiff \| raw
2012-11-04	Jeff King	Merge branch 'gb/maint-doc-svn-log-window-size'	blob \| commitdiff \| raw
2012-11-04	Jeff King	Merge branch 'sz/maint-submodule-reference-arg'	blob \| commitdiff \| raw
2012-11-04	Jeff King	Merge branch 'sl/maint-configure-messages'	blob \| commitdiff \| raw
2012-11-04	Jeff King	Merge branch 'po/maint-refs-replace-docs'	blob \| commitdiff \| raw
2012-11-04	Jeff King	Merge branch 'ph/pull-rebase-detached'	blob \| commitdiff \| raw
2012-11-04	Jeff King	Merge branch 'mm/maint-doc-remote-tracking'	blob \| commitdiff \| raw
2012-10-25	Matthieu Moy	Documentation: remote tracking branch -> remote-trackin...	blob \| commitdiff \| raw
2012-10-17	Junio C Hamano	Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2012-10-08	Junio C Hamano	Merge branch 'os/commit-submodule-ignore' into maint	blob \| commitdiff \| raw \| diff to current
2012-10-01	Junio C Hamano	Merge branch 'os/commit-submodule-ignore'	blob \| commitdiff \| raw \| diff to current
2012-09-15	Junio C Hamano	Merge branch 'da/gitk-reload-tag-contents' into maint...	blob \| commitdiff \| raw \| diff to current
2012-09-12	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2012-09-12	Junio C Hamano	Merge branch 'da/gitk-reload-tag-contents'	blob \| commitdiff \| raw \| diff to current
2012-08-24	Junio C Hamano	Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge branch 'jn/block-sha1' into maint	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge branch 'ms/daemon-doc-typo' into maint	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge branch 'lm/git-blame-el' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-24	Junio C Hamano	Merge branch 'jn/block-sha1'	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'jk/maint-commit-amend-only-no-paths'...	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'tg/maint-cache-name-compare' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'ms/daemon-doc-typo'	blob \| commitdiff \| raw \| diff to current
2012-07-16	Junio C Hamano	Merge branch 'tg/maint-cache-name-compare'	blob \| commitdiff \| raw \| diff to current
2012-07-16	Junio C Hamano	Merge branch 'jk/maint-commit-amend-only-no-paths'	blob \| commitdiff \| raw \| diff to current
2012-07-11	Junio C Hamano	Merge branch 'tg/maint-cache-name-compare' into tg...	blob \| commitdiff \| raw \| diff to current
2012-06-25	Junio C Hamano	Merge branch 'lp/no-cmd-http-fetch'	blob \| commitdiff \| raw \| diff to current
2012-06-25	Junio C Hamano	Merge branch 'lm/git-blame-el'	blob \| commitdiff \| raw \| diff to current
2012-06-17	Junio C Hamano	Merge branch 'js/maint-fast-export-mark-error' into...	blob \| commitdiff \| raw \| diff to current
2012-06-12	Junio C Hamano	Merge branch 'js/maint-fast-export-mark-error'	blob \| commitdiff \| raw \| diff to current
2012-06-03	Junio C Hamano	Merge branch 'ef/maint-rebase-error-message' into maint	blob \| commitdiff \| raw \| diff to current
2012-06-01	Junio C Hamano	Merge branch 'ef/maint-rebase-error-message'	blob \| commitdiff \| raw \| diff to current
2012-05-23	Junio C Hamano	Merge branch 'js/rev-parse-doc-fix'	blob \| commitdiff \| raw \| diff to current
2012-05-23	Junio C Hamano	Merge branch 'js/rebase-i-p-test-fix'	blob \| commitdiff \| raw \| diff to current
2012-04-26	Junio C Hamano	Merge branch 'rs/combine-diff-zero-context-at-the-begin...	blob \| commitdiff \| raw \| diff to current
2012-04-16	Junio C Hamano	Merge branch 'rs/combine-diff-zero-context-at-the-begin...	blob \| commitdiff \| raw \| diff to current
2012-04-10	David A. Greene	Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...	blob \| commitdiff \| raw \| diff to current
2012-04-02	Junio C Hamano	Merge branch 'pt/gitk'	blob \| commitdiff \| raw \| diff to current
2012-03-26	Junio C Hamano	Merge branch 'jn/maint-fast-import-empty-ls' into maint	blob \| commitdiff \| raw \| diff to current
2012-03-24	Junio C Hamano	Merge gitk changes from Paul Mackerras at git://ozlabs...	blob \| commitdiff \| raw \| diff to current
2012-03-16	Junio C Hamano	Merge "two fixes for fast-import's 'ls' command" from...	blob \| commitdiff \| raw \| diff to current
2012-03-16	Junio C Hamano	Merge branch 'th/doc-diff-submodule-option'	blob \| commitdiff \| raw \| diff to current
2012-03-12	Junio C Hamano	Merge branch 'jc/maint-diff-patch-header' into maint	blob \| commitdiff \| raw \| diff to current
2012-03-06	Junio C Hamano	Merge branch 'jc/maint-diff-patch-header'	blob \| commitdiff \| raw \| diff to current
2012-02-27	Junio C Hamano	Merge branch 'pj/remote-set-branches-usage-fix' into...	blob \| commitdiff \| raw \| diff to current
2012-02-23	Junio C Hamano	Merge branch 'pj/remote-set-branches-usage-fix'	blob \| commitdiff \| raw \| diff to current
2012-02-16	Junio C Hamano	Merge branch 'mm/empty-loose-error-message' into maint	blob \| commitdiff \| raw \| diff to current
2012-02-13	Junio C Hamano	Merge branch 'mm/empty-loose-error-message'	blob \| commitdiff \| raw \| diff to current
2012-01-29	Junio C Hamano	Merge branch 'rs/diff-postimage-in-context'	blob \| commitdiff \| raw \| diff to current
2012-01-27	Junio C Hamano	Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into...	blob \| commitdiff \| raw \| diff to current
2012-01-09	Junio C Hamano	Merge branch 'mm/maint-gitweb-project-maxdepth'	blob \| commitdiff \| raw \| diff to current
2011-12-28	Junio C Hamano	Merge branch 'jc/checkout-m-twoway' into maint	blob \| commitdiff \| raw \| diff to current
2011-12-28	Junio C Hamano	Merge branch 'tr/doc-sh-setup' into maint	blob \| commitdiff \| raw \| diff to current
2011-12-28	Junio C Hamano	Merge branch 'jk/maint-strbuf-missing-init' into maint	blob \| commitdiff \| raw \| diff to current
2011-12-28	Junio C Hamano	Merge branch 'jk/maint-snprintf-va-copy' into maint	blob \| commitdiff \| raw \| diff to current
2011-12-22	Junio C Hamano	Merge branch 'tr/doc-sh-setup'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom