Fix multi-glob assertion in git-svn
[gitweb.git] / builtin-merge.c
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 'rs/archive-parse-options'
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 Fix merge name generation in "merge in C"
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-24 Make non-static functions, that may be static, static
2008-07-22 builtin-merge: add missing structure initialization
2008-07-22 builtin-merge: give a proper error message for invalid...
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 'jc/add-addremove'
2008-07-21 Merge branch 'maint'
2008-07-20 builtin-merge.c: Fix option parsing
2008-07-20 Teach 'git merge' that some merge strategies no longer...
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-17 Merge branch 'rs/archive'
2008-07-17 Merge branch 'ag/blame'
2008-07-17 Merge branch 'rs/rebase-checkout-not-so-quiet'
2008-07-17 Merge branch 'sp/maint-index-pack'
2008-07-17 Merge branch 'maint'
2008-07-16 Merge branch 'mv/merge-in-c'
2008-07-10 Teach merge.log to "git-merge" again
2008-07-08 Build in merge