]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fd9de86 afb5de7)
Merge branch 'mm/am-c-doc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 20:45:40 +0000 (12:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 20:45:40 +0000 (12:45 -0800)
commitfec7b79aa469eec2fa184b1ff7f8e41fb6fa632c
tree90b2ff2fabdeb0aaf849c320917468d828ecf5ddtree | snapshot
parentfd9de868c359a1bbd214e354aefdb0f1eaa898bdcommit | diff
parentafb5de7f8d0dd9207a587f4ee2fa29d7ee8485eacommit | diff
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
Documentation/config.txt diff1 | diff2 | blob | history
Documentation/git-am.txt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.