Fix earlier mismerges.
[gitweb.git] / combine-diff.c
2006-04-27 Merge branch 'fix'
2006-04-27 Merge branch 'fix'
2006-04-25 Merge branch 'fix'
2006-04-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-21 Merge branch 'fix'
2006-04-21 Merge branch 'fix'
2006-04-20 Merge branch 'fix'
2006-04-20 Stop carrying Geert's similarity estimator.
2006-04-19 Merge branch 'maint'
2006-04-19 Merge branch 'fix'
2006-04-18 Merge branch 'jc/pager-cat'
2006-04-18 Merge branch 'lt/logopt'
2006-04-18 Merge branch 'master' into next
2006-04-18 Merge branch 'lt/logopt' into next
2006-04-18 Merge branch 'lt/logopt' into next
2006-04-18 Merge branch 'master' into next
2006-04-18 combine-diff: show diffstat with the first parent.
2006-04-18 Log message printout cleanups (#2)
2006-04-17 Log message printout cleanups
2006-04-17 cleanups: Remove unused vars from combine-diff.c
2006-04-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-12 Merge branch 'jc/combine' into next
2006-04-12 Merge branch 'master' into jc/combine
2006-04-12 combine-diff: type fix.
2006-04-11 Merge branch 'jc/combine' into next
2006-04-11 Merge branch 'jc/diff' into next
2006-04-11 combine-diff: fix hunks at the end (take #2).
2006-04-11 combine-diff: do not lose hunks with only deletion...
2006-04-11 Merge branch 'ds/index' into next
2006-04-11 Merge branch 'jc/withraw' into next
2006-04-11 Separate the raw diff and patch with a newline
2006-04-11 Merge branch 'eb/apply' into next
2006-04-11 Merge branch 'jc/withraw' into next
2006-04-11 diff-* --patch-with-raw
2006-04-08 Merge branch 'kh/svn'
2006-04-08 Merge branch 'jc/thinpack'
2006-04-08 Merge branch 'jc/date'
2006-04-08 Merge branch 'nh/http'
2006-04-08 Merge branch 'ew/rev-abbrev'
2006-04-08 Merge branch 'jc/blame'
2006-04-07 Merge branch 'master' into next
2006-04-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07 Merge branch 'maint'
2006-04-07 Merge branch 'jc/thinpack' into next
2006-04-07 Merge branch 'ew/rev-abbrev' into next
2006-04-07 Merge branch 'jc/blame' into next
2006-04-07 Merge branch 'kh/svn' into next
2006-04-07 Match ofs/cnt types in diff interface.
2006-04-06 Merge branch 'master' into next
2006-04-05 Merge branch 'jc/date' into next
2006-04-05 Merge branch 'nh/http' into next
2006-04-05 Merge branch 'jc/clone'
2006-04-05 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-05 Merge branch 'jc/combine' into next
2006-04-05 combine-diff: move the code to parse hunk-header into...
2006-04-05 Merge branches 'master' and 'jc/combine' into next
2006-04-05 Merge branch 'fix'
2006-04-05 combine-diff: refactor built-in xdiff interface.
2006-04-05 Merge branch 'nh/http' into next
2006-04-05 Merge branch 'pb/regex' into next
2006-04-04 Merge branch 'jc/combine' into next
2006-04-04 combine-diff: use built-in xdiff.
2006-04-04 Merge in xdiff cleanup pieces
2006-04-04 Merge branch 'pe/cleanup'
2006-04-04 Merge branch 'lt/fix-sol-pack'
2006-04-04 Merge branch 'pe/cleanup' into next
2006-04-04 Use blob_, commit_, tag_, and tree_type throughout.
2006-04-04 Merge branch 'lt/fix-sol-pack' into next
2006-04-02 Merge branch 'lt/fix-sol-pack' into next
2006-03-31 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-30 tree/diff header cleanup.
2006-03-26 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-04 Merge branch 'fk/blame'
2006-03-04 Merge branch 'lt/rev-list'
2006-03-04 Merge branch 'fk/blame' into next
2006-03-04 Merge branch 'lt/rev-list' into next
2006-03-03 Merge branch 'fk/blame' into next
2006-03-03 Merge branch 'lt/rev-list' into next
2006-03-02 Merge branch 'kh/svnimport'
2006-03-02 Merge branch 'lt/fix-apply' into maint v1.2.4
2006-03-02 Merge branch 'lt/apply'
2006-03-02 Merge early parts of 'np/delta' branch
2006-03-01 combine-diff: Honour -z option correctly.
2006-03-01 combine-diff: Honour --full-index.
2006-03-01 Merge branch 'lt/rev-list' into next
2006-03-01 Merge branch 'lt/rev-list' into next
2006-03-01 Merge branch 'lt/apply' into next
2006-02-28 Merge part of np/delta
2006-02-28 Merge branch 'lt/apply' into next
2006-02-27 Merge branch 'master' into next
2006-02-27 Merge part of kh/svnimport branch into master
2006-02-27 combine-diff: Honour -z option correctly.
2006-02-27 combine-diff: Honour --full-index.
2006-02-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-22 Merge branch 'jc/nostat'
2006-02-18 Merge branch 'jc/rebase-limit'
2006-02-15 Merge branch 'jc/rebase-limit'
2006-02-15 Merge branch 'master'
2006-02-15 Merge branch 'kh/svn'
2006-02-15 Merge branch 'jc/commit'
next