summaryrefslogtreecommitdiffstats
path: root/man1/git-merge.1
diff options
context:
space:
mode:
Diffstat (limited to 'man1/git-merge.1')
-rw-r--r--man1/git-merge.16
1 files changed, 3 insertions, 3 deletions
diff --git a/man1/git-merge.1 b/man1/git-merge.1
index 0172cf827..3a5cd96d9 100644
--- a/man1/git-merge.1
+++ b/man1/git-merge.1
@@ -2,12 +2,12 @@
.\" Title: git-merge
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\" Date: 2023-08-02
+.\" Date: 2023-08-04
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.494.g1b0a512956
+.\" Source: Git 2.42.0.rc0
.\" Language: English
.\"
-.TH "GIT\-MERGE" "1" "2023\-08\-02" "Git 2\&.41\&.0\&.494\&.g1b0a51" "Git Manual"
+.TH "GIT\-MERGE" "1" "2023\-08\-04" "Git 2\&.42\&.0\&.rc0" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
oup
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Skripkin <paskripkin@gmail.com>2021-06-18 16:49:02 +0300
committerSasha Levin <sashal@kernel.org>2021-06-30 08:48:51 -0400
commitb1ad283755095a4b9d1431aeb357d7df1a33d3bb (patch)
tree8a98b6bd85f0a4980c2ebc8d070abb4b55d7f1b9
parent6ae141218d681ffccc477959c3bcc8a5dbe9969a (diff)
downloadlinux-b1ad283755095a4b9d1431aeb357d7df1a33d3bb.tar.gz
net: ethernet: fix potential use-after-free in ec_bhf_remove