merge-trees: let caller decide whether to renormalize
[gitweb.git] / diffcore-pickaxe.c
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-25 Merge branch 'maint'
2010-06-22 Merge branch 'jc/maint-simpler-common-prefix'
2010-06-22 Merge branch 'bd/maint-unpack-trees-parawalk-fix'
2010-06-22 Merge branch 'jc/rev-list-ancestry-path'
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 '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 'js/async-thread'
2010-06-21 Merge branch 'gv/portable'
2010-06-21 Merge branch 'jn/gitweb-fastcgi'
2010-06-21 Merge branch 'jn/checkout-doc'
2010-06-21 Merge branch 'maint'
2010-06-21 Merge branch 'maint'
2010-06-18 Merge branch 'cc/maint-diff-CC-binary'
2010-06-18 Merge branch 'cb/ls-files-cdup'
2010-06-18 Merge branch 'jc/t9129-any-utf8'
2010-06-18 Merge branch 'ab/maint-perl-use-instlibdir'
2010-06-18 Merge branch 'ec/diff-noprefix-config'
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-18 Merge branch 'tc/merge-m-log'
2010-06-18 Merge branch 'ph/clone-message-reword'
2010-06-17 Merge 'maint' updates in
2010-06-14 Merge branch 'maint'
2010-06-13 Merge branch 'ab/cvsserver'
2010-06-13 Merge branch 'mg/notes-dry-run'
2010-06-13 Merge branch 'mc/maint-zoneparse'
2010-06-13 Merge branch 'jk/diff-m-doc'
2010-06-13 Merge branch 'jn/maint-doc-ignore'
2010-06-13 Merge branch 'jn/fsck-ident'
2010-06-13 Merge branch 'bs/userdiff-php'
2010-06-13 Merge branch 'jk/maint-sha1-file-name-fix'
2010-06-13 Merge branch 'jk/maint-pull-dry-run-noop'
2010-06-13 Merge branch 'rs/grep-binary'
2010-06-13 Merge branch 'jn/gitweb-syntax-highlight'
2010-06-13 Merge branch 'js/maint-windows'
2010-06-13 Merge branch 'bw/diff-metainfo-color'
2010-06-13 Merge branch 'js/try-to-free-stackable'
2010-06-13 Merge branch 'jn/make-header-dependency'
2010-06-13 Merge branch 'cb/assume-unchanged-fix'
2010-06-13 Merge branch 'jn/notes-doc'
2010-06-13 Merge branch 'wp/pretty-enhancement'
2010-06-13 Merge branch 'ab/test-cleanup'
2010-06-13 Merge branch 'jn/maint-amend-missing-name'
2010-06-13 Merge branch 'rs/diff-no-minimal'
2010-06-13 Merge branch 'maint'
2010-06-12 Merge branch 'maint'
2010-06-08 Merge branch 'maint'
2010-06-07 Merge branch 'maint'
2010-06-07 Merge branch 'maint'
2010-06-02 Merge branch 'maint'
2010-06-01 Merge branch 'maint'
2010-05-28 Merge branch 'maint'
2010-05-25 Merge branch 'maint'
2010-05-21 Merge branch 'by/blame-doc-m-c'
2010-05-21 Merge branch 'by/log-follow'
2010-05-21 Merge branch 'jn/gitweb-our-squelch'
2010-05-07 Add a macro DIFF_QUEUE_CLEAR.
2010-04-19 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-11 Merge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10 Merge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-03-08 Merge branch 'fn/maint-mkdtemp-compat' into maint
2010-03-08 Merge branch 'jk/maint-push-tracking-wo-remote' into...
2010-03-07 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
2010-03-07 Merge branch 'tr/maint-cherry-pick-list' into maint...
2010-03-07 Merge branch 'fn/maint-mkdtemp-compat'
2010-03-07 Merge branch 'jk/maint-push-tracking-wo-remote'
2010-03-05 Merge branch 'tr/maint-cherry-pick-list' into maint
2010-03-05 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-02 Merge branch 'tr/maint-cherry-pick-list'
2010-03-02 Merge branch 'gf/maint-sh-setup-nongit-ok'
2010-02-10 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
2010-02-08 Merge branch 'jc/maint-imap-config-parse' into maint
2010-02-08 Merge branch 'jc/maint-doc-git-add-example' into maint
2010-02-07 Merge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-31 Merge commit 'b319ef7' into jc/maint-fix-test-perm
2010-01-29 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-24 Merge branch 'maint' of git://git.spearce.org/git-gui...
2010-01-17 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-10 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-12-31 Merge branch 'maint-1.6.0' into maint
2009-12-30 Merge branch 'maint-1.6.1' into maint
2009-12-27 Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
2009-12-09 Merge git://repo.or.cz/git-gui
2009-12-09 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-03 Merge branch 'jc/maint-am-keep' into maint
2009-11-30 Merge branch 'jc/maint-am-keep'
2009-10-27 Merge git://repo.or.cz/git-gui
next