projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
notes: allow treeish expressions as notes ref
[git] / merge.c
2016-01-04  Junio C HamanoSync with 2.6.5 blob | commitdiff | raw
2016-01-04  Junio C HamanoMerge branch 'jk/pending-keep-tag-name' into maint blob | commitdiff | raw | diff to current
2015-12-28  Junio C HamanoMerge branch 'jk/pending-keep-tag-name' blob | commitdiff | raw
2015-12-28  Junio C HamanoMerge branch 'jk/symbolic-ref-maint' blob | commitdiff | raw
2015-12-22  Junio C HamanoMerge branch 'js/emu-write-epipe-on-windows' blob | commitdiff | raw
2015-12-21  Junio C HamanoMerge branch 'jk/ident-loosen-getpwuid' blob | commitdiff | raw
2015-12-21  Junio C HamanoMerge branch 'jk/send-email-ssl-errors' blob | commitdiff | raw
2015-12-21  Junio C HamanoMerge branch 'sg/completion-no-column' blob | commitdiff | raw
2015-12-21  Junio C HamanoMerge branch 'mc/push-recurse-submodules-config' blob | commitdiff | raw
2015-12-21  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw
2015-12-16  Junio C HamanoMerge branch 'fr/rebase-i-continue-preserve-options' blob | commitdiff | raw
2015-12-16  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2015-12-15  Junio C HamanoSync with maint blob | commitdiff | raw
2015-12-15  Junio C HamanoMerge branch 'jk/send-email-complete-aliases' blob | commitdiff | raw
2015-12-15  Junio C HamanoMerge branch 'ep/ident-with-getaddrinfo' blob | commitdiff | raw
2015-12-15  Junio C HamanoMerge branch 'jk/prune-mtime' into maint blob | commitdiff | raw | diff to current
2015-12-15  Junio C HamanoMerge branch 'ls/p4-keep-empty-commits' blob | commitdiff | raw
2015-12-15  Junio C HamanoMerge branch 'jk/prune-mtime' blob | commitdiff | raw
2015-12-11  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2015-12-11  Junio C HamanoMerge branch 'sn/null-pointer-arith-in-mark-tree-uninte... blob | commitdiff | raw
2015-12-11  Junio C HamanoMerge branch 'sb/doc-submodule-sync-recursive' blob | commitdiff | raw
2015-12-11  Junio C HamanoMerge branch 'cb/t3404-shellquote' blob | commitdiff | raw
2015-12-11  Junio C HamanoMerge branch 'sg/lock-file-commit-error' blob | commitdiff | raw
2015-12-11  Jiang XinMerge branch 'master' of git://github.com/git-l10n... blob | commitdiff | raw
2015-12-10  Junio C HamanoSync with maint blob | commitdiff | raw
2015-12-10  Junio C HamanoMerge branch 'nd/doc-check-ref-format-typo' blob | commitdiff | raw
2015-12-10  Junio C HamanoMerge branch 'bc/object-id' blob | commitdiff | raw
2015-12-01  Jeff KingMerge branch 'rc/configure-use-libs-when-checking-a... blob | commitdiff | raw | diff to current
2015-11-25  Jeff KingMerge branch 'rc/configure-use-libs-when-checking-a... blob | commitdiff | raw | diff to current
2015-11-20  brian m. carlsonConvert struct object to object_id blob | commitdiff | raw
2015-11-05  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule... blob | commitdiff | raw | diff to current
2015-11-05  Junio C HamanoMerge branch 'jc/add-u-A-default-to-top' into maint blob | commitdiff | raw | diff to current
2015-11-04  Junio C HamanoMerge branch 'xf/user-manual-ff' into maint blob | commitdiff | raw | diff to current
2015-11-04  Junio C HamanoMerge branch 'xf/user-manual-markup' into maint blob | commitdiff | raw | diff to current
2015-11-04  Junio C HamanoMerge branch 'jc/everyday-markup' into maint blob | commitdiff | raw | diff to current
2015-11-03  Junio C HamanoMerge branch 'jk/merge-file-exit-code' into maint blob | commitdiff | raw | diff to current
2015-11-03  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule... blob | commitdiff | raw | diff to current
2015-10-30  Junio C HamanoMerge branch 'jk/merge-file-exit-code' blob | commitdiff | raw | diff to current
2015-10-30  Junio C HamanoMerge branch 'xf/user-manual-ff' blob | commitdiff | raw | diff to current
2015-10-30  Junio C HamanoMerge branch 'jc/add-u-A-default-to-top' blob | commitdiff | raw | diff to current
2015-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2015-10-29  Junio C HamanoMerge branch 'jc/everyday-markup' blob | commitdiff | raw | diff to current
2015-10-29  Junio C HamanoMerge branch 'xf/user-manual-markup' blob | commitdiff | raw | diff to current
2015-10-20  Junio C HamanoMerge branch 'jk/filter-branch-use-of-sed-on-incomplete... blob | commitdiff | raw | diff to current
2015-10-16  Junio C HamanoMerge branch 'jk/filter-branch-use-of-sed-on-incomplete... blob | commitdiff | raw | diff to current
2015-10-16  Junio C HamanoMerge branch 'tk/doc-interpret-trailers-grammo' into... blob | commitdiff | raw | diff to current
2015-10-16  Junio C HamanoMerge branch 'jk/asciidoctor-section-heading-markup... blob | commitdiff | raw | diff to current
2015-10-16  Junio C HamanoMerge branch 'sb/http-flaky-test-fix' into maint blob | commitdiff | raw | diff to current
2015-10-16  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix' into... blob | commitdiff | raw | diff to current
2015-10-16  Junio C HamanoMerge branch 'jw/make-arflags-customizable' into maint blob | commitdiff | raw | diff to current
2015-10-15  Junio C HamanoMerge branch 'tk/doc-interpret-trailers-grammo' blob | commitdiff | raw | diff to current
2015-10-15  Junio C HamanoMerge branch 'sb/http-flaky-test-fix' blob | commitdiff | raw | diff to current
2015-10-14  Junio C HamanoMerge branch 'jk/asciidoctor-section-heading-markup... blob | commitdiff | raw | diff to current
2015-10-05  Junio C HamanoMerge branch 'jw/make-arflags-customizable' blob | commitdiff | raw | diff to current
2015-10-05  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix' blob | commitdiff | raw | diff to current
2015-09-17  Junio C HamanoMerge branch 'as/config-doc-markup-fix' blob | commitdiff | raw | diff to current
2015-09-17  Junio C HamanoMerge branch 'br/svn-doc-include-paths-config' into... blob | commitdiff | raw | diff to current
2015-09-17  Junio C HamanoMerge branch 'ah/submodule-typofix-in-error' into maint blob | commitdiff | raw | diff to current
2015-09-14  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2015-09-14  Junio C HamanoMerge branch 'mp/t7060-diff-index-test' blob | commitdiff | raw | diff to current
2015-09-14  Junio C HamanoMerge branch 'gb/apply-comment-typofix' blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoMerge branch 'ee/clean-test-fixes' into maint blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoMerge branch 'sg/t3020-typofix' into maint blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoMerge branch 'jh/strbuf-read-use-read-in-full' into... blob | commitdiff | raw | diff to current
2015-09-02  Junio C HamanoMerge branch 'ee/clean-test-fixes' blob | commitdiff | raw | diff to current
2015-09-01  Junio C HamanoMerge branch 'ah/submodule-typofix-in-error' blob | commitdiff | raw | diff to current
2015-09-01  Junio C HamanoMerge branch 'ah/reflog-typofix-in-error' blob | commitdiff | raw | diff to current
2015-09-01  Junio C HamanoMerge branch 'ah/read-tree-usage-string' blob | commitdiff | raw | diff to current
2015-09-01  Junio C HamanoMerge branch 'ah/pack-objects-usage-strings' blob | commitdiff | raw | diff to current
2015-09-01  Junio C HamanoMerge branch 'br/svn-doc-include-paths-config' blob | commitdiff | raw | diff to current
2015-08-31  Junio C HamanoMerge branch 'sg/describe-contains' blob | commitdiff | raw | diff to current
2015-08-26  Junio C HamanoMerge branch 'sg/t3020-typofix' blob | commitdiff | raw | diff to current
2015-08-25  Junio C HamanoMerge branch 'jh/strbuf-read-use-read-in-full' blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'jc/finalize-temp-file' blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'sb/remove-unused-var-from-builtin-add... blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'nd/export-worktree' into maint blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'as/sparse-checkout-removal' into maint blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'jx/do-not-crash-receive-pack-wo-head... blob | commitdiff | raw | diff to current
2015-08-12  Junio C HamanoMerge branch 'sb/remove-unused-var-from-builtin-add' blob | commitdiff | raw | diff to current
2015-08-03  Junio C HamanoMerge branch 'jx/do-not-crash-receive-pack-wo-head' blob | commitdiff | raw | diff to current
2015-08-03  Junio C HamanoMerge branch 'as/sparse-checkout-removal' blob | commitdiff | raw | diff to current
2015-08-03  Junio C HamanoMerge branch 'jc/commit-slab' blob | commitdiff | raw | diff to current
2015-08-03  Junio C HamanoMerge branch 'nd/export-worktree' blob | commitdiff | raw | diff to current
2015-08-03  Junio C HamanoMerge branch 'sg/completion-commit-cleanup' into maint blob | commitdiff | raw | diff to current
2015-08-03  Junio C HamanoMerge branch 'sg/commit-cleanup-scissors' into maint blob | commitdiff | raw | diff to current
2015-07-27  Junio C HamanoMerge branch 'jk/pretty-encoding-doc' into maint blob | commitdiff | raw | diff to current
2015-07-27  Junio C HamanoMerge branch 'mm/branch-doc-updates' into maint blob | commitdiff | raw | diff to current
2015-07-27  Junio C HamanoMerge branch 'jc/fsck-retire-require-eoh' into maint blob | commitdiff | raw | diff to current
2015-07-27  Junio C HamanoMerge branch 'jk/rev-list-no-bitmap-while-pruning'... blob | commitdiff | raw | diff to current
2015-07-27  Junio C HamanoMerge branch 'jk/fix-refresh-utime' into maint blob | commitdiff | raw | diff to current
2015-07-27  Junio C HamanoMerge branch 'jk/index-pack-reduce-recheck' into maint blob | commitdiff | raw | diff to current
2015-07-21  Junio C HamanoMerge branch 'tf/gitweb-typofix' blob | commitdiff | raw | diff to current
2015-07-17  Junio C HamanoMerge branch 'jk/still-interesting' blob | commitdiff | raw | diff to current
2015-07-15  Junio C HamanoMerge branch 'jc/prompt-document-ps1-state-separator... blob | commitdiff | raw | diff to current
2015-07-15  Junio C HamanoMerge branch 'es/osx-header-pollutes-mask-macro' into... blob | commitdiff | raw | diff to current
2015-07-15  Junio C HamanoMerge branch 'es/utf8-stupid-compiler-workaround' into... blob | commitdiff | raw | diff to current
2015-07-15  Junio C HamanoMerge branch 'fk/doc-format-patch-vn' into maint blob | commitdiff | raw | diff to current
2015-07-15  Junio C HamanoMerge branch 'me/fetch-into-shallow-safety' into maint blob | commitdiff | raw | diff to current
2015-07-15  Junio C HamanoMerge branch 'af/tcsh-completion-noclobber' into maint blob | commitdiff | raw | diff to current
2015-07-13  Junio C HamanoMerge branch 'jc/fsck-retire-require-eoh' blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.