Merge githash

doc/makedefs.6

@@ -85,6 +85,14 @@ Generate
 .I date.h
 and
 .I options
+file. It will read 
+.I dat/gitinfo.txt
+,only if it is present, to obtain 
+.B githash=
+and 
+.B gitbranch=
+ info and include related preprocessor #defines in
+.I date.h
 file.
 .br
 .TP

doc/nethack.6

@@ -1,5 +1,5 @@
 .TH NETHACK 6 "7 December 2015"
-.\" NetHack 3.6  nethack.6	$NHDT-Date: 1449616496 2015/12/08 23:14:56 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.11 $
+.\" NetHack 3.6  nethack.6	$NHDT-Date: 1519228609 2018/02/21 15:56:49 $  $NHDT-Branch: githash $:$NHDT-Revision: 1.13 $
 .SH NAME
 nethack \- Exploring The Mazes of Menace
 .SH SYNOPSIS
@@ -34,6 +34,9 @@ nethack \- Exploring The Mazes of Menace
 [
 .B \-ibm
 ]
+[
+.BR \-\-version [ :paste ]
+]
 .PP
 .B nethack
 [
@@ -207,6 +210,17 @@ The playground must contain several auxiliary files such as help files,
 the list of top scorers, and a subdirectory
 .I save
 where games are saved.
+.PP
+.B \-\-version
+can be used to cause NetHack to show the version information it
+was compiled with, then exit. That will include the
+.I git
+commit hash if the information was available when the game was compiled.
+On some platforms, such as windows and macosx, a variation 
+.B \-\-version:paste
+can be used to cause NetHack to show the version information, then exit,
+while also leaving a copy of the version information in the paste buffer 
+or clipboard for potential insertion into things like bug reports.
 .SH AUTHORS
 .PP
 Jay Fenlason (+ Kenny Woodland, Mike Thome and Jon Payne) wrote the

doc/nethack.txt

@@ -7,7 +7,7 @@ NAME
 
 SYNOPSIS
        nethack [ -d directory ] [ -n ] [ -p profession ] [ -r race ] [ -[DX] ]
-       [ -u playername ] [ -dec ] [ -ibm ]
+       [ -u playername ] [ -dec ] [ -ibm ] [ --version[:paste] ]
 
        nethack [ -d directory ] -s [ -v ] [ -p profession ] [ -r race ] [
        playernames ]