git-merge documentation: describe how conflict is presented
[gitweb.git] / Documentation / RelNotes-1.5.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-08-06 Merge branch 'rs/archive-parse-options'
2008-08-06 Merge branch 'maint'
2008-08-05 Documentation: typos / spelling fixes in older RelNotes
2008-07-30 Merge git://repo.or.cz/git-gui
2008-07-27 Merge git://repo.or.cz/git-gui
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-06 Merge git://repo.or.cz/git-gui
2008-06-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-27 Merge git://repo.or.cz/git-gui
2008-05-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-15 Merge git://repo.or.cz/git-gui
2008-05-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-04-08 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-04-05 Merge git://repo.or.cz/git-gui
2008-04-02 Merge git://repo.or.cz/git-gui
2008-03-16 Merge branch 'master' of git://repo.or.cz/git-gui
2008-03-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-03-12 Merge git://repo.or.cz/git-gui
2008-03-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-03-01 Merge branch 'master' of git://repo.or.cz/git-gui
2008-03-01 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-02-23 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-02-17 Merge git://repo.or.cz/git-gui
2008-02-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-02-13 Merge git://repo.or.cz/git-gui
2008-02-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-01-24 Merge git://repo.or.cz/git-gui
2008-01-21 Merge git://repo.or.cz/git-gui
2008-01-21 Merge git://repo.or.cz/git-gui
2008-01-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-01-11 Merge ../gitk
2008-01-09 Merge branch 'master' of git://git./gitk/gitk
2008-01-05 Merge git://repo.or.cz/git-gui
2007-12-07 Merge branch 'master' of git://repo.or.cz/git-gui
2007-11-21 Merge git://repo.or.cz/git-gui
2007-10-28 Merge branch 'master' of git://git./gitk/gitk
2007-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2007-10-21 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2007-09-18 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2007-09-15 Merge branch 'np/delta'
2007-09-15 Merge branch 'jc/pack'
2007-09-06 Merge branch 'master' of git://repo.or.cz/git/git-p4
2007-09-02 Typofix: 1.5.3 release notes
2007-09-02 GIT 1.5.3 v1.5.3
2007-09-01 Merge branch 'jp/send-email-cc'
2007-08-31 Hopefully the final update to draft release notes for...
2007-08-29 Merge branch 'master' of git://git./gitk/gitk
2007-08-29 GIT 1.5.3-rc7 v1.5.3-rc7
2007-08-27 RelNotes draft for 1.5.3 update.
2007-08-27 Merge branch 'master' of git://repo.or.cz/git-gui
2007-08-26 Merge branch 'maint'
2007-08-21 GIT 1.5.3-rc6 v1.5.3-rc6
2007-08-21 Merge branch 'master' of git://git./gitk/gitk
2007-08-19 Merge branch 'master' of git://repo.or.cz/git-gui
2007-08-19 Merge branch 'master' of git://git./gitk/gitk
2007-08-16 Merge branch 'maint' to sync with 1.5.2.5
2007-08-15 GIT 1.5.3-rc5 v1.5.3-rc5
2007-08-13 Merge branch 'master' of git://git./gitk/gitk
2007-08-11 Merge branch 'cr/tag'
2007-08-11 Merge branch 'jc/clone'
2007-08-06 Merge branch 'maint'
2007-08-05 Merge branch 'maint'
2007-08-03 GIT 1.5.3-rc4 v1.5.3-rc4
2007-08-02 RelNotes 1.5.3 updates before -rc4
2007-08-01 Merge branch 'maint'
2007-07-30 Merge branch 'master' of git://repo.or.cz/git-gui
2007-07-28 Merge branch 'master' of git://git./gitk/gitk
2007-07-25 GIT 1.5.3-rc3 v1.5.3-rc3
2007-07-19 Merge branch 'master' of git://people.freedesktop.org...
2007-07-19 Merge branch 'maint'
2007-07-15 GIT v1.5.3-rc2 v1.5.3-rc2
2007-07-15 Merge branch 'master' of git://repo.or.cz/git/fastimport
2007-07-14 Merge branch 'master' of git://git./gitk/gitk
2007-07-12 GIT v1.5.3-rc1 v1.5.3-rc1
2007-07-12 Merge branch 'master' of git://git./gitk/gitk
2007-07-12 Merge commit 'git-gui/master'
2007-07-12 Merge branch 'maint'
2007-07-10 Merge branch 'maint'
2007-07-09 Merge branch 'maint'
2007-07-07 Merge branch 'maint'
2007-07-04 Merge branch 'maint'
2007-07-04 Update draft Release Notes for 1.5.3
2007-07-03 Merge branch 'jo/init'
2007-07-03 Merge branch 'maint'
2007-07-03 Merge branch 'maint'
2007-07-02 Merge branch 'ew/svn'
2007-07-02 Merge branch 'js/rebase'
2007-07-02 Merge 1.5.2.3 in
2007-07-01 Merge branch 'rs/diff'
2007-07-01 Merge branch 'jc/quote'
2007-07-01 Merge branch 'ml/worktree'
2007-07-01 Merge branch 'ei/worktree+filter'
2007-07-01 Merge branch 'fl/config'
next