t6023: merge-file fails to output anything for a degenerate merge
[gitweb.git] / builtin-update-index.c
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-11-02 Merge branch 'js/maint-fetch-update-head' into maint
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into...
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-diff-quiet' into maint
2008-09-19 Merge branch 'jc/maint-name-hash-clear' into maint
2008-09-19 Merge branch 'jc/maint-template-permbits' into maint
2008-09-19 Merge branch 'mh/maint-honor-no-ssl-verify' into maint
2008-09-16 Start conforming code to "git subcmd" style part 3
2008-09-12 Merge branch 'ho/maint-dashless' into maint
2008-09-10 Merge branch 'jc/maint-hide-cr-in-diff-from-less' into...
2008-09-10 Merge branch 'jc/maint-checkout-fix' into maint
2008-09-10 Merge branch 'np/maint-safer-pack' into maint
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-09-03 Merge branch 'nd/worktree' into maint
2008-09-03 Merge branch 'ho/dashless' into maint
2008-08-31 'git foo' program identifies itself without dash in...
2008-08-31 update-index: fix worktree setup
2008-08-17 Merge git-gui 0.11.0
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-14 Merge branch 'maint'
2008-08-13 Merge branch 'maint'
2008-08-12 Merge branch 'maint'
2008-08-11 Merge branch 'maint'
2008-08-11 Merge branch 'maint'
2008-08-09 Merge branch 'maint'
2008-08-06 Sync with 1.5.6.5
2008-08-06 Merge git://repo.or.cz/git-gui
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-06 Merge branch 'maint'
2008-08-03 Merge branch 'maint'
2008-08-02 Merge branch 'maint'
2008-08-02 Merge branch 'maint'
2008-07-30 Merge git://repo.or.cz/git-gui
2008-07-27 Merge git://repo.or.cz/git-gui
2008-07-25 Merge branch 'maint'
2008-07-24 Merge branch 'maint' into ph/checkout
2008-07-21 Merge branch 'ap/trackinfo' v1.6.0-rc0
2008-07-21 Merge branch 'jc/rerere-auto-more'
2008-07-21 Merge branch 'ns/am-abort'
2008-07-21 Merge branch 'maint'
2008-07-19 Merge branch 'maint'
2008-07-17 Merge branch 'mv/dashless'
2008-07-17 Merge branch 'ls/mailinfo'
2008-07-17 Merge branch 'sb/dashless'
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-13 Make usage strings dash-less
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-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 'cc/bisect'
2008-05-25 Merge branch 'ap/svn'
2008-05-25 Merge branch 'js/cvsexportcommit'
2008-05-25 Merge branch 'js/ignore-submodule'
2008-05-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-23 Merge branch 'maint-1.5.4' into maint v1.5.5.2
2008-05-21 Merge branch 'maint-1.5.4' into maint
2008-05-15 Teach update-index about --ignore-submodules
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-1.5.4' into maint
2008-05-14 Provide git_config with a callback-data parameter
2008-05-11 Merge branch 'maint-1.5.4' into maint
2008-05-09 Merge branch 'maint-1.5.4' into maint
2008-05-04 Merge branch 'maint-1.5.4' into maint
2008-04-30 Merge branch 'maint-1.5.4' into maint
next