git-sh-setup: document git_editor() and get_author_ident_from_commit()

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index eabd7ef33f6c01322fc3794341c8982573b516a4..1521a9ee0fec3a825bdbade4869012b7c3cf3bf7 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -163,7 +163,8 @@ After seeing a conflict, you can do two things:
 
 SEE ALSO
 --------
-gitlink:git-fmt-merge-msg[1], gitlink:git-pull[1]
+gitlink:git-fmt-merge-msg[1], gitlink:git-pull[1],
+gitlink:gitattributes[5]
 
 
 Author