summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2007-04-21lockfile: record the primary process.Junio C Hamano
2007-04-21convert.c: restructure the attribute checking part.Junio C Hamano
2007-04-21Fix bogus linked-list management for user defined merge drivers.Junio C Hamano
2007-04-21Simplify calling of CR/LF conversion routinesAlex Riesen
2007-04-20Document gitattributes(5)Junio C Hamano
2007-04-20Update 'crlf' attribute semantics.Junio C Hamano
2007-04-20Documentation: support manual section (5) - file formats.Junio C Hamano
2007-04-19Simplify code to find recursive merge driver.Junio C Hamano
2007-04-19Counto-fix in merge-recursiveJunio C Hamano
2007-04-18Fix funny types used in attribute value representationJunio C Hamano
2007-04-18Allow low-level driver to specify different behaviour during internal merge.Junio C Hamano
2007-04-18Custom low-level merge driver: change the configuration scheme.Junio C Hamano
2007-04-18Allow the default low-level merge driver to be configured.Junio C Hamano
2007-04-18Custom low-level merge driver support.Junio C Hamano
2007-04-17Add a demonstration/test of customized merge.Junio C Hamano
2007-04-17Allow specifying specialized merge-backend per path.Junio C Hamano
2007-04-17merge-recursive: separate out xdl_merge() interface.Junio C Hamano
2007-04-17Allow more than true/false to attributes.Junio C Hamano
2007-04-15Document git-check-attrJames Bowes
2007-04-15Change attribute negation marker from '!' to '-'.Junio C Hamano
2007-04-15Define a built-in attribute macro "binary".Junio C Hamano
2007-04-15attribute macro supportJunio C Hamano
2007-04-15Makefile: add patch-ids.h back in.Junio C Hamano
2007-04-15Fix 'diff' attribute semantics.Junio C Hamano
2007-04-15Fix 'crlf' attribute semantics.Junio C Hamano
2007-04-14Teach 'diff' about 'diff' attribute.Junio C Hamano
2007-04-14Define 'crlf' attribute.Junio C Hamano
2007-04-14Add basic infrastructure to assign attributes to pathsJunio C Hamano
2007-04-14Merge branch 'maint'Junio C Hamano
2007-04-14git-quiltimport complaining yet still workingLinus Torvalds
2007-04-14config.txt: Fix grammatical error in description of http.noEPSVFrank Lichtenheld
2007-04-14config.txt: Change pserver to server in description of gitcvs.*Frank Lichtenheld
2007-04-14config.txt: Document core.autocrlfFrank Lichtenheld
2007-04-14config.txt: Document gitcvs.allbinaryFrank Lichtenheld
2007-04-14Do not default to --no-index when given two directories.Junio C Hamano
2007-04-14Use rev-list --reverse in git-rebase.shAlex Riesen
2007-04-13Merge branch 'jc/cherry'Junio C Hamano
2007-04-13Merge branch 'maint'Junio C Hamano
2007-04-13handle_options in git wrapper miscounts the options it handled.Matthias Lederhofer
2007-04-13Fix git {log,show,...} --pretty=emailJunio C Hamano
2007-04-13Don't yap about merge-subtree during makeShawn O. Pearce
2007-04-12Documentation: --cherry-pickJunio C Hamano
2007-04-12git-log --cherry-pick A...BJunio C Hamano
2007-04-12Refactor patch-id filtering out of git-cherry and git-format-patch.Junio C Hamano
2007-04-12Add %m to '--pretty=format:'Junio C Hamano
2007-04-12sscanf/strtoul: parse integers robustlyJim Meyering
2007-04-12Add testcase for format-patch --subject-prefix (take 3)Robin H. Johnson
2007-04-12Add custom subject prefix support to format-patch (take 3)Robin H. Johnson
2007-04-12Merge branch 'maint'Junio C Hamano
2007-04-12GIT 1.5.1.1v1.5.1.1Junio C Hamano