summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bw/config-h'Junio C Hamano2017-06-24147-229/+397
|\
| * config: don't implicitly use gitdir or commondirbw/config-hBrandon Williams2017-06-153-24/+29
| * config: respect commondirBrandon Williams2017-06-152-4/+8
| * setup: teach discover_git_directory to respect the commondirBrandon Williams2017-06-153-16/+26
| * config: don't include config.h by defaultBrandon Williams2017-06-15146-1/+145
| * config: remove git_config_iterBrandon Williams2017-06-151-1/+0
| * config: create config.hBrandon Williams2017-06-152-189/+195
* | Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano2017-06-2415-123/+168
|\ \
| * | ls-files: factor out tag calculationbw/ls-files-sans-the-indexBrandon Williams2017-06-131-16/+25
| * | ls-files: factor out debug info into a functionBrandon Williams2017-06-131-9/+14
| * | ls-files: convert show_files to take an indexBrandon Williams2017-06-131-15/+15
| * | ls-files: convert show_ce_entry to take an indexBrandon Williams2017-06-131-5/+6
| * | ls-files: convert prune_cache to take an indexBrandon Williams2017-06-131-7/+8
| * | ls-files: convert ce_excluded to take an indexBrandon Williams2017-06-131-4/+5
| * | ls-files: convert show_ru_info to take an indexBrandon Williams2017-06-131-4/+4
| * | ls-files: convert show_other_files to take an indexBrandon Williams2017-06-131-3/+4
| * | ls-files: convert show_killed_files to take an indexBrandon Williams2017-06-131-10/+11
| * | ls-files: convert write_eolinfo to take an indexBrandon Williams2017-06-131-7/+6
| * | ls-files: convert overlay_tree_on_cache to take an indexBrandon Williams2017-06-133-9/+12
| * | tree: convert read_tree to take an index parameterBrandon Williams2017-06-133-12/+21
| * | convert: convert renormalize_buffer to take an indexBrandon Williams2017-06-134-6/+9
| * | convert: convert convert_to_git to take an indexBrandon Williams2017-06-138-15/+18
| * | convert: convert convert_to_git_filter_fd to take an indexBrandon Williams2017-06-133-4/+6
| * | convert: convert crlf_to_git to take an indexBrandon Williams2017-06-131-6/+8
| * | convert: convert get_cached_convert_stats_ascii to take an indexBrandon Williams2017-06-133-4/+9
* | | Merge branch 'js/alias-early-config'Junio C Hamano2017-06-248-61/+49
|\ \ \ | | |/ | |/|
| * | alias: use the early config machinery to expand aliasesjs/alias-early-configJohannes Schindelin2017-06-153-59/+26
| * | t7006: demonstrate a problem with aliases in subdirectoriesJohannes Schindelin2017-06-151-0/+11
| * | t1308: relax the test verifying that empty alias values are disallowedJohannes Schindelin2017-06-151-1/+3
| * | help: use early config when autocorrecting aliasesJohannes Schindelin2017-06-151-1/+1
| * | config: report correct line number upon errorJohannes Schindelin2017-06-152-1/+8
| * | discover_git_directory(): avoid setting invalid git_dirJohannes Schindelin2017-06-151-0/+1
* | | Merge branch 'sn/reset-doc-typofix'Junio C Hamano2017-06-241-1/+1
|\ \ \
| * | | doc: git-reset: fix a trivial typosn/reset-doc-typofixŠtěpán Němec2017-06-151-1/+1
* | | | Merge branch 'sg/doc-pretty-formats'Junio C Hamano2017-06-241-2/+2
|\ \ \ \
| * | | | docs/pretty-formats: stress that %- removes all preceding line-feedssg/doc-pretty-formatsSZEDER Gábor2017-06-151-2/+2
* | | | | Merge branch 'rs/pretty-add-again'Junio C Hamano2017-06-243-45/+0
|\ \ \ \ \
| * | | | | pretty: recalculate duplicate short hashesrs/pretty-add-againRené Scharfe2017-06-153-45/+0
* | | | | | Merge branch 'jk/diff-highlight-module'Junio C Hamano2017-06-245-19/+82
|\ \ \ \ \ \
| * | | | | | diff-highlight: split code into modulejk/diff-highlight-moduleJeff King2017-06-155-19/+82
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ah/doc-gitattributes-empty-index'Junio C Hamano2017-06-241-1/+1
|\ \ \ \ \ \
| * | | | | | doc: do not use `rm .git/index` when normalizing line endingsah/doc-gitattributes-empty-indexAndreas Heiduk2017-06-151-1/+1
| |/ / / / /
* | | | | | Merge branch 'ab/wildmatch-glob-slash-test'Junio C Hamano2017-06-241-0/+2
|\ \ \ \ \ \
| * | | | | | wildmatch test: cover a blind spot in "/" matchingab/wildmatch-glob-slash-testÆvar Arnfjörð Bjarmason2017-06-151-0/+2
* | | | | | | Merge branch 'ab/pcre-v2'Junio C Hamano2017-06-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | grep: fix erroneously copy/pasted variable in check/assert patternÆvar Arnfjörð Bjarmason2017-06-211-1/+1
* | | | | | | | Merge branch 'da/mergetools-meld-output-opt-on-macos'Junio C Hamano2017-06-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | mergetools/meld: improve compatibiilty with Meld on macOS Xda/mergetools-meld-output-opt-on-macosDavid Aguilar2017-06-181-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/split-index-unshare'Junio C Hamano2017-06-243-47/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "split-index: add and use unshare_split_index()"nd/split-index-unshareJunio C Hamano2017-06-243-47/+21
View Lorry Controller Status