| gitflow | git |
|---|---|
git flow init |
git init |
git commit --allow-empty -m "Initial commit" |
|
git checkout -b develop master |
This file contains hidden or 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
| from __future__ import (absolute_import, division, print_function, | |
| unicode_literals) | |
| from sqlalchemy import Column, MetaData, Table, create_engine | |
| from sqlalchemy import String, Integer, Float, BigInteger, DateTime | |
| from sqlalchemy.schema import DropTable, CreateTable | |
| from sqlalchemy.orm import scoped_session, sessionmaker |
This file contains hidden or 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
| BOX_NAME=vagrant-build | |
| BASE_DIR="`pwd`/machines" | |
| BOX_DIR="${BASE_DIR}/${BOX_NAME}" | |
| mkdir -p ${BASE_DIR} | |
| VBoxManage createvm --name "${BOX_NAME}" --ostype RedHat_64 --basefolder ${BASE_DIR} | |
| VBoxManage registervm "${BOX_DIR}/${BOX_NAME}.vbox" | |
| mkdir -p tmp |
This file contains hidden or 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
| #!/bin/bash | |
| # Sometimes you need to move your existing git repository | |
| # to a new remote repository (/new remote origin). | |
| # Here are a simple and quick steps that does exactly this. | |
| # | |
| # Let's assume we call "old repo" the repository you wish | |
| # to move, and "new repo" the one you wish to move to. | |
| # | |
| ### Step 1. Make sure you have a local copy of all "old repo" | |
| ### branches and tags. |
This file contains hidden or 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
| $> brew cask install java | |
| $> brew install kafka | |
| $> vim ~/bin/kafka | |
| # ~/bin/kafka | |
| #!/bin/bash | |
| zkServer start | |
| kafka-server-start.sh /usr/local/etc/kafka/server.properties |
FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.
The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.
This file contains hidden or 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
| #! /bin/sh | |
| # ================================================================== | |
| # ______ __ _____ | |
| # /_ __/___ ____ ___ _________ _/ /_ /__ / | |
| # / / / __ \/ __ `__ \/ ___/ __ `/ __/ / / | |
| # / / / /_/ / / / / / / /__/ /_/ / /_ / / | |
| #/_/ \____/_/ /_/ /_/\___/\__,_/\__/ /_/ | |
| # Multi-instance Apache Tomcat installation with a focus | |
| # on best-practices as defined by Apache, SpringSource, and MuleSoft |
This file contains hidden or 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
| <?xml version="1.0" encoding="UTF-8"?> | |
| <configuration scan="true"> | |
| <appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender"> | |
| <encoder> | |
| <charset>UTF-8</charset> | |
| <Pattern>%d %-4relative [%thread] %-5level %logger{35} - %msg%n</Pattern> | |
| </encoder> | |
| </appender> | |
| <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> |