diff --git a/best-practices/starting-GitHub.md b/best-practices/starting-GitHub.md index 1642038..e9e2285 100644 --- a/best-practices/starting-GitHub.md +++ b/best-practices/starting-GitHub.md @@ -56,3 +56,25 @@ Sometimes is hard to know how to start in GitHub since many people has different - Click **pull request** ### YOU ROCK in OPEN SOURCE :sunglasses: :octocat: + + +* Other commands + +``` + > git blame +``` +- Show what revision and author last modified each line of a file + + +``` + > git rebase +``` +- Rebasing is the process of moving or combining a sequence of commits to a new base commit. +- Rebasing is most useful and easily visualized in the context of a feature branching workflow. + +- If you would prefer a clean, linear history free of unnecessary merge commits, you should reach for git rebase instead of git merge when integrating changes from another branch. + + +- **Commit early and often** + +- Git only takes full responsibility for your data when you commit. If you fail to commit and then do something poorly thought out, you can run into trouble. Additionally, having periodic checkpoints means that you can understand how you broke something. diff --git a/github-workshop/CONTRIBUTORS.md b/github-workshop/CONTRIBUTORS.md index 2ff18b7..705f1ef 100644 --- a/github-workshop/CONTRIBUTORS.md +++ b/github-workshop/CONTRIBUTORS.md @@ -60,3 +60,7 @@ - Bio: Estudiante en Ingeniería informática, trabajo como frontend y me gustan los perros. - Github: [noraprogramadoraoficial](https://github.com/noraprogramadoraoficial) + +#### Rosa Quintero +- Bio: Extranjera a dónde quiera que voy con mi playera de la leyenda "Enque l@ puedo ayudar, amante de la tecnologia y del café" +-Github: [rosaq](https://github.com/rosaq)