diff --git a/content.tex b/content.tex index 9e63cb1..addabe6 100644 --- a/content.tex +++ b/content.tex @@ -155,11 +155,12 @@ are used. Release notes are generated for release candidats and releases. For release candidats (internal releases) more tags are analyzed. The definition of the commit tag rules are somewhere in the Polarion :) Because the release notes content is taken from the log history of a release branch -each commit in it's history has to use tagged commits. As long as the -release branch is branched off the master only it's own commits and the -master's commits has to be tagged. Figure \ref{fig:git_commit_history} -illustrates the flow of the log history of the release branch shown in -figure \ref{fig:gitlab_workflow}. +each commit in it's history has to use tagged commits. To show logs only of +direct parents (commits on the current release branch and commits on the +master) the log command\\ +\texttt{git log ..HEAD --first parent master}\\ +can be used. Figure \ref{fig:git_commit_history} illustrates the flow of the +log history of the release branch shown in figure \ref{fig:gitlab_workflow}. \subsection{Configuring the build jobs} \label{sec:ci_conf} @@ -192,6 +193,3 @@ variables: SW_MINOR: "2" \end{lstlisting} -\textbf{Remember}, it is a good idea to change these values before creating -the release branch, creating (and pushing) the branch triggers the build of -a release candidate.