Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'bw/ls-files-sans-the-index' | Junio C Hamano | 2017-06-24 | 15 | -123/+168 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | ls-files: factor out tag calculationbw/ls-files-sans-the-index | Brandon Williams | 2017-06-13 | 1 | -16/+25 | |
| * | | | | | | | | | | | | | | | | | | | | | ls-files: factor out debug info into a function | Brandon Williams | 2017-06-13 | 1 | -9/+14 | |
| * | | | | | | | | | | | | | | | | | | | | | ls-files: convert show_files to take an index | Brandon Williams | 2017-06-13 | 1 | -15/+15 | |
| * | | | | | | | | | | | | | | | | | | | | | ls-files: convert show_ce_entry to take an index | Brandon Williams | 2017-06-13 | 1 | -5/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | ls-files: convert prune_cache to take an index | Brandon Williams | 2017-06-13 | 1 | -7/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | ls-files: convert ce_excluded to take an index | Brandon Williams | 2017-06-13 | 1 | -4/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | ls-files: convert show_ru_info to take an index | Brandon Williams | 2017-06-13 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | ls-files: convert show_other_files to take an index | Brandon Williams | 2017-06-13 | 1 | -3/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | ls-files: convert show_killed_files to take an index | Brandon Williams | 2017-06-13 | 1 | -10/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | ls-files: convert write_eolinfo to take an index | Brandon Williams | 2017-06-13 | 1 | -7/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | ls-files: convert overlay_tree_on_cache to take an index | Brandon Williams | 2017-06-13 | 3 | -9/+12 | |
| * | | | | | | | | | | | | | | | | | | | | | tree: convert read_tree to take an index parameter | Brandon Williams | 2017-06-13 | 3 | -12/+21 | |
| * | | | | | | | | | | | | | | | | | | | | | convert: convert renormalize_buffer to take an index | Brandon Williams | 2017-06-13 | 4 | -6/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | convert: convert convert_to_git to take an index | Brandon Williams | 2017-06-13 | 8 | -15/+18 | |
| * | | | | | | | | | | | | | | | | | | | | | convert: convert convert_to_git_filter_fd to take an index | Brandon Williams | 2017-06-13 | 3 | -4/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | convert: convert crlf_to_git to take an index | Brandon Williams | 2017-06-13 | 1 | -6/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | convert: convert get_cached_convert_stats_ascii to take an index | Brandon Williams | 2017-06-13 | 3 | -4/+9 | |
| | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/alias-early-config' | Junio C Hamano | 2017-06-24 | 8 | -61/+49 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | alias: use the early config machinery to expand aliasesjs/alias-early-config | Johannes Schindelin | 2017-06-15 | 3 | -59/+26 | |
| * | | | | | | | | | | | | | | | | | | | | t7006: demonstrate a problem with aliases in subdirectories | Johannes Schindelin | 2017-06-15 | 1 | -0/+11 | |
| * | | | | | | | | | | | | | | | | | | | | t1308: relax the test verifying that empty alias values are disallowed | Johannes Schindelin | 2017-06-15 | 1 | -1/+3 | |
| * | | | | | | | | | | | | | | | | | | | | help: use early config when autocorrecting aliases | Johannes Schindelin | 2017-06-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | config: report correct line number upon error | Johannes Schindelin | 2017-06-15 | 2 | -1/+8 | |
| * | | | | | | | | | | | | | | | | | | | | discover_git_directory(): avoid setting invalid git_dir | Johannes Schindelin | 2017-06-15 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sn/reset-doc-typofix' | Junio C Hamano | 2017-06-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | doc: git-reset: fix a trivial typosn/reset-doc-typofix | Štěpán Němec | 2017-06-15 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/doc-pretty-formats' | Junio C Hamano | 2017-06-24 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | docs/pretty-formats: stress that %- removes all preceding line-feedssg/doc-pretty-formats | SZEDER Gábor | 2017-06-15 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/pretty-add-again' | Junio C Hamano | 2017-06-24 | 3 | -45/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | pretty: recalculate duplicate short hashesrs/pretty-add-again | René Scharfe | 2017-06-15 | 3 | -45/+0 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/diff-highlight-module' | Junio C Hamano | 2017-06-24 | 5 | -19/+82 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | diff-highlight: split code into modulejk/diff-highlight-module | Jeff King | 2017-06-15 | 5 | -19/+82 | |
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/doc-gitattributes-empty-index' | Junio C Hamano | 2017-06-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | doc: do not use `rm .git/index` when normalizing line endingsah/doc-gitattributes-empty-index | Andreas Heiduk | 2017-06-15 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/wildmatch-glob-slash-test' | Junio C Hamano | 2017-06-24 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | wildmatch test: cover a blind spot in "/" matchingab/wildmatch-glob-slash-test | Ævar Arnfjörð Bjarmason | 2017-06-15 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/pcre-v2' | Junio C Hamano | 2017-06-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | grep: fix erroneously copy/pasted variable in check/assert pattern | Ævar Arnfjörð Bjarmason | 2017-06-21 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/mergetools-meld-output-opt-on-macos' | Junio C Hamano | 2017-06-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | mergetools/meld: improve compatibiilty with Meld on macOS Xda/mergetools-meld-output-opt-on-macos | David Aguilar | 2017-06-18 | 1 | -1/+1 | |
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/split-index-unshare' | Junio C Hamano | 2017-06-24 | 3 | -47/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Revert "split-index: add and use unshare_split_index()"nd/split-index-unshare | Junio C Hamano | 2017-06-24 | 3 | -47/+21 | |
* | | | | | | | | | | | | | | | | | | | | | | | Tenth batch for 2.14 | Junio C Hamano | 2017-06-22 | 1 | -0/+28 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/strbuf-addftime-zZ' | Junio C Hamano | 2017-06-22 | 5 | -11/+73 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | date: use localtime() for "-local" time formatsrs/strbuf-addftime-zZ | Jeff King | 2017-06-15 | 2 | -2/+13 | |
| * | | | | | | | | | | | | | | | | | | | | | | | t0006: check --date=format zone offsets | Jeff King | 2017-06-15 | 1 | -2/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | strbuf: let strbuf_addftime handle %z and %Z itself | René Scharfe | 2017-06-15 | 5 | -8/+54 | |
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sd/t3200-branch-m-test' | Junio C Hamano | 2017-06-22 | 1 | -0/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | t3200: add test for single parameter passed to -m optionsd/t3200-branch-m-test | Sahil Dua | 2017-06-13 | 1 | -0/+17 |