aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Simplify calling of CR/LF conversion routinesAlex Riesen2007-04-20
* Document gitattributes(5)Junio C Hamano2007-04-19
* Update 'crlf' attribute semantics.Junio C Hamano2007-04-19
* Documentation: support manual section (5) - file formats.Junio C Hamano2007-04-19
* Simplify code to find recursive merge driver.Junio C Hamano2007-04-18
* Counto-fix in merge-recursiveJunio C Hamano2007-04-18
* Fix funny types used in attribute value representationJunio C Hamano2007-04-18
* Allow low-level driver to specify different behaviour during internal merge.Junio C Hamano2007-04-18
* Custom low-level merge driver: change the configuration scheme.Junio C Hamano2007-04-18
* Allow the default low-level merge driver to be configured.Junio C Hamano2007-04-18
* Custom low-level merge driver support.Junio C Hamano2007-04-18
* Add a demonstration/test of customized merge.Junio C Hamano2007-04-17
* Allow specifying specialized merge-backend per path.Junio C Hamano2007-04-17
* merge-recursive: separate out xdl_merge() interface.Junio C Hamano2007-04-17
* Allow more than true/false to attributes.Junio C Hamano2007-04-17
* Document git-check-attrJames Bowes2007-04-15
* Change attribute negation marker from '!' to '-'.Junio C Hamano2007-04-15
* Define a built-in attribute macro "binary".Junio C Hamano2007-04-15
* attribute macro supportJunio C Hamano2007-04-15
* Makefile: add patch-ids.h back in.Junio C Hamano2007-04-15
* Fix 'diff' attribute semantics.Junio C Hamano2007-04-15
* Fix 'crlf' attribute semantics.Junio C Hamano2007-04-15
* Teach 'diff' about 'diff' attribute.Junio C Hamano2007-04-14
* Define 'crlf' attribute.Junio C Hamano2007-04-14
* Add basic infrastructure to assign attributes to pathsJunio C Hamano2007-04-14
* Merge branch 'maint'Junio C Hamano2007-04-14
|\
| * git-quiltimport complaining yet still workingLinus Torvalds2007-04-14
| * config.txt: Fix grammatical error in description of http.noEPSVFrank Lichtenheld2007-04-13
| * config.txt: Change pserver to server in description of gitcvs.*Frank Lichtenheld2007-04-13
| * config.txt: Document core.autocrlfFrank Lichtenheld2007-04-13
| * config.txt: Document gitcvs.allbinaryFrank Lichtenheld2007-04-13
| * Do not default to --no-index when given two directories.Junio C Hamano2007-04-13
| * Use rev-list --reverse in git-rebase.shAlex Riesen2007-04-13
* | Merge branch 'jc/cherry'Junio C Hamano2007-04-12
|\ \
| * | Documentation: --cherry-pickJunio C Hamano2007-04-11
| * | git-log --cherry-pick A...BJunio C Hamano2007-04-11
| * | Refactor patch-id filtering out of git-cherry and git-format-patch.Junio C Hamano2007-04-11
| * | Add %m to '--pretty=format:'Junio C Hamano2007-04-11
* | | Merge branch 'maint'Junio C Hamano2007-04-12
|\ \ \ | | |/ | |/|
| * | handle_options in git wrapper miscounts the options it handled.Matthias Lederhofer2007-04-12
* | | Fix git {log,show,...} --pretty=emailJunio C Hamano2007-04-12
* | | Don't yap about merge-subtree during makeShawn O. Pearce2007-04-12
| |/ |/|
* | sscanf/strtoul: parse integers robustlyJim Meyering2007-04-11
* | Add testcase for format-patch --subject-prefix (take 3)Robin H. Johnson2007-04-11
* | Add custom subject prefix support to format-patch (take 3)Robin H. Johnson2007-04-11
* | Merge branch 'maint'Junio C Hamano2007-04-11
|\ \ | |/
| * GIT 1.5.1.1v1.5.1.1Junio C Hamano2007-04-11
| * cvsserver: Fix handling of diappeared files on updateFrank Lichtenheld2007-04-11
| * fsck: do not complain on detached HEAD.Junio C Hamano2007-04-11
| * (encode_85, decode_85): Mark source buffer pointer as "const".Jim Meyering2007-04-11