merge-trees: let caller decide whether to renormalize
[gitweb.git] / convert.c
2010-07-02 Don't expand CRLFs when normalizing text during merge
2010-07-02 Avoid conflicts when merging branches with mixed normal...
2010-06-27 Merge branch 'cp/textconv-cat-file'
2010-06-27 Merge branch 'pb/maint-perl-errmsg-no-dir'
2010-06-27 Merge branch 'tr/send-email-8bit'
2010-06-27 Merge branch 'js/maint-am-rebase-invalid-author'
2010-06-27 Merge branch 'ab/blame-textconv'
2010-06-27 Merge branch 'jn/show-num-walks'
2010-06-25 Merge branch 'maint'
2010-06-23 Merge branch 'jk/url-decode'
2010-06-22 Merge branch 'jc/maint-simpler-common-prefix'
2010-06-22 Merge branch 'sb/format-patch-signature'
2010-06-22 Merge branch 'mg/pretty-magic-space'
2010-06-22 Merge branch 'jn/gitweb-return-or-exit-cleanup'
2010-06-22 Merge branch 'bd/maint-unpack-trees-parawalk-fix'
2010-06-22 Merge branch 'cc/cherry-pick-series'
2010-06-22 Merge branch 'jc/rev-list-ancestry-path'
2010-06-22 Merge branch 'lt/extended-sha1-match-commit-with-regexp'
2010-06-22 Merge branch 'maint'
2010-06-21 Merge branch 'js/maint-receive-pack-symref-alias'
2010-06-21 Merge branch 'cc/maint-commit-reflog-msg'
2010-06-21 Merge branch 'ic/maint-rebase-i-abort'
2010-06-21 Merge branch 'jk/maint-advice-empty-amend'
2010-06-21 Merge branch 'eb/core-eol'
2010-06-21 Merge branch 'fg/autocrlf'
2010-06-21 Merge branch 'sm/branch-broken-ref'
2010-06-21 Merge branch 'rr/parse-date-refactor'
2010-06-21 Merge branch 'jn/document-rebase-i-p-limitation'
2010-06-21 Merge branch 'tc/commit-abbrev-fix'
2010-06-21 Merge branch 'tr/receive-pack-aliased-update-fix'
2010-06-21 Merge branch 'gs/usage-to-stdout'
2010-06-21 Merge branch 'js/async-thread'
2010-06-21 Merge branch 'gv/portable'
2010-06-21 Merge branch 'bc/portable'
2010-06-21 Merge branch 'jn/gitweb-fastcgi'
2010-06-21 Merge branch 'jn/checkout-doc'
2010-06-21 Merge branch 'em/checkout-orphan'
2010-06-21 Merge branch 'maint'
2010-06-21 Merge branch 'bg/apply-blank-trailing-context' into...
2010-06-21 Merge branch 'maint'
2010-06-18 Merge branch 'cc/maint-diff-CC-binary'
2010-06-18 Merge branch 'by/diff-graph'
2010-06-18 Merge branch 'cb/ls-files-cdup'
2010-06-18 Merge branch 'jc/t9129-any-utf8'
2010-06-18 Merge branch 'rr/am-help'
2010-06-18 Merge branch 'jn/rebase-cmdline-fix'
2010-06-18 Merge branch 'ps/gitweb--browse-chrome'
2010-06-18 Merge branch 'jk/am-skip-hint'
2010-06-18 Merge branch 'jh/diff-index-line-abbrev'
2010-06-18 Merge branch 'ab/maint-perl-use-instlibdir'
2010-06-18 Merge branch 'ec/diff-noprefix-config'
2010-06-18 Merge branch 'mg/status-b'
2010-06-18 Merge branch 'jn/gitweb-plackup'
2010-06-18 Merge branch 'jk/url-decode'
2010-06-18 Merge branch 'jn/remote-set-branches'
2010-06-18 Merge branch 'rc/ls-remote-default'
2010-06-18 Merge branch 'hg/id-munging'
2010-06-16 Merge branch 'np/index-pack-memsave' into maint
2010-06-16 Merge branch 'jc/am-3-show-corrupted-patch' into maint
2010-06-16 Merge branch 'sp/maint-describe-tiebreak-with-tagger...
2010-06-16 Merge branch 'rc/maint-curl-helper' into maint
2010-06-16 Merge branch 'hg/maint-attr-fix' into maint
2010-06-07 Add "core.eol" config variable
2010-05-31 Rewrite dynamic structure initializations to runtime...
2010-05-21 Merge branch 'jn/gitweb-our-squelch'
2010-05-21 Merge branch 'np/index-pack-memsave'
2010-05-21 Merge branch 'jc/am-3-show-corrupted-patch'
2010-05-21 Merge branch 'jc/maint-no-reflog-expire-unreach-for...
2010-05-21 Merge branch 'sp/maint-describe-tiebreak-with-tagger...
2010-05-20 Rename the "crlf" attribute "text"
2010-05-20 Add per-repository eol normalization
2010-05-12 autocrlf: Make it work also for un-normalized repositories
2010-05-09 Merge branch 'bg/apply-blank-trailing-context'
2010-05-09 Merge branch 'rc/maint-curl-helper'
2010-05-09 Merge branch 'hg/maint-attr-fix'
2010-05-09 Merge branch 'jc/maint-reflog-expire-unreachable'
2010-05-09 Merge branch 'sd/log-decorate'
2010-04-23 Merge branch 'jk/maint-diffstat-overflow' into maint
2010-04-19 Merge branch 'maint-1.6.6' into maint
2010-04-19 Merge branch 'jk/maint-diffstat-overflow'
2010-04-19 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-11 Merge branch 'jl/maint-submodule-gitfile-awareness'
2010-04-11 Merge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-11 convert: Keep foreign $Id$ on checkout.
2010-04-11 convert: Safer handling of $Id$ contraction.
2010-04-10 Merge branch 'jl/maint-submodule-gitfile-awareness'
2010-04-10 Merge branch 'jc/conflict-marker-size' into maint
2010-04-10 Merge branch 'mg/maint-send-email-lazy-editor' into...
2010-04-10 Merge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-04-06 Merge branch 'jc/conflict-marker-size'
2010-04-06 Merge branch 'sg/bash-completion'
2010-04-03 Merge branch 'mg/maint-send-email-lazy-editor'
2010-03-31 Merge branch 'jc/maint-refs-dangling' into maint
2010-03-29 Merge branch 'sb/notes-parse-opt'
2010-03-29 Merge branch 'cp/add-u-pathspec' into maint
2010-03-24 Merge branch 'jh/maint-submodule-status-in-void'
2010-03-24 Merge branch 'tr/notes-display'
2010-03-24 Merge branch 'jl/submodule-diff-dirtiness'
2010-03-24 Merge branch 'pb/log-first-parent-p-m'
2010-03-24 Merge branch 'jc/maint-refs-dangling'
next