mergetool: Add prompt to continue after failing to merge a file
[gitweb.git] / Documentation / RelNotes-1.6.0.4.txt
2008-11-14 Merge git://git.bogomips.org/git-svn
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Merge branch 'jn/gitweb-customlinks'
2008-11-13 Merge branch 'gb/gitweb-snapshot-pathinfo'
2008-11-13 Merge branch 'ds/uintmax-config' (early part)
2008-11-13 Merge branch 'np/pack-safer'
2008-11-13 Merge branch 'mv/remote-rename'
2008-11-13 Merge branch 'dl/xdiff'
2008-11-13 Merge branch 'lt/decorate'
2008-11-13 Merge branch 'jk/diff-convfilter'
2008-11-13 Merge branch 'jk/diff-convfilter-test-fix'
2008-11-13 Merge branch 'st/tag'
2008-11-13 Merge git://repo.or.cz/git-gui
2008-11-09 Merge branch 'maint'
2008-11-09 GIT 1.6.0.4 v1.6.0.4
2008-11-09 Merge branch 'cj/maint-gitpm-fix-maybe-self' into maint
2008-11-09 Merge branch 'ar/maint-mksnpath' into maint
2008-11-09 Merge branch 'mv/maint-branch-m-symref' into maint
2008-11-09 Merge branch 'ds/autoconf'
2008-11-09 Merge branch 'rs/blame'
2008-11-05 Merge branch 'ar/mksnpath'
2008-11-05 Merge branch 'jc/gitweb-fix-cloud-tag'
2008-11-05 Merge branch 'mv/maint-branch-m-symref'
2008-11-05 Merge branch 'mv/parseopt-checkout-index'
2008-11-03 Merge branch 'maint'
2008-11-03 Merge branch 'np/index-pack'
2008-11-03 Merge branch 'sh/rebase-i-p'
2008-11-03 Merge branch 'ag/blame-encoding'
2008-11-03 Merge branch 'gb/gitweb-pathinfo'
2008-11-03 Merge branch 'cj/maint-gitpm-fix-maybe-self'
2008-11-02 Update draft 1.6.0.4 release notes
2008-11-02 Merge branch 'js/maint-fetch-update-head' into maint
2008-11-02 Merge branch 'jk/maint-ls-files-other' into maint
2008-11-02 Merge branch 'jc/maint-reset-remove-unmerged-new' into...
2008-11-02 Merge branch 'jc/maint-co-track' into maint
2008-11-02 Merge branch 'maint'
2008-11-02 Start 1.6.0.4 cycle