git-merge: fix confusion between tag and branch
[gitweb.git] / xdiff-interface.c
2006-11-29 Merge master.kernel.org:/pub/scm/gitk/gitk
2006-11-24 Merge branch 'jc/upload-pack'
2006-11-08 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-10-17 Merge branch 'maint'
2006-10-02 Merge branch 'maint'
2006-10-01 Merge branch 'maint'
2006-10-01 Merge branch 'jc/gitpm'
2006-09-18 Merge part of branch 'jc/upload-pack'
2006-09-14 Merge branches 'maint' and 'jc/http'
2006-09-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-28 Merge branch 'gl/web'
2006-08-28 Merge branch 'gl/cleanup-next'
2006-08-28 Merge branch 'js/c-merge-recursive'
2006-08-28 Merge branch 'ts/daemon'
2006-08-28 Merge branch 'jc/apply'
2006-08-27 Use xrealloc instead of realloc
2006-08-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-10 Merge git://git.kernel.org/pub/scm/git/gitweb
2006-06-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-04 Merge branch 'new' of git://git./gitk/gitk into next
2006-06-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-05-03 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
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 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/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 combine-diff: refactor built-in xdiff interface.