чување ffdbf5e0c54e551ec747101aa626090542f6abf7
родитељ 254ad89242f9c74a313d02a3d582eddc37919682
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Tue, 24 Nov 2020 13:34:50 +0100
Changed wording explaining the effect of git-log; updated manpage
Signed-off-by: Страхиња Радић <contact@strahinja.org>
Diffstat:
измењених датотека: 4, додавања: 13(+), брисања: 4(-)
diff --git a/index.css b/index.css
@@ -50,6 +50,7 @@ p
font-family: "Noto Mono", "Courier New", "Courier", monospace;
font-size: 90%;
text-align: center;
+ margin-bottom: 1em;
}
#made-by
diff --git a/index.html b/index.html
@@ -96,7 +96,8 @@ PARTICULAR PURPOSE. See the GNU General Public License for more details. </p>
this program. If not, see <https://www.gnu.org/licenses/>. </p>
<div id="git-log">
-index.slw b7bea71 2020-11-23 20:46:46 +0100 (Страхиња Радић) (tag: v0.2.2-beta)
+Previous commit:
+index.slw 254ad89 2020-11-24 13:02:50 +0100 (Страхиња Радић) (HEAD -> master, origin/master, origin/HEAD)
</div><!--git-log-->
diff --git a/slweb.1.in b/slweb.1.in
@@ -125,9 +125,15 @@ include the resulting
.SM HTML. Directive needs to start at the beginning of the line.
.
.IP \[bu]
+.BR "Previous Git commit information" .
+Directive \fC{git\-log}\fR is converted into a div with the id \fCgit\-log\fR
+containing the information about the previous commit (as having information
+about the current commit would be impossible).
+.
+.IP \[bu]
.BR "Brand \[lq]watermark\[rq]" .
-Directive \fC{made-by}\fR is converted into a div containing the
-\[lq]watermark\[rq] text and a link to the
+Directive \fC{made\-by}\fR is converted into a div with the id \fCmade\-by\fR
+containing the \[lq]watermark\[rq] text and a link to the
.B slweb
home page.
.
diff --git a/slweb.in b/slweb.in
@@ -170,7 +170,8 @@ EOT
)
GITLOG=$(cat <<EOT | sed -e's/\//\\\//g' -e"s/\"/\\\\\"/g" | sed -z -e's/\n/\\n/g'
<div id="git-log">
-$(git log --pretty=format:"$(basename $INFILE) %h %ci (%cn) %d" \
+Previous commit:
+$(git log -1 --pretty=format:"$(basename $INFILE) %h %ci (%cn) %d" \
$INFILE 2>/dev/null || echo "(Not in a Git repository)")
</div><!--git-log-->
EOT