diff --git a/branching/branching.tex b/branching/branching.tex index 2b8311c03a04c86cbf2ca81ad26fc1db6b159dd0..fb9c458082fe6bb7ec48a6b4a8c83a356e7397ff 100644 --- a/branching/branching.tex +++ b/branching/branching.tex @@ -2,7 +2,7 @@ \title{Working with branches in Git} \providecommand{\myConference}{Git course} -\providecommand{\myDate}{Monday, October 14, 2013} +\providecommand{\myDate}{Monday, June 23, 2014} \author{Martijn Vermaat} \providecommand{\myGroup}{Leiden Genome Technology Center} \providecommand{\myDepartment}{Department of Human Genetics} @@ -574,6 +574,7 @@ Hit return to start merge resolution tool (meld): Zuotian Tatum + Wibowo Arindrarto \end{center} \vfill \permfoot{http://git-scm.com/book}\\ diff --git a/remotes/remotes.tex b/remotes/remotes.tex index 2ecf219641d376b255f0e022fcf43106dedc1f32..d57e5c00826736b9e10ce4b4d821761a9f4f6ade 100644 --- a/remotes/remotes.tex +++ b/remotes/remotes.tex @@ -2,7 +2,7 @@ \title{Git and remote repositories} \providecommand{\myConference}{Git course} -\providecommand{\myDate}{Monday, October 14, 2013} +\providecommand{\myDate}{Monday, June 23, 2014} \author{Martijn Vermaat} \providecommand{\myGroup}{Leiden Genome Technology Center} \providecommand{\myDepartment}{Department of Human Genetics} @@ -310,6 +310,7 @@ $ git pull ==> $ git fetch origin Zuotian Tatum + Wibowo Arindrarto \end{center} \vfill \permfoot{http://git-scm.com/book}\\