status: do not report errors in sequencer/todo
[gitweb.git] / builtin / merge-file.c
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...
2018-03-02 Merge branch 'bb/ssh-key-files' of git-gui into bb...
2018-03-02 Merge branch 'bp/bind-kp-enter' of git-gui into bp...
2018-02-28 Merge branch 'tz/do-not-clean-spec-file'
2018-02-28 Merge branch 'gs/test-unset-xdg-cache-home'
2018-02-28 Merge branch 'sb/status-doc-fix'
2018-02-27 Merge branch 'ys/bisect-object-id-missing-conversion...
2018-02-27 Merge branch 'nd/ita-wt-renames-in-status' into maint
2018-02-27 Merge branch 'bc/doc-interpret-trailers-grammofix'
2018-02-27 Merge branch 'bp/name-hash-dirname-fix'
2018-02-15 Merge branch 'as/read-tree-prefix-doc-fix' into maint
2018-02-15 Merge branch 'tg/reset-hard-show-head-with-pretty'
2018-02-15 Merge branch 'sb/pull-rebase-submodule'
2018-02-13 Merge branch 'jc/mailinfo-cleanup-fix'
2018-02-13 Merge branch 'nd/diff-flush-before-warning'
2018-02-13 Merge branch 'cl/t9001-cleanup'
2018-01-23 Merge branch 'as/read-tree-prefix-doc-fix'
2018-01-23 Merge branch 'ys/bisect-object-id-missing-conversion...
2018-01-23 Merge branch 'nd/ita-wt-renames-in-status'
2018-01-11 Merge branch 'js/test-with-ws-in-path'
2018-01-09 Merge branch 'jk/doc-diff-options'
2018-01-09 Merge branch 'js/test-with-ws-in-path'
2018-01-09 Merge branch 'js/misc-git-gui-stuff' of ../git-gui
2018-01-05 Merge branch 'jh/memihash-opt'
2017-12-28 Merge branch 'sr/http-sslverify-config-doc'
2017-12-27 Merge branch 'es/clone-shared-worktree'
2017-12-27 Merge branch 'jk/cvsimport-quoting'
2017-12-27 Merge branch 'rs/strbuf-read-once-reset-length'
2017-12-27 Merge branch 'rs/fmt-merge-msg-string-leak-fix'
2017-12-27 Merge branch 'rs/am-builtin-leakfix'
2017-12-19 Merge branch 'sg/setup-doc-update'
2017-12-13 Merge branch 'ks/doc-checkout-previous'
2017-12-13 Merge branch 'jc/receive-pack-hook-doc'
2017-12-06 Merge branch 'sp/doc-info-attributes'
2017-12-06 Merge branch 'rd/doc-notes-prune-fix'
2017-12-06 Merge branch 'rd/man-reflog-add-n'
2017-12-06 Merge branch 'rd/man-prune-progress'
next