From 6c7b3784b94598ed17a84db094d34aa55a18eb0f Mon Sep 17 00:00:00 2001 From: patymori Date: Sat, 29 Oct 2016 12:24:07 -0200 Subject: [PATCH 1/8] Criado .gitignore e teste.md --- .gitignore | 2 ++ README.md | 7 +++++++ teste.md | 4 ++++ 3 files changed, 13 insertions(+) create mode 100644 .gitignore create mode 100644 teste.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..783cd5b --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.swp + diff --git a/README.md b/README.md index 11867eb..4e0a82e 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,10 @@ Repositório de testes para a oficina de Git Pages: [https://marialabhackerspace.github.io/oficina-git/](https://marialabhackerspace.github.io/oficina-git/) + +## Patymori + +Este é o meu primeiro commit neste projeto! =D + +Oficina Git do MariaLab! <3 + diff --git a/teste.md b/teste.md new file mode 100644 index 0000000..5267244 --- /dev/null +++ b/teste.md @@ -0,0 +1,4 @@ +# Teste + +Este é um arquivo de teste! xP + From 5fb9f21dc640dcefdd4d8e24045997c80f762f1d Mon Sep 17 00:00:00 2001 From: patymori Date: Sat, 29 Oct 2016 14:15:24 -0200 Subject: [PATCH 2/8] Alterado teste.md --- teste.md | 1 + 1 file changed, 1 insertion(+) diff --git a/teste.md b/teste.md index 5267244..9dda528 100644 --- a/teste.md +++ b/teste.md @@ -2,3 +2,4 @@ Este é um arquivo de teste! xP +Alterando na outra branch... From c8668fde814f9ce0dfad641d2b041852244a0914 Mon Sep 17 00:00:00 2001 From: patymori Date: Sat, 29 Oct 2016 14:26:53 -0200 Subject: [PATCH 3/8] Alterado teste.md --- teste.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/teste.md b/teste.md index 5267244..85337ef 100644 --- a/teste.md +++ b/teste.md @@ -2,3 +2,5 @@ Este é um arquivo de teste! xP +Alterando n GH-Pages + From 23b583b992374e1aec18c9dcd618e605675d4374 Mon Sep 17 00:00:00 2001 From: patymori Date: Sat, 29 Oct 2016 15:03:32 -0200 Subject: [PATCH 4/8] =?UTF-8?q?Outra=20altera=C3=A7=C3=A3o=20no=20teste?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- teste.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/teste.md b/teste.md index 9dda528..ba3656c 100644 --- a/teste.md +++ b/teste.md @@ -3,3 +3,6 @@ Este é um arquivo de teste! xP Alterando na outra branch... + +Outra alteração nesse cara + From c689e0fb06c815756cdf8b659cb24f1f557a2008 Mon Sep 17 00:00:00 2001 From: patymori Date: Sat, 29 Oct 2016 15:04:45 -0200 Subject: [PATCH 5/8] =?UTF-8?q?Altera=C3=A7=C3=A3o=20para=20teste=20do=20m?= =?UTF-8?q?erge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- teste.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/teste.md b/teste.md index 82556b1..e91fa7e 100644 --- a/teste.md +++ b/teste.md @@ -5,3 +5,5 @@ Este é um arquivo de teste! xP Alterando na outra branch... Alterando n GH-Pages + +Agora vamos ver esse merge! From c0a372415d490c9f25da720c9fe02414553544c3 Mon Sep 17 00:00:00 2001 From: Patricia Morimoto Minamizawa Date: Sat, 29 Oct 2016 15:13:51 -0200 Subject: [PATCH 6/8] Alterado teste.md --- teste.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/teste.md b/teste.md index dcacd12..81b6b14 100644 --- a/teste.md +++ b/teste.md @@ -4,6 +4,8 @@ Este é um arquivo de teste! xP Alterando na outra branch... +## Título super legal para o merge + Alterando n GH-Pages Agora vamos ver esse merge! From 2b2d6ceef87b091fcd0d0c8f09b05cc7c3396737 Mon Sep 17 00:00:00 2001 From: patymori Date: Sat, 29 Oct 2016 15:14:35 -0200 Subject: [PATCH 7/8] =?UTF-8?q?Altera=C3=A7=C3=A3o=20para=20merge=20do=20t?= =?UTF-8?q?este?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- teste.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/teste.md b/teste.md index ba3656c..5d63346 100644 --- a/teste.md +++ b/teste.md @@ -6,3 +6,5 @@ Alterando na outra branch... Outra alteração nesse cara +Teste de merge com a master agora + From c20a4207ab3035f94315794d954f09b1696878a7 Mon Sep 17 00:00:00 2001 From: patymori Date: Sat, 29 Oct 2016 15:46:43 -0200 Subject: [PATCH 8/8] Teste de pull request --- patymori.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 patymori.md diff --git a/patymori.md b/patymori.md new file mode 100644 index 0000000..d00a70c --- /dev/null +++ b/patymori.md @@ -0,0 +1,2 @@ +Teste para o pull request! +