git-checkout -m: fix merge case
[gitweb.git] / git.c
2007-01-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-14 Merge branch 'sp/merge' (early part)
2007-01-12 Merge branch 'jc/bare'
2007-01-12 Merge branch 'jc/detached-head'
2007-01-10 Disallow working directory commands in a bare repository.
2007-01-10 Merge branch 'js/reflog'
2007-01-10 Make git-describe a builtin.
2007-01-09 Merge branch 'maint'
2007-01-08 Merge branch 'jc/reflog'
2007-01-08 "init-db" can really be just "init"
2007-01-05 Merge branch 'maint'
2007-01-01 Merge branch 'sp/merge' (early part)
2006-12-31 Merge branch 'jc/send-pack-pipeline'
2006-12-31 Merge branch 'master' into sp/mmap
2006-12-31 Replace "GIT_DIR" with GIT_DIR_ENVIRONMENT.
2006-12-31 Use PATH_MAX constant for --bare.
2006-12-29 Merge branch 'jc/utf8'
2006-12-27 Merge branch 'master' into js/shallow
2006-12-27 Merge branch 'jc/fsck-reflog'
2006-12-25 Merge branch 'jc/skip-count'
2006-12-25 Merge branch 'jc/git-add--interactive'
2006-12-24 Merge branch 'sb/merge-friendly'
2006-12-24 Merge branch 'js/rerere'
2006-12-23 Keep "git --git-dir" from causing a bus error.
2006-12-22 Make git-rerere a builtin
2006-12-22 Merge branch 'master' into jc/fsck-reflog
2006-12-22 Merge branch 'maint'
2006-12-21 git reflog expire
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-12-18 Merge branch 'jn/web' (early part)
2006-12-14 Merge branch 'maint'
2006-12-14 Merge branch 'jc/diff--cached'
2006-12-13 Merge branch 'jc/read-tree-ignore'
2006-12-13 Merge branch 'ew/rerere'
2006-12-13 Merge branch 'np/addcommit'
2006-12-13 Merge branch 'lh/branch-rename'
2006-12-13 Merge branch 'jc/commit-careful'
2006-12-13 Merge branch 'ap/clone-origin'
2006-12-13 Merge branch 'jc/numstat'
2006-12-13 Merge branch 'rr/cvsexportcommit'
2006-12-13 Merge branch 'ap/branch'
2006-12-13 Merge branch 'js/merge'
2006-12-13 Merge branch 'maint'
2006-12-13 Merge branch 'master' into js/merge
2006-12-13 Merge branch 'maint'
2006-12-11 Merge branch 'maint'
2006-12-07 Merge branch 'maint'
2006-12-06 Merge branch 'maint'
2006-12-06 Add builtin merge-file, a minimal replacement for RCS...
2006-12-05 Merge branch 'maint'
2006-12-03 Merge branch 'maint'
2006-11-29 Merge master.kernel.org:/pub/scm/gitk/gitk
2006-11-29 Merge branch 'maint'
2006-11-29 Merge branch 'jc/globfetch'
2006-11-29 Merge branch 'maint'
2006-11-28 shortlog: use pager
2006-11-27 Merge branch 'js/shortlog'
2006-11-24 Merge branch 'jc/upload-pack'
2006-11-20 Build in shortlog
2006-11-13 Merge branch 'maint'
2006-11-12 Merge branch 'maint'
2006-11-11 Merge branch 'maint'
2006-11-09 Merge branch 'maint'
2006-11-09 Merge branch 'maint'
2006-11-09 git-pickaxe: retire pickaxe
2006-11-08 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-11-08 Merge branch 'maint'
2006-11-08 Merge branch 'jc/pickaxe'
2006-11-07 Merge branch 'jc/read-tree'
2006-11-07 Merge branch 'maint'
2006-11-05 Merge branch 'maint'
2006-11-05 Merge branch 'lt/push-config'
2006-11-05 Merge branch 'pb/web'
2006-11-04 Merge branch 'maint'
2006-11-03 Merge branch 'master' into np/index-pack
2006-11-03 Merge branch 'maint'
2006-11-01 Merge branch 'maint'
2006-11-01 branch: work in subdirectories.
2006-11-01 Merge branch 'rs/cherry'
2006-11-01 Merge branch 'jc/refs-and-fetch'
2006-11-01 Merge branch 'lj/refs'
2006-10-31 Merge branch 'maint'
2006-10-27 Merge branch 'maint'
2006-10-27 Merge branch 'jc/reflog' into lj/refs
2006-10-26 Merge branch 'jc/combined'
2006-10-26 Merge branch 'jc/combined'
2006-10-25 Merge branch 'maint'
2006-10-25 Merge branch 'aw/cvsimport'
2006-10-25 Merge branch 'jc/web'
2006-10-25 Merge for-each-ref to sync gitweb fully with 'next'
2006-10-25 Merge branch 'jc/web-blame'
2006-10-24 Merge branch 'master' into jc/web
2006-10-24 Make git-branch a builtin
2006-10-24 Built-in cherry
next