Fast forward only

32f5904d · Daniel Stan · 314badd9 · 32f5904d · 32f5904d
Commit 32f5904d authored Mar 26, 2017 by Daniel Stan
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

.gitconfig .config/.gitconfig +4 -0

index.html www.tudo.re/index.html +1 -0

No files found.
--- a/.config/.gitconfig
+++ b/.config/.gitconfig
@@ -7,3 +7,7 @@
    email = ds@tudo.re
 [push]
    default = simple
+[merge]
+  ff = false
+[pull]
+  ff = true
--- a/www.tudo.re/index.html
+++ b/www.tudo.re/index.html
@@ -6,6 +6,7 @@
 <body>
   <h1>Tudor's webpage</h1>
 <ul>
+ <li><a href="http://www.lsv.ens-cachan.fr/~dstan/defense.php">My PhD Defense</a></li>
 <li><a href="http://www.lsv.ens-cachan.fr/~dstan/">Academic page at LSV</a></li>
 <li><a href="https://gitlab.crans.org/u/dstan">Gitlab profile (at Crans)</a></li>
 </ul>