Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Makefile: Do not use OLD_ICONV on MINGW anymore | Sebastian Schuberth | 2013-06-04 | 1 | -1/+0 |
* | Sync with maint | Junio C Hamano | 2013-06-03 | 1 | -1/+1 |
|\ | |||||
| * | sha1_file: trivial style cleanup | Felipe Contreras | 2013-06-03 | 1 | -1/+1 |
* | | Merge branch 'kb/status-ignored-optim-2' | Junio C Hamano | 2013-06-03 | 2 | -0/+21 |
|\ \ | |||||
| * | | dir.c: fix ignore processing within not-ignored directories | Karsten Blees | 2013-06-02 | 2 | -0/+21 |
* | | | test: fix post rewrite hook report | Felipe Contreras | 2013-06-03 | 1 | -2/+2 |
* | | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-06-03 | 1 | -0/+53 |
* | | | Merge branch 'tr/line-log' | Junio C Hamano | 2013-06-03 | 31 | -123/+3374 |
|\ \ \ | |||||
| * | | | git-log(1): remove --full-line-diff description | Thomas Rast | 2013-04-22 | 1 | -4/+0 |
| * | | | line-log: fix documentation formatting | Junio C Hamano | 2013-04-22 | 1 | -3/+2 |
| * | | | log -L: improve comments in process_all_files() | Thomas Rast | 2013-04-12 | 1 | -3/+16 |
| * | | | log -L: store the path instead of a diff_filespec | Thomas Rast | 2013-04-12 | 3 | -24/+31 |
| * | | | log -L: test merge of parallel modify/rename | Thomas Rast | 2013-04-12 | 3 | -6/+250 |
| * | | | t4211: pass -M to 'git log -M -L...' test | Thomas Rast | 2013-04-12 | 2 | -9/+49 |
| * | | | log -L: fix overlapping input ranges | Thomas Rast | 2013-04-05 | 5 | -7/+366 |
| * | | | log -L: check range set invariants when we look it up | Thomas Rast | 2013-04-05 | 1 | -0/+26 |
| * | | | Speed up log -L... -M | Thomas Rast | 2013-03-28 | 1 | -4/+52 |
| * | | | log -L: :pattern:file syntax to find by funcname | Thomas Rast | 2013-03-28 | 11 | -14/+332 |
| * | | | Implement line-history search (git log -L) | Thomas Rast | 2013-03-28 | 20 | -2/+2156 |
| * | | | Export rewrite_parents() for 'log -L' | Bo Yang | 2013-03-28 | 2 | -9/+14 |
| * | | | Refactor parse_loc | Bo Yang | 2013-03-28 | 7 | -109/+151 |
* | | | | Merge branch 'mc/describe-first-parent' | Junio C Hamano | 2013-06-03 | 3 | -1/+16 |
|\ \ \ \ | |||||
| * | | | | describe: Add --first-parent option | Mike Crowe | 2013-05-20 | 3 | -1/+16 |
* | | | | | Merge branch 'rs/tar-tests' | Junio C Hamano | 2013-06-03 | 3 | -78/+92 |
|\ \ \ \ \ | |||||
| * | | | | | t5000: test long filenames | René Scharfe | 2013-05-21 | 2 | -0/+46 |
| * | | | | | t5000: simplify tar-tree tests | René Scharfe | 2013-05-21 | 1 | -23/+8 |
| * | | | | | t5000: use check_tar for prefix test | René Scharfe | 2013-05-21 | 1 | -12/+12 |
| * | | | | | t5000: factor out check_tar | René Scharfe | 2013-05-21 | 1 | -13/+22 |
| * | | | | | t5000, t5003: create directories for extracted files lazily | René Scharfe | 2013-05-21 | 2 | -4/+4 |
| * | | | | | t5000: integrate export-subst tests into regular tests | René Scharfe | 2013-05-21 | 1 | -32/+6 |
* | | | | | | Merge branch 'jc/strbuf-branchname-fix' | Junio C Hamano | 2013-06-03 | 2 | -4/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | strbuf_branchname(): do not double-expand @{-1}~22 | Junio C Hamano | 2013-05-16 | 2 | -4/+19 |
* | | | | | | | Merge branch 'jk/fetch-always-update-tracking' | Junio C Hamano | 2013-06-03 | 4 | -30/+102 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fetch: don't try to update unfetched tracking refs | John Keeping | 2013-05-28 | 2 | -1/+17 |
| * | | | | | | | fetch: opportunistically update tracking refs | Jeff King | 2013-05-13 | 3 | -5/+21 |
| * | | | | | | | refactor "ref->merge" flag | Jeff King | 2013-05-13 | 2 | -23/+48 |
| * | | | | | | | fetch/pull doc: untangle meaning of bare <ref> | Thomas Rast | 2013-05-13 | 1 | -3/+8 |
| * | | | | | | | t5510: start tracking-ref tests from a known state | Jeff King | 2013-05-13 | 1 | -0/+10 |
* | | | | | | | | Merge branch 'tr/coverage' | Junio C Hamano | 2013-06-03 | 1 | -8/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | coverage: build coverage-untested-functions by default | Thomas Rast | 2013-05-14 | 1 | -1/+1 |
| * | | | | | | | | coverage: set DEFAULT_TEST_TARGET to avoid using prove | Thomas Rast | 2013-05-14 | 1 | -1/+1 |
| * | | | | | | | | coverage: do not delete .gcno files before building | Thomas Rast | 2013-05-14 | 1 | -3/+6 |
| * | | | | | | | | coverage: split build target into compile and test | Thomas Rast | 2013-05-14 | 1 | -3/+5 |
* | | | | | | | | | Merge branch 'mk/combine-diff-context-horizon-fix' | Junio C Hamano | 2013-06-03 | 2 | -2/+53 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | combine-diff.c: Fix output when changes are exactly 3 lines apart | Matthijs Kooijman | 2013-05-15 | 2 | -2/+53 |
* | | | | | | | | | | Merge branch 'kb/ancestry-path-threedots' | Junio C Hamano | 2013-06-03 | 3 | -1/+38 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | revision.c: treat A...B merge bases as if manually specified | Kevin Bracey | 2013-05-16 | 3 | -1/+19 |
| * | | | | | | | | | | t6019: demonstrate --ancestry-path A...B breakage | Kevin Bracey | 2013-05-13 | 1 | -1/+20 |
* | | | | | | | | | | | Merge branch 'jc/t5551-posix-sed-bre' | Junio C Hamano | 2013-06-03 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t5551: do not use unportable sed '\+' | Junio C Hamano | 2013-05-13 | 1 | -2/+6 |