git commands

# Undoing the Last Commit
git reset --soft HEAD~1

# rollback commit with new commit
git revert %commit_hash%

# merge into master
git checkout master
git merge develop
git pull

# merge one commit
git cherry-pick <commit>

#
git stash push -m  file

# stash only staged
git stash -- $(git diff --staged --name-only)

# take file from another branch
git checkout branch_name replay/dataframe_bucketizer.py

# get: switch branch when --skip-worktree
cd client
git update-index --no-skip-worktree .env.production.local
git update-index --no-skip-worktree .env.development.local
cd ../server
git update-index --no-skip-worktree config.yaml

git stash