t6023: merge-file fails to output anything for a degenerate merge
[gitweb.git] / setup.c
2009-01-07 Merge branch 'maint-1.5.6' into maint-1.6.0
2008-12-20 GIT 1.6.0.6 v1.6.0.6
2008-12-17 GIT 1.5.6.6 v1.5.6.6
2008-12-17 GIT 1.5.5.6 v1.5.5.6
2008-11-02 Merge branch 'js/maint-fetch-update-head' into maint
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-18 Merge branch 'db/maint-checkout-b' into maint
2008-10-09 Merge branch 'sg/maint-intrebase-msghook' into maint
2008-10-09 Merge branch 'jk/maint-soliconv' into maint
2008-10-06 make prefix_path() never return NULL
2008-09-19 Merge branch 'jc/maint-name-hash-clear' into maint
2008-09-12 Merge branch 'ho/maint-dashless' into maint
2008-09-10 Merge branch 'jc/maint-hide-cr-in-diff-from-less' into...
2008-09-10 Merge branch 'jc/maint-checkout-fix' into maint
2008-09-10 Merge branch 'np/maint-safer-pack' into maint
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-09-03 Merge branch 'nd/worktree' into maint
2008-08-31 setup_git_directory(): fix move to worktree toplevel...
2008-08-17 Merge git-gui 0.11.0
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-14 Merge branch 'maint'
2008-08-13 Merge branch 'maint'
2008-08-12 Merge branch 'maint'
2008-08-11 Merge branch 'maint'
2008-08-11 Merge branch 'maint'
2008-08-09 Merge branch 'maint'
2008-08-07 Merge branch 'lt/config-fsync' into maint
2008-08-07 Merge branch 'jc/reflog-expire' into maint
2008-08-06 Sync with 1.5.6.5
2008-08-06 Merge git://repo.or.cz/git-gui
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-06 Merge branch 'maint'
2008-08-03 Merge branch 'maint'
2008-08-02 Merge branch 'maint'
2008-08-02 Merge branch 'maint'
2008-07-30 Merge git://repo.or.cz/git-gui
2008-07-27 Merge git://repo.or.cz/git-gui
2008-07-25 Merge branch 'maint'
2008-07-24 Merge branch 'maint' into ph/checkout
2008-07-21 Merge branch 'maint'
2008-07-19 Merge branch 'maint'
2008-07-17 Merge branch 'sp/maint-index-pack'
2008-07-17 Merge branch 'maint'
2008-07-16 Merge branch 'mv/merge-in-c'
2008-07-16 Merge branch 'ag/rewrite_one'
2008-07-16 Merge branch 'js/maint-pretty-mailmap'
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-15 Merge branch 'ls/maint-mailinfo-patch-label'
2008-07-15 Merge branch 'jc/branch-merged'
2008-07-15 Merge branch 'jc/rebase-orig-head'
2008-07-15 Merge branch 'sp/maint-bash-completion-optim'
2008-07-13 Merge branch 'sp/maint-bash-completion-optim'
2008-07-13 Merge branch 'maint' to sync with 1.5.6.3
2008-07-13 Merge branch 'ph/parseopt-step-blame'
2008-07-13 Merge branch 'am/stash-branch'
2008-07-13 Merge branch 'sg/stash-k-i'
2008-07-13 Merge branch 'jc/report-tracking'
2008-07-13 Merge branch 'js/pick-root'
2008-07-13 Merge branch 'ab/bundle'
2008-07-13 Merge branch 'tr/add-i-e'
2008-07-09 Merge branch 'jk/pager-config'
2008-07-09 Merge branch 'js/apply-root'
2008-07-09 Merge branch 'jc/reflog-expire'
2008-07-09 Merge branch 'sp/maint-pack-memuse'
2008-07-09 Merge branch 'maint'
2008-07-08 Merge branch 'jc/blame' (early part) into HEAD
2008-07-08 Merge branch 'lt/racy-empty' into maint
2008-07-07 Merge branch 'qq/maint'
2008-07-07 Merge branch 'js/maint-daemon-syslog'
2008-07-07 Merge branch 'maint'
2008-07-07 Merge branch 'jc/rerere'
2008-07-07 Merge branch 'dr/ceiling'
2008-07-07 Merge branch 'db/no-git-config'
2008-07-07 Merge branch 'js/import-zip'
2008-07-07 Merge branch 'maint'
2008-07-07 Merge branch 'qq/maint'
2008-07-06 Merge git://repo.or.cz/git-gui
2008-07-06 Merge branch 'qq/maint'
2008-07-06 Merge branch 'qq/maint'
2008-07-04 Merge branch 'maint'
2008-07-03 Merge branch 'j6t/mingw'
2008-07-03 Merge branch 'jc/maint-reset' into maint
2008-07-01 Merge branch 'ph/mergetool'
2008-07-01 Merge branch 'jc/maint-reset'
2008-07-01 Merge branch 'jc/dashless' (early part)
2008-07-01 Merge branch 'nd/dashless'
2008-06-27 Merge branch 'maint-1.5.5' into maint
2008-06-27 Merge branch 'maint-1.5.4' into maint-1.5.5
2008-06-25 Merge branch 'sb/rebase'
2008-06-25 Merge branch 'lw/gitweb'
2008-06-25 Merge branch 'lt/config-fsync'
2008-06-25 Merge branch 'sr/tests'
2008-06-25 Merge branch 'jh/clone-packed-refs'
2008-06-25 Merge branch 'lw/perlish'
2008-06-25 Merge branch 'jc/maint-combine-diff-pre-context' into...
2008-06-25 Merge branch 'lt/maint-gitdir-relative' into maint
2008-06-24 Merge branch 'maint'
2008-06-23 Windows: Treat Windows style path names.
2008-06-23 setup.c: Prepare for Windows directory separators.
2008-06-23 Merge branch 'maint'
next