git-merge documentation: describe how conflict is presented
[gitweb.git] / Documentation / RelNotes-1.5.6.3.txt
2008-08-17 Merge git-gui 0.11.0
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-07 Merge branch 'lt/config-fsync' into maint
2008-08-07 Merge branch 'jc/reflog-expire' into maint
2008-08-07 Merge branch 'ag/rewrite_one' into maint
2008-08-06 Merge git://repo.or.cz/git-gui
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-07-30 Merge git://repo.or.cz/git-gui
2008-07-27 Merge git://repo.or.cz/git-gui
2008-07-17 Merge branch 'mv/dashless'
2008-07-17 Merge branch 'ls/mailinfo'
2008-07-17 Merge branch 'sb/dashless'
2008-07-16 Merge branch 'js/maint-pretty-mailmap' into maint
2008-07-16 Merge branch 'sp/maint-bash-completion-optim' into...
2008-07-16 Merge branch 'sp/maint-pack-memuse' into maint
2008-07-16 Merge branch 'ls/maint-mailinfo-patch-label' into maint
2008-07-16 Merge branch 'js/maint-daemon-syslog' into maint
2008-07-16 Merge branch 'mv/merge-in-c'
2008-07-16 Merge branch 'ag/rewrite_one'
2008-07-16 Merge branch 'sp/win'
2008-07-16 Merge branch 'js/more-win'
2008-07-16 Merge branch 'js/maint-pretty-mailmap'
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-15 Merge branch 'js/merge-rr'
2008-07-15 Merge branch 'sb/rerere-lib'
2008-07-15 Merge branch 'ls/maint-mailinfo-patch-label'
2008-07-15 Merge branch 'om/rerere-careful'
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 GIT 1.5.6.3 v1.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 'maint'
2008-07-09 Start preparing release notes for 1.5.6.3