diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-05 21:00:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-05 21:00:31 -0700 |
| commit | 67e5a00d0a1e5deb15ebd963e61c396567af1ef0 (patch) | |
| tree | 6395cc48fbf5e9cda33748407236e0622273c906 /Documentation/merge-strategies.txt | |
| parent | Merge branch 'jk/type-from-string-gently' (diff) | |
| parent | config: fix settings in default_user_config template (diff) | |
| download | tgif-67e5a00d0a1e5deb15ebd963e61c396567af1ef0.tar.xz | |
Merge branch 'oh/fix-config-default-user-name-section'
The default $HOME/.gitconfig file created upon "git config --global"
that edits it had incorrectly spelled user.name and user.email
entries in it.
* oh/fix-config-default-user-name-section:
config: fix settings in default_user_config template
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions