diff options
| author |  Mark Lodato <lodatom@gmail.com> | 2010-09-09 21:39:37 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-10 09:31:13 -0700 |
| commit | 9904fadfea002edf2ef22e8ec9a978e45d1f540b (patch) | |
| tree | 37adeb6e3374efcccd240d1bfa3237f7b308b108 /builtin/merge-ours.c | |
| parent | xdiff-interface.c: always trim trailing space from xfuncname matches (diff) | |
| download | tgif-9904fadfea002edf2ef22e8ec9a978e45d1f540b.tar.xz | |
config.txt: fix placement of diff.noprefix
In git-config(1), diff.noprefix was placed in between
diff.mnemonicprefix and the list of mnemonic prefixes, which is
obviously incorrect and very confusing to readers. Now, it is located
after the end of the explanation of mnemonicprefix, which makes much
more sense.
Signed-off-by: Mark Lodato <lodatom@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