| 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
| gpg --version # Check GPG installation | |
| git --version # Check Git installation | |
| git-secret --version # Check git-secret installation | |
| gpg --list-keys # Make sure that your GPG key is listed here | |
| git init # Initialize the repository if you have not done it already | |
| git secret init # Initialize the repository using git-secret | |
| git secret tell [email protected] # Add a user | |
| git secret whoknows # Get a list of which users are attached on the repo | |
| git secret add file.txt # Add a file on the encryption list |
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 |
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
| SELECT STATIC_FIELD, | |
| MAX (X), | |
| MAX (A), | |
| MAX (Y), | |
| MAX (B), | |
| MAX (Z), | |
| MAX (C) | |
| FROM (SELECT * | |
| FROM (SELECT * | |
| FROM (SELECT STATIC_FIELD, |
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
| #make user admin | |
| sudo gitlab-rails console | |
| u = User.find_by_username("maneesh") | |
| u.admin = true | |
| u.save | |
| exit |
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
| :pserver:[email protected]:/usr/public/developers/POS | |
| CVSROOT=:pserver:[email protected]:/usr/public/developers/POS cvs login | |
| git cvsimport -v -a -d :pserver:[email protected]:/usr/public/developers/POS GeniusOpenPOS |
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.
NewerOlder