diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-05 12:45:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 12:45:40 -0800 |
| commit | fec7b79aa469eec2fa184b1ff7f8e41fb6fa632c (patch) | |
| tree | 90b2ff2fabdeb0aaf849c320917468d828ecf5dd /git-merge-one-file.sh | |
| parent | Merge branch 'mh/refs-have-new' (diff) | |
| parent | Documentation/git-am.txt: mention mailinfo.scissors config variable (diff) | |
| download | tgif-fec7b79aa469eec2fa184b1ff7f8e41fb6fa632c.tar.xz | |
Merge branch 'mm/am-c-doc'
The configuration variable 'mailinfo.scissors' was hard to
discover in the documentation.
* mm/am-c-doc:
Documentation/git-am.txt: mention mailinfo.scissors config variable
Documentation/config.txt: document mailinfo.scissors
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions