create different ssh key according the article Mac Set-Up Git
$ ssh-keygen -t rsa -C "your_email@youremail.com"
create different ssh key according the article Mac Set-Up Git
$ ssh-keygen -t rsa -C "your_email@youremail.com"
require 'rubygems' | |
require 'net/http' | |
require 'uri' | |
BIT_RATE = 48 #6kbxseg * 60 seg (a min) * 15min | |
TAMO_CORTE = (BIT_RATE/8) * 60 * 15 #en KB | |
url = URI.parse('http://186.1.15.253:8000/') | |
Net::HTTP.start(url.host, url.port) do |http| |
<?php | |
$ch = curl_init(); | |
curl_setopt($ch, CURLOPT_PROXY, NULL); | |
curl_setopt($ch, CURLOPT_POST, true); | |
curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-type: text/xml')); | |
curl_setopt($ch, CURLOPT_URL, 'https://cert.litle.com/vap/communicator/online'); | |
curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, true); | |
curl_setopt($ch,CURLOPT_TIMEOUT,'5'); | |
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); | |
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST,2); |
#!/usr/bin/env bash | |
uninstall() { | |
list=`gem list --no-versions` | |
for gem in $list; do | |
gem uninstall $gem -aIx | |
done | |
gem list | |
gem install bundler | |
} |
#!/bin/bash | |
# bash generate random alphanumeric string | |
# | |
# bash generate random 32 character alphanumeric string (upper and lowercase) and | |
NEW_UUID=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) | |
# bash generate random 32 character alphanumeric string (lowercase only) | |
cat /dev/urandom | tr -dc 'a-z0-9' | fold -w 32 | head -n 1 |
I have two independent repositories (A and B) and would like to merge one repo. (B) into another one (A) with keeping the whole history of both. What do to?
% cd projectA
% git remote add test ../path/to/other/repo && git fetch test
Adds a new branch called test which pulls in ALL branches from the /other/repo. git fetch test pulls code for all branches
#git Branch
(freakin awesome http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging)
Also, see JadedEvan's gist about branching. In particular, 'Create a new branch and have it track remote commits'
To create a new branch and switch to that branch:
$ git checkout -b my_new_branch
#Submodules
Here is how we do it at Our Office
When you clone your working repos (api, app, www), you'll have an empty Modules
directory. The working repo will contain a pointer to the hash of the last Modules
repo committed. All that needs to be done from your working repo directory is:
$ git subumodule init
See http://stackoverflow.com/questions/7773181/git-keeps-prompting-me-for-password
Make sure you are cloning your repos using ssh
:
ssh://git@github.com/username/repo.git
If you use https
or git
, you will always be asked for username/password:
https://github.com/username/repo.git
git://github.com/username/repo.git