Change xdl_merge to generate output even for null merges
[gitweb.git] / unpack-trees.c
2009-03-13 Merge branch 'ks/maint-1.6.0-mailinfo-folded' into...
2009-03-13 Merge branch 'cc/maint-1.6.0-bisect-fix' into maint...
2009-03-13 Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into...
2009-01-31 merge: fix out-of-bounds memory access
2009-01-07 Merge branch 'maint-1.5.6' into maint-1.6.0
2008-12-20 GIT 1.6.0.6 v1.6.0.6
2008-12-17 GIT 1.5.6.6 v1.5.6.6
2008-12-17 GIT 1.5.5.6 v1.5.5.6
2008-12-01 Merge branch 'st/maint-tag' into maint
2008-11-11 Fix non-literal format in printf-style calls
2008-11-09 Merge branch 'cj/maint-gitpm-fix-maybe-self' into maint
2008-11-09 Merge branch 'ar/maint-mksnpath' into maint
2008-11-09 Merge branch 'mv/maint-branch-m-symref' into maint
2008-11-02 Merge branch 'js/maint-fetch-update-head' into maint
2008-11-02 Merge branch 'jk/maint-ls-files-other' into maint
2008-11-02 Merge branch 'jc/maint-reset-remove-unmerged-new' into...
2008-11-02 Merge branch 'jc/maint-co-track' into maint
2008-11-02 correct cache_entry allocation
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-09-29 Merge branch 'bc/maint-diff-hunk-header-fix' into maint
2008-09-29 Merge branch 'mg/maint-remote-fix' into maint
2008-09-19 Merge branch 'dp/maint-rebase-fix' into maint
2008-09-19 Merge branch 'jc/maint-checkout-keep-remove' into maint
2008-09-19 Merge branch 'jc/maint-name-hash-clear' into maint
2008-09-10 checkout: do not lose staged removal
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-08-30 Merge branch 'sp/missing-thin-base' into maint
2008-08-30 Merge branch 'np/verify-pack' into maint
2008-08-24 unpack_trees(): protect the handcrafted in-core index...
2008-08-17 Merge git-gui 0.11.0
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-06 Merge git://repo.or.cz/git-gui
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-07-30 Merge git://repo.or.cz/git-gui
2008-07-27 Merge git://repo.or.cz/git-gui
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-08 Merge branch 'jc/blame' (early part) into HEAD
2008-07-08 Merge branch 'lt/racy-empty' into maint
2008-07-07 Merge branch 'dr/ceiling'
2008-07-06 Merge git://repo.or.cz/git-gui
2008-06-27 Merge branch 'maint-1.5.5' into maint
2008-06-27 Merge branch 'maint-1.5.4' into maint-1.5.5
2008-06-25 Merge branch 'jc/maint-combine-diff-pre-context' into...
2008-06-22 Merge branch 'lt/racy-empty'
2008-06-22 Merge branch 'jc/maint-combine-diff-pre-context'
2008-06-17 Merge branch 'maint'
2008-06-16 Merge branch 'maint'
2008-06-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-06-11 Merge branch 'maint'
2008-06-09 Merge branch 'js/merge-recursive'
2008-06-09 Merge branch 'maint'
2008-06-07 Merge 1.5.5.4 in
2008-06-06 Merge branch 'maint'
2008-06-04 Merge branch 'maint'
2008-06-02 Merge branch 'sb/am-tests'
2008-06-02 Merge branch 'lw/test-fix'
2008-06-02 Merge branch 'sp/remote'
2008-06-02 Merge branch 'lt/pack-sync'
2008-06-02 Merge branch 'np/pack-check'
2008-06-02 Merge branch 'jb/reset-q'
2008-06-02 Merge branch 'jc/checkout'
2008-05-30 unpack_trees(): allow callers to differentiate worktree...
2008-05-28 Merge 1.5.5.3 in
2008-05-27 Merge branch 'jc/diff-no-no-index'
2008-05-27 Merge branch 'maint'
2008-05-27 Merge git://repo.or.cz/git-gui
2008-05-26 Merge branch 'maint'
2008-05-26 Merge branch 'maint-1.5.4' into maint
2008-05-25 Merge branch 'js/config-cb' v1.5.6-rc0
2008-05-25 Merge branch 'as/graph'
2008-05-25 Merge branch 'js/mailinfo'
2008-05-25 Merge branch 'jc/add-n-u'
2008-05-25 Merge branch 'ar/t6031'
2008-05-25 Merge branch 'db/clone-in-c'
2008-05-25 Merge branch 'jc/apply-whitespace'
2008-05-25 Merge branch 'jc/unpack-trees-reword'
2008-05-25 Merge branch 'ar/batch-cat'
2008-05-25 Merge branch 'ap/svn'
2008-05-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-23 Merge branch 'pb/push'
2008-05-23 Merge branch 'bc/repack'
2008-05-23 Merge branch 'sp/ignorecase'
2008-05-23 Merge branch 'maint'
2008-05-23 Merge branch 'maint-1.5.4' into maint v1.5.5.2
2008-05-21 Merge branch 'maint'
2008-05-21 Merge branch 'maint-1.5.4' into maint
2008-05-21 Merge branch 'ds/branch-auto-rebase'
2008-05-21 Merge branch 'sv/first-parent'
2008-05-21 Merge branch 'np/pack'
2008-05-21 Merge branch 'as/graph'
2008-05-21 Merge branch 'jk/maint-send-email-compose'
2008-05-21 Merge branch 'hb/maint-send-email-quote-recipients'
2008-05-20 unpack-trees: allow Porcelain to give different error...
2008-05-17 Merge branch 'maint'
2008-05-15 Merge git://repo.or.cz/git-gui
2008-05-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-14 Merge branch 'maint'
2008-05-14 Merge branch 'maint-1.5.4' into maint
2008-05-14 Merge branch 'sb/committer'
2008-05-14 Merge branch 'bd/tests'
next