diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2013-02-14 16:36:54 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-02-15 09:05:55 -0800 |
| commit | c0179c0d33b0fc3c8ad30246eece220e0442fb6e (patch) | |
| tree | 228fcbdf499359a697d4da3fcb8125b1a6e09003 /Documentation/technical/trivial-merge.txt | |
| parent | Replace filepattern with pathspec for consistency (diff) | |
| download | tgif-c0179c0d33b0fc3c8ad30246eece220e0442fb6e.tar.xz | |
git.txt: update description of the configuration mechanism
The old Git version where it appeared is now useful only to historians,
not to normal users. Also, the text was mentioning only the per-repo
config file, but this is a good place to teach that customization can
also be made per-user.
While at it, remove a now-defunct e-mail from an example.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions