fread does not return negative on error
[git] / builtin-merge.c
2009-06-22  Junio C HamanoMerge branch 'sb/maint-1.6.0-add-config-fix' into maint
2009-06-22  Junio C HamanoMerge branch 'ak/maint-for-each-ref-no-lookup' into...
2009-06-22  Junio C HamanoMerge branch 'rc/maint-http-local-slot-fix' into maint
2009-06-22  Junio C HamanoMerge branch 'cb/maint-no-double-merge' into maint
2009-06-22  Junio C HamanoMerge branch 'pb/maint-1.6.2-userdiff-fix' into maint
2009-06-21  Junio C HamanoMerge branch 'maint-1.6.2' into maint
2009-06-21  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-06-21  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-06-14  Junio C HamanoMerge branch 'maint-1.6.2' into maint
2009-06-14  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-06-14  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-06-11  Junio C HamanoMerge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
2009-06-02  Junio C HamanoMerge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
2009-06-02  Junio C HamanoMerge branch 'sb/maint-1.6.2-opt-filename-fix' into...
2009-06-02  Clemens Buchacherrefuse to merge during a merge
2009-05-26  Junio C HamanoMerge branch 'js/maint-no-ln-across-libexec-and-bin...
2009-05-26  Junio C HamanoMerge branch 'lt/maint-diff-reduce-lstat' into maint
2009-05-26  Junio C HamanoMerge branch 'do/maint-merge-recursive-fix' into maint
2009-05-26  Junio C HamanoMerge branch 'jk/maint-1.6.0-trace-argv' into maint
2009-05-24  Junio C HamanoMerge branch 'maint-1.6.2' into maint
2009-05-24  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-05-24  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-05-16  Junio C HamanoMerge branch 'maint-1.6.2' into maint
2009-05-14  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-05-14  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-05-12  Junio C HamanoMerge branch 'maint-1.6.2' into maint
2009-05-12  Junio C HamanoMerge branch 'jc/maint-read-tree-multi' into maint...
2009-05-09  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-05-09  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-05-06  Junio C HamanoMerge branch 'maint'
2009-05-06  Junio C HamanoMerge branch 'rj/maint-1.6.0-svn-parse-fix' into maint
2009-05-06  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-05-03  Junio C HamanoSync with GIT 1.6.2.5
2009-05-03  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-05-03  Junio C HamanoMerge branch 'jc/maint-read-tree-multi' into maint
2009-05-03  Junio C HamanoMerge branch 'mk/maint-apply-swap' into maint
2009-05-03  Junio C HamanoMerge branch 'mm/maint-add-p-quit' into maint
2009-05-03  Junio C HamanoMerge branch 'lt/pack-object-memuse' into maint
2009-05-03  Junio C HamanoMerge branch 'jc/maint-1.6.0-keep-pack' into maint...
2009-05-03  Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-05-03  Junio C HamanoMerge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
2009-05-02  Junio C HamanoMerge git://repo.or.cz/git-gui
2009-05-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-04-29  Junio C HamanoMerge branch 'maint'
2009-04-29  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-29  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-28  Junio C HamanoMerge branch 'maint'
2009-04-28  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-28  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-27  Allan Caffeebuiltin-merge: fix a typo in an error message
2009-04-25  Junio C HamanoMerge branch 'maint'
2009-04-25  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-25  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-23  Junio C HamanoMerge branch 'jc/maint-read-tree-multi'
2009-04-21  Junio C HamanoMerge branch 'mk/maint-apply-swap'
2009-04-21  Junio C HamanoMerge branch 'maint'
2009-04-20  Junio C HamanoMerge branch 'mm/maint-add-p-quit'
2009-04-20  Junio C HamanoSync with 1.6.2.4
2009-04-18  Junio C HamanoMerge branch 'lt/pack-object-memuse'
2009-04-18  Junio C HamanoMerge branch 'maint'
2009-04-18  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-18  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-18  Junio C HamanoMerge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
2009-04-18  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-04-18  Junio C HamanoMerge branch 'maint'
2009-04-18  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-18  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-13  Junio C HamanoMark t1301 permission test to depend on POSIXPERM
2009-04-12  Junio C HamanoMerge branch 'sb/doc-upstream-branch'
2009-04-12  Junio C HamanoMerge branch 'fg/remote-prune'
2009-04-12  Junio C HamanoMerge branch 'cc/sha1-bsearch'
2009-04-12  Junio C HamanoMerge branch 'cc/bisect-filter'
2009-04-12  Junio C HamanoMerge branch 'maint'
2009-04-12  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-12  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-09  Junio C HamanoMerge branch 'maint'
2009-04-09  Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-04-09  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-09  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-09  Junio C HamanoMerge branch 'jc/maint-1.6.0-keep-pack' into maint
2009-04-09  Junio C HamanoMerge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
2009-04-09  Junio C HamanoMerge branch 'js/maint-1.6.0-exec-path-env' into maint...
2009-04-08  Junio C HamanoMerge branch 'maint'
2009-04-08  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-08  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-08  Junio C HamanoMerge branch 'lt/reflog-expire'
2009-04-08  Junio C HamanoMerge branch 'bs/maint-1.6.0-tree-walk-prefix'
2009-04-08  Junio C HamanoMerge branch 'ms/http-auth'
2009-04-08  Junio C HamanoMerge branch 'js/maint-submodule-checkout'
2009-04-08  Junio C HamanoMerge branch 'cb/maint-merge-recursive-submodule-fix'
2009-04-08  Junio C HamanoMerge branch 'mh/html-path'
2009-04-06  Junio C HamanoMerge branch 'jc/name-branch'
2009-04-06  Junio C HamanoMerge branch 'jc/shared-literally'
2009-04-05  Junio C HamanoMerge branch 'maint'
2009-04-05  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-05  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-02  Junio C HamanoSync with 1.6.2.2
2009-04-02  Junio C HamanoMerge branch 'jc/maint-1.6.0-blame-s' into maint
2009-04-02  Junio C HamanoMerge branch 'js/maint-1.6.0-exec-path-env' into maint
2009-04-02  Junio C HamanoMerge branch 'bc/maint-1.6.1-branch-deleted-was' into...
next