git-merge: fail correctly when we cannot fast forward.
[gitweb.git] / dir.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-15 Merge branch 'master' of git://git./git/git
2007-01-14 Merge branch 'master' into sp/fast-import
2007-01-12 Merge branch 'jc/bare'
2007-01-12 Merge branch 'jc/detached-head'
2007-01-09 Merge branch 'maint'
2007-01-08 Merge branch 'jc/reflog'
2007-01-08 short i/o: fix calls to read to use xread or read_in_full
2007-01-05 Merge branch 'maint'
2007-01-01 Merge branch 'sp/merge' (early part)
2006-12-29 Merge branch 'jc/curl'
2006-12-29 Fix 'git add' with .gitignore
2006-12-29 Revert "read_directory: show_both option."
2006-12-27 Merge branch 'master' into js/shallow
2006-12-27 Merge branch 'jc/fsck-reflog'
2006-12-26 Merge branch 'jc/bm'
2006-12-26 Merge branch 'rf/web'
2006-12-25 read_directory: show_both option.
2006-12-25 match_pathspec() -- return how well the spec matched
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-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-06 read-tree: further loosen "working file will be lost...
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-25 Merge branch 'aw/cvsimport'
2006-10-25 Merge for-each-ref to sync gitweb fully with 'next'
2006-10-23 Merge branch 'np/pack'
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-10-01 Merge branch 'jc/diff-stat'
2006-10-01 Merge branch 'lt/web'
2006-09-28 Merge branch 'jl/virtual'
2006-09-28 Merge branch 'master' into lj/refs
2006-09-28 Merge branch 'cc/branch-test'
2006-09-28 Merge branch 'jc/for-each-ref' into jc/ref-locking
2006-09-28 Merge branch 'sp/void'
2006-09-28 Merge branch 'jc/whitespace'
2006-09-28 Merge branch 'jc/repack'
2006-09-28 Merge branch 'jc/deprecate-recursive'
2006-09-28 runstatus: do not recurse into subdirectories if not...
2006-09-21 Merge branch 'lt/refs' into jc/lt-ref2-with-lt-refs
2006-09-21 Merge branch 'lt/refs' into jc/for-each-ref-with-lt...
2006-09-18 Merge branch 'sk/ftp'
2006-09-18 Merge part of branch 'jc/upload-pack'
2006-09-18 Merge branch 'jc/pack'
2006-09-18 Merge branch 'jc/am'
2006-09-18 Merge branch 'jk/diff'
2006-09-14 Merge branches 'maint' and 'jc/http'
2006-09-08 git-commit.sh: convert run_status to a C builtin
2006-09-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-28 Merge branch 'gl/web'
2006-08-28 Use fstat instead of fseek
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-27 Use PATH_MAX instead of MAXPATHLEN
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-13 Merge branch 'ml/trace'
2006-07-13 Merge branch 'js/merge-base'
2006-07-13 Merge branch 'lt/prune'
2006-07-13 Merge branch 'lt/merge-tree'
2006-07-10 Merge branch 'jc/show-merge'
2006-07-10 Avoid C99 comments, use old-style C comments instead.
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-02 Merge branch 'nh/http'
2006-06-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-01 Merge branch 'nh/http' into next
2006-05-29 Merge branch 'jc/dirwalk-n-cache-tree' into jc/cache...
next