rerere: record resolution even if file is not in merge base
[git] / attr.c
2007-06-29  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-06-29  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-06-28  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk
2007-06-26  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk into...
2007-06-22  Shawn O. PearceImport branch 'git-p4' of git://repo.or.cz/fast-export
2007-06-12  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-06-12  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-06-11  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-06-11  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-05-31  Junio C HamanoMerge branch 'maint-1.5.1' into maint
2007-05-29  Junio C HamanoMerge branch 'maint-1.5.1' into maint
2007-05-29  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-05-26  Junio C HamanoMerge branch 'maint-1.5.1' into maint
2007-05-25  Junio C HamanoMerge branch 'maint-1.5.1' into maint
2007-05-24  Junio C HamanoMerge branch 'maint-1.5.1' into maint
2007-05-23  Junio C HamanoMerge branch 'maint-1.5.1' into maint
2007-05-22  Junio C HamanoMerge branch 'maint-1.5.1' into maint
2007-05-21  Junio C HamanoMerge branch 'maint-1.5.1' into maint
2007-05-20  Junio C HamanoMerge branch 'maint' to synchronize with 1.5.1.6
2007-05-19  Junio C HamanoMerge branch 'maint'
2007-05-19  Junio C HamanoMerge 1.5.1.5 in
2007-05-18  Junio C HamanoMerge branch 'maint'
2007-05-17  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-05-16  Junio C HamanoMerge branch 'maint'
2007-05-15  Junio C HamanoMerge branch 'maint'
2007-05-13  Junio C HamanoMerge branch 'maint'
2007-05-12  Junio C HamanoMerge branch 'maint'
2007-05-10  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-05-10  Junio C HamanoMerge branch 'maint'
2007-05-10  Junio C HamanoMerge branch 'maint'
2007-05-09  Junio C HamanoMerge branch 'maint'
2007-05-08  Shawn O. PearceMerge branch 'master' of git://repo.or.cz/git-gui
2007-05-07  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-05-07  Junio C HamanoMerge branch 'maint'
2007-05-06  Junio C HamanoMerge branch 'maint'
2007-05-04  Junio C HamanoMerge branch 'maint'
2007-05-02  Junio C HamanoMerge branch 'maint'
2007-05-02  Shawn O. PearceMerge branch 'gfi-maint' into gfi-master
2007-05-01  Junio C HamanoMerge branch 'maint'
2007-04-29  Junio C HamanoMerge branch 'maint'
2007-04-29  Shawn O. PearceMerge branch 'gfi-maint' into gfi-master
2007-04-27  Junio C HamanoMerge branch 'maint'
2007-04-26  Junio C HamanoMerge branch 'maint'
2007-04-25  Junio C HamanoMerge branch 'maint'
2007-04-25  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/fastimport
2007-04-24  Junio C HamanoMerge branch 'maint'
2007-04-22  Alex RiesenFix crash in t0020 (crlf conversion)
2007-04-22  Junio C HamanoMerge branch 'lt/objalloc'
2007-04-22  Junio C HamanoMerge branch 'jc/add'
2007-04-22  Junio C HamanoMerge branch 'jc/attr'
2007-04-18  Junio C HamanoFix funny types used in attribute value representation
2007-04-17  Junio C HamanoAllow more than true/false to attributes.
2007-04-15  Junio C HamanoChange attribute negation marker from '!' to '-'.
2007-04-15  Junio C HamanoDefine a built-in attribute macro "binary".
2007-04-15  Junio C Hamanoattribute macro support
2007-04-14  Junio C HamanoTeach 'diff' about 'diff' attribute.
2007-04-14  Junio C HamanoDefine 'crlf' attribute.
2007-04-14  Junio C HamanoAdd basic infrastructure to assign attributes to paths