Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
[gitweb.git] / builtin-rev-list.c
2007-04-09 Merge branch 'js/fetch-progress'
2007-04-09 Merge branch 'maint'
2007-04-08 Merge branch 'jc/read-tree-df' (early part)
2007-04-08 Merge branch 'maint'
2007-04-07 Merge branch 'jc/index-output'
2007-04-07 Merge branch 'fp/make-j'
2007-04-07 Merge branch 'cc/bisect'
2007-04-07 Merge branch 'jc/checkout' (early part)
2007-04-07 Merge branch 'maint'
2007-04-05 Merge branch 'maint'
2007-04-05 Document --left-right option to rev-list.
2007-04-04 Merge branch 'jc/bisect'
2007-04-04 Merge 1.5.0.7 in
2007-03-30 Merge branch 'maint'
2007-03-28 Merge branch 'maint' to synchronize with 1.5.0.6
2007-03-26 Merge branch 'jc/fpl'
2007-03-25 Merge branch 'maint'
2007-03-25 Merge branch 'js/remote-show-push'
2007-03-25 Merge branch 'maint'
2007-03-24 make the previous optimization work also on path-limite...
2007-03-24 rev-list --bisect: Fix "halfway" optimization.
2007-03-24 Merge branch 'master' into jc/bisect
2007-03-24 Merge branch 'maint'
2007-03-24 Fix path-limited "rev-list --bisect" termination condition.
2007-03-22 Merge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-22 git-rev-list --bisect: optimization
2007-03-22 git-rev-list: add --bisect-vars option.
2007-03-20 Merge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-03-12 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2007-03-06 Merge branch 'master' of git://repo.or.cz/git-gui into...
2007-03-05 Merge branch 'js/fetch-progress' (early part)
2007-03-02 Merge branch 'js/commit-format'
2007-02-28 Merge branch 'js/bundle'
2007-02-28 Merge branch 'mc/sendmail'
2007-02-27 Merge branch 'np/types' into jc/fetch
2007-02-26 Merge branch 'jc/merge-symlink' into maint
2007-02-25 Merge git://repo.or.cz/git-gui into maint
2007-02-24 Evil Merge branch 'jc/status' (early part) into js...
2007-02-24 Merge branch 'js/apply'
2007-02-24 Merge branch 'js/no-limit-boundary'
2007-02-24 Merge branch 'js/etc-config'
2007-02-23 Merge branches 'lt/crlf' and 'jc/apply-config'
2007-02-21 Merge branch 'master' of git://repo.or.cz/git-gui into...
2007-02-21 Merge branch 'fk/autoconf'
2007-02-21 Merge branch 'js/name-rev-fix'
2007-02-20 Merge branch 'js/diff-color-check'
2007-02-20 Merge branch 'jc/fetch-notags'
2007-02-19 Merge branch 'ap/cvsserver'
2007-02-19 Merge branch 'maint'
2007-02-18 Read the config in rev-list
2007-02-18 Merge git://git./pub/scm/gitk/gitk into maint
2007-02-14 Merge branch 'jc/diff-apply-patch'
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/skip-count'
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-17 Teach all of log family --left-right output.
2006-12-17 rev-list --left-right
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-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-28 Merge branch 'master' into lj/refs
2006-09-28 Merge branch 'jc/for-each-ref' into jc/ref-locking
2006-09-28 Merge branch 'jc/whitespace'
2006-09-28 Merge branch 'jc/repack'
2006-09-25 Merge branch 'sk/svnimport'
2006-09-25 Merge early parts of branch 'np/pack'
2006-09-25 Merge branch 'jc/filter-commit'
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-20 git log: Unify header_filter and message_filter into...
2006-09-20 rev-list: fix segfault with --{author,committer,grep}
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-14 Merge branches 'maint' and 'jc/http'
2006-09-13 Merge branch 'jc/unpack'
2006-09-07 pack-objects: further work on internal rev-list logic.
2006-09-07 Separate object listing routines out of rev-list
2006-09-07 Merge branch 'jc/daemon'
2006-09-07 Merge branch 'pm/diff'
2006-09-06 Teach rev-list an option to read revs from the standard...
2006-09-03 Merge branch 'master' into cc/trace
2006-09-02 Replace uses of strdup with xstrdup.
next