- git rebase -i HEAD~X - this allows you to merge interactively several commits
- then fixup OR pick OR reword AND push --force
- git reset --hard HEAD~X - this rollbacks the index back to X commits (check git status before doing this. Commit first)
- commit again using just one commit
- git reset --hard COMMIT_ID - this rollbacks the index back to the commit_id
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
version: '3' | |
services: | |
rem-api: | |
container_name: java-api | |
build: . | |
links: | |
- oracledb | |
- redis | |
ports: | |
- "443:443" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
## Import all the needed libraries | |
from elasticsearch import helpers | |
from elasticsearch import Elasticsearch | |
import os | |
import sys | |
import json | |
import logging.config | |
from elasticsearch import RequestsHttpConnection | |
## Create connection using proxy |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{"lastUpload":"2018-08-28T01:17:18.202Z","extensionVersion":"v3.1.0"} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
### Keybase proof | |
I hereby claim: | |
* I am alebaffa on github. | |
* I am alebaffa (https://keybase.io/alebaffa) on keybase. | |
* I have a public key ASCuG3qyeOFenECA4Lil5-V8vpI8ilfcZK9dVV5lpQVvfgo | |
To claim this, I am signing this object: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
branch="$(git rev-parse --abbrev-ref HEAD)" | |
echo ${branch} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{"lastUpload":"2017-07-03T00:16:19.577Z","extensionVersion":"v2.8.2"} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@Test | |
public void should_return_the_string_converted() throws IOException { | |
HtmlTextConverter converter = new HtmlTextConverter(""); | |
Reader stringReader = new StringReader("foo"); | |
assertThat(converter.convertToHtml(stringReader), is("foo<br />")); | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
public String convertToHtml() throws IOException { | |
return convertToHtml(new FileReader(fullFilenameWithPath)); | |
} | |
protected String convertToHtml(Reader reader) throws IOException { | |
BufferedReader bufferedReader = new BufferedReader(reader); | |
String line = bufferedReader.readLine(); | |
String html = ""; | |
while (line != null) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@Test | |
public void should_convert_to_html() throws IOException { | |
HtmlTextConverter converter = new FakeHtmlTextConverter("ciao"); | |
assertThat(converter.convertToHtml(), is("ciao<br />")); | |
} |