Extend index to save more flags
[gitweb.git] / builtin-merge.c
2008-08-24 Merge branch 'jc/no-slim-shell'
2008-08-24 Merge branch 'maint' to sync with 1.6.0.1
2008-08-24 Merge branch 'ag/maint-combine-diff-fix' into maint
2008-08-24 Merge branch 'mv/maint-merge-fix' into maint
2008-08-24 Merge branch 'maint'
2008-08-24 merge: fix numerus bugs around "trivial merge" area
2008-08-22 provide more errors for the "merge into empty head...
2008-08-21 Merge branch 'ml/submodule-foreach'
2008-08-21 Merge branch 'pm/log-exit-code'
2008-08-21 Merge branch 'sb/commit-tree-minileak'
2008-08-21 Merge branch 'pb/reflog-dwim'
2008-08-21 Merge branch 'jc/add-stop-at-symlink'
2008-08-21 Merge branch 'kh/diff-tree'
2008-08-21 Merge branch 'mg/count-objects'
2008-08-21 Merge branch 'mz/push-verbose'
2008-08-21 Merge branch 'jc/index-extended-flags'
2008-08-21 Merge branch 'cc/merge-base-many'
2008-08-21 Merge branch 'jc/test-deeper'
2008-08-21 Merge branch 'js/parallel-test'
2008-08-21 Fix "git-merge -s bogo" help text
2008-08-20 Merge branch 'maint'
2008-08-20 "git-merge": allow fast-forwarding in a stat-dirty...
2008-08-20 Merge branch 'ph/enable-threaded'
2008-08-20 Merge branch 'jk/pager-swap'
2008-08-20 Merge branch 'rs/imap'
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 '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-30 builtin-merge: allow using a custom strategy
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