diff --git a/.nojekyll b/.nojekyll index 0421540..54df6ae 100644 --- a/.nojekyll +++ b/.nojekyll @@ -1 +1 @@ -2e79cacc \ No newline at end of file +7fb02dcb \ No newline at end of file diff --git a/git/git_intro.html b/git/git_intro.html index 4a0e599..5ac8a8e 100644 --- a/git/git_intro.html +++ b/git/git_intro.html @@ -215,6 +215,7 @@

Table of contents

  • 1.5 File staging and git commit
  • 1.6 Git push/pull
  • 1.7 Git merge and git rebase
  • +
  • 1.8 Git Cheetsheet
  • @@ -361,6 +362,10 @@

    git checkout my_new_feature
     git rebase main

    This will sort of re-write the project history by moving the feature branch to the “tip” of the main and create new commits in the original branch.

    + +
    +

    1.8 Git Cheetsheet

    +

    A Git cheetsheet by Julia Evans

    diff --git a/index.html b/index.html index da7633d..a35ebc8 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ - + Training: Tech shorts