git-merge documentation: describe how conflict is presented
[gitweb.git] / Documentation / RelNotes-1.5.4.txt
2008-08-17 Merge git-gui 0.11.0
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
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-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-27 Merge branch 'js/branch-track'
2008-02-27 Merge branch 'db/checkout'
2008-02-23 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-02-23 Merge branch 'bc/reflog-fix' into js/reflog-delete
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-02-12 Merge branch 'lt/in-core-index'
2008-02-12 Merge branch 'ph/describe-match'
2008-02-02 GIT 1.5.4 v1.5.4
2008-01-27 GIT 1.5.4-rc5 v1.5.4-rc5
2008-01-24 Merge git://repo.or.cz/git-gui
2008-01-22 Clarify that http-push being temporarily disabled with...
2008-01-21 Merge git://repo.or.cz/git-gui
2008-01-21 GIT 1.5.4-rc4 v1.5.4-rc4
2008-01-21 Merge git://repo.or.cz/git-gui
2008-01-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-01-18 Officially deprecate repo-config.
2008-01-12 GIT 1.5.4-rc3 v1.5.4-rc3
2008-01-11 Merge ../gitk
2008-01-09 Merge branch 'master' of git://git./gitk/gitk
2008-01-08 Merge in GIT 1.5.3.8
2008-01-07 Update draft release notes for 1.5.4
2008-01-05 Update draft release notes for 1.5.4
2008-01-05 Merge git://repo.or.cz/git-gui
2007-12-31 Merge branch 'maint' of git://linux-nfs.org/~bfields/git
2007-12-27 GIT 1.5.4-rc2 v1.5.4-rc2
2007-12-21 clean up 1.5.4 release notes
2007-12-21 Mention git-shell's "cvs" substitution in the RelNotes
2007-12-20 GIT 1.5.4-rc1 v1.5.4-rc1
2007-12-18 Merge branch 'maint'
2007-12-15 Update draft release notes for 1.5.4
2007-12-14 provide advance warning of some future pack default...
2007-12-13 GIT 1.5.4-rc0 v1.5.4-rc0
2007-12-13 Merge branch 'jc/shortlog-e'
2007-12-10 Merge branch 'master' into cc/help
2007-12-10 Update draft Release Notes for 1.5.4
2007-12-09 Merge branch 'jc/spht'
2007-12-09 Merge branch 'pr/mergetool'
2007-12-09 Merge branch 'maint'
2007-12-07 Update draft release notes to 1.5.4
2007-12-07 Merge branch 'master' of git://repo.or.cz/git-gui
2007-12-07 Merge branch 'maint'
2007-12-06 Merge branch 'maint'
2007-12-05 Merge branch 'wc/add-i'
2007-12-05 Merge branch 'kh/commit'
2007-12-05 Merge branch 'sp/refspec-match'
2007-12-04 Update draft release notes for 1.5.4
2007-12-03 Merge branch 'js/prune-expire'
2007-12-03 Merge branch 'js/export-with-assignment'
2007-12-03 Merge branch 'js/fast-export'
2007-12-03 Merge branch 'js/rebase-i-rerere'
2007-12-03 Merge branch 'js/pull-rebase'
2007-12-03 Merge branch 'wc/rebase-insn'
2007-12-03 Merge branch 'jc/color'
2007-12-02 Merge branch 'maint'
2007-12-02 Update draft release notes for 1.5.4
2007-12-02 Merge branch 'tt/help'
2007-12-01 Merge branch 'jc/move-gitk'
2007-12-01 Merge branch 'jc/branch-contains'
2007-12-01 Merge branch 'cr/tag-options'
2007-12-01 Update draft release notes for 1.5.4
2007-12-01 Merge 1.5.3.7 in
2007-12-01 Merge branch 'maint'
2007-11-29 Merge branch 'maint'
2007-11-26 Fix typo in draft 1.5.4 release notes
2007-11-26 Merge branch 'maint'
2007-11-25 Update draft release notes for 1.5.4
2007-11-25 Merge branch 'maint'
2007-11-25 Merge branch 'jk/send-pack'
2007-11-25 Merge branch 'sb/clean'
2007-11-25 Merge branch 'js/mingw-fallouts'
2007-11-25 Merge branch 'mh/rebase-skip-hard'
2007-11-25 Merge branch 'cc/bisect'
2007-11-23 Merge branch 'maint'
2007-11-23 Merge branch 'maint'
2007-11-21 Merge git://repo.or.cz/git-gui
next