tokkee.org

Code

projects / git.git / search

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

2010-07-02	Eyvind Bernhardsen	Don't expand CRLFs when normalizing text during merge Signed-off-by: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>	commit \| commitdiff \| tree
2010-07-02	Eyvind Bernhardsen	Try normalizing files to avoid delete/modify conflicts... Signed-off-by: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>	commit \| commitdiff \| tree
2010-07-02	Eyvind Bernhardsen	Avoid conflicts when merging branches with mixed normalization Signed-off-by: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>	commit \| commitdiff \| tree
2010-06-07	Eyvind Bernhardsen	Add "core.eol" config variable Signed-off-by: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>	commit \| commitdiff \| tree
2010-05-20	Eyvind Bernhardsen	Rename the "crlf" attribute "text" Signed-off-by: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>	commit \| commitdiff \| tree
2010-05-20	Eyvind Bernhardsen	Add per-repository eol normalization Signed-off-by: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>	commit \| commitdiff \| tree
2010-05-20	Eyvind Bernhardsen	Add tests for per-repository eol normalization Signed-off-by: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>	commit \| commitdiff \| tree
2008-03-23	Eyvind Bernhardsen	fast-import: Document the effect of "merge" with no... Signed-off-by: Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no>	commit \| commitdiff \| tree
2008-03-16	Eyvind Bernhardsen	fast-import: Allow "reset" to delete a new branch without... Signed-off-by: Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no>	commit \| commitdiff \| tree
2007-12-10	Eyvind Bernhardsen	Fix mis-markup of the -p, --patch option in git-add(1) Signed-off-by: Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no>	commit \| commitdiff \| tree

Git - the stupid content tracker