Andrew's git - gitweb.git/history

[gitweb.git] / merge-recursive.c

2016-10-03	Sync with 2.10.1	blob \| diff \| raw
2016-10-03	Merge branch 'pb/rev-list-reverse-with-count'	blob \| diff \| raw
2016-10-03	Merge branch 'dt/tree-fsck'	blob \| diff \| raw
2016-10-03	Merge branch 'kd/mailinfo-quoted-string'	blob \| diff \| raw
2016-10-03	Merge branch 'mh/diff-indent-heuristic'	blob \| diff \| raw
2016-10-03	Merge branch 'dt/mailinfo'	blob \| diff \| raw
2016-10-03	Merge branch 'va/git-gui-i18n'	blob \| diff \| raw
2016-10-03	Merge branch 'rs/git-gui-use-modern-git-merge-syntax'	blob \| diff \| raw
2016-10-03	Merge branch 'jc/verify-loose-object-header'	blob \| diff \| raw
2016-10-03	Merge branch 'nd/init-core-worktree-in-multi-worktree...	blob \| diff \| raw
2016-10-03	Merge branch 'ik/gitweb-force-highlight'	blob \| diff \| raw
2016-10-03	Merge branch 'rs/copy-array'	blob \| diff \| raw
2016-10-03	Merge branch 'jk/ident-ai-canonname-could-be-null'...	blob \| diff \| raw \| diff to current
2016-10-03	Merge branch 'jk/doc-cvs-update' into maint	blob \| diff \| raw \| diff to current
2016-10-03	Merge branch 'jk/pack-tag-of-tag' into maint	blob \| diff \| raw \| diff to current
2016-09-29	Sync with maint	blob \| diff \| raw
2016-09-29	Merge branch 'jc/worktree-config'	blob \| diff \| raw
2016-09-29	Merge branch 'jk/ident-ai-canonname-could-be-null'	blob \| diff \| raw
2016-09-29	Merge branch 'jt/fetch-pack-in-vain-count-with-stateless'	blob \| diff \| raw
2016-09-29	Merge branch 'jk/verify-packfile-gently'	blob \| diff \| raw
2016-09-29	Merge branch 'jt/mailinfo-fold-in-body-headers'	blob \| diff \| raw
2016-09-29	Merge branch 'tg/add-chmod+x-fix' into maint	blob \| diff \| raw \| diff to current
2016-09-29	Merge branch 'et/add-chmod-x' into maint	blob \| diff \| raw \| diff to current
2016-09-29	Merge branch 'ls/travis-homebrew-path-fix' into maint	blob \| diff \| raw \| diff to current
2016-09-29	Merge branch 'js/regexec-buf' into maint	blob \| diff \| raw \| diff to current
2016-09-29	Merge branch 'ep/doc-check-ref-format-example' into...	blob \| diff \| raw \| diff to current
2016-09-29	Merge branch 'mm/config-color-ui-default-to-auto' into...	blob \| diff \| raw \| diff to current
2016-09-29	Merge branch 'jk/reduce-gc-aggressive-depth' into maint	blob \| diff \| raw \| diff to current
2016-09-29	Merge branch 'jk/rebase-i-drop-ident-check' into maint	blob \| diff \| raw \| diff to current
2016-09-29	Merge branch 'rs/xdiff-merge-overlapping-hunks-for...	blob \| diff \| raw \| diff to current
2016-09-29	Merge branch 'ew/http-do-not-forget-to-call-curl-multi...	blob \| diff \| raw \| diff to current
2016-09-29	Merge branch 'js/git-gui-commit-gpgsign' into maint	blob \| diff \| raw \| diff to current
2016-09-29	Merge branch 'jk/fix-remote-curl-url-wo-proto' into...	blob \| diff \| raw \| diff to current
2016-09-29	Merge branch 'mr/vcs-svn-printf-ulong' into maint	blob \| diff \| raw \| diff to current
2016-09-29	Merge branch 'rs/strbuf-remove-fix' into maint	blob \| diff \| raw \| diff to current
2016-09-29	Merge branch 'rs/checkout-some-states-are-const' into...	blob \| diff \| raw \| diff to current
2016-09-29	Merge branch 'bw/pathspec-remove-unused-extern-decl...	blob \| diff \| raw \| diff to current
2016-09-26	Merge branch 'jk/clone-recursive-progress'	blob \| diff \| raw
2016-09-26	Merge branch 'jk/doc-cvs-update'	blob \| diff \| raw
2016-09-26	Merge branch 'rt/rebase-i-broken-insn-advise'	blob \| diff \| raw
2016-09-26	Merge branch 'rs/checkout-init-macro'	blob \| diff \| raw
2016-09-26	Merge branch 'ls/travis-homebrew-path-fix'	blob \| diff \| raw
2016-09-26	Merge branch 'tg/add-chmod+x-fix'	blob \| diff \| raw
2016-09-26	Merge branch 'js/regexec-buf'	blob \| diff \| raw
2016-09-26	Merge branch 'nd/checkout-disambiguation'	blob \| diff \| raw
2016-09-26	Merge branch 'va/i18n-more'	blob \| diff \| raw
2016-09-26	Merge branch 'jt/format-patch-rfc'	blob \| diff \| raw
2016-09-26	Merge branch 'ep/doc-check-ref-format-example'	blob \| diff \| raw
2016-09-26	Merge branch 'mh/diff-indent-heuristic'	blob \| diff \| raw
2016-09-26	Merge branch 'rs/c-auto-resets-attributes'	blob \| diff \| raw
2016-09-26	Merge branch 'mm/config-color-ui-default-to-auto'	blob \| diff \| raw
2016-09-26	Merge branch 'rs/cocci'	blob \| diff \| raw
2016-09-26	Merge branch 'va/i18n' of ../git-gui into va/git-gui...	blob \| diff \| raw \| diff to current
2016-09-26	Merge branch 'rs/use-modern-git-merge-syntax' of git...	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'jk/reduce-gc-aggressive-depth'	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'jk/rebase-i-drop-ident-check'	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'va/i18n'	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'jt/format-patch-base-info-above-sig'	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'ks/perf-build-with-autoconf'	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'mr/vcs-svn-printf-ulong'	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'rs/xdiff-merge-overlapping-hunks-for...	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'rs/unpack-trees-reduce-file-scope-global'	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'rs/strbuf-remove-fix'	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'rs/pack-sort-with-llist-mergesort'	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'rs/checkout-some-states-are-const'	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'jk/setup-sequence-update'	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'ew/http-do-not-forget-to-call-curl-multi...	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'bw/pathspec-remove-unused-extern-decl'	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'ks/pack-objects-bitmap'	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'jk/patch-ids-no-merges'	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'jk/delta-base-cache'	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'et/add-chmod-x'	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'js/cat-file-filters'	blob \| diff \| raw \| diff to current
2016-09-21	Merge branch 'jt/accept-capability-advertisement-when...	blob \| diff \| raw \| diff to current
2016-09-19	Sync with maint	blob \| diff \| raw \| diff to current
2016-09-19	Merge branch 'sb/xdiff-remove-unused-static-decl' into...	blob \| diff \| raw \| diff to current
2016-09-19	Merge branch 'js/t9903-chaining' into maint	blob \| diff \| raw \| diff to current
2016-09-19	Merge branch 'rs/hex2chr' into maint	blob \| diff \| raw \| diff to current
2016-09-19	Merge branch 'rs/compat-strdup' into maint	blob \| diff \| raw \| diff to current
2016-09-19	Merge branch 'jk/squelch-false-warning-from-gcc-o3...	blob \| diff \| raw \| diff to current
2016-09-19	Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maint	blob \| diff \| raw \| diff to current
2016-09-19	Merge branch 'jc/submodule-anchor-git-dir' into maint	blob \| diff \| raw \| diff to current
2016-09-19	Merge branch 'jk/test-lib-drop-pid-from-results' into...	blob \| diff \| raw \| diff to current
2016-09-19	Merge branch 'po/range-doc' into maint	blob \| diff \| raw \| diff to current
2016-09-19	Merge branch 'bc/object-id'	blob \| diff \| raw \| diff to current
2016-09-19	Merge branch 'mh/ref-store'	blob \| diff \| raw \| diff to current
2016-09-19	Merge branch 'cc/apply-am'	blob \| diff \| raw \| diff to current
2016-09-15	Merge branch 'js/git-gui-commit-gpgsign'	blob \| diff \| raw \| diff to current
2016-09-15	Merge branch 'jk/fix-remote-curl-url-wo-proto'	blob \| diff \| raw \| diff to current
2016-09-15	Merge branch 'jk/pack-tag-of-tag'	blob \| diff \| raw \| diff to current
2016-09-15	use strbuf_addstr() for adding constant strings to...	blob \| diff \| raw \| diff to current
2016-09-12	Merge branch 'sb/xdiff-remove-unused-static-decl'	blob \| diff \| raw \| diff to current
2016-09-12	Merge branch 'js/t9903-chaining'	blob \| diff \| raw \| diff to current
2016-09-12	Merge branch 'rs/hex2chr'	blob \| diff \| raw \| diff to current
2016-09-12	Merge branch 'rs/compat-strdup'	blob \| diff \| raw \| diff to current
2016-09-12	Merge branch 'jc/forbid-symbolic-ref-d-HEAD'	blob \| diff \| raw \| diff to current
2016-09-12	Merge branch 'jc/submodule-anchor-git-dir'	blob \| diff \| raw \| diff to current
2016-09-12	Merge branch 'jk/squelch-false-warning-from-gcc-o3'	blob \| diff \| raw \| diff to current
2016-09-12	Merge branch 'jk/test-lib-drop-pid-from-results'	blob \| diff \| raw \| diff to current
2016-09-12	Merge branch 'jk/diff-submodule-diff-inline'	blob \| diff \| raw \| diff to current
next