Andrew's git / gitweb.git / history
?
Merge branch 'nd/exclusion-regression-fix' into maint
[gitweb.git] / builtin / merge-recursive.c
2016-02-05 Merge branch 'nd/exclusion-regression-fix' into maint blob | diff | raw
2016-02-05 Merge branch 'dk/reflog-walk-with-non-commit' into... blob | diff | raw
2016-02-05 Merge branch 'dw/signoff-doc' into maint blob | diff | raw
2016-02-05 Merge branch 'jk/clang-pedantic' into maint blob | diff | raw
2016-02-05 Merge branch 'ew/send-email-mutt-alias-fix' into maint blob | diff | raw
2016-02-05 Merge branch 'nd/dir-exclude-cleanup' into maint blob | diff | raw
2016-02-05 Merge branch 'nd/stop-setenv-work-tree' into maint blob | diff | raw
2016-01-04 Sync with 2.6.5 blob | diff | raw
2015-12-28 Merge branch 'jk/pending-keep-tag-name' blob | diff | raw
2015-12-28 Merge branch 'jk/symbolic-ref-maint' blob | diff | raw
2015-12-22 Merge branch 'js/emu-write-epipe-on-windows' blob | diff | raw
2015-12-21 Merge branch 'jk/ident-loosen-getpwuid' blob | diff | raw
2015-12-21 Merge branch 'jk/send-email-ssl-errors' blob | diff | raw
2015-12-21 Merge branch 'sg/completion-no-column' blob | diff | raw
2015-12-21 Merge git://ozlabs.org/~paulus/gitk blob | diff | raw
2015-12-16 Merge branch 'fr/rebase-i-continue-preserve-options' blob | diff | raw
2015-12-16 Merge branch 'maint' blob | diff | raw
2015-12-15 Sync with maint blob | diff | raw
2015-12-15 Merge branch 'ep/ident-with-getaddrinfo' blob | diff | raw
2015-12-15 Merge branch 'ls/p4-keep-empty-commits' blob | diff | raw
2015-12-15 Merge branch 'jk/prune-mtime' blob | diff | raw
2015-12-11 Merge branch 'maint' blob | diff | raw
2015-12-11 Merge branch 'sn/null-pointer-arith-in-mark-tree-uninte... blob | diff | raw
2015-12-11 Merge branch 'sb/doc-submodule-sync-recursive' blob | diff | raw
2015-12-11 Merge branch 'cb/t3404-shellquote' blob | diff | raw
2015-12-11 Merge branch 'sg/lock-file-commit-error' blob | diff | raw
2015-12-10 Sync with maint blob | diff | raw
2015-12-10 Merge branch 'nd/doc-check-ref-format-typo' blob | diff | raw
2015-12-10 Merge branch 'dt/fsck-verify-pack-error' blob | diff | raw
2015-12-08 Merge branch 'ep/ident-with-getaddrinfo' blob | diff | raw
2015-12-08 Sync with 2.6.4 blob | diff | raw
2015-12-04 Sync with maint blob | diff | raw
2015-12-04 Merge branch 'sg/bash-prompt-dirty-orphan' blob | diff | raw
2015-12-04 Merge branch 'ad/sha1-update-chunked' blob | diff | raw
2015-12-01 Merge branch 'mk/blame-first-parent' blob | diff | raw
2015-12-01 Merge branch 'maint' blob | diff | raw
2015-11-25 Merge branch 'fp/subtree-todo-update' blob | diff | raw
2015-11-25 Merge branch 'rc/configure-use-libs-when-checking-a... blob | diff | raw
2015-11-25 Merge branch 'maint' blob | diff | raw
2015-11-20 Merge branch 'dk/gc-idx-wo-pack' blob | diff | raw
2015-11-05 Merge branch 'ea/checkout-progress' blob | diff | raw
2015-11-05 Sync with 2.6.3 blob | diff | raw
2015-11-05 Merge branch 'jk/initialization-fix-to-add-submodule... blob | diff | raw | diff to current
2015-11-04 Sync with maint blob | diff | raw
2015-11-03 Sync with maint blob | diff | raw
2015-11-03 Merge branch 'rs/daemon-plug-child-leak' blob | diff | raw
2015-11-03 Merge branch 'mk/blame-first-parent' blob | diff | raw
2015-11-03 Merge branch 'rs/wt-status-detached-branch-fix' blob | diff | raw
2015-11-03 Merge branch 'rs/show-branch-argv-array' blob | diff | raw
2015-11-03 Merge branch 'jk/initialization-fix-to-add-submodule... blob | diff | raw
2015-11-03 Merge branch 'da/difftool' blob | diff | raw
2015-11-03 Merge branch 'jc/mailinfo-lib' blob | diff | raw
2015-11-03 Merge branch 'kn/for-each-branch' blob | diff | raw
2015-10-30 Merge branch 'jk/merge-file-exit-code' blob | diff | raw
2015-10-30 Merge branch 'gr/rebase-i-drop-warn' blob | diff | raw
2015-10-30 Merge branch 'xf/user-manual-ff' blob | diff | raw
2015-10-30 Merge branch 'rs/pop-commit' blob | diff | raw
2015-10-30 Merge branch 'mk/blame-error-message' blob | diff | raw
2015-10-30 Merge branch 'js/misc-fixes' blob | diff | raw
2015-10-30 Merge branch 'js/imap-send-curl-compilation-fix' blob | diff | raw
2015-10-30 Merge branch 'jk/delete-modechange-conflict' blob | diff | raw
2015-10-30 Merge branch 'jc/add-u-A-default-to-top' blob | diff | raw
2015-10-30 Merge git://ozlabs.org/~paulus/gitk blob | diff | raw
2015-10-29 Merge branch 'jc/am-mailinfo-direct' blob | diff | raw
2015-10-29 Merge branch 'jc/mailinfo-lib' blob | diff | raw
2015-10-29 Merge branch 'rp/link-curl-before-ssl' blob | diff | raw
2015-10-29 Merge branch 'dt/name-hash-dir-entry-fix' blob | diff | raw
2015-10-29 Merge branch 'tk/sigchain-unnecessary-post-tempfile' blob | diff | raw
2015-10-29 Merge branch 'jc/em-dash-in-doc' blob | diff | raw
2015-10-29 Merge branch 'jc/everyday-markup' blob | diff | raw
2015-10-29 Merge branch 'xf/user-manual-markup' blob | diff | raw
2015-10-26 Merge branch 'dk/p4-import-ctypes' blob | diff | raw
2015-10-26 Merge branch 'jk/repository-extension' blob | diff | raw
2015-10-26 Merge branch 'dt/t7063-fix-flaky-test' blob | diff | raw
2015-10-26 Merge branch 'kn/for-each-tag' blob | diff | raw
2015-10-26 Merge branch 'es/worktree-add' blob | diff | raw
2015-10-26 Merge branch 'tk/stripspace' blob | diff | raw
2015-10-26 Merge branch 'rt/placeholder-in-usage' blob | diff | raw
2015-10-26 Merge branch 'jc/usage-stdin' blob | diff | raw
2015-10-26 Merge branch 'mr/worktree-list' blob | diff | raw
2015-10-26 Merge branch 'jc/am-3-fallback-regression-fix' blob | diff | raw
2015-10-20 Sync with maint blob | diff | raw
2015-10-20 Merge branch 'tb/t0027-crlf' blob | diff | raw
2015-10-20 Merge branch 'ls/p4-test-updates' blob | diff | raw
2015-10-20 Merge branch 'jk/war-on-sprintf' blob | diff | raw
2015-10-16 Merge branch 'jk/make-findstring-makeflags-fix' into... blob | diff | raw | diff to current
2015-10-05 Merge branch 'jk/make-findstring-makeflags-fix' blob | diff | raw | diff to current
2015-09-25 convert trivial sprintf / strcpy calls to xsnprintf blob | diff | raw
2015-09-17 Merge branch 'as/config-doc-markup-fix' blob | diff | raw | diff to current
2015-09-17 Merge branch 'br/svn-doc-include-paths-config' into... blob | diff | raw | diff to current
2015-09-17 Merge branch 'ah/submodule-typofix-in-error' into maint blob | diff | raw | diff to current
2015-09-14 Merge git://ozlabs.org/~paulus/gitk blob | diff | raw | diff to current
2015-09-14 Merge branch 'mp/t7060-diff-index-test' blob | diff | raw | diff to current
2015-09-14 Merge branch 'gb/apply-comment-typofix' blob | diff | raw | diff to current
2015-09-04 Merge branch 'ee/clean-test-fixes' into maint blob | diff | raw | diff to current
2015-09-04 Merge branch 'sg/t3020-typofix' into maint blob | diff | raw | diff to current
2015-09-02 Merge branch 'ee/clean-test-fixes' blob | diff | raw | diff to current
2015-09-01 Merge branch 'ah/submodule-typofix-in-error' blob | diff | raw | diff to current
2015-09-01 Merge branch 'ah/reflog-typofix-in-error' blob | diff | raw | diff to current
2015-09-01 Merge branch 'ah/read-tree-usage-string' blob | diff | raw | diff to current
next