Commit 67d6f362 authored by Sven Greiner's avatar Sven Greiner
Browse files

Branches auflisten und löschen

parent fd4b9fc1
...@@ -536,20 +536,72 @@ ...@@ -536,20 +536,72 @@
\end{itemize} \end{itemize}
\end{frame} \end{frame}
\begin{frame}{Branches auflisten und löschen}
\begin{columns}
\column{.5\textwidth}
\begin{block}{Auflisten}
\bigskip
\begin{itemize}
\item Lokale Branches
\medskip\lstinline{\$ git branch}
\bigskip
\item Remote Tracking Branches
\medskip\lstinline{\$ git branch -r}
\bigskip
\item Alle Branches
\medskip\lstinline{\$ git branch -a}
\end{itemize}
\medskip
\end{block}
\column{.5\textwidth}
\begin{block}{Löschen}
\bigskip
\begin{itemize}
\item Lokale Branches
\medskip\lstinline{\$ git branch -d <NAME>}
\bigskip
\item Remote Tracking Branches
\medskip\lstinline{\$ git branch -r -d <NAME>}
\bigskip
\item Remote Branches
\medskip\lstinline{\$ git push origin :<NAME>}
\end{itemize}
\medskip
\end{block}
\end{columns}
\end{frame}
\begin{frame} \begin{frame}
\begin{taskbox}{75mm} \begin{taskbox}{80mm}
\begin{itemize} \begin{itemize}
\setlength{\itemsep}{1em} \setlength{\itemsep}{1em}
\item Lege Branches an, mache Commits, wechsle Branches \item Lege Branches an, mache Commits, wechsle Branches
\item Merge Branches, achte auf Konflikte! \item Merge Branches, achte auf Konflikte!
\item Lösche einen Branch nach dem Mergen
\end{itemize} \end{itemize}
\end{taskbox} \end{taskbox}
\vskip3em \vskip2em
\hfill \hfill
\begin{helpbox}{90mm} \begin{helpbox}{90mm}
\lstinline{git branch <NAME>},\quad \lstinline{git checkout -b <NAME>} \\ \lstinline{git branch <NAME>},\quad \lstinline{git checkout -b <NAME>} \\
\lstinline{git checkout <NAME>},\quad \lstinline{git merge <NAME>} \lstinline{git checkout <NAME>},\quad \lstinline{git merge <NAME>} \\
\lstinline{git branch -d <NAME>}
\end{helpbox} \end{helpbox}
\end{frame} \end{frame}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment