Andrew's git - gitweb.git/history

[gitweb.git] / merge-recursive.c

2015-11-20	Convert struct object to object_id	blob \| diff \| raw
2015-11-20	Add several uses of get_object_hash.	blob \| diff \| raw \| diff to current
2015-11-20	Merge branch 'dk/gc-idx-wo-pack'	blob \| diff \| raw \| diff to current
2015-11-05	Merge branch 'ea/checkout-progress'	blob \| diff \| raw \| diff to current
2015-11-05	Sync with 2.6.3	blob \| diff \| raw \| diff to current
2015-11-05	Merge branch 'rs/daemon-plug-child-leak' into maint	blob \| diff \| raw \| diff to current
2015-11-05	Merge branch 'rs/wt-status-detached-branch-fix' into...	blob \| diff \| raw \| diff to current
2015-11-05	Merge branch 'jk/initialization-fix-to-add-submodule...	blob \| diff \| raw \| diff to current
2015-11-05	Merge branch 'js/misc-fixes' into maint	blob \| diff \| raw \| diff to current
2015-11-05	Merge branch 'jc/add-u-A-default-to-top' into maint	blob \| diff \| raw \| diff to current
2015-11-05	Merge branch 'jk/delete-modechange-conflict' into maint	blob \| diff \| raw \| diff to current
2015-11-05	Merge branch 'sa/send-email-smtp-batch-data-limit'...	blob \| diff \| raw \| diff to current
2015-11-04	Sync with maint	blob \| diff \| raw \| diff to current
2015-11-04	Merge branch 'xf/user-manual-ff' into maint	blob \| diff \| raw \| diff to current
2015-11-04	Merge branch 'xf/user-manual-markup' into maint	blob \| diff \| raw \| diff to current
2015-11-04	Merge branch 'jc/everyday-markup' into maint	blob \| diff \| raw \| diff to current
2015-11-04	Merge branch 'jc/em-dash-in-doc' into maint	blob \| diff \| raw \| diff to current
2015-11-04	Merge branch 'es/worktree-add' into maint	blob \| diff \| raw \| diff to current
2015-11-03	Sync with maint	blob \| diff \| raw \| diff to current
2015-11-03	Merge branch 'mk/blame-error-message' into maint	blob \| diff \| raw \| diff to current
2015-11-03	Merge branch 'jk/merge-file-exit-code' into maint	blob \| diff \| raw \| diff to current
2015-11-03	Merge branch 'dt/name-hash-dir-entry-fix' into maint	blob \| diff \| raw \| diff to current
2015-11-03	Merge branch 'nd/gc-auto-background-fix' into maint	blob \| diff \| raw \| diff to current
2015-11-03	Merge branch 'gr/rebase-i-drop-warn' into maint	blob \| diff \| raw \| diff to current
2015-11-03	Merge branch 'rs/daemon-plug-child-leak'	blob \| diff \| raw \| diff to current
2015-11-03	Merge branch 'mk/blame-first-parent'	blob \| diff \| raw \| diff to current
2015-11-03	Merge branch 'rs/wt-status-detached-branch-fix'	blob \| diff \| raw \| diff to current
2015-11-03	Merge branch 'rs/show-branch-argv-array'	blob \| diff \| raw \| diff to current
2015-11-03	Merge branch 'js/git-gdb'	blob \| diff \| raw \| diff to current
2015-11-03	Merge branch 'jk/initialization-fix-to-add-submodule...	blob \| diff \| raw \| diff to current
2015-11-03	Merge branch 'da/difftool'	blob \| diff \| raw \| diff to current
2015-11-03	Merge branch 'jc/mailinfo-lib'	blob \| diff \| raw \| diff to current
2015-11-03	Merge branch 'kn/for-each-branch'	blob \| diff \| raw \| diff to current
2015-10-30	Merge branch 'jk/merge-file-exit-code'	blob \| diff \| raw \| diff to current
2015-10-30	Merge branch 'gr/rebase-i-drop-warn'	blob \| diff \| raw \| diff to current
2015-10-30	Merge branch 'xf/user-manual-ff'	blob \| diff \| raw \| diff to current
2015-10-30	Merge branch 'rs/pop-commit'	blob \| diff \| raw \| diff to current
2015-10-30	Merge branch 'mk/blame-error-message'	blob \| diff \| raw \| diff to current
2015-10-30	Merge branch 'js/misc-fixes'	blob \| diff \| raw \| diff to current
2015-10-30	Merge branch 'js/imap-send-curl-compilation-fix'	blob \| diff \| raw \| diff to current
2015-10-30	Merge branch 'jk/delete-modechange-conflict'	blob \| diff \| raw \| diff to current
2015-10-30	Merge branch 'jc/add-u-A-default-to-top'	blob \| diff \| raw \| diff to current
2015-10-30	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2015-10-29	Merge branch 'jc/am-mailinfo-direct'	blob \| diff \| raw \| diff to current
2015-10-29	Merge branch 'jc/mailinfo-lib'	blob \| diff \| raw \| diff to current
2015-10-29	Merge branch 'rp/link-curl-before-ssl'	blob \| diff \| raw \| diff to current
2015-10-29	Merge branch 'dt/name-hash-dir-entry-fix'	blob \| diff \| raw \| diff to current
2015-10-29	Merge branch 'tk/sigchain-unnecessary-post-tempfile'	blob \| diff \| raw \| diff to current
2015-10-29	Merge branch 'jc/em-dash-in-doc'	blob \| diff \| raw \| diff to current
2015-10-29	Merge branch 'jc/everyday-markup'	blob \| diff \| raw \| diff to current
2015-10-29	Merge branch 'xf/user-manual-markup'	blob \| diff \| raw \| diff to current
2015-10-26	Merge branch 'dk/p4-import-ctypes'	blob \| diff \| raw \| diff to current
2015-10-26	Merge branch 'jk/repository-extension'	blob \| diff \| raw \| diff to current
2015-10-26	Merge branch 'dt/t7063-fix-flaky-test'	blob \| diff \| raw \| diff to current
2015-10-26	Merge branch 'kn/for-each-tag'	blob \| diff \| raw \| diff to current
2015-10-26	Merge branch 'es/worktree-add'	blob \| diff \| raw \| diff to current
2015-10-26	Merge branch 'tk/stripspace'	blob \| diff \| raw \| diff to current
2015-10-26	Merge branch 'rt/placeholder-in-usage'	blob \| diff \| raw \| diff to current
2015-10-26	Merge branch 'jc/usage-stdin'	blob \| diff \| raw \| diff to current
2015-10-26	Merge branch 'mr/worktree-list'	blob \| diff \| raw \| diff to current
2015-10-26	Merge branch 'jc/am-3-fallback-regression-fix'	blob \| diff \| raw \| diff to current
2015-10-26	merge: detect delete/modechange conflict	blob \| diff \| raw \| diff to current
2015-10-20	Sync with maint	blob \| diff \| raw \| diff to current
2015-10-20	Merge branch 'tb/t0027-crlf'	blob \| diff \| raw \| diff to current
2015-10-20	Merge branch 'ls/p4-test-updates'	blob \| diff \| raw \| diff to current
2015-10-20	Merge branch 'jk/war-on-sprintf'	blob \| diff \| raw \| diff to current
2015-10-20	Merge branch 'jc/doc-gc-prune-now' into maint	blob \| diff \| raw \| diff to current
2015-10-20	Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...	blob \| diff \| raw \| diff to current
2015-10-16	Merge branch 'jc/doc-gc-prune-now'	blob \| diff \| raw \| diff to current
2015-10-16	Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...	blob \| diff \| raw \| diff to current
2015-10-16	Merge branch 'es/worktree-add-cleanup' into maint	blob \| diff \| raw \| diff to current
2015-10-16	Merge branch 'tk/doc-interpret-trailers-grammo' into...	blob \| diff \| raw \| diff to current
2015-10-16	Merge branch 'jk/asciidoctor-section-heading-markup...	blob \| diff \| raw \| diff to current
2015-10-16	Merge branch 'sb/http-flaky-test-fix' into maint	blob \| diff \| raw \| diff to current
2015-10-16	Merge branch 'gr/rebase-i-drop-warn' into maint	blob \| diff \| raw \| diff to current
2015-10-16	Merge branch 'jk/make-findstring-makeflags-fix' into...	blob \| diff \| raw \| diff to current
2015-10-16	Merge branch 'jw/make-arflags-customizable' into maint	blob \| diff \| raw \| diff to current
2015-10-15	Merge branch 'tk/doc-interpret-trailers-grammo'	blob \| diff \| raw \| diff to current
2015-10-15	Merge branch 'es/worktree-add-cleanup'	blob \| diff \| raw \| diff to current
2015-10-15	Merge branch 'gr/rebase-i-drop-warn'	blob \| diff \| raw \| diff to current
2015-10-15	Merge branch 'sa/send-email-smtp-batch-data-limit'	blob \| diff \| raw \| diff to current
2015-10-15	Merge branch 'sb/http-flaky-test-fix'	blob \| diff \| raw \| diff to current
2015-10-15	Merge branch 'nd/gc-auto-background-fix'	blob \| diff \| raw \| diff to current
2015-10-14	Merge branch 'jk/asciidoctor-section-heading-markup...	blob \| diff \| raw \| diff to current
2015-10-07	Merge branch 'nd/ignore-then-not-ignore'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jw/make-arflags-customizable'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jk/rebase-no-autostash'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jk/make-findstring-makeflags-fix'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jh/quiltimport-explicit-series-file'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jc/rerere'	blob \| diff \| raw \| diff to current
2015-10-05	merge-recursive: convert malloc / strcpy to strbuf	blob \| diff \| raw \| diff to current
2015-09-28	Sync with 2.3.10	blob \| diff \| raw \| diff to current
2015-09-17	Merge branch 'po/doc-branch-desc'	blob \| diff \| raw \| diff to current
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 branch 'sg/help-group'	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
next