summaryrefslogtreecommitdiff
path: root/builtin/blame.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ks/no-textconv-symlink'Junio C Hamano2010-11-171-11/+22
|\
| * blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''Kirill Smelkov2010-09-291-11/+22
* | Merge branch 'maint'Junio C Hamano2010-08-221-2/+2
|\ \ | |/
| * Typos in code comments, an error message, documentationRalf Wildenhues2010-08-221-2/+2
* | Merge branch 'cc/find-commit-subject'Junio C Hamano2010-08-181-15/+7
|\ \ | |/ |/|
| * blame: use find_commit_subject() instead of custom codeChristian Couder2010-07-231-15/+7
| * Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-211-1/+1
* | Merge branch 'cp/textconv-cat-file'Junio C Hamano2010-06-271-4/+4
|\ \
| * | textconv: support for cat_fileClément Poulain2010-06-181-4/+4
* | | Merge branch 'ab/blame-textconv'Junio C Hamano2010-06-271-13/+72
|\ \ \ | |/ /
| * | textconv: support for blameAxel Bonnet2010-06-181-13/+72
| |/
* | Merge branch 'gv/portable'Junio C Hamano2010-06-211-4/+6
|\ \
| * | Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan2010-05-311-4/+6
* | | Merge branch 'rs/diff-no-minimal'Junio C Hamano2010-06-131-1/+1
| |/ |/|
* | Change C99 comments to old-style C commentsTor Arntsen2010-06-071-1/+1
|/
* Merge branch 'maint'Junio C Hamano2010-03-131-1/+1
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+2477