aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'bw/config-h'Junio C Hamano2017-06-24
|\
| * config: don't implicitly use gitdir or commondirBrandon Williams2017-06-15
| * config: respect commondirBrandon Williams2017-06-15
| * setup: teach discover_git_directory to respect the commondirBrandon Williams2017-06-15
| * config: don't include config.h by defaultBrandon Williams2017-06-15
| * config: remove git_config_iterBrandon Williams2017-06-15
| * config: create config.hBrandon Williams2017-06-15
* | Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano2017-06-24
|\ \
| * | ls-files: factor out tag calculationBrandon Williams2017-06-13
| * | ls-files: factor out debug info into a functionBrandon Williams2017-06-13
| * | ls-files: convert show_files to take an indexBrandon Williams2017-06-13
| * | ls-files: convert show_ce_entry to take an indexBrandon Williams2017-06-13
| * | ls-files: convert prune_cache to take an indexBrandon Williams2017-06-13
| * | ls-files: convert ce_excluded to take an indexBrandon Williams2017-06-13
| * | ls-files: convert show_ru_info to take an indexBrandon Williams2017-06-13
| * | ls-files: convert show_other_files to take an indexBrandon Williams2017-06-13
| * | ls-files: convert show_killed_files to take an indexBrandon Williams2017-06-13
| * | ls-files: convert write_eolinfo to take an indexBrandon Williams2017-06-13
| * | ls-files: convert overlay_tree_on_cache to take an indexBrandon Williams2017-06-13
| * | tree: convert read_tree to take an index parameterBrandon Williams2017-06-13
| * | convert: convert renormalize_buffer to take an indexBrandon Williams2017-06-13
| * | convert: convert convert_to_git to take an indexBrandon Williams2017-06-13
| * | convert: convert convert_to_git_filter_fd to take an indexBrandon Williams2017-06-13
| * | convert: convert crlf_to_git to take an indexBrandon Williams2017-06-13
| * | convert: convert get_cached_convert_stats_ascii to take an indexBrandon Williams2017-06-13
* | | Merge branch 'js/alias-early-config'Junio C Hamano2017-06-24
|\ \ \ | | |/ | |/|
| * | alias: use the early config machinery to expand aliasesJohannes Schindelin2017-06-15
| * | t7006: demonstrate a problem with aliases in subdirectoriesJohannes Schindelin2017-06-15
| * | t1308: relax the test verifying that empty alias values are disallowedJohannes Schindelin2017-06-15
| * | help: use early config when autocorrecting aliasesJohannes Schindelin2017-06-15
| * | config: report correct line number upon errorJohannes Schindelin2017-06-15
| * | discover_git_directory(): avoid setting invalid git_dirJohannes Schindelin2017-06-15
* | | Merge branch 'sn/reset-doc-typofix'Junio C Hamano2017-06-24
|\ \ \
| * | | doc: git-reset: fix a trivial typoŠtěpán Němec2017-06-15
* | | | Merge branch 'sg/doc-pretty-formats'Junio C Hamano2017-06-24
|\ \ \ \
| * | | | docs/pretty-formats: stress that %- removes all preceding line-feedsSZEDER Gábor2017-06-15
* | | | | Merge branch 'rs/pretty-add-again'Junio C Hamano2017-06-24
|\ \ \ \ \
| * | | | | pretty: recalculate duplicate short hashesRené Scharfe2017-06-15
* | | | | | Merge branch 'jk/diff-highlight-module'Junio C Hamano2017-06-24
|\ \ \ \ \ \
| * | | | | | diff-highlight: split code into moduleJeff King2017-06-15
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ah/doc-gitattributes-empty-index'Junio C Hamano2017-06-24
|\ \ \ \ \ \
| * | | | | | doc: do not use `rm .git/index` when normalizing line endingsAndreas Heiduk2017-06-15
| |/ / / / /
* | | | | | Merge branch 'ab/wildmatch-glob-slash-test'Junio C Hamano2017-06-24
|\ \ \ \ \ \
| * | | | | | wildmatch test: cover a blind spot in "/" matchingÆvar Arnfjörð Bjarmason2017-06-15
* | | | | | | Merge branch 'ab/pcre-v2'Junio C Hamano2017-06-24
|\ \ \ \ \ \ \
| * | | | | | | grep: fix erroneously copy/pasted variable in check/assert patternÆvar Arnfjörð Bjarmason2017-06-21
* | | | | | | | Merge branch 'da/mergetools-meld-output-opt-on-macos'Junio C Hamano2017-06-24
|\ \ \ \ \ \ \ \
| * | | | | | | | mergetools/meld: improve compatibiilty with Meld on macOS XDavid Aguilar2017-06-18
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/split-index-unshare'Junio C Hamano2017-06-24
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "split-index: add and use unshare_split_index()"Junio C Hamano2017-06-24