config: fix bogus fd check when setting up default config
[gitweb.git] / builtin / merge-file.c
2016-06-10 Merge branch 'jk/diff-compact-heuristic'
2016-06-10 Merge branch 'jk/shell-portability'
2016-06-10 Merge branch 'jc/t2300-setup'
2016-06-06 Sync with 2.8.4
2016-06-06 Merge branch 'ar/diff-args-osx-precompose' into maint
2016-06-03 Merge branch 'rs/apply-name-terminate'
2016-06-03 Merge branch 'rs/patch-id-use-skip-prefix'
2016-06-03 Merge branch 'mm/makefile-developer-can-be-in-config...
2016-06-03 Merge branch 'pa/cherry-pick-doc-typo'
2016-06-03 Merge branch 'js/rebase-i-dedup-call-to-rerere'
2016-06-03 Merge branch 'js/perf-rebase-i'
2016-05-31 Merge branch 'maint'
2016-05-31 Merge branch 'jk/test-send-sh-x-trace-elsewhere' into...
2016-05-31 Merge branch 'js/name-rev-use-oldest-ref' into maint
2016-05-31 Merge branch 'es/t1500-modernize'
2016-05-31 Merge branch 'jk/cat-file-buffered-batch-all'
2016-05-31 Merge branch 'fc/fast-import-broken-marks-file'
2016-05-30 Merge branch 'ak/t0008-ksh88-workaround'
2016-05-30 Merge branch 'js/t6044-use-test-seq'
2016-05-30 Merge branch 'rj/log-decorate-auto'
2016-05-30 Merge branch 'kb/msys2-tty'
2016-05-26 Sync with maint
2016-05-26 Merge branch 'sb/z-is-gnutar-ism' into maint
2016-05-26 Merge branch 'ak/t4151-ls-files-could-be-empty' into...
2016-05-26 Merge branch 'jc/test-seq' into maint
2016-05-26 Merge branch 'tb/t5601-sed-fix' into maint
2016-05-26 Merge branch 'va/mailinfo-doc-typofix' into maint
2016-05-26 Merge branch 'jk/war-on-sprintf' into maint-2.7
2016-05-26 Merge branch 'fix_fr' of git://github.com/jnavila/git
2016-05-23 Merge branch 'jc/rerere-multi'
2016-05-23 Merge branch 'da/difftool'
2016-05-23 Merge branch 'jk/test-z-n-unquoted'
2016-05-23 Merge branch 'ar/diff-args-osx-precompose'
2016-05-23 Merge branch 'jc/doc-lint'
2016-05-23 Merge branch 'js/perf-rebase-i'
2016-05-23 Merge branch 'jc/test-parse-options-expect'
2016-05-23 Merge branch 'pb/commit-verbose-config'
2016-05-23 Merge branch 'xy/format-patch-base'
2016-05-23 Merge branch 'tb/core-eol-fix'
2016-05-23 Merge branch 'nd/worktree-various-heads'
2016-05-23 Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'
2016-05-18 Sync with 2.8.3
2016-05-18 Merge branch 'jk/push-client-deadlock-fix'
2016-05-18 Merge branch 'rn/glossary-typofix' into HEAD
2016-05-18 Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD
2016-05-18 Merge branch 'sk/gitweb-highlight-encoding' into HEAD
2016-05-18 Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD
2016-05-18 Merge branch 'jd/send-email-to-whom' into HEAD
2016-05-17 Merge branch 'kf/gpg-sig-verification-doc'
2016-05-17 Merge branch 'js/windows-dotgit'
2016-05-17 Merge branch 'va/mailinfo-doc-typofix'
2016-05-17 Merge branch 'jk/test-send-sh-x-trace-elsewhere'
2016-05-17 Merge branch 'js/http-custom-headers'
2016-05-17 Merge branch 'jk/rebase-interative-eval-fix'
2016-05-17 Merge branch 'jc/fsck-nul-in-commit'
2016-05-17 Merge branch 'nd/test-helpers'
2016-05-17 Merge branch 'ls/travis-build-doc'
2016-05-17 Merge branch 'jc/ll-merge-internal'
2016-05-17 Merge branch 'jc/linkgit-fix'
2016-05-17 Merge branch 'va/i18n-remote-comment-to-align'
2016-05-17 Merge branch 'tb/t5601-sed-fix'
2016-05-17 Merge branch 'nd/error-errno'
2016-05-17 Merge branch 'jc/test-seq'
2016-05-17 Merge branch 'ak/t4151-ls-files-could-be-empty'
2016-05-17 Merge branch 'sb/z-is-gnutar-ism'
2016-05-13 Merge branch 'jc/commit-tree-ignore-commit-gpgsign'
2016-05-10 Merge branch 'sk/gitweb-highlight-encoding'
2016-05-10 Merge branch 'rn/glossary-typofix'
2016-05-09 builtin/merge-file.c: use error_errno()
2016-05-06 Merge branch 'kn/for-each-tag-branch' into maint
2016-05-06 Merge branch 'jk/diff-compact-heuristic'
2016-05-06 Merge branch 'ls/p4-lfs-test-fix-2.7.0'
2016-05-03 Merge branch 'jd/send-email-to-whom'
2016-05-03 Merge branch 'jk/fix-attribute-macro-in-2.5'
2016-05-03 Merge branch 'js/name-rev-use-oldest-ref'
2016-05-02 Merge branch 'jc/xstrfmt-null-with-prec-0' into maint
2016-05-02 Merge branch 'ew/send-email-drop-data-dumper' into...
2016-05-02 Merge branch 'ad/cygwin-wants-rename' into maint
2016-05-02 Merge branch 'ad/commit-have-m-option' into maint
2016-05-02 Merge branch 'sb/submodule-helper-clone-regression...
2016-05-02 Merge branch 'es/format-patch-doc-hide-no-patch' into...
2016-05-02 Merge branch 'ew/send-email-readable-message-id' into...
2016-04-29 Merge branch 'ep/trace-doc-sample-fix' into maint
2016-04-29 Merge branch 'jc/makefile-redirection-stderr' into...
2016-04-29 Merge branch 'tb/blame-force-read-cache-to-workaround...
2016-04-29 Merge branch 'sk/send-pack-all-fix' into maint
2016-04-29 Merge branch 'sg/diff-multiple-identical-renames' into...
2016-04-25 Merge branch 'jc/rerere-multi'
2016-04-22 Merge branch 'ad/cygwin-wants-rename'
2016-04-22 Merge branch 'jc/xstrfmt-null-with-prec-0'
2016-04-22 Merge branch 'ad/commit-have-m-option'
2016-04-22 Merge branch 'ew/send-email-drop-data-dumper'
2016-04-22 Merge branch 'ew/send-email-readable-message-id'
2016-04-22 Merge branch 'sb/submodule-helper-clone-regression...
2016-04-15 Merge branch 'ss/commit-squash-msg' into maint
2016-04-15 Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codep...
2016-04-15 Merge branch 'pb/t7502-drop-dup' into maint
2016-04-15 Merge branch 'ss/exc-flag-is-a-collection-of-bits'...
2016-04-14 Merge branch 'sb/submodule-helper-clone-regression...
2016-04-13 Merge branch 'tb/blame-force-read-cache-to-workaround...
next