summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cc/replace-no-replace'Junio C Hamano2009-10-184-2/+36
|\
| * git: add --no-replace-objects option to disable replacingChristian Couder2009-10-134-2/+36
* | Merge branch 'jn/maint-1.6.3-check-ref-format-doc'Junio C Hamano2009-10-181-3/+6
|\ \
| * | Documentation: describe check-ref-format --branchJonathan Nieder2009-10-121-3/+6
* | | Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'Junio C Hamano2009-10-182-8/+32
|\ \ \
| * | | ls-files: excludes should not impact tracked filesJeff King2009-10-122-8/+32
| |/ /
* | | Merge branch 'jn/gitweb-show-size'Junio C Hamano2009-10-182-15/+60
|\ \ \
| * | | gitweb: Add 'show-sizes' feature to show blob sizes in tree viewJakub Narebski2009-09-072-15/+60
* | | | Merge branch 'jp/fetch-tag-match'Junio C Hamano2009-10-181-33/+74
|\ \ \ \
| * | | | fetch: Speed up fetch by rewriting find_non_local_tagsJulian Phillips2009-09-181-33/+74
* | | | | Merge branch 'jn/gitweb-patch'Junio C Hamano2009-10-181-3/+3
|\ \ \ \ \
| * | | | | gitweb: Do not show 'patch' link for merge commitsJakub Narebski2009-10-091-3/+3
* | | | | | Merge branch 'tf/doc-pt-br'Junio C Hamano2009-10-181-11/+11
|\ \ \ \ \ \
| * | | | | | Documentation: update pt-BRThiago Farina2009-10-011-11/+11
| |/ / / / /
* | | | | | Merge branch 'dk/blame-el'Junio C Hamano2009-10-181-54/+102
|\ \ \ \ \ \
| * | | | | | git-blame.el: Change how blame information is shown.David Kågedal2009-09-291-54/+102
| |/ / / / /
* | | | | | Merge branch 'mr/instaweb-cgid'Junio C Hamano2009-10-181-1/+15
|\ \ \ \ \ \
| * | | | | | instaweb: support mod_cgid for apache2Mark Rada2009-09-291-1/+15
| |/ / / / /
* | | | | | describe: load refnames before calling describe()René Scharfe2009-10-181-9/+4
* | | | | | Merge branch 'maint'Junio C Hamano2009-10-183-3/+8
|\ \ \ \ \ \
| * | | | | | git push: say that --tag can't be used with --all or --mirror in help textNanako Shiraishi2009-10-181-1/+1
| * | | | | | git push: remove incomplete options list from help textNanako Shiraishi2009-10-181-1/+1
| * | | | | | document push's new quiet optionJeff King2009-10-181-0/+5
| * | | | | | Makefile: clean block-sha1/ directory instead of mozilla-sha1/Carlos R. Mafra2009-10-181-1/+1
* | | | | | | Start 1.6.6 cycleJunio C Hamano2009-10-173-2/+62
* | | | | | | Merge branch 'jc/maint-blank-at-eof'Junio C Hamano2009-10-178-173/+437
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc/maint-blank-at-eofJunio C Hamano2009-09-151-22/+47
| |\ \ \ \ \ \ \
| | * | | | | | | diff -B: colour whitespace errorsJunio C Hamano2009-09-151-26/+49
| * | | | | | | | 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 'maint'Junio C Hamano2009-10-174-1/+88
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | GIT 1.6.5.1v1.6.5.1Junio C Hamano2009-10-164-2/+23
| * | | | | | | | Merge branch 'maint-1.6.4' into maintJunio C Hamano2009-10-162-1/+67
| |\ \ \ \ \ \ \ \
| | * | | | | | | | grep: do not segfault when -f is usedMatt Kraai2009-10-162-1/+67
* | | | | | | | | | Merge branch 'pv/maint-add-p-no-exclude'Junio C Hamano2009-10-142-1/+15
|\ \ \ \ \ \ \ \ \ \