| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'eb/core-eol' | Junio C Hamano | 2010-06-21 | 1 | -32/+133 |
|\ |
|
| * | Add "core.eol" config variable | Eyvind Bernhardsen | 2010-06-06 | 1 | -13/+15 |
| * | Rename the "crlf" attribute "text" | Eyvind Bernhardsen | 2010-05-19 | 1 | -24/+35 |
| * | Add per-repository eol normalization | Eyvind Bernhardsen | 2010-05-19 | 1 | -25/+113 |
* | | Merge branch 'tr/word-diff' | Junio C Hamano | 2010-05-21 | 1 | -1/+1 |
|\ \ |
|
| * | | diff: add --word-diff option that generalizes --color-words | Thomas Rast | 2010-04-14 | 1 | -1/+1 |
* | | | diff: cache textconv output | Jeff King | 2010-04-02 | 1 | -0/+20 |
|/ / |
|
* | | Documentation: mention conflict marker size argument (%L) for merge driver | Bert Wesarg | 2010-02-23 | 1 | -1/+2 |
|/ |
|
* | conflict-marker-size: add test and docs | Junio C Hamano | 2010-01-20 | 1 | -0/+17 |
* | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 2010-01-10 | 1 | -6/+6 |
* | Illustrate "filter" attribute with an example | Nanako Shiraishi | 2009-12-14 | 1 | -0/+19 |
* | Document `delta` attribute in "git help attributes". | Nasser Grainawi | 2009-10-21 | 1 | -0/+10 |
* | Change mentions of "git programs" to "git commands" | Ori Avtalion | 2009-08-12 | 1 | -1/+1 |
* | doc/gitattributes: clarify location of config text | Jeff King | 2009-04-17 | 1 | -3/+6 |
* | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-04-07 | 1 | -3/+3 |
|\ |
|
| * | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-07 | 1 | -3/+3 |
| |\ |
|
| | * | Documentation: clarify .gitattributes search | Jason Merrill | 2009-04-07 | 1 | -3/+3 |
* | | | gitattributes.txt: Path matching rules are explained in gitignore.txt | Johannes Sixt | 2009-02-25 | 1 | -6/+7 |
* | | | Change the spelling of "wordregex". | Boyd Stephen Smith Jr | 2009-01-21 | 1 | -2/+2 |
* | | | color-words: make regex configurable via attributes | Thomas Rast | 2009-01-17 | 1 | -0/+21 |
|/ / |
|
* | | Documentation: New GUI configuration and command-line options. | Alexander Gavrilov | 2008-11-14 | 1 | -0/+17 |
* | | Merge branch 'jk/diff-convfilter-test-fix' | Junio C Hamano | 2008-11-12 | 1 | -13/+53 |
|\ \ |
|
| * | | document the diff driver textconv feature | Jeff King | 2008-10-26 | 1 | -13/+53 |
* | | | Merge branch 'maint' | Junio C Hamano | 2008-11-02 | 1 | -0/+6 |
|\ \ \
| | |/
| |/| |
|
| * | | Documentation/gitattributes: Add subsection header for each attribute | Jakub Narebski | 2008-11-01 | 1 | -0/+6 |
* | | | Merge branch 'maint' | Junio C Hamano | 2008-10-31 | 1 | -2/+2 |
|\ \ \
| |/ /
| | /
| |/
|/| |
|
| * | Documentation: clarify information about 'ident' attribute | Jan Krüger | 2008-10-31 | 1 | -2/+2 |
* | | Teach git diff about Objective-C syntax | Jonathan del Strother | 2008-10-06 | 1 | -0/+2 |
* | | Merge branch 'maint' into bc/master-diff-hunk-header-fix | Shawn O. Pearce | 2008-09-29 | 1 | -9/+9 |
|\ \
| |/ |
|
| * | Merge branch 'bc/maint-diff-hunk-header-fix' into maint | Shawn O. Pearce | 2008-09-29 | 1 | -2/+2 |
| |\ |
|
| * | | Clarified gitattributes documentation regarding custom hunk header. | Garry Dolley | 2008-09-18 | 1 | -9/+9 |
* | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix | Junio C Hamano | 2008-09-18 | 1 | -3/+3 |
|\ \ \
| | |/
| |/| |
|
| * | | diff.*.xfuncname which uses "extended" regex's for hunk header selection | Brandon Casey | 2008-09-18 | 1 | -2/+2 |
| |/ |
|
| * | Fix some manual typos. | Ralf Wildenhues | 2008-09-12 | 1 | -1/+1 |
* | | Teach "git diff -p" to locate PHP class methods | Andreas Ericsson | 2008-09-07 | 1 | -2/+4 |
* | | Merge branch 'maint' | Junio C Hamano | 2008-08-31 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Document clarification: gitmodules, gitattributes | Gustaf Hendeby | 2008-08-31 | 1 | -1/+1 |
* | | Merge branch 'maint' | Junio C Hamano | 2008-08-30 | 1 | -3/+37 |
|\ \
| |/ |
|
| * | gitattributes: -crlf is not binary | Junio C Hamano | 2008-08-30 | 1 | -3/+37 |
* | | Teach "git diff -p" HTML funcname patterns | Johan Herland | 2008-08-20 | 1 | -0/+2 |
* | | Teach "git diff -p" Python funcname patterns | Kirill Smelkov | 2008-08-20 | 1 | -0/+2 |
|/ |
|
* | Teach git diff about BibTeX head hunk patterns | Gustaf Hendeby | 2008-08-12 | 1 | -0/+2 |
* | gitattributes: Document built in hunk header patterns | Gustaf Hendeby | 2008-08-12 | 1 | -3/+10 |
* | Merge branch 'qq/maint' | Junio C Hamano | 2008-07-05 | 1 | -22/+23 |
|\ |
|
| * | attribute documentation: keep EXAMPLE at end | Junio C Hamano | 2008-07-05 | 1 | -16/+17 |
* | | manpages: italicize nongit command names (if they are in teletype font) | Jonathan Nieder | 2008-07-05 | 1 | -3/+3 |
* | | manpages: italicize git command names (which were in teletype font) | Jonathan Nieder | 2008-07-05 | 1 | -8/+8 |
* | | Documentation formatting and cleanup | Jonathan Nieder | 2008-07-01 | 1 | -6/+6 |
* | | Documentation: be consistent about "git-" versus "git " | Jonathan Nieder | 2008-07-01 | 1 | -7/+7 |
* | | Teach new attribute 'export-ignore' to git-archive | René Scharfe | 2008-06-09 | 1 | -0/+6 |
|/ |
|