Skip to content

tdervieux/resources

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

37 Commits
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

Markdown Syntax

Check this link for complete markdown syntax

Git

clone a repo

git clone url

push branch to repo (origin)

git push origin mybranch

add a change or a new file

git add myfile.py

commit

git commit -m "i changed this and this and this"

add a change from a file already tracked and commit

git commit -am `I changed this and this on this file already added`

check the remote repo

> git remote 
origin
upstream
> git remote show // seems to be the same as git remove

check the url of a specific repo

> git remote show origin
* remote origin
  Fetch URL: https://github.com/PixarAnimationStudios/OpenTimelineIO.git
  Push  URL: https://github.com/PixarAnimationStudios/OpenTimelineIO.git
  HEAD branch: master
  Remote branch:
    master tracked
  Local branch configured for 'git pull':
    master merges with remote master
  Local ref configured for 'git push':
    master pushes to master (up to date)

create a ssh key

xclip -sel clip < ~/.ssh/id_dsa.pub

add upstream repo

git remote add upstream git@github.com:PixarAnimationStudios/OpenTimelineIO.git

merge with upstream/master

> git merge upstream/master

visualize commit graph in the shell

> git log --oneline --graph --all

update my repo from upstream

> git fetch upstream

add a local repo

git remote add forked /home/tdervieux/tree/OpenTimelineIO
or
git remote add upstream git@github.com:PixarAnimationStudios/OpenTimelineIO.git
or
git remote add upstream https://github.com/PixarAnimationStudios/OpenTimelineIO.git

rebase

[otio] > git rebase -i forked/master

push a branch to a repo

git push forked otioviewerFeature

visualize your git branches

> gitk --all

diff with my favourite tooks

git config --global diff.external ~/git-diff-wrapper.sh

Then add the following in ~/git-diff-wrapper.sd

/bin/xxdiff $2 $5

rebase example

git fetch upstream
git checkout Ruler
git rebase -i upstream/master
# in the editor that pops out, you want to delete the line with teh commit from the other branch -- should be the first one, with the commit message "add frame all function"
after its done rebasing, then you :
git push origin Ruler --force
# you need to --force because you rebased.

Python

Create a virtual environment

  1. cd to $VIRTUAL_ENV_ROOT
  2. virtualenv my_env_name #(otio)
  3. source my_env_name/bin/activate.csh
  4. pip install -U pip
  5. pip install -U setuptools
  6. cd ~/otio_dir
  7. pip install -e .
  8. pip install PySide2==5.11.0
  9. pip install -e .[dev] #linter, mock library
  10. rehash; which otioview #should be pointing at your dir```

11.to turn it off: deactivate

About

Resources et liens utils

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

 
 
 

Contributors

Languages