[Git] difference upstream / origin

upstream generally refers to the original repo that you have forked
origin is your fork: your own repo on GitHub, clone of the original repo of GitHub

git : reset your branch to the upstream branch

git checkout yourbranch
git remote add upstream https://.......
git fetch upstream
git reset --hard upstream/master
# take care, this will delete all your changes on your forked yourbranch
git push origin yourbranch --force

Source : https://stackoverflow.com/questions/42332769/how-do-i-reset-the-git-master-branch-to-the-upstream-branch-in-a-forked-reposito

https://stackoverflow.com/a/42332860

git : adding an upstream

git remote add upstream https://....

git : how to do a local rebase

git clone <origin>
git checkout <featbranch>
git pull
git remote add upstream https://.....
git fetch upstream
git rebase upstream/development
git push 

git : remove a submodule

git submodule deinit -f -- a/submodule    
rm -rf .git/modules/a/submodule
git rm -f a/submodule

Source : https://stackoverflow.com/questions/1260748/how-do-i-remove-a-submodule

git clone : server certificate verification failed

Solution:

export GIT_SSL_NO_VERIFY=1

or

git config --global http.sslverify false

git submodule update -> already exists and is not an empty directory

When typing this :
git submodule update

Having this error :
fatal: destination path 'xxx' already exists and is not an empty directory. 
fatal: clone of 'git@bitbucket.org:xxxxx/your-repo.git' into submodule path 'xxx' failed

Solution
git submodule deinit --force . 
git submodule init 
git submodule update --recursive

[Pip] Packaging and distributing project with git and pip

1- make the project "pip compatible"

in your project directory: nano setup.py

from setuptools import setup

setup( 

   name='testapp', 

   version='0.1', 

   description='A test application !', 

   url='http://github.com/testappli', 

   author='an_author', 

   author_email='author@author', 

   license='MIT', 

   packages=['xyz'], 

   install_requires=['cherrypy'], 

   zip_safe=False

)

mkdir xyz (the package)

cd xyz

nano utils.py

def print_hello(): 

   print("print_hello called")

nano __init__.py

#empty file

2- how to install our project with pip from our private repository

retrieve project with pip: 
pip install https://github.com/user/repository/archive/branch.zip 

which becomes for django master: 
pip install https://github.com/django/django/archive/master.zip 

for django stable/1.7.x: 
pip install https://github.com/django/django/archive/stable/1.7.x.zip 

With BitBucket it's about the same predictable pattern: 
pip install https://bitbucket.org/izi/django-admin-tools/get/default.zip

for a private Bitbucket repository:
pip install git+https://bitbucket.org/<bitbucket_username>/<repo_name>.git

Source : http://stackoverflow.com/questions/20101834/pip-install-from-github-repo-branch
Source : http://stackoverflow.com/questions/4830856/is-it-possible-to-use-pip-to-install-a-package-from-a-private-github-repository

Source : https://packaging.python.org/en/latest/distributing/
Source : https://python-packaging.readthedocs.io/en/latest/minimal.html

[Git] init local project for bitbucket and first commit

1- create your repository on bitbucket


2- init local project:

mkdir /path/to/your/project
cd /path/to/your/project
git init 

git remote add origin https://<bitbucket_username>@bitbucket.org/<bitbucket_username>/<repository_in_lower_case>.git

3- first commit:

echo "James Bond" >> contributors.txt
git add contributors.txt
git commit -m 'Initial commit with contributors'
git push -u origin master