summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano2009-09-151-14/+35
|\
| * diff.c: emit_add_line() takes only the rest of the lineJunio C Hamano2009-09-151-7/+9
| * diff.c: split emit_line() from the first char and the rest of the lineJunio C Hamano2009-09-151-7/+26
* | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano2009-09-151-148/+148
|\ \ | |/
| * diff.c: shuffling code aroundJunio C Hamano2009-09-141-125/+125
* | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano2009-09-158-70/+288
|\ \ | |/
| * diff --whitespace: fix blank lines at endJunio C Hamano2009-09-142-22/+54
| * core.whitespace: split trailing-space into blank-at-{eol,eof}Junio C Hamano2009-09-053-12/+21
| * diff --color: color blank-at-eofJunio C Hamano2009-09-042-10/+36
| * diff --whitespace=warn/error: fix blank-at-eof checkJunio C Hamano2009-09-042-16/+55
| * diff --whitespace=warn/error: obey blank-at-eofJunio C Hamano2009-09-043-6/+10
| * diff.c: the builtin_diff() deals with only two-file comparisonJunio C Hamano2009-09-041-23/+9
| * apply --whitespace: warn blank but not necessarily empty lines at EOFJunio C Hamano2009-09-042-2/+17
| * apply --whitespace=warn/error: diagnose blank at EOFJunio C Hamano2009-09-045-10/+54
| * apply.c: split check_whitespace() into twoJunio C Hamano2009-09-041-9/+15
| * apply --whitespace=fix: detect new blank lines at eof correctlyJunio C Hamano2009-09-042-0/+30
| * apply --whitespace=fix: fix handling of blank lines at the eofJunio C Hamano2009-09-042-1/+30
* | Merge branch 'rc/maint-http-no-head-pack-check' into maintJunio C Hamano2009-09-141-1/+1
|\ \
| * | http.c: avoid freeing an uninitialized pointerJunio C Hamano2009-09-141-1/+1
* | | GIT 1.6.4.3v1.6.4.3Junio C Hamano2009-09-134-3/+33
* | | svn: properly escape arguments for authors-progMark Lodato2009-09-132-0/+15
* | | Merge branch 'cb/maint-1.6.3-grep-relative-up' into maintJunio C Hamano2009-09-133-27/+30
|\ \ \ | |/ / |/| |
| * | grep: accept relative paths outside current working directoryClemens Buchacher2009-09-073-27/+29
| * | grep: fix exit status if external_grep() puntsClemens Buchacher2009-09-071-0/+1
* | | http.c: remove verification of remote packsTay Ray Chuan2009-09-111-11/+0
* | | git-pull: do not mention --quiet and --verbose twiceEmmanuel Trillaud2009-09-071-0/+2
* | | githooks.txt: put hooks into subsectionsBert Wesarg2009-09-071-15/+18
* | | push: re-flow non-fast-forward messageJeff King2009-09-061-3/+3
* | | push: fix english in non-fast-forward messageJeff King2009-09-061-1/+1
* | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-09-034-24/+28
|\ \ \
| * \ \ Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2009-09-033-4/+8
| |\ \ \
| | * | | git-clone: add missing comma in --reference documentationMiklos Vajna2009-09-031-1/+1
| | * | | clone: disconnect transport after fetchingJeff King2009-09-022-3/+7
| * | | | git-cvsserver: no longer use deprecated 'git-subcommand' commandsGerrit Pape2009-09-021-20/+20
* | | | | GIT 1.6.4.2v1.6.4.2Junio C Hamano2009-08-294-3/+36
* | | | | Remove unused t/t8005/iso8859-5.txtNanako Shiraishi2009-08-291-2/+0
* | | | | Merge branch 'rc/maint-http-fix' into maintJunio C Hamano2009-08-281-1/+3
|\ \ \ \ \
| * | | | | http.c: don't assume that urls don't end with slashTay Ray Chuan2009-08-181-1/+3
* | | | | | http.c: set slot callback members to NULL when releasing objectTay Ray Chuan2009-08-281-1/+6
* | | | | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-274-4/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2009-08-274-4/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix overridable written with an extra 'e'Nanako Shiraishi2009-08-272-2/+2
| | * | | | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-08-271-1/+1
| | |\ \ \ \
| | | * \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-08-271-1/+1
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Documentation: git-archive: mark --format as optional in summaryWesley J. Landaker2009-08-271-1/+1
| | | | * | | Merge branch 'maint-1.5.6' into maint-1.6.0Junio C Hamano2009-08-272-2/+43
| | | | |\ \ \
| | * | | | | | Round-down years in "years+months" relative date viewDavid Reiss2009-08-271-1/+1
* | | | | | | | git-log: allow --decorate[=short|full]Lars Hjemli2009-08-269-10/+65
* | | | | | | | Minor improvement to the write-tree documentationDavid Kågedal2009-08-261-1/+2
* | | | | | | | git-bisect: call the found commit "*the* first bad commit"Nanako Shiraishi2009-08-263-11/+11