git-merge-recursive: honor merge.conflictstyle once again
[gitweb.git] / builtin-verify-pack.c
2008-10-09 Merge branch 'lt/time-reject-fractional-seconds'
2008-09-29 Merge branch 'jc/better-conflict-resolution'
2008-09-25 Merge git://repo.or.cz/git-gui
2008-09-19 Merge branch 'jc/diff-prefix'
2008-09-19 Merge branch 'tr/rev-list-reverse'
2008-09-19 Merge branch 'jc/maint-name-hash-clear' into maint
2008-09-16 Merge branch 'jc/maint-name-hash-clear'
2008-09-12 Merge branch 'ho/maint-dashless' into maint
2008-09-10 Merge branch 'jc/maint-checkout-fix' into maint
2008-09-10 Merge branch 'np/maint-safer-pack' into maint
2008-09-10 Merge branch 'ho/dashless'
2008-09-08 Merge branch 'jc/cc-ld-dynpath'
2008-09-08 Merge branch 'jc/maint-checkout-fix'
2008-09-07 Merge updated git-gui and gitk that call each other
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-09-03 Merge branch 'tr/filter-branch'
2008-09-03 Merge branch 'np/maint-safer-pack'
2008-09-03 Merge branch 'jc/author-nickname'
2008-09-03 Merge branch 'np/maint-safer-pack' into np/pack
2008-08-30 Merge branch 'sp/missing-thin-base' into maint
2008-08-30 Merge branch 'sb/daemon'
2008-08-30 Merge branch 'af/maint-install-no-handlink' into maint
2008-08-30 Merge branch 'np/verify-pack' into maint
2008-08-29 Merge branch 'maint'
2008-08-28 Merge branch 'mv/merge-custom'
2008-08-28 Merge branch 'ml/submodule'
2008-08-27 Merge branch 'am/cherry-pick-rerere'
2008-08-27 Merge branch 'jc/add-addremove'
2008-08-27 Merge branch 'np/verify-pack'
2008-08-23 discard revindex data when pack list changes
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 'maint'
2008-07-19 Merge branch 'maint'
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-16 Merge branch 'ag/rewrite_one'
2008-07-16 Merge branch 'js/maint-pretty-mailmap'
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-15 Merge branch 'ls/maint-mailinfo-patch-label'
2008-07-15 Merge branch 'jc/branch-merged'
2008-07-15 Merge branch 'sp/maint-bash-completion-optim'
2008-07-13 Merge branch 'sp/maint-bash-completion-optim'
2008-07-13 Merge branch 'maint' to sync with 1.5.6.3
2008-07-13 Merge branch 'ph/parseopt-step-blame'
2008-07-13 Merge branch 'am/stash-branch'
2008-07-13 Merge branch 'sg/stash-k-i'
2008-07-13 Merge branch 'jc/report-tracking'
2008-07-13 Merge branch 'tr/add-i-e'
2008-07-09 Merge branch 'js/apply-root'
2008-07-09 Merge branch 'jc/reflog-expire'
2008-07-09 Merge branch 'sp/maint-pack-memuse'
2008-07-09 Merge branch 'maint'
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 'qq/maint'
2008-07-07 Merge branch 'js/maint-daemon-syslog'
2008-07-07 Merge branch 'maint'
2008-07-07 Merge branch 'jc/rerere'
2008-07-07 Merge branch 'dr/ceiling'
2008-07-07 Merge branch 'db/no-git-config'
2008-07-07 Merge branch 'js/import-zip'
2008-07-07 Merge branch 'maint'
2008-07-07 Merge branch 'qq/maint'
2008-07-06 Merge git://repo.or.cz/git-gui
2008-07-06 Merge branch 'qq/maint'
2008-07-06 Merge branch 'qq/maint'
2008-07-06 Fix some warnings (on cygwin) to allow -Werror
2008-07-04 Merge branch 'maint'
2008-07-03 Merge branch 'j6t/mingw'
2008-07-03 Merge branch 'maint'
2008-07-02 Merge maint in
2008-07-01 Merge branch 'ph/mergetool'
2008-07-01 Merge branch 'js/maint-clone-insteadof'
2008-07-01 Merge branch 'jc/maint-reset'
2008-07-01 Merge branch 'jk/maint-fetch-ref-hier'
2008-07-01 Merge branch 'jc/dashless' (early part)
2008-07-01 Merge branch 'nd/dashless'
2008-06-30 Merge branch 'maint'
2008-06-29 Merge branch 'maint'
next