summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.6.5.3v1.6.5.3Junio C Hamano2009-11-164-3/+67
* Merge branch 'bs/maint-pre-commit-hook-sample' into maintJunio C Hamano2009-11-161-9/+9
|\
| * pre-commit.sample: Diff against the empty tree when HEAD is invalidBjörn Steinbrink2009-11-061-9/+9
* | Merge branch 'jk/maint-add-p-empty' into maintJunio C Hamano2009-11-162-5/+30
|\ \
| * | add-interactive: handle deletion of empty filesJeff King2009-10-272-5/+30
| |/
* | Merge branch 'js/maint-diff-color-words' into maintJunio C Hamano2009-11-162-8/+32
|\ \
| * | diff --color-words: bit of clean-upJunio C Hamano2009-10-311-14/+12
| * | diff --color-words -U0: fix the location of hunk headersJohannes Schindelin2009-10-302-1/+7
| * | t4034-diff-words: add a test for word diff without contextMarkus Heidelberg2009-10-301-0/+20
| |/
* | Merge branch 'tz/maint-rpm' into maintJunio C Hamano2009-11-151-1/+4
|\ \
| * | Makefile: Ensure rpm packages can be read by older rpm versionsTodd Zullinger2009-11-141-1/+4
| |/
* | Merge branch 'jk/maint-format-patch-p-suppress-stat' into maintJunio C Hamano2009-11-152-2/+28
|\ \
| * | format-patch: make "-p" suppress diffstatJeff King2009-11-082-2/+28
| |/
* | Merge branch 'pb/maint-gitweb-blob-lineno' into maintJunio C Hamano2009-11-151-1/+2
|\ \
| * | gitweb: Fix blob linenr links in pathinfo modePetr Baudis2009-11-061-1/+2
| |/
* | Merge branch 'jk/maint-1.6.3-ls-files-i' into maintJunio C Hamano2009-11-153-2/+20
|\ \
| * | ls-files: unbreak "ls-files -i"Jeff King2009-10-303-2/+20
* | | Merge branch 'vl/maint-openssl-signature-change' into maintJunio C Hamano2009-11-151-0/+4
|\ \ \
| * | | imap-send.c: fix compiler warnings for OpenSSL 1.0Vietor Liu2009-10-311-0/+4
* | | | Merge branch 'jk/maint-push-config' into maintJunio C Hamano2009-11-151-2/+1
|\ \ \ \
| * | | | push: always load default configJeff King2009-10-251-2/+1
| | |_|/ | |/| |
* | | | Merge branch 'sr/blame-incomplete' into maintJunio C Hamano2009-11-151-0/+6
|\ \ \ \
| * | | | blame: make sure that the last line ends in an LFJohannes Schindelin2009-10-211-0/+6
| |/ / /
* | | | Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano2009-11-158-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 'jc/maint-1.6.3-graft-trailing-space' into maintJunio C Hamano2009-11-151-2/+2
|\ \ \ \ \ \
| * | | | | | info/grafts: allow trailing whitespaces at the end of lineJunio C Hamano2009-10-141-2/+2
* | | | | | | Merge branch 'tr/maint-roff-quote' into maintJunio C Hamano2009-11-153-0/+28
|\ \ \ \ \ \ \
| * | | | | | | Quote ' as \(aq in manpagesThomas Rast2009-10-223-0/+28
| |/ / / / / /
* | | | | | | Merge branch 'ja/fetch-doc' into maintJunio C Hamano2009-11-153-67/+76
|\ \ \ \ \ \ \
| * | | | | | | Documentation/merge-options.txt: order options in alphabetical groupsJari Aalto2009-10-221-43/+45
| * | | | | | | Documentation/git-pull.txt: Add subtitles above included option filesJari Aalto2009-10-221-0/+7