summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Paul Tan <pyokagan@gmail.com>2015-05-06 16:01:01 +0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-06 11:33:24 -0700
commit64ab71db3a7e5b41a37580f8a3d15cb25b3e7093 (patch)
tree67e7d769b6e2a7560ecd99327c318b2a3f3814ad /builtin/merge-ours.c
parentdir.c: replace home_config_paths() with xdg_config_home() (diff)
downloadtgif-64ab71db3a7e5b41a37580f8a3d15cb25b3e7093.tar.xz
credential-store.c: replace home_config_paths() with xdg_config_home()
Since only the xdg credentials file path is required, and home_config_paths() is unable to construct the path ~/.git-credentials, simplify the code by replacing home_config_paths() with xdg_config_home(). Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions