Andrew's git - gitweb.git/history - builtin/merge-index.c

[gitweb.git] / builtin / merge-index.c

2017-07-21	Merge branch 'ew/fd-cloexec-fix' into maint	blob \| diff \| raw
2017-07-21	Merge branch 'ks/fix-rebase-doc-picture' into maint	blob \| diff \| raw
2017-07-21	Merge branch 'bb/unicode-10.0' into maint	blob \| diff \| raw
2017-07-12	Merge branch 'kn/ref-filter-branch-list' into maint	blob \| diff \| raw
2017-07-10	Merge branch 'jc/utf8-fprintf' into maint	blob \| diff \| raw
2017-07-10	Merge branch 'js/fsck-name-object' into maint	blob \| diff \| raw
2017-07-10	Merge branch 'js/t5534-rev-parse-gives-multi-line-outpu...	blob \| diff \| raw
2017-07-10	Merge branch 'aw/contrib-subtree-doc-asciidoctor' into...	blob \| diff \| raw
2017-07-10	Merge branch 'ah/doc-pretty-color-auto-prefix' into...	blob \| diff \| raw
2017-07-10	Merge branch 'mb/reword-autocomplete-message' into...	blob \| diff \| raw
2017-07-10	Merge branch 'ks/t7508-indent-fix' into maint	blob \| diff \| raw
2017-07-10	Merge branch 'sb/t4005-modernize' into maint	blob \| diff \| raw
2017-07-10	Merge branch 'rs/apply-validate-input' into maint	blob \| diff \| raw
2017-07-10	Merge branch 'jc/pack-bitmap-unaligned' into maint	blob \| diff \| raw
2017-07-10	Merge branch 'pw/rebase-i-regression-fix-tests' into...	blob \| diff \| raw
2017-07-10	Merge branch 'jk/add-p-commentchar-fix' into maint	blob \| diff \| raw
2017-07-10	Merge branch 'rs/pretty-add-again' into maint	blob \| diff \| raw
2017-06-24	Merge branch 'sg/doc-pretty-formats' into maint	blob \| diff \| raw
2017-06-24	Merge branch 'sg/revision-parser-skip-prefix' into...	blob \| diff \| raw
2017-06-24	Merge branch 'km/test-mailinfo-b-failure' into maint	blob \| diff \| raw
2017-06-24	Merge branch 'sb/submodule-rm-absorb' into maint	blob \| diff \| raw
2017-06-24	Merge branch 'jc/diff-tree-stale-comment' into maint	blob \| diff \| raw
2017-06-24	Merge branch 'ps/stash-push-pathspec-fix' into maint	blob \| diff \| raw
2017-06-24	Merge branch 'jk/pack-idx-corruption-safety' into maint	blob \| diff \| raw
2017-06-24	Merge branch 'jc/name-rev-lw-tag' into maint	blob \| diff \| raw
2017-06-13	Merge branch 'jk/connect-symref-info-leak-fix' into...	blob \| diff \| raw
2017-06-13	Merge branch 'ab/t3070-test-dedup' into maint	blob \| diff \| raw
2017-06-13	Merge branch 'jh/memihash-opt' into maint	blob \| diff \| raw
2017-06-13	Merge branch 'jh/close-index-before-stat' into maint	blob \| diff \| raw
2017-06-13	Merge branch 'sl/clean-d-ignored-fix' into maint	blob \| diff \| raw
2017-06-13	Merge branch 'dk/send-email-avoid-net-smtp-ssl-when...	blob \| diff \| raw
2017-06-13	Merge branch 'bw/forking-and-threading' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'ah/doc-filter-branch-export-env' into...	blob \| diff \| raw
2017-06-05	Merge branch 'sd/t3200-typofix' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'sb/t5531-update-desc' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'ah/doc-pretty-format-fix' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'ah/doc-interpret-trailers-ifexists' into...	blob \| diff \| raw
2017-06-05	Merge branch 'ab/ref-filter-no-contains' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'sg/core-filemode-doc-typofix' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'jn/credential-doc-on-clear' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'js/bs-is-a-dir-sep-on-windows' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'jk/alternate-ref-optim' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'kn/ref-filter-branch-list' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'rs/checkout-am-fix-unborn' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'jn/clone-add-empty-config-from-command...	blob \| diff \| raw
2017-06-05	Merge branch 'ls/travis-doc-asciidoctor' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'tg/stash-push-fixup' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'km/log-showsignature-doc' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'jt/use-trailer-api-in-commands' into...	blob \| diff \| raw
2017-06-04	Merge branch 'jt/push-options-doc' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'jk/update-links-in-docs' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'jk/ignore-broken-tags-when-ignoring-missi...	blob \| diff \| raw
2017-06-04	Merge branch 'jk/disable-pack-reuse-when-broken' into...	blob \| diff \| raw
2017-06-04	Merge branch 'jk/am-leakfix' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'jc/read-tree-empty-with-m' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'jc/apply-fix-mismerge' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'ja/do-not-ask-needless-questions' into...	blob \| diff \| raw
2017-06-04	Merge branch 'bw/submodule-with-bs-path' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'ah/log-decorate-default-to-auto' into...	blob \| diff \| raw
2017-06-04	Merge branch 'ab/aix-needs-compat-regex' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'pw/rebase-i-regression-fix' into maint	blob \| diff \| raw
2017-05-09	Sync with v2.12.3	blob \| diff \| raw
2017-05-09	Merge branch 'jh/verify-index-checksum-only-in-fsck'	blob \| diff \| raw
2017-05-05	Merge branch 'maint-2.11' into maint	blob \| diff \| raw \| diff to current
2017-05-05	Merge branch 'maint-2.10' into maint-2.11	blob \| diff \| raw \| diff to current
2017-05-05	Merge branch 'maint-2.6' into maint-2.7	blob \| diff \| raw \| diff to current
2017-05-04	Merge branch 'sr/hooks-cwd-doc'	blob \| diff \| raw
2017-05-04	Merge branch 'rg/doc-submittingpatches-wordfix'	blob \| diff \| raw
2017-05-04	Merge branch 'rg/doc-pull-typofix'	blob \| diff \| raw
2017-05-01	Merge branch 'jk/submodule-init-segv-fix'	blob \| diff \| raw
2017-05-01	Merge branch 'jk/prio-queue-avoid-swap-with-self'	blob \| diff \| raw
2017-04-26	Merge branch 'mh/separate-ref-cache'	blob \| diff \| raw
2017-04-26	Merge branch 'nd/worktree-add-lock'	blob \| diff \| raw
2017-04-26	Merge branch 'jk/update-links-in-docs'	blob \| diff \| raw
2017-04-26	Merge branch 'sf/putty-w-args'	blob \| diff \| raw
2017-04-26	Merge branch 'ab/completion-push-delete-ref'	blob \| diff \| raw
2017-04-26	Merge branch 'cc/split-index-config'	blob \| diff \| raw
2017-04-26	Merge branch 'jk/war-on-git-path'	blob \| diff \| raw
2017-04-26	Merge branch 'jh/add-index-entry-optim'	blob \| diff \| raw
2017-04-26	Merge branch 'ss/submodule-shallow-doc'	blob \| diff \| raw
2017-04-26	Merge branch 'ss/gitmodules-ignore-doc'	blob \| diff \| raw
2017-04-26	Merge branch 'nd/conditional-config-in-early-config'	blob \| diff \| raw
2017-04-26	Merge branch 'ab/push-cas-doc-n-test'	blob \| diff \| raw
2017-04-26	Merge branch 'ls/travis-coccicheck'	blob \| diff \| raw
2017-04-26	Merge branch 'ps/pathspec-empty-prefix-origin'	blob \| diff \| raw
2017-04-26	Merge branch 'pc/t2027-git-to-pipe-cleanup'	blob \| diff \| raw
2017-04-26	Merge branch 'gb/rebase-signoff'	blob \| diff \| raw
2017-04-24	Merge branch 'dt/xgethostname-nul-termination'	blob \| diff \| raw
2017-04-24	Merge branch 'jk/ls-files-recurse-submodules-fix'	blob \| diff \| raw
2017-04-24	Merge branch 'rs/misc-cppcheck-fixes'	blob \| diff \| raw
2017-04-24	Merge branch 'jk/snprintf-cleanups'	blob \| diff \| raw
2017-04-24	Merge branch 'xy/format-patch-base'	blob \| diff \| raw
2017-04-24	Merge branch 'sb/checkout-recurse-submodules'	blob \| diff \| raw
2017-04-24	Merge branch 'jt/fetch-pack-error-reporting'	blob \| diff \| raw
2017-04-24	Merge branch 'km/t1400-modernization'	blob \| diff \| raw
2017-04-24	Merge branch 'jk/quarantine-received-objects'	blob \| diff \| raw
2017-04-24	Merge branch 'jk/loose-object-fsck'	blob \| diff \| raw
2017-04-24	Merge branch 'bw/submodule-with-bs-path'	blob \| diff \| raw
2017-04-24	Merge branch 'jh/verify-index-checksum-only-in-fsck'	blob \| diff \| raw
2017-04-24	Merge branch 'jh/unpack-trees-micro-optim'	blob \| diff \| raw
next