]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2e7ca27 afb5de7)
Merge branch 'mm/am-c-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2015 22:57:56 +0000 (14:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2015 22:57:56 +0000 (14:57 -0800)
commitd86679fa061e22e33596814630513b6a7b4d4767
treecbb918dcdfa87f73743c4a3c58597a6e71555d3atree
parent2e7ca2745b7c08815fdbdccf9b410846e079b102commit | diff
parentafb5de7f8d0dd9207a587f4ee2fa29d7ee8485eacommit | diff
Merge branch 'mm/am-c-doc' into maint

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.