Andrew's git / gitweb.git / history
?
general improvements
[gitweb.git] / builtin / merge-file.c
2018-12-01 Merge branch 'ab/replace-graft-with-replace-advice' blob | diff | raw
2018-11-29 Merge branch 'nd/n18n-fix' blob | diff | raw
2018-11-26 Merge branch 'nd/per-worktree-ref-iteration' blob | diff | raw
2018-11-26 Merge branch 'tb/clone-case-smashing-warning-test' blob | diff | raw
2018-11-26 Merge branch 'jk/t5562-perl-path-fix' blob | diff | raw
2018-11-21 Sync with 2.19.2 blob | diff | raw
2018-11-21 Merge branch 'jk/check-everything-connected-is-long... blob | diff | raw | diff to current
2018-11-21 Merge branch 'cc/shared-index-permbits' blob | diff | raw
2018-11-21 Merge branch 'nd/clone-case-smashing-warning' blob | diff | raw
2018-11-21 Merge branch 'cc/delta-islands' blob | diff | raw
2018-11-21 Merge branch 'js/rebase-am-options-fix' blob | diff | raw
2018-11-21 Merge branch 'js/builtin-rebase-perf-fix-err-fix' blob | diff | raw
2018-11-20 Merge branch 'master' of git://github.com/git-l10n... blob | diff | raw
2018-11-19 Merge branch 'sb/cocci-pending' blob | diff | raw
2018-11-19 Merge branch 'js/test-git-installed' blob | diff | raw
2018-11-19 Merge branch 'dd/poll-dot-h' blob | diff | raw
2018-11-19 Merge branch 'tb/print-size-t-with-uintmax-format' blob | diff | raw
2018-11-19 Merge branch 'tb/xcurl-off-t' blob | diff | raw
2018-11-19 Merge branch 'nd/format-patch-cover-letter-stat-width' blob | diff | raw
2018-11-19 Merge branch 'ds/push-squelch-ambig-warning' blob | diff | raw
2018-11-19 Merge branch 'ab/dynamic-gettext-poison' blob | diff | raw
2018-11-18 Merge branch 'jk/close-duped-fd-before-unlock-for-bundle' blob | diff | raw
2018-11-18 Merge branch 'ab/rebase-in-c-escape-hatch' blob | diff | raw
2018-11-18 Merge branch 'js/rebase-am-options' blob | diff | raw
2018-11-18 Merge branch 'sg/ref-filter-wo-repository' blob | diff | raw
2018-11-18 Merge branch 'nd/doc-extensions' blob | diff | raw
2018-11-18 Merge branch 'js/fuzz-cxxflags' blob | diff | raw
2018-11-18 Merge branch 'js/mingw-msdn-url' blob | diff | raw
2018-11-18 Merge branch 'js/mingw-create-hard-link' blob | diff | raw
2018-11-18 Merge branch 'js/config-sequence' blob | diff | raw
2018-11-18 Merge branch 'lj/mingw-pthread-cond' blob | diff | raw
2018-11-18 Merge branch 'nd/command-list-gen-fix' blob | diff | raw
2018-11-18 Merge branch 'ag/p3400-force-checkout' blob | diff | raw
2018-11-18 Merge branch 'cb/notes-freeing-always-null-fix' blob | diff | raw
2018-11-18 Merge branch 'js/rebase-r-and-merge-head' blob | diff | raw
2018-11-18 Merge branch 'js/apply-recount-allow-noop' blob | diff | raw
2018-11-18 Merge branch 'ra/rev-parse-exclude-glob' blob | diff | raw
2018-11-18 Merge branch 'js/builtin-rebase-perf-fix' blob | diff | raw
2018-11-18 Merge branch 'js/mailmap' blob | diff | raw
2018-11-18 Merge branch 'js/rebase-autostash-detach-fix' blob | diff | raw
2018-11-18 Merge branch 'ab/range-diff-no-patch' blob | diff | raw
2018-11-18 Merge branch 'jk/verify-sig-merge-into-void' blob | diff | raw
2018-11-18 Merge branch 'js/mingw-res-rebuild' blob | diff | raw
2018-11-18 Merge branch 'jk/unused-parameter-fixes' blob | diff | raw
2018-11-06 assert NOARG/NONEG behavior of parse-options callbacks blob | diff | raw
2018-10-31 Adjust for 2.19.x series blob | diff | raw | diff to current
2018-10-16 Merge branch 'jk/check-everything-connected-is-long... blob | diff | raw | diff to current
2018-08-27 Merge branch 'sg/t7501-thinkofix' blob | diff | raw | diff to current
2018-08-27 Merge branch 'sg/t0020-conversion-fix' blob | diff | raw | diff to current
2018-08-27 Merge branch 'sg/t4051-fix' blob | diff | raw | diff to current
2018-08-27 Merge branch 'js/larger-timestamps' blob | diff | raw | diff to current
2018-08-20 Merge branch 'sb/pull-rebase-submodule' blob | diff | raw | diff to current
2018-08-20 Merge branch 'js/typofixes' blob | diff | raw | diff to current
2018-08-15 Merge branch 'sb/histogram-less-memory' blob | diff | raw | diff to current
2018-07-24 Merge branch 'jk/fetch-all-peeled-fix' blob | diff | raw | diff to current
2018-06-28 Merge branch 'jk/fetch-all-peeled-fix' blob | diff | raw | diff to current
2018-06-18 Merge branch 'mw/doc-merge-enumfix' blob | diff | raw | diff to current
2018-05-30 Merge branch 'rs/no-null-ptr-arith-in-fast-export' blob | diff | raw | diff to current
2018-05-22 Sync with Git 2.13.7 blob | diff | raw | diff to current
2018-05-22 Merge branch 'jk/submodule-name-verify-fix' into jk... blob | diff | raw | diff to current
2018-05-08 Merge branch 'ab/git-svn-get-record-typofix' blob | diff | raw | diff to current
2018-04-25 Merge branch 'es/fread-reads-dir-autoconf-fix' blob | diff | raw | diff to current
2018-04-25 Merge branch 'js/t5404-path-fix' blob | diff | raw | diff to current
2018-04-25 Merge branch 'mn/send-email-credential-doc' blob | diff | raw | diff to current
2018-04-25 Merge branch 'ak/bisect-doc-typofix' blob | diff | raw | diff to current
2018-04-10 Merge branch 'ys/bisect-object-id-missing-conversion... blob | diff | raw | diff to current
2018-03-22 Merge branch 'gs/test-unset-xdg-cache-home' into maint blob | diff | raw | diff to current
2018-03-22 Merge branch 'sb/status-doc-fix' into maint blob | diff | raw | diff to current
2018-03-22 Merge branch 'bc/doc-interpret-trailers-grammofix'... blob | diff | raw | diff to current
2018-03-22 Merge branch 'jc/mailinfo-cleanup-fix' into maint blob | diff | raw | diff to current
2018-03-22 Merge branch 'cl/t9001-cleanup' into maint blob | diff | raw | diff to current
2018-03-22 Merge branch 'nd/diff-flush-before-warning' into maint blob | diff | raw | diff to current
2018-03-21 Merge branch 'dp/merge-strategy-doc-fix' blob | diff | raw | diff to current
2018-03-21 Merge branch 'ks/t3200-typofix' blob | diff | raw | diff to current
2018-03-08 Merge branch 'mk/doc-pretty-fill' blob | diff | raw | diff to current
2018-03-08 Merge branch 'ds/mark-parents-uninteresting-optim' blob | diff | raw | diff to current
2018-03-06 Merge branch 'xz/send-email-batch-size' blob | diff | raw | diff to current
2018-03-06 Merge branch 'cb/ttk-style' of git-gui into cb/git... blob | diff | raw | diff to current
2018-03-02 Merge branch 'bb/ssh-key-files' of git-gui into bb... blob | diff | raw | diff to current
2018-03-02 Merge branch 'bp/bind-kp-enter' of git-gui into bp... blob | diff | raw | diff to current
2018-02-28 Merge branch 'tz/do-not-clean-spec-file' blob | diff | raw | diff to current
2018-02-28 Merge branch 'gs/test-unset-xdg-cache-home' blob | diff | raw | diff to current
2018-02-28 Merge branch 'sb/status-doc-fix' blob | diff | raw | diff to current
2018-02-27 Merge branch 'ys/bisect-object-id-missing-conversion... blob | diff | raw | diff to current
2018-02-27 Merge branch 'nd/ita-wt-renames-in-status' into maint blob | diff | raw | diff to current
2018-02-27 Merge branch 'bc/doc-interpret-trailers-grammofix' blob | diff | raw | diff to current
2018-02-27 Merge branch 'bp/name-hash-dirname-fix' blob | diff | raw | diff to current
2018-02-15 Merge branch 'as/read-tree-prefix-doc-fix' into maint blob | diff | raw | diff to current
2018-02-15 Merge branch 'tg/reset-hard-show-head-with-pretty' blob | diff | raw | diff to current
2018-02-15 Merge branch 'sb/pull-rebase-submodule' blob | diff | raw | diff to current
2018-02-13 Merge branch 'jc/mailinfo-cleanup-fix' blob | diff | raw | diff to current
2018-02-13 Merge branch 'nd/diff-flush-before-warning' blob | diff | raw | diff to current
2018-02-13 Merge branch 'cl/t9001-cleanup' blob | diff | raw | diff to current
2018-01-23 Merge branch 'as/read-tree-prefix-doc-fix' blob | diff | raw | diff to current
2018-01-23 Merge branch 'ys/bisect-object-id-missing-conversion... blob | diff | raw | diff to current
2018-01-23 Merge branch 'nd/ita-wt-renames-in-status' blob | diff | raw | diff to current
2018-01-11 Merge branch 'js/test-with-ws-in-path' blob | diff | raw | diff to current
2018-01-09 Merge branch 'jk/doc-diff-options' blob | diff | raw | diff to current
2018-01-09 Merge branch 'js/test-with-ws-in-path' blob | diff | raw | diff to current
2018-01-09 Merge branch 'js/misc-git-gui-stuff' of ../git-gui blob | diff | raw | diff to current
next