git-merge: fix confusion between tag and branch
[gitweb.git] / diff-lib.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-13 Merge branch 'jc/unpack'
2006-09-07 Merge branch 'jc/daemon'
2006-09-07 Merge branch 'pm/diff'
2006-09-05 diff-index --cc shows a 3-way diff between HEAD, index...
2006-09-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
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-26 Merge branch 'master' into gl/web
2006-08-26 Merge branch 'gl/cleanup'
2006-08-23 Merge branch 'gl/cleanup' into gl/cleanup-next
2006-08-23 Convert memset(hash,0,20) to hashclr(hash).
2006-08-23 Convert memcpy(a,b,20) to hashcpy(a,b).
2006-08-21 Merge branch 'maint'
2006-08-17 Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded...
2006-08-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-22 Merge branch 'js/lsfix'
2006-06-22 Merge branch 'ew/rebase'
2006-06-22 Merge branch 'jn/web'
2006-06-22 Merge early parts of branch 'js/diff'
2006-06-22 Merge branch 'jc/upload-corrupt'
2006-06-22 Merge branch 'ew/rebase' into next
2006-06-22 Merge branch 'jn/web' into next
2006-06-22 Merge branch 'jc/waitpid'
2006-06-22 Merge branch 'ff/c99'
2006-06-22 Merge branch 'pb/config'
2006-06-22 Merge branch 'lt/objlist'
2006-06-22 Merge branch 'master' into next
2006-06-21 Merge branch 'jc/upload-corrupt' into next
2006-06-21 Merge branch 'jn/web' into next
2006-06-21 Merge branch 'ew/rebase' into next
2006-06-21 Merge branch 'ff/c99' into next
2006-06-21 Merge branch 'jc/upload-corrupt' into next
2006-06-21 Merge branch 'jn/web' into next
2006-06-21 Merge branch 'master' into next
2006-06-20 Merge branch 'jn/web' into next
2006-06-20 Merge branch 'jn/web' into next
2006-06-20 Merge branch 'master' into next
2006-06-20 Merge branch 'jn/web' into next
2006-06-20 Merge branch 'pb/config' into next
2006-06-20 Merge branch 'jc/waitpid' into next
2006-06-20 Merge branch 'lt/objlist' into next
2006-06-20 Merge branches 'js/lsfix', 'pb/config' and 'jn/web...
2006-06-20 Add "named object array" concept
2006-06-19 Merge early parts of branch 'ff/c99'
2006-06-19 Don't instantiate structures with FAMs.
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-19 Merge part of 'js/fmt-patch' for RFC2822 dates into...
2006-05-18 Merge branch 'maint'
2006-05-17 Merge branch 'maint'
2006-05-15 Merge branch 'fix'
2006-05-15 Merge branch 'fix'
2006-05-14 Merge branch 'fix'
2006-05-14 Merge branch 'fix'
2006-05-13 Merge branch 'lt/fix-config' into lt/config
2006-05-10 Merge branch 'fix'
2006-05-09 Merge branch 'np/delta'
2006-05-09 Merge branch 'fix'
2006-05-08 Merge branch 'fix'
2006-05-07 Merge branch 'fix'
2006-05-06 Merge branch 'master' into js/fmt-patch
2006-05-05 Merge branch 'js/fmt-patch' into next
2006-05-05 Merge branch 'fix'
2006-05-04 Merge branch 'maint'
2006-05-04 Merge branch 'fix'
2006-05-03 Merge branch 'np/delta' into next
2006-05-03 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-05-02 Merge branch 'fix'
2006-05-01 Merge branch 'jc/fmt-patch' into next
2006-04-30 Merge with git://kernel.org/pub/scm/git/git.git
2006-04-30 Merge branch 'fix'
2006-04-29 Merge branch 'np/delta' into next
2006-04-28 Merge branch 'fix'
2006-04-28 Merge branch 'np/delta' into next
2006-04-27 Merge branch 'fix'
2006-04-27 Merge branch 'pb/config'
2006-04-27 Merge branch 'fix'
2006-04-26 Merge branch 'master' into jc/cache-tree
2006-04-26 Merge branch 'pb/config' into next
2006-04-26 Merge branch 'jc/diff'
2006-04-26 Merge branch 'jc/cache-tree' into next
2006-04-25 Merge branch 'pb/config' into next
2006-04-25 Merge branch 'np/delta' into next
2006-04-25 Merge branch 'fix'
2006-04-25 Merge branch 'jc/cache-tree' into next
2006-04-24 Merge branch 'master' into next
2006-04-24 Merge branch 'sh/daemon'
next