make update-server-info more robust
[git] / merge.c
2014-08-26  Junio C HamanoMerge branch 'jk/diff-tree-t-fix'
2014-08-26  Junio C HamanoMerge branch 'jk/pack-shallow-always-without-bitmap'
2014-08-26  Junio C HamanoMerge branch 'jk/fix-profile-feedback-build'
2014-08-10  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-08-04  Junio C HamanoMerge branch 'tf/maint-doc-push'
2014-08-04  Junio C HamanoMerge branch 'ta/doc-config'
2014-08-04  Jiang XinMerge remote-tracking branch 'sv/nafmo/master'
2014-07-30  Junio C HamanoSync with 2.0.4
2014-07-30  Junio C HamanoMerge branch 'jk/more-push-completion'
2014-07-30  Junio C HamanoMerge branch 'sk/mingw-uni-fix-more'
2014-07-30  Junio C HamanoMerge branch 'ep/avoid-test-a-o'
2014-07-28  Junio C HamanoMerge branch 'maint'
2014-07-28  Junio C HamanoMerge branch 'jk/misc-fixes-maint'
2014-07-27  Junio C HamanoMerge branch 'jk/rebase-am-fork-point'
2014-07-27  Junio C HamanoMerge branch 'cc/replace-graft'
2014-07-27  Junio C HamanoMerge branch 'jk/stable-prio-queue'
2014-07-23  Junio C HamanoSync with v2.0.3
2014-07-23  Junio C HamanoMerge branch 'rs/fix-unlink-unix-socket'
2014-07-23  Junio C HamanoMerge branch 'ta/string-list-init'
2014-07-23  Junio C HamanoMerge branch 'jk/tag-sort'
2014-07-22  Junio C HamanoSync with maint
2014-07-22  Junio C HamanoMerge branch 'rs/code-cleaning'
2014-07-22  Junio C HamanoMerge branch 'nd/path-max-must-go'
2014-07-22  Junio C HamanoMerge branch 'jk/alloc-commit-id'
2014-07-22  Junio C HamanoMerge branch 'kb/perf-trace'
2014-07-21  Junio C HamanoMerge branch 'maint'
2014-07-21  Junio C HamanoMerge branch 'rs/unify-is-branch'
2014-07-21  Junio C HamanoMerge branch 'kb/avoid-fchmod-for-now'
2014-07-21  Junio C HamanoMerge branch 'sk/mingw-uni-fix'
2014-07-21  Junio C HamanoMerge branch 'ek/alt-odb-entry-fix'
2014-07-21  Junio C HamanoMerge branch 'kb/hashmap-updates'
2014-07-21  Junio C HamanoMerge branch 'jk/remote-curl-squelch-extra-errors'
2014-07-21  Junio C HamanoMerge branch 'rs/ref-transaction-0'
2014-07-21  Junio C HamanoMerge branch 'jl/submodule-tests'
2014-07-21  Junio C HamanoMerge branch 'ak/profile-feedback-build'
2014-07-21  Junio C HamanoMerge branch 'cc/for-each-mergetag'
2014-07-16  Junio C HamanoSync with 2.0.2
2014-07-16  Junio C HamanoMerge branch 'ah/fix-http-push'
2014-07-16  Junio C HamanoMerge branch 'rs/code-cleaning'
2014-07-16  Junio C HamanoMerge branch 'jk/skip-prefix'
2014-07-16  Junio C HamanoMerge branch 'po/error-message-style'
2014-07-16  Junio C HamanoMerge branch 'jl/test-lint-scripts'
2014-07-16  Junio C HamanoMerge branch 'zk/log-graph-showsig'
2014-07-16  Junio C HamanoMerge branch 'mg/fix-log-mergetag-color'
2014-07-16  Junio C HamanoMerge branch 'kb/path-max-must-go'
2014-07-16  Junio C HamanoMerge branch 'cb/filter-branch-prune-empty-degenerate...
2014-07-16  Junio C HamanoMerge branch 'mk/merge-incomplete-files'
2014-07-16  Junio C HamanoMerge branch 'jk/strip-suffix'
2014-07-16  Junio C HamanoMerge branch 'ep/submodule-code-cleanup'
2014-07-16  Junio C HamanoMerge branch 'jk/replace-edit-raw'
2014-07-16  Junio C HamanoMerge branch 'cc/replace-edit'
2014-07-16  Junio C HamanoMerge branch 'tb/crlf-tests'
2014-07-16  Junio C HamanoMerge branch 'nd/split-index'
2014-07-10  Junio C HamanoMerge branch 'maint'
2014-07-10  Junio C HamanoMerge branch 'dt/refs-check-refname-component-sse-fix'
2014-07-10  Junio C HamanoMerge branch 'rs/simplify-archive-tests'
2014-07-10  Junio C HamanoMerge branch 'rs/fix-alt-odb-path-comparison'
2014-07-10  Junio C HamanoMerge branch 'rs/status-code-clean-up'
2014-07-10  Junio C HamanoMerge branch 'kb/path-max-must-go'
2014-07-10  Junio C HamanoMerge branch 'mg/verify-commit'
2014-07-10  Junio C HamanoMerge branch 'jc/fix-clone-single-starting-at-a-tag'
2014-07-09  Junio C HamanoMerge branch 'sk/mingw-unicode-spawn-args'
2014-07-09  Junio C HamanoMerge branch 'sk/mingw-dirent'
2014-07-09  Junio C HamanoMerge branch 'sk/mingw-uni-console'
2014-07-09  Junio C HamanoMerge branch 'sk/mingw-main'
2014-07-09  Junio C HamanoMerge branch 'jk/pretty-G-format-fixes'
2014-07-09  Junio C HamanoMerge branch 'jk/xstrfmt'
2014-06-27  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-06-26  Junio C HamanoMerge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26  Junio C HamanoMerge git://repo.or.cz/git-gui
2014-06-19  Jeff Kingmerge: use argv_array when spawning merge strategy
2014-06-13  Nguyễn Thái Ngọc Duyread-cache: new API write_locked_index instead of write...
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-03-18  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18  Junio C HamanoMerge branch 'jk/config-path-include-fix' into maint
2014-03-14  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree'
2014-02-27  Junio C HamanoMerge branch 'bs/stdio-undef-before-redef'
2014-02-27  Junio C HamanoMerge branch 'jk/config-path-include-fix'
2014-02-13  Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint
2014-01-27  Junio C HamanoMerge branch 'jc/revision-range-unpeel'
2014-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-01-21  Junio C HamanoMerge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2014-01-14  Junio C HamanoMerge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2013-12-17  Junio C HamanoMerge branch 'jk/two-way-merge-corner-case-fix' into...
2013-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui
2013-12-09  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-12-05  Junio C HamanoMerge branch 'jk/two-way-merge-corner-case-fix'
2013-11-07  Junio C HamanoMerge branch 'vd/doc-unpack-objects' into maint
2013-11-07  Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint
2013-11-04  Junio C HamanoMerge branch 'vd/doc-unpack-objects'
2013-10-30  Junio C HamanoMerge branch 'jk/refs-c-squelch-gcc'
2013-10-30  Junio C HamanoMerge branch 'jk/date-c-double-semicolon'
2013-10-30  Junio C HamanoMerge branch 'sg/t3600-nul-sha1-fix'
2013-10-28  Junio C HamanoMerge branch 'ew/keepalive'
2013-10-28  Junio C HamanoMerge branch 'jc/revision-range-unpeel'
2013-10-14  Jonathan NiederMerge branch 'rj/highlight-test-hang'
2013-10-14  Jonathan NiederMerge branch 'nv/doc-config-signingkey'
2013-09-26  Jonathan NiederMerge branch 'js/xread-in-full' into maint
2013-09-12  Junio C HamanoMerge branch 'mn/doc-pack-heu-remove-dead-pastebin'
2013-09-11  Junio C HamanoMerge branch 'js/xread-in-full'
next