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

[git] / Documentation / merge-config.txt

2013-02-20	Junio C Hamano	Sync with v1.8.1.4	blob \| commitdiff \| raw
2013-02-20	Junio C Hamano	Merge branch 'ob/imap-send-ssl-verify' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-19	Junio C Hamano	Merge branch 'jc/mention-tracking-for-pull-default'	blob \| commitdiff \| raw
2013-02-19	Junio C Hamano	Merge branch 'mm/config-intro-in-git-doc'	blob \| commitdiff \| raw
2013-02-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2013-02-17	Junio C Hamano	Merge branch 'jc/hidden-refs'	blob \| commitdiff \| raw
2013-02-17	Junio C Hamano	Merge branch 'mp/diff-algo-config'	blob \| commitdiff \| raw
2013-02-17	Junio C Hamano	Merge branch 'jk/rebase-i-comment-char'	blob \| commitdiff \| raw
2013-02-17	Junio C Hamano	Merge branch 'jk/read-commit-buffer-data-after-free'	blob \| commitdiff \| raw
2013-02-15	Junio C Hamano	Merge branch 'wk/man-deny-current-branch-is-default...	blob \| commitdiff \| raw
2013-02-15	Junio C Hamano	Merge branch 'ef/non-ascii-parse-options-error-diag'	blob \| commitdiff \| raw
2013-02-15	Junio C Hamano	Merge branch 'da/p4merge-mktemp-fix'	blob \| commitdiff \| raw
2013-02-14	Junio C Hamano	Merge branch 'jk/diff-graph-cleanup'	blob \| commitdiff \| raw
2013-02-14	Junio C Hamano	Merge branch 'nd/status-show-in-progress'	blob \| commitdiff \| raw
2013-02-14	Junio C Hamano	Merge branch 'bw/get-tz-offset-perl'	blob \| commitdiff \| raw
2013-02-14	Junio C Hamano	Merge branch 'al/mergetool-printf-fix'	blob \| commitdiff \| raw
2013-02-14	Junio C Hamano	Merge branch 'jk/error-const-return'	blob \| commitdiff \| raw
2013-02-14	Junio C Hamano	Merge branch 'jx/utf8-printf-width'	blob \| commitdiff \| raw
2013-02-14	Junio C Hamano	Merge branch 'mg/bisect-doc'	blob \| commitdiff \| raw
2013-02-14	Junio C Hamano	Merge branch 'tz/perl-styles'	blob \| commitdiff \| raw
2013-02-14	Junio C Hamano	Merge branch 'jc/extended-fake-ancestor-for-gitlink'	blob \| commitdiff \| raw
2013-02-14	Junio C Hamano	Merge branch 'dg/subtree-fixes'	blob \| commitdiff \| raw
2013-02-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2013-02-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2013-02-11	Junio C Hamano	Merge branch 'sp/smart-http-content-type-check'	blob \| commitdiff \| raw
2013-02-09	Junio C Hamano	Merge branch 'master' of git://github.com/git-l10n...	blob \| commitdiff \| raw
2013-02-08	Junio C Hamano	Merge branch 'jc/combine-diff-many-parents'	blob \| commitdiff \| raw
2013-02-08	Junio C Hamano	Merge branch 'jk/apply-similaritly-parsing'	blob \| commitdiff \| raw
2013-02-08	Junio C Hamano	Merge branch 'mk/tcsh-complete-only-known-paths'	blob \| commitdiff \| raw
2013-02-08	Junio C Hamano	Merge branch 'mp/complete-paths'	blob \| commitdiff \| raw
2013-02-08	Junio C Hamano	Merge branch 'ct/autoconf-htmldir'	blob \| commitdiff \| raw
2013-02-07	Junio C Hamano	Sync with 1.8.1.3	blob \| commitdiff \| raw
2013-02-07	Junio C Hamano	Merge branch 'ft/transport-report-segv' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'sb/gpg-plug-fd-leak' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'jc/fake-ancestor-with-non-blobs' into...	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'jn/auto-depend-workaround-buggy-ccache...	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'da/mergetool-docs'	blob \| commitdiff \| raw
2013-02-07	Junio C Hamano	Merge branch 'ss/mergetools-tortoise'	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'jk/mergetool'	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'jk/doc-makefile-cleanup'	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'jk/remote-helpers-doc'	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'sb/run-command-fd-error-reporting'	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'nd/branch-error-cases'	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'sb/gpg-i18n'	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'jk/python-styles'	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'ab/gitweb-use-same-scheme'	blob \| commitdiff \| raw \| diff to current
2013-02-06	Junio C Hamano	Merge branch 'jn/auto-depend-workaround-buggy-ccache'	blob \| commitdiff \| raw \| diff to current
2013-02-06	Junio C Hamano	Merge branch 'ta/doc-no-small-caps'	blob \| commitdiff \| raw \| diff to current
2013-02-06	Junio C Hamano	Merge branch 'jc/fake-ancestor-with-non-blobs'	blob \| commitdiff \| raw \| diff to current
2013-02-06	Junio C Hamano	Merge branch 'sb/gpg-plug-fd-leak'	blob \| commitdiff \| raw \| diff to current
2013-02-06	Junio C Hamano	Merge branch 'ft/transport-report-segv'	blob \| commitdiff \| raw \| diff to current
2013-02-04	Junio C Hamano	Merge branch 'nd/edit-branch-desc-while-detached' into...	blob \| commitdiff \| raw \| diff to current
2013-02-04	Junio C Hamano	Merge branch 'jn/do-not-drop-username-when-reading...	blob \| commitdiff \| raw \| diff to current
2013-02-04	Junio C Hamano	Merge branch 'dl/am-hg-locale' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-03	David Aguilar	doc: generate a list of valid merge tools	blob \| commitdiff \| raw \| diff to current
2013-02-01	Thomas Ackermann	Documentation: the name of the system is 'Git', not...	blob \| commitdiff \| raw \| diff to current
2013-02-01	Junio C Hamano	Merge branch 'nd/edit-branch-desc-while-detached'	blob \| commitdiff \| raw \| diff to current
2013-02-01	Junio C Hamano	Merge branch 'jn/do-not-drop-username-when-reading...	blob \| commitdiff \| raw \| diff to current
2013-02-01	Junio C Hamano	Merge branch 'jc/no-git-config-in-clone'	blob \| commitdiff \| raw \| diff to current
2013-01-30	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-01-30	Junio C Hamano	Merge branch 'nd/edit-branch-desc-while-detached' into...	blob \| commitdiff \| raw \| diff to current
2013-01-30	Junio C Hamano	Merge branch 'tb/t0050-maint' into maint	blob \| commitdiff \| raw \| diff to current
2013-01-29	Junio C Hamano	Merge branch 'ph/rebase-preserve-all-merges' into maint	blob \| commitdiff \| raw \| diff to current
2013-01-28	Junio C Hamano	Merge branch 'ss/help-htmlpath-config-doc' into maint	blob \| commitdiff \| raw \| diff to current
2013-01-28	Junio C Hamano	Merge branch 'nd/attr-debug-fix' into maint	blob \| commitdiff \| raw \| diff to current
2013-01-28	Junio C Hamano	Merge branch 'ds/completion-silence-in-tree-path-probe...	blob \| commitdiff \| raw \| diff to current
2013-01-28	Junio C Hamano	Merge branch 'jn/maint-trim-vim-contrib' into maint	blob \| commitdiff \| raw \| diff to current
2013-01-28	Junio C Hamano	Merge branch 'pe/doc-email-env-is-trumped-by-config...	blob \| commitdiff \| raw \| diff to current
2013-01-28	Junio C Hamano	Merge branch 'ap/status-ignored-in-ignored-directory...	blob \| commitdiff \| raw \| diff to current
2013-01-28	Junio C Hamano	Merge branch 'mh/ceiling' into maint	blob \| commitdiff \| raw \| diff to current
2013-01-28	Junio C Hamano	Merge branch 'tb/t0050-maint'	blob \| commitdiff \| raw \| diff to current
2013-01-28	Junio C Hamano	Merge branch 'dl/am-hg-locale'	blob \| commitdiff \| raw \| diff to current
2013-01-27	Junio C Hamano	Merge branch 'jk/maint-gc-auto-after-fetch' into jk...	blob \| commitdiff \| raw \| diff to current
2013-01-25	Junio C Hamano	Merge branch 'nd/retire-fnmatch'	blob \| commitdiff \| raw \| diff to current
2013-01-24	Junio C Hamano	Merge branch 'ch/add-auto-submitted-in-sample-post...	blob \| commitdiff \| raw \| diff to current
2013-01-24	Junio C Hamano	Merge branch 'as/check-ignore'	blob \| commitdiff \| raw \| diff to current
2013-01-24	Junio C Hamano	Merge branch 'rs/clarify-entry-cmp-sslice'	blob \| commitdiff \| raw \| diff to current
2013-01-24	Junio C Hamano	Merge branch 'mo/cvs-server-updates'	blob \| commitdiff \| raw \| diff to current
2013-01-23	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-01-22	Junio C Hamano	Merge branch 'ph/rebase-preserve-all-merges'	blob \| commitdiff \| raw \| diff to current
2013-01-22	Junio C Hamano	Merge branch 'nd/clone-no-separate-git-dir-with-bare'	blob \| commitdiff \| raw \| diff to current
2013-01-21	Junio C Hamano	Merge branch 'nz/send-email-headers-are-case-insensitiv...	blob \| commitdiff \| raw \| diff to current
2013-01-21	Junio C Hamano	Merge branch 'rs/zip-with-uncompressed-size-in-the...	blob \| commitdiff \| raw \| diff to current
2013-01-18	Junio C Hamano	Merge branch 'ss/help-htmlpath-config-doc'	blob \| commitdiff \| raw \| diff to current
2013-01-18	Junio C Hamano	Merge branch 'nd/attr-debug-fix'	blob \| commitdiff \| raw \| diff to current
2013-01-18	Junio C Hamano	Merge branch 'ds/completion-silence-in-tree-path-probe'	blob \| commitdiff \| raw \| diff to current
2013-01-18	Junio C Hamano	Merge branch 'jn/maint-trim-vim-contrib'	blob \| commitdiff \| raw \| diff to current
2013-01-18	Junio C Hamano	Merge branch 'pe/doc-email-env-is-trumped-by-config'	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'jc/blame-no-follow'	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'fc/remote-testgit-feature-done'	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'nd/upload-pack-shallow-must-be-commit'	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'ap/status-ignored-in-ignored-directory'	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'nz/send-email-headers-are-case-insensitive'	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'jk/maint-fast-import-doc-reorder' into...	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'jk/shortlog-no-wrap-doc' into maint	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'jk/maint-fast-import-doc-dedup-done'...	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'rs/leave-base-name-in-name-field-of-tar...	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'jl/interrupt-clone-remove-separate-git...	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credi...	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'jc/apply-trailing-blank-removal' into...	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom