git-merge-recursive: honor merge.conflictstyle once again
[gitweb.git] / object.h
2008-10-18 Merge branch 'maint'
2008-10-18 Merge branch 'pb/commit-where'
2008-10-17 Merge branch 'maint'
2008-10-13 Merge branch 'maint'
2008-10-12 Merge branch 'maint'
2008-10-10 Merge branch 'maint'
2008-10-09 Merge branch 'lt/time-reject-fractional-seconds'
2008-10-09 Merge branch 'jc/add-ita'
2008-10-09 Merge branch 'maint'
2008-10-08 Merge branch 'maint'
2008-10-06 Merge branch 'maint'
2008-10-03 Merge branch 'maint'
2008-10-01 Merge branch 'maint'
2008-09-30 Merge branch 'maint'
2008-09-29 Merge branch 'bc/master-diff-hunk-header-fix'
2008-09-29 Merge branch 'jc/better-conflict-resolution'
2008-09-26 Merge branch 'maint'
2008-09-25 Merge branch 'mv/merge-recursive'
2008-09-25 Merge branch 'jc/alternate-push'
2008-09-25 Merge branch 'am/status'
2008-09-25 Merge branch 'pb/autocorrect-wrapper'
2008-09-25 Merge branch 'mv/commit-tree'
2008-09-25 Merge branch 'jc/apply-include-exclude'
2008-09-25 Merge branch 'jc/safe-c-l-d'
2008-09-25 Merge branch 'ho/dirstat-by-file'
2008-09-25 Merge git://repo.or.cz/git-gui
2008-09-25 Merge branch 'maint'
2008-09-23 Merge branch 'maint'
2008-09-22 Merge branch 'maint'
2008-09-22 Merge branch 'db/maint-checkout-b'
2008-09-20 Merge branch 'maint'
2008-09-19 Merge branch 'maint'
2008-09-19 Merge branch 'jc/diff-prefix'
2008-09-19 Merge branch 'np/pack'
2008-09-19 Merge branch 'bw/shortref'
2008-09-19 Merge branch 'rs/decorate'
2008-09-19 Merge branch 'tr/rev-list-reverse'
2008-09-19 Merge branch 'cc/bisect'
2008-09-19 Merge branch 'jc/setlinebuf-setvbuf'
2008-09-16 Merge branch 'maint'
2008-09-16 Merge branch 'dp/maint-rebase-fix'
2008-09-16 Merge branch 'jc/maint-checkout-keep-remove'
2008-09-16 Merge branch 'jc/maint-diff-quiet'
2008-09-16 Merge branch 'jc/maint-name-hash-clear'
2008-09-16 Merge branch 'jc/maint-template-permbits'
2008-09-16 Merge branch 'mh/maint-honor-no-ssl-verify'
2008-09-13 Sync with 1.6.0.2
2008-09-10 Fix git-diff-tree --stdin
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-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-06 Merge git://repo.or.cz/git-gui
2008-06-27 Merge branch 'maint-1.5.4' into maint-1.5.5
2008-06-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-27 Merge git://repo.or.cz/git-gui
2008-05-26 Merge branch 'maint-1.5.4' into maint
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 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-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
2008-04-28 Merge branch 'maint-1.5.4' into maint
2008-04-25 Merge branch 'maint-1.5.4' into maint
2008-04-23 Merge branch 'maint-1.5.4' into maint
2008-04-19 Merge branch 'maint-1.5.4' into maint
2008-04-17 Merge branch 'maint-1.5.4' into maint
2008-04-16 Merge branch 'maint-1.5.4' into maint
2008-04-12 Merge branch 'maint-1.5.4' into maint
2008-04-12 Merge branch 'maint-1.5.4' into maint
2008-04-10 Merge branch 'maint-1.5.4' into maint
2008-04-09 Merge branch 'jc/rename'
2008-04-08 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-04-07 Merge branch 'jc/maint-apply-match-beginning'
2008-04-05 Merge git://repo.or.cz/git-gui
2008-04-02 Merge git://repo.or.cz/git-gui
2008-03-28 GIT 1.5.5-rc2 v1.5.5-rc2
2008-03-27 Merge branch 'maint'
2008-03-26 Merge branch 'jc/maint-fetch-regression-1.5.4'
2008-03-16 Merge branch 'maint'
2008-03-16 Merge branch 'master' of git://repo.or.cz/git-gui
2008-03-15 Merge branch 'maint'
2008-03-15 Merge branch 'maint'
2008-03-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-03-14 Merge branch 'maint'
2008-03-13 Merge branch 'maint'
2008-03-12 Merge git://repo.or.cz/git-gui
2008-03-12 Merge branch 'js/remote'
2008-03-12 Merge branch 'maint'
2008-03-11 Merge branch 'jc/cherry-pick' (early part)
next