From ce5804cbbd1269bbedffd6e9d83a0d4381898546 Mon Sep 17 00:00:00 2001
From: Alcides Conte Neto <neto_conte@hotmail.com>
Date: Mon, 16 Nov 2015 17:32:12 -0200
Subject: [PATCH] Adicionado Reescrever mensagem commit
---
cap08/cap08_er.Rmd | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/cap08/cap08_er.Rmd b/cap08/cap08_er.Rmd
index ad56972..0d396d3 100644
--- a/cap08/cap08_er.Rmd
+++ b/cap08/cap08_er.Rmd
@@ -18,7 +18,6 @@ git push origin master
```
## Resolver conflito de merge
-
```{r, engine='bash', eval=FALSE, echo=TRUE}
# Requisitar merge:
git merge ramo_teste
@@ -33,9 +32,12 @@ git commit -a -m "Merge do ramo_teste"
## Incorporar o remoto ao local
```{r, engine='bash', eval=FALSE, echo=TRUE}
+# Listando os servidores remotos:
+git remote
# Adicionando novo remote com nome remoto:
-git remote add remoto git@gitlab.c3sl.ufpr.br:pet-estatistica/apostila-git.git
-
+git remote add remoto git@gitlab.c3sl.ufpr.br:pet-estatistica/apostila-git.git
+# Atualizando arquivos locais:
+git pull
```
## Resolver um bug
@@ -54,6 +56,8 @@ git branch -d bugfix
```
+## Deletar ramos
+
```{r, engine='bash', echo=TRUE, eval=FALSE}
# Listar ramos:
git branch
@@ -88,3 +92,11 @@ git log --pretty=oneline
git checkout ec3650c8661d75b486a236e3d416ab58db1d596a
```
+
+## Reescrever mensagem de commit
+
+```{r, engine='bash', echo=TRUE, eval=FALSE}
+git log --oneline
+git commit --amend "Correção de Commit"
+git push -f origin master
+```
--
GitLab