rebase: Support preserving merges in non-interactive mode
[gitweb.git] / builtin-diff-files.c
2008-09-29 Merge branch 'maint' into bc/master-diff-hunk-header-fix
2008-09-29 Merge branch 'bc/maint-diff-hunk-header-fix' into maint
2008-09-29 Merge branch 'jc/better-conflict-resolution'
2008-09-29 Merge branch 'mg/maint-remote-fix' into 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-19 Merge branch 'maint'
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-18 diff/diff-files: do not use --cc too aggressively
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-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-24 diff-files: do not play --no-index games
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-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
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-09 Merge branch 'mk/unpack-careful'
next