summaryrefslogtreecommitdiff
path: root/builtin/diff-files.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-24 21:28:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-24 21:28:40 (GMT)
commit1c3d87cf5594cc7e57d71c7b2d99dd4982285951 (patch)
tree9a461af87a2e6c7191cd158093b37f0eea6f0c2a /builtin/diff-files.c
parent9bca0e5513579386384c064c5cdc45980b6774df (diff)
parenta9bcf6586d1a4888aea91553d73cda20494b8335 (diff)
downloadgit-1c3d87cf5594cc7e57d71c7b2d99dd4982285951.zip
git-1c3d87cf5594cc7e57d71c7b2d99dd4982285951.tar.gz
git-1c3d87cf5594cc7e57d71c7b2d99dd4982285951.tar.bz2
Merge branch 'js/alias-early-config'
The code to pick up and execute command alias definition from the configuration used to switch to the top of the working tree and then come back when the expanded alias was executed, which was unnecessarilyl complex. Attempt to simplify the logic by using the early-config mechanism that does not chdir around. * js/alias-early-config: alias: use the early config machinery to expand aliases t7006: demonstrate a problem with aliases in subdirectories t1308: relax the test verifying that empty alias values are disallowed help: use early config when autocorrecting aliases config: report correct line number upon error discover_git_directory(): avoid setting invalid git_dir
Diffstat (limited to 'builtin/diff-files.c')
0 files changed, 0 insertions, 0 deletions