Skip to content

Instantly share code, notes, and snippets.

@wagnerdevel
Created March 29, 2020 22:05
Show Gist options
  • Select an option

  • Save wagnerdevel/ee21bf454f78cc5d7291f5f9f683213a to your computer and use it in GitHub Desktop.

Select an option

Save wagnerdevel/ee21bf454f78cc5d7291f5f9f683213a to your computer and use it in GitHub Desktop.
5058 mkdir exercises
5059 cd exercises
5060 git clone https://gitlab.setrem.mdcnet.ninja/setrem/wagnersilveira-centralizado.git alice
5062 git clone https://gitlab.setrem.mdcnet.ninja/setrem/wagnersilveira-centralizado.git bob
5063 cd alice
5064 git status
5065 ls -la
5066 code .git/config
5067 echo '\n[user]\n email = alice@target.trust\n name = Alice S.\n[alias]\n hist=log -20 --pretty=format:"%C(yellow)%h%Creset\\ %C(green)%ar%C(cyan)%d\\ %Creset%s%C(yellow)\\ [%cn]" --graph --decorate --all' >> .git/config
5068 git config
5069 code .git/config
5070 git config
5071 git config --list
5072 git config --list --local
5073 git hist
5074 touch alice.txt
5075 echo "Este arquivo foi criado pela Alice, desenvolvedora de sistemas." > alice.txt
5076 touch comum.txt
5077 echo "Este arquivo foi criado pela Alice, desenvolvedora de sistemas." > comum.txt
5078 git add .
5079 git commit -m "Primeira submissão"
5080 git status
5081 git hist
5082 git push origin master
5083 cd ../bob
5084 git status
5085 echo '\n[user]\n email = bob@target.trust\n name = Bob A.\n[alias]\n hist=log -20 --pretty=format:"%C(yellow)%h%Creset\\ %C(green)%ar%C(cyan)%d\\ %Creset%s%C(yellow)\\ [%cn]" --graph --decorate --all' >> .git/config
5086 git config --list --local
5087 code .git/config
5088 git config --list --local
5089 echo "Este arquivo foi criado pela Bob, desenvolvedor de sistemas." > bob.txt
5090 echo "Este arquivo foi criado pela Bob, desenvolvedor de sistemas." > comum.txt
5091 git add .
5092 git commit -m "Primeira submissão do Bob"
5093 git hist
5094 git push origin master
5095 git pull --rebase origin master
5096 git am --show-current-patch
5097 echo "Este arquivo foi criado pela Alice, desenvolvedora de sistemas.\nEste arquivo foi alterado pelo Bob, desenvolvedor de sistemas." > comum.txt
5098 git status
5099 git add .
5100 git rebase --continue
5101 git status
5102 git hist
5103 git push origin master
5104 cd ..
5105 ls -l
5106 mkdir centralizado
5107 mv alice centralizado
5108 mv bob centralizado
---------
2:
5109 mkdir featurebranch
5110 cd featurebranch
5111 git clone https://gitlab.setrem.mdcnet.ninja/setrem/wagnersilveira-featurebranch.git alice
5112 git clone https://gitlab.setrem.mdcnet.ninja/setrem/wagnersilveira-featurebranch.git bob
5113 cd alice
5114 git status
5115 echo '\n[user]\n email = alice@target.trust\n name = Alice S.\n[alias]\n hist=log -20 --pretty=format:"%C(yellow)%h%Creset\\ %C(green)%ar%C(cyan)%d\\ %Creset%s%C(yellow)\\ [%cn]" --graph --decorate --all' >> .git/config
5116 git config --list --local
5117 code .git/config
5118 git config --list --local
5119 git checkout -b alice-feature master
5120 echo "Nova funcionalidade criada pela Alice." > alice.txt
5121 git add .
5122 git commit -m "Alice-feature: Nova funcionalidade"
5123 git hist
5124 git push -u origin alice-feature
5125 echo "Nova funcionalidade incrível criada pela Alice." > alice.txt
5126 git commit -am "Alice-feature: Nova funcionalidade incrível"
5127 git hist
5128 git push
5129 cd ../bob
5130 git status
5131 echo '\n[user]\n email = bob@target.trust\n name = Bob A.\n[alias]\n hist=log -20 --pretty=format:"%C(yellow)%h%Creset\\ %C(green)%ar%C(cyan)%d\\ %Creset%s%C(yellow)\\ [%cn]" --graph --decorate --all' >> .git/config
5132 code .git/config
5133 git hist
5134 git checkout -b bob-feature master
5135 echo "Nova funcionalidade muito massa criada pelo Bob." > bob.txt
5136 git add .
5137 git commit -m "Bob-feature: Nova funcionalidade muito massa"
5138 git push -u origin bob-feature
5139 cd ../alice
5140 git checkout master
5141 git branch
5142 git pull
5143 git hist
5144 git pull origin alice-feature
5145 cd dev/poscc/devops/exercises/featurebranch
5146 ls -l
5147 git hist
5148 history
5149 git pull origin alice-feature
5150 cd alice
5151 git pull origin alice-feature
5152 git branch
5175 cd ..
---------
3:
5189 git clone https://gitlab.setrem.mdcnet.ninja/setrem/wagnersilveira-gitflow.git gitflow
5190 cd gitflow
5191 git checkout develop
5192 git flow init
5193 git flow feature start feature_branch
5194 echo "Super ultra mega bacana feature." > feature.txt
5195 git add .
5196 git commit -m "GitFlow: New feature"\n
5197 git push -u origin feature/feature_branch"
5198 git push -u origin feature/feature_branch
5199 git flow feature finish feature_branch
5200 git push
5201 git flow release start 0.1.0
5202 git hist
5203 echo '\n[user]\n email = alice@target.trust\n name = Alice S.\n[alias]\n hist=log -20 --pretty=format:"%C(yellow)%h%Creset\\ %C(green)%ar%C(cyan)%d\\ %Creset%s%C(yellow)\\ [%cn]" --graph --decorate --all' >> .git/config
5204 code .git/config
5205 git hist
5206 git branch
5207 git flow release finish '0.1.0'
5208 git hist
5209 git push
5210 git checkout master
5211 git push
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment