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

[git] / Documentation / merge-config.txt

2016-07-11	Junio C Hamano	Merge branch 'jn/preformatted-doc-url' into maint	blob \| commitdiff \| raw
2016-07-11	Junio C Hamano	Merge branch 'ao/p4-has-branch-prefix-fix' into maint	blob \| commitdiff \| raw
2016-07-11	Junio C Hamano	Merge branch 'js/perf-on-apple' into maint	blob \| commitdiff \| raw
2016-07-11	Junio C Hamano	Merge branch 'ak/t7800-wo-readlink' into maint	blob \| commitdiff \| raw
2016-07-11	Junio C Hamano	Merge branch 'jk/tzoffset-fix' into maint	blob \| commitdiff \| raw
2016-07-11	Junio C Hamano	Merge branch 'js/mingw-parameter-less-c-functions'...	blob \| commitdiff \| raw
2016-07-11	Junio C Hamano	Merge branch 'lc/shell-default-value-noexpand' into...	blob \| commitdiff \| raw
2016-07-11	Junio C Hamano	Merge branch 'sb/clone-shallow-passthru' into maint	blob \| commitdiff \| raw
2016-07-11	Junio C Hamano	Merge branch 'mg/signature-doc' into maint	blob \| commitdiff \| raw
2016-07-11	Junio C Hamano	Merge branch 'jk/bisect-show-tree' into maint	blob \| commitdiff \| raw
2016-07-11	Junio C Hamano	Merge branch 'km/fetch-do-not-free-remote-name' into...	blob \| commitdiff \| raw
2016-07-11	Junio C Hamano	Merge branch 'nd/graph-width-padded' into maint	blob \| commitdiff \| raw
2016-07-11	Junio C Hamano	Merge branch 'jk/add-i-diff-compact-heuristics' into...	blob \| commitdiff \| raw
2016-07-06	Junio C Hamano	Merge branch 'jc/deref-tag' into maint	blob \| commitdiff \| raw
2016-07-06	Junio C Hamano	Merge branch 'pb/strbuf-read-file-doc' into maint	blob \| commitdiff \| raw
2016-07-06	Junio C Hamano	Merge branch 'jk/fetch-prune-doc' into maint	blob \| commitdiff \| raw
2016-07-06	Junio C Hamano	Merge branch 'pc/occurred' into maint	blob \| commitdiff \| raw
2016-07-06	Junio C Hamano	Merge branch 'mg/cherry-pick-multi-on-unborn' into...	blob \| commitdiff \| raw
2016-07-06	Junio C Hamano	Merge branch 'em/newer-freebsd-shells-are-fine-with...	blob \| commitdiff \| raw
2016-07-06	Junio C Hamano	Merge branch 'lv/status-say-working-tree-not-directory...	blob \| commitdiff \| raw
2016-07-06	Junio C Hamano	Merge branch 'nb/gnome-keyring-build' into maint	blob \| commitdiff \| raw
2016-07-06	Junio C Hamano	Merge branch 'et/add-chmod-x' into maint	blob \| commitdiff \| raw
2016-07-06	Junio C Hamano	Merge branch 'jk/avoid-unbounded-alloca' into maint	blob \| commitdiff \| raw
2016-07-06	Junio C Hamano	Merge branch 'rj/compat-regex-size-max-fix' into maint	blob \| commitdiff \| raw
2016-07-06	Junio C Hamano	Merge branch 'vs/prompt-avoid-unset-variable' into...	blob \| commitdiff \| raw
2016-07-06	Junio C Hamano	Merge branch 'sg/reflog-past-root' into maint	blob \| commitdiff \| raw
2016-07-06	Junio C Hamano	Merge branch 'dn/gpg-doc' into maint	blob \| commitdiff \| raw
2016-07-06	Junio C Hamano	Merge branch 'ap/git-svn-propset-doc' into maint	blob \| commitdiff \| raw
2016-07-06	Junio C Hamano	Merge branch 'tr/doc-tt' into maint	blob \| commitdiff \| raw
2016-06-08	Tom Russello	doc: change environment variables format	blob \| commitdiff \| raw
2016-06-03	Junio C Hamano	Merge branch 'pa/cherry-pick-doc-typo'	blob \| commitdiff \| raw \| diff to current
2016-05-30	Junio C Hamano	Merge branch 'rj/log-decorate-auto'	blob \| commitdiff \| raw \| diff to current
2016-05-26	Junio C Hamano	Merge branch 'va/mailinfo-doc-typofix' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-23	Junio C Hamano	Merge branch 'jc/rerere-multi'	blob \| commitdiff \| raw \| diff to current
2016-05-18	Junio C Hamano	Merge branch 'rn/glossary-typofix' into HEAD	blob \| commitdiff \| raw \| diff to current
2016-05-18	Junio C Hamano	Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD	blob \| commitdiff \| raw \| diff to current
2016-05-17	Junio C Hamano	Merge branch 'va/mailinfo-doc-typofix'	blob \| commitdiff \| raw \| diff to current
2016-05-17	Junio C Hamano	Merge branch 'jc/ll-merge-internal'	blob \| commitdiff \| raw \| diff to current
2016-05-10	Junio C Hamano	Merge branch 'rn/glossary-typofix'	blob \| commitdiff \| raw \| diff to current
2016-05-06	Junio C Hamano	Merge branch 'kn/for-each-tag-branch' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-03	Junio C Hamano	Merge branch 'jk/fix-attribute-macro-in-2.5'	blob \| commitdiff \| raw \| diff to current
2016-05-02	Junio C Hamano	Merge branch 'ad/cygwin-wants-rename' into maint	blob \| commitdiff \| raw \| diff to current
2016-04-25	Junio C Hamano	Merge branch 'jc/rerere-multi'	blob \| commitdiff \| raw \| diff to current
2016-04-22	Junio C Hamano	Merge branch 'ad/cygwin-wants-rename'	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'kn/for-each-tag-branch'	blob \| commitdiff \| raw \| diff to current
2016-04-03	Junio C Hamano	Merge branch 'jc/maint-index-pack-keep'	blob \| commitdiff \| raw \| diff to current
2016-03-21	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2016-03-14	Junio C Hamano	Merge branch 'mg/wt-status-mismarked-i18n'	blob \| commitdiff \| raw \| diff to current
2016-03-10	Junio C Hamano	Merge branch 'nd/dwim-wildcards-as-pathspecs' into...	blob \| commitdiff \| raw \| diff to current
2016-03-03	Junio C Hamano	Merge branch 'jc/maint-index-pack-keep' into jc/index...	blob \| commitdiff \| raw \| diff to current
2016-02-24	Junio C Hamano	Merge branch 'nd/dwim-wildcards-as-pathspecs'	blob \| commitdiff \| raw \| diff to current
2016-02-22	Junio C Hamano	Merge branch 'js/git-remote-add-url-insteadof-test'	blob \| commitdiff \| raw \| diff to current
2016-02-22	Junio C Hamano	Merge branch 'jk/config-include'	blob \| commitdiff \| raw \| diff to current
2016-02-22	Junio C Hamano	Merge branch 'nd/ita-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2016-02-17	Junio C Hamano	Merge branch 'jk/rerere-xsnprintf'	blob \| commitdiff \| raw \| diff to current
2016-02-10	Junio C Hamano	Merge branch 'wp/sha1-name-negative-match'	blob \| commitdiff \| raw \| diff to current
2016-02-05	Junio C Hamano	Merge branch 'ss/clone-depth-single-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-02-05	Junio C Hamano	Merge branch 'sg/t6050-failing-editor-test-fix' into...	blob \| commitdiff \| raw \| diff to current
2016-02-05	Junio C Hamano	Merge branch 'ew/for-each-ref-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-02-05	Junio C Hamano	Merge branch 'ss/user-manual' into maint	blob \| commitdiff \| raw \| diff to current
2016-02-05	Junio C Hamano	Merge branch 'jk/sanity' into maint	blob \| commitdiff \| raw \| diff to current
2016-02-05	Junio C Hamano	Merge branch 'nd/exclusion-regression-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-02-05	Junio C Hamano	Merge branch 'nd/dir-exclude-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2016-02-05	Junio C Hamano	Merge branch 'nd/stop-setenv-work-tree' into maint	blob \| commitdiff \| raw \| diff to current
2016-01-29	Junio C Hamano	Merge branch 'jk/sanity'	blob \| commitdiff \| raw \| diff to current
2016-01-20	Junio C Hamano	Merge branch 'ss/clone-depth-single-doc'	blob \| commitdiff \| raw \| diff to current
2016-01-20	Junio C Hamano	Merge branch 'nd/exclusion-regression-fix'	blob \| commitdiff \| raw \| diff to current
2016-01-20	Junio C Hamano	Merge branch 'sg/t6050-failing-editor-test-fix'	blob \| commitdiff \| raw \| diff to current
2016-01-20	Junio C Hamano	Merge branch 'ew/for-each-ref-doc'	blob \| commitdiff \| raw \| diff to current
2016-01-20	Junio C Hamano	Merge branch 'ss/user-manual'	blob \| commitdiff \| raw \| diff to current
2016-01-20	Junio C Hamano	Merge branch 'nd/ita-cleanup'	blob \| commitdiff \| raw \| diff to current
2016-01-20	Junio C Hamano	Merge branch 'nd/dir-exclude-cleanup'	blob \| commitdiff \| raw \| diff to current
2016-01-20	Junio C Hamano	Merge branch 'jk/pack-revindex'	blob \| commitdiff \| raw \| diff to current
2016-01-12	Junio C Hamano	Merge branch 'nd/stop-setenv-work-tree'	blob \| commitdiff \| raw \| diff to current
2016-01-04	Junio C Hamano	Merge branch 'jk/pending-keep-tag-name' into maint	blob \| commitdiff \| raw \| diff to current
2015-12-28	Junio C Hamano	Merge branch 'jk/pending-keep-tag-name'	blob \| commitdiff \| raw \| diff to current
2015-12-22	Junio C Hamano	Merge branch 'nd/stop-setenv-work-tree' into nd/clear...	blob \| commitdiff \| raw \| diff to current
2015-12-21	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-12-15	Junio C Hamano	Merge branch 'ls/p4-keep-empty-commits' into maint	blob \| commitdiff \| raw \| diff to current
2015-12-15	Junio C Hamano	Merge branch 'jk/prune-mtime' into maint	blob \| commitdiff \| raw \| diff to current
2015-12-15	Junio C Hamano	Merge branch 'ls/p4-keep-empty-commits'	blob \| commitdiff \| raw \| diff to current
2015-12-15	Junio C Hamano	Merge branch 'jk/prune-mtime'	blob \| commitdiff \| raw \| diff to current
2015-12-11	Junio C Hamano	Merge branch 'cb/t3404-shellquote' into maint	blob \| commitdiff \| raw \| diff to current
2015-12-11	Junio C Hamano	Merge branch 'cb/t3404-shellquote'	blob \| commitdiff \| raw \| diff to current
2015-12-08	Junio C Hamano	Merge branch 'ad/sha1-update-chunked' into maint	blob \| commitdiff \| raw \| diff to current
2015-12-08	Junio C Hamano	Merge branch 'jk/rebase-no-autostash' into maint	blob \| commitdiff \| raw \| diff to current
2015-12-04	Junio C Hamano	Merge branch 'da/difftool' into maint	blob \| commitdiff \| raw \| diff to current
2015-12-04	Junio C Hamano	Merge branch 'ad/sha1-update-chunked'	blob \| commitdiff \| raw \| diff to current
2015-12-01	Jeff King	Merge branch 'rc/configure-use-libs-when-checking-a...	blob \| commitdiff \| raw \| diff to current
2015-11-25	Jeff King	Merge branch 'rc/configure-use-libs-when-checking-a...	blob \| commitdiff \| raw \| diff to current
2015-11-05	Junio C Hamano	Merge branch 'jk/initialization-fix-to-add-submodule...	blob \| commitdiff \| raw \| diff to current
2015-11-05	Junio C Hamano	Merge branch 'js/misc-fixes' into maint	blob \| commitdiff \| raw \| diff to current
2015-11-05	Junio C Hamano	Merge branch 'jc/add-u-A-default-to-top' into maint	blob \| commitdiff \| raw \| diff to current
2015-11-05	Junio C Hamano	Merge branch 'jk/delete-modechange-conflict' into maint	blob \| commitdiff \| raw \| diff to current
2015-11-05	Junio C Hamano	Merge branch 'sa/send-email-smtp-batch-data-limit'...	blob \| commitdiff \| raw \| diff to current
2015-11-04	Junio C Hamano	Merge branch 'xf/user-manual-ff' into maint	blob \| commitdiff \| raw \| diff to current
2015-11-04	Junio C Hamano	Merge branch 'xf/user-manual-markup' into maint	blob \| commitdiff \| raw \| diff to current
2015-11-04	Junio C Hamano	Merge branch 'jc/everyday-markup' into maint	blob \| commitdiff \| raw \| diff to current
2015-11-04	Junio C Hamano	Merge branch 'jc/em-dash-in-doc' into maint	blob \| commitdiff \| raw \| diff to current
2015-11-04	Junio C Hamano	Merge branch 'es/worktree-add' into maint	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom