git-merge: fail correctly when we cannot fast forward.
[gitweb.git] / tree.c
2007-02-25 Merge git://repo.or.cz/git-gui into maint
2007-02-21 Merge branch 'master' of git://repo.or.cz/git-gui into...
2007-02-18 Merge git://git./pub/scm/gitk/gitk into maint
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-02-12 Merge git-gui
2007-01-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-14 Merge branch 'master' into sp/fast-import
2007-01-09 Merge branch 'maint'
2007-01-05 Merge branch 'maint'
2006-12-27 Merge branch 'master' into js/shallow
2006-12-25 Merge branch 'jc/git-add--interactive'
2006-12-22 Merge branch 'maint'
2006-12-21 Merge branch 'ew/svn-pm'
2006-12-20 Merge branch 'jc/leftright'
2006-12-20 Merge branch 'jc/blame'
2006-12-20 Merge branch 'jc/branch-remove-remote'
2006-12-20 Merge branch 'jc/clone'
2006-12-20 Merge branch 'maint'
2006-12-20 simplify inclusion of system header files.
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 '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 memcpy(a,b,20) to hashcpy(a,b).
2006-08-21 Merge branch 'maint'
2006-08-17 Merge branch 'jc/format-patch'
2006-08-16 Merge branch 'maint'
2006-08-16 Merge branch 'maint'
2006-08-15 Merge branch 'master' into pb/gitpm
2006-08-15 Make track_tree_refs void.
2006-08-13 Merge branch 'jc/upload-pack'
2006-08-13 Merge branch 'th/diff-extra'
2006-08-13 GIT 1.4.2 v1.4.2
2006-08-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-08 Merge branch 'master' into pb/gitpm
2006-07-30 Merge branch 'jn/make'
2006-07-26 Merge branch 'pb/configure'
2006-07-25 Merge branch 'jc/clone-bind-failure'
2006-07-25 Merge branch 'lt/objformat'
2006-07-17 Merge branch 'sp/reflog' v1.4.2-rc1
2006-07-14 Merge branch 'lt/unitype'
2006-07-14 Merge branch 'lt/unitype' into js/c-merge-recursive
2006-07-13 Remove TYPE_* constant macros and use object_type enums...
2006-06-22 Merge branch 'js/lsfix'
2006-06-22 Merge branch 'jn/web'
2006-06-22 Merge early parts of branch 'js/diff'
2006-06-22 Merge branch 'jn/web' into next
2006-06-22 Merge branch 'ff/c99'
2006-06-22 Merge branch 'pb/config'
2006-06-21 Merge branch 'jn/web' into next
2006-06-21 Merge branch 'ff/c99' into next
2006-06-21 Merge branch 'jn/web' 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 'jn/web' into next
2006-06-20 Merge branch 'pb/config' into next
2006-06-20 Merge branch 'lt/objlist' into next
2006-06-20 Add specialized object allocator
2006-06-19 Merge branch 'jc/shared'
2006-06-18 Merge branch 'eb/mail' into next
2006-06-18 Shrink "struct object" a bit
2006-06-18 Merge early part of branch 'jc/fetchupload'
2006-06-18 Merge branch 'jc/rw-prefix'
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-04 Merge branch 'lt/tree-2'
2006-06-03 Merge branch 'jc/fmt-patch' into next
2006-06-02 Merge branch 'master' into next
2006-06-02 Merge branch 'jc/fmt-patch' into next
2006-06-01 Merge branch 'master' into next
2006-06-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-01 Merge branch 'master' into next
2006-06-01 Merge branch 'nh/http' into next
2006-05-31 Merge branch 'sp/reflog' into next
2006-05-31 Merge branch 'jc/fmt-patch' into next
2006-05-31 Merge branch 'ff/svnimport' into next
2006-05-31 Merge branch 'lt/tree-2' into next
2006-05-31 tree_entry(): new tree-walking helper function
2006-05-30 Merge branch 'master' into next
2006-05-30 Merge branch 'jc/lt-tree-n-cache-tree' into next
2006-05-30 Merge branch 'jc/lt-tree-n-cache-tree' into lt/tree-2
2006-05-30 Remove last vestiges of generic tree_entry_list
2006-05-30 Remove unused "zeropad" entry from tree_list_entry
2006-05-30 Remove "tree->entries" tree-entry list from tree parser
2006-05-30 Switch "read_tree_recursive()" over to tree-walk functi...
next