git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - builtin/merge.c

projects / thirdparty / git.git / history

[thirdparty/git.git] / builtin / merge.c

2016-07-19	Junio C Hamano	Merge branch 'bc/cocci'	blob \| commitdiff \| raw
2016-07-19	Junio C Hamano	Merge branch 'js/log-to-diffopt-file'	blob \| commitdiff \| raw \| diff to current
2016-07-19	Junio C Hamano	Merge branch 'sb/submodule-parallel-fetch'	blob \| commitdiff \| raw \| diff to current
2016-07-19	Junio C Hamano	Merge branch 'lf/recv-sideband-cleanup'	blob \| commitdiff \| raw \| diff to current
2016-07-19	Junio C Hamano	Merge branch 'dk/blame-move-no-reason-for-1-line-context'	blob \| commitdiff \| raw \| diff to current
2016-07-19	Junio C Hamano	Merge branch 'nd/connect-ssh-command-config'	blob \| commitdiff \| raw \| diff to current
2016-07-15	Junio C Hamano	Sync with 2.9.2	blob \| commitdiff \| raw \| diff to current
2016-07-15	Junio C Hamano	Merge branch 'jk/tzoffset-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-14	Junio C Hamano	Merge branch 'jk/upload-pack-hook'	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'jk/big-and-future-archive-tar'	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'nd/ita-cleanup'	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'ps/rebase-i-auto-unstash-upon-abort'	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'js/t3404-grammo-fix'	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'js/sign-empty-commit-fix'	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'mm/doc-tt'	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'dg/subtree-rebase-test'	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'nd/doc-new-command'	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'ew/gc-auto-pack-limit-fix'	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'ah/unpack-trees-advice-messages'	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'va/i18n-even-more'	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'jc/t2300-setup' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'cb/t7810-test-label-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'sb/t5614-modernize' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'jn/preformatted-doc-url' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'ao/p4-has-branch-prefix-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'ak/t7800-wo-readlink' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'jk/tzoffset-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'js/mingw-parameter-less-c-functions'...	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'lc/shell-default-value-noexpand' into...	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'sb/clone-shallow-passthru' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'jk/bisect-show-tree' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'km/fetch-do-not-free-remote-name' into...	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'js/color-on-windows-comment'	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'js/find-commit-subject-ignore-leading...	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'jn/preformatted-doc-url'	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'jk/ansi-color'	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'jc/send-email-skip-backup'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'jc/t2300-setup'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'ao/p4-has-branch-prefix-fix'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'cb/t7810-test-label-fix'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'sb/t5614-modernize'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'ak/t7800-wo-readlink'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'jk/tzoffset-fix'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'js/mingw-parameter-less-c-functions'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'lc/shell-default-value-noexpand'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'sb/clone-shallow-passthru'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'nd/worktree-cleanup-post-head-protection'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'jk/bisect-show-tree'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'km/fetch-do-not-free-remote-name'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'jk/send-pack-stdio'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'ep/http-curl-trace'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'jc/deref-tag' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'pb/strbuf-read-file-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'jk/fetch-prune-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'pc/occurred' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'mg/cherry-pick-multi-on-unborn' into...	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'em/newer-freebsd-shells-are-fine-with...	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'nb/gnome-keyring-build' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'jk/avoid-unbounded-alloca' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'rj/compat-regex-size-max-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'vs/prompt-avoid-unset-variable' into...	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'dn/gpg-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'ap/git-svn-propset-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'tr/doc-tt' into maint	blob \| commitdiff \| raw \| diff to current
2016-06-28	brian m. carlson	coccinelle: apply object_id Coccinelle transformations	blob \| commitdiff \| raw \| diff to current
2016-06-28	brian m. carlson	coccinelle: convert hashcpy() with null_sha1 to hashclr()	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'tb/complete-status'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'mg/cherry-pick-multi-on-unborn'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'lf/receive-pack-auto-gc-to-client'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'em/newer-freebsd-shells-are-fine-with...	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'nb/gnome-keyring-build'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'jc/deref-tag'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'jk/avoid-unbounded-alloca'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'rj/compat-regex-size-max-fix'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'vs/prompt-avoid-unset-variable'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'pb/strbuf-read-file-doc'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'dn/gpg-doc'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'jk/fetch-prune-doc'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'ap/git-svn-propset-doc'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'tr/doc-tt'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'pc/occurred'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'rs/xdiff-hunk-with-func-line' into maint	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'jk/rev-list-count-with-bitmap' into maint	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'et/pretty-format-c-auto' into maint	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'ew/daemon-socket-keepalive' into maint	blob \| commitdiff \| raw \| diff to current
2016-06-20	Junio C Hamano	Merge branch 'rs/xdiff-hunk-with-func-line'	blob \| commitdiff \| raw \| diff to current
2016-06-20	Junio C Hamano	Merge branch 'jk/rev-list-count-with-bitmap'	blob \| commitdiff \| raw \| diff to current
2016-06-20	Junio C Hamano	Merge branch 'wd/userdiff-css'	blob \| commitdiff \| raw \| diff to current
2016-06-20	Junio C Hamano	Merge branch 'et/pretty-format-c-auto'	blob \| commitdiff \| raw \| diff to current
2016-06-20	Junio C Hamano	Merge branch 'ew/daemon-socket-keepalive'	blob \| commitdiff \| raw \| diff to current
2016-06-20	Junio C Hamano	Merge branch 'ew/fast-import-unpack-limit'	blob \| commitdiff \| raw \| diff to current
2016-06-17	Vasco Almeida	i18n: merge: change command option help to lowercase	blob \| commitdiff \| raw \| diff to current
2016-06-17	Vasco Almeida	i18n: merge: mark messages for translation	blob \| commitdiff \| raw \| diff to current
2016-06-13	Junio C Hamano	Merge branch 'jk/parseopt-string-list' into jk/string...	blob \| commitdiff \| raw \| diff to current
2016-06-10	Junio C Hamano	Merge branch 'jk/diff-compact-heuristic'	blob \| commitdiff \| raw \| diff to current
2016-06-10	Junio C Hamano	Merge branch 'jk/shell-portability'	blob \| commitdiff \| raw \| diff to current
2016-06-10	Junio C Hamano	Merge branch 'jc/t2300-setup'	blob \| commitdiff \| raw \| diff to current
2016-06-07	Junio C Hamano	Merge branch 'jc/t2300-setup' into HEAD	blob \| commitdiff \| raw \| diff to current
2016-06-06	Junio C Hamano	Sync with 2.8.4	blob \| commitdiff \| raw \| diff to current
2016-06-06	Junio C Hamano	Merge branch 'tb/core-eol-fix' into maint	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom