sha1-name.c: remove implicit dependency on the_index
[gitweb.git] / builtin / merge-file.c
2019-01-04 Merge branch 'mk/http-backend-kill-children-before...
2019-01-04 Merge branch 'sd/stash-wo-user-name'
2019-01-04 Merge branch 'sg/clone-initial-fetch-configuration'
2019-01-04 Merge branch 'nd/checkout-dwim-fix'
2019-01-04 Merge branch 'ab/push-dwim-dst'
2019-01-04 Merge branch 'en/fast-export-import'
2019-01-04 Merge branch 'nd/the-index'
2019-01-04 Merge branch 'jk/loose-object-cache'
2019-01-04 Merge branch 'fc/http-version'
2019-01-04 Merge branch 'en/merge-path-collision'
2019-01-04 Merge branch 'nd/i18n'
2018-12-15 Merge branch 'jc/run-command-report-exec-failure-fix...
2018-12-15 Merge branch 'js/help-commands-verbose-by-default-fix...
2018-12-15 Merge branch 'nd/show-gitcomp-compilation-fix' into...
2018-12-15 Merge branch 'js/mailinfo-format-flowed-fix' into maint
2018-12-15 Merge branch 'ds/hash-independent-tests-fix' into maint
2018-12-04 Merge branch 'en/rebase-consistency'
2018-12-01 Merge branch 'ss/msvc-strcasecmp'
2018-12-01 Merge branch 'ab/push-example-in-doc'
2018-12-01 Merge branch 'rt/rebase-in-c-message-fix'
2018-12-01 Merge branch 'sg/daemon-test-signal-fix'
2018-12-01 Merge branch 'ma/reset-doc-rendering-fix'
2018-12-01 Merge branch 'ab/replace-graft-with-replace-advice'
2018-11-29 Merge branch 'nd/n18n-fix'
2018-11-26 Merge branch 'nd/per-worktree-ref-iteration'
2018-11-26 Merge branch 'tb/clone-case-smashing-warning-test'
2018-11-26 Merge branch 'jk/t5562-perl-path-fix'
2018-11-21 Sync with 2.19.2
2018-11-21 Merge branch 'jk/check-everything-connected-is-long...
2018-11-21 Merge branch 'cc/shared-index-permbits'
2018-11-21 Merge branch 'nd/clone-case-smashing-warning'
2018-11-21 Merge branch 'cc/delta-islands'
2018-11-21 Merge branch 'js/rebase-am-options-fix'
2018-11-21 Merge branch 'js/builtin-rebase-perf-fix-err-fix'
2018-11-20 Merge branch 'master' of git://github.com/git-l10n...
2018-11-19 Merge branch 'sb/cocci-pending'
2018-11-19 Merge branch 'js/test-git-installed'
2018-11-19 Merge branch 'dd/poll-dot-h'
2018-11-19 Merge branch 'tb/print-size-t-with-uintmax-format'
2018-11-19 Merge branch 'tb/xcurl-off-t'
2018-11-19 Merge branch 'nd/format-patch-cover-letter-stat-width'
2018-11-19 Merge branch 'ds/push-squelch-ambig-warning'
2018-11-19 Merge branch 'ab/dynamic-gettext-poison'
2018-11-18 Merge branch 'jk/close-duped-fd-before-unlock-for-bundle'
2018-11-18 Merge branch 'ab/rebase-in-c-escape-hatch'
2018-11-18 Merge branch 'js/rebase-am-options'
2018-11-18 Merge branch 'sg/ref-filter-wo-repository'
2018-11-18 Merge branch 'nd/doc-extensions'
2018-11-18 Merge branch 'js/fuzz-cxxflags'
2018-11-18 Merge branch 'js/mingw-msdn-url'
2018-11-18 Merge branch 'js/mingw-create-hard-link'
2018-11-18 Merge branch 'js/config-sequence'
2018-11-18 Merge branch 'lj/mingw-pthread-cond'
2018-11-18 Merge branch 'nd/command-list-gen-fix'
2018-11-18 Merge branch 'ag/p3400-force-checkout'
2018-11-18 Merge branch 'cb/notes-freeing-always-null-fix'
2018-11-18 Merge branch 'js/rebase-r-and-merge-head'
2018-11-18 Merge branch 'js/apply-recount-allow-noop'
2018-11-18 Merge branch 'ra/rev-parse-exclude-glob'
2018-11-18 Merge branch 'js/builtin-rebase-perf-fix'
2018-11-18 Merge branch 'js/mailmap'
2018-11-18 Merge branch 'js/rebase-autostash-detach-fix'
2018-11-18 Merge branch 'ab/range-diff-no-patch'
2018-11-18 Merge branch 'jk/verify-sig-merge-into-void'
2018-11-18 Merge branch 'js/mingw-res-rebuild'
2018-11-18 Merge branch 'jk/unused-parameter-fixes'
2018-11-06 assert NOARG/NONEG behavior of parse-options callbacks
2018-10-31 Adjust for 2.19.x series
2018-10-16 Merge branch 'jk/check-everything-connected-is-long...
2018-08-27 Merge branch 'sg/t7501-thinkofix'
2018-08-27 Merge branch 'sg/t0020-conversion-fix'
2018-08-27 Merge branch 'sg/t4051-fix'
2018-08-27 Merge branch 'js/larger-timestamps'
2018-08-20 Merge branch 'sb/pull-rebase-submodule'
2018-08-20 Merge branch 'js/typofixes'
2018-08-15 Merge branch 'sb/histogram-less-memory'
2018-07-24 Merge branch 'jk/fetch-all-peeled-fix'
2018-06-28 Merge branch 'jk/fetch-all-peeled-fix'
2018-06-18 Merge branch 'mw/doc-merge-enumfix'
2018-05-30 Merge branch 'rs/no-null-ptr-arith-in-fast-export'
2018-05-22 Sync with Git 2.13.7
2018-05-22 Merge branch 'jk/submodule-name-verify-fix' into jk...
2018-05-08 Merge branch 'ab/git-svn-get-record-typofix'
2018-04-25 Merge branch 'es/fread-reads-dir-autoconf-fix'
2018-04-25 Merge branch 'js/t5404-path-fix'
2018-04-25 Merge branch 'mn/send-email-credential-doc'
2018-04-25 Merge branch 'ak/bisect-doc-typofix'
2018-04-10 Merge branch 'ys/bisect-object-id-missing-conversion...
2018-03-22 Merge branch 'gs/test-unset-xdg-cache-home' into maint
2018-03-22 Merge branch 'sb/status-doc-fix' into maint
2018-03-22 Merge branch 'bc/doc-interpret-trailers-grammofix'...
2018-03-22 Merge branch 'jc/mailinfo-cleanup-fix' into maint
2018-03-22 Merge branch 'cl/t9001-cleanup' into maint
2018-03-22 Merge branch 'nd/diff-flush-before-warning' into maint
2018-03-21 Merge branch 'dp/merge-strategy-doc-fix'
2018-03-21 Merge branch 'ks/t3200-typofix'
2018-03-08 Merge branch 'mk/doc-pretty-fill'
2018-03-08 Merge branch 'ds/mark-parents-uninteresting-optim'
2018-03-06 Merge branch 'xz/send-email-batch-size'
2018-03-06 Merge branch 'cb/ttk-style' of git-gui into cb/git...
next