summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t8001, t8002: fix "blame -L :literal" test on NetBSDes/blame-L-breakageRené Scharfe2013-08-051-2/+2
* blame-options.txt: explain that -L <start> and <end> are optionalEric Sunshine2013-07-171-2/+5
* blame-options.txt: place each -L option variation on its own lineEric Sunshine2013-07-171-1/+2
* t8001/t8002 (blame): add blame -L :funcname testsEric Sunshine2013-07-171-2/+46
* t8001/t8002 (blame): add blame -L testsEric Sunshine2013-07-171-3/+101
* t8001/t8002 (blame): modernize styleEric Sunshine2013-07-173-112/+127
* line-range: fix "blame -L X,-N" regressionEric Sunshine2013-07-171-0/+7
* Merge branch 'tr/line-log'Junio C Hamano2013-06-0231-123/+3374
|\
| * git-log(1): remove --full-line-diff descriptionThomas Rast2013-04-221-4/+0
| * line-log: fix documentation formattingJunio C Hamano2013-04-211-3/+2
| * log -L: improve comments in process_all_files()Thomas Rast2013-04-121-3/+16
| * log -L: store the path instead of a diff_filespecThomas Rast2013-04-123-24/+31
| * log -L: test merge of parallel modify/renameThomas Rast2013-04-123-6/+250
| * t4211: pass -M to 'git log -M -L...' testThomas Rast2013-04-122-9/+49
| * log -L: fix overlapping input rangesThomas Rast2013-04-055-7/+366
| * log -L: check range set invariants when we look it upThomas Rast2013-04-051-0/+26
| * Speed up log -L... -MThomas Rast2013-03-281-4/+52
| * log -L: :pattern:file syntax to find by funcnameThomas Rast2013-03-2811-14/+332
| * Implement line-history search (git log -L)Thomas Rast2013-03-2820-2/+2156
| * Export rewrite_parents() for 'log -L'Bo Yang2013-03-282-9/+14
| * Refactor parse_locBo Yang2013-03-287-109/+151
* | Merge branch 'mc/describe-first-parent'Junio C Hamano2013-06-023-1/+16
|\ \
| * | describe: Add --first-parent optionMike Crowe2013-05-203-1/+16
* | | Merge branch 'rs/tar-tests'Junio C Hamano2013-06-023-78/+92
|\ \ \
| * | | t5000: test long filenamesRené Scharfe2013-05-202-0/+46
| * | | t5000: simplify tar-tree testsRené Scharfe2013-05-201-23/+8
| * | | t5000: use check_tar for prefix testRené Scharfe2013-05-201-12/+12
| * | | t5000: factor out check_tarRené Scharfe2013-05-201-13/+22
| * | | t5000, t5003: create directories for extracted files lazilyRené Scharfe2013-05-202-4/+4
| * | | t5000: integrate export-subst tests into regular testsRené Scharfe2013-05-201-32/+6
* | | | Merge branch 'jc/strbuf-branchname-fix'Junio C Hamano2013-06-022-4/+19
|\ \ \ \
| * | | | strbuf_branchname(): do not double-expand @{-1}~22Junio C Hamano2013-05-162-4/+19
* | | | | Merge branch 'jk/fetch-always-update-tracking'Junio C Hamano2013-06-024-30/+102
|\ \ \ \ \
| * | | | | fetch: don't try to update unfetched tracking refsJohn Keeping2013-05-282-1/+17
| * | | | | fetch: opportunistically update tracking refsJeff King2013-05-123-5/+21
| * | | | | refactor "ref->merge" flagJeff King2013-05-122-23/+48
| * | | | | fetch/pull doc: untangle meaning of bare <ref>Thomas Rast2013-05-121-3/+8
| * | | | | t5510: start tracking-ref tests from a known stateJeff King2013-05-121-0/+10
* | | | | | Merge branch 'tr/coverage'Junio C Hamano2013-06-021-8/+13
|\ \ \ \ \ \
| * | | | | | coverage: build coverage-untested-functions by defaultThomas Rast2013-05-131-1/+1
| * | | | | | coverage: set DEFAULT_TEST_TARGET to avoid using proveThomas Rast2013-05-131-1/+1
| * | | | | | coverage: do not delete .gcno files before buildingThomas Rast2013-05-131-3/+6
| * | | | | | coverage: split build target into compile and testThomas Rast2013-05-131-3/+5
* | | | | | | Merge branch 'mk/combine-diff-context-horizon-fix'Junio C Hamano2013-06-022-2/+53
|\ \ \ \ \ \ \
| * | | | | | | combine-diff.c: Fix output when changes are exactly 3 lines apartMatthijs Kooijman2013-05-152-2/+53
* | | | | | | | Merge branch 'kb/ancestry-path-threedots'Junio C Hamano2013-06-023-1/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | revision.c: treat A...B merge bases as if manually specifiedKevin Bracey2013-05-163-1/+19
| * | | | | | | | t6019: demonstrate --ancestry-path A...B breakageKevin Bracey2013-05-131-1/+20
* | | | | | | | | Merge branch 'jc/t5551-posix-sed-bre'Junio C Hamano2013-06-021-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5551: do not use unportable sed '\+'Junio C Hamano2013-05-121-2/+6
View Lorry Controller Status