Git Help - Tips for using

I want to commit to the PR of a colleague who went on vacation

git remote add mycolleague https://github.com/mycolleague/project.git
git push mycolleague pr-449:{his branch name - remote branch}

I want to force a commit without change to trigger the pipeline build

git commit --allow-empty -m "Trigger Build"

I have a changed local file that shouldn't be committed for now

git update-index --assume-unchanged config/database.yml

To undo this setting:

git update-index --no-assume-unchanged config/database.yml

I pulled the code, there was a conflict in the merge and I want to undo the pull (to delete the local branch)

git merge --abort

I have made some local changes in a branch and want to transfer that to another branch, before commit them

Use git stash when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the HEAD commit.

git stash
git checkout another-branch
git stash --apply

Remove local branch

git branch -D 'branch_name'

Remove remote branch

git push origin --delete 'branch_name'

Add remote repository

git remote add upstream <remote_reporitory_url>

Create local branch from remote

git fetch upstream <remote_branch>:<local_branch>

Download pull request for local testing

git fetch upstream pull/<id>/head:<local_branch>
git checkout <local_branch>

Update local branch with code from pull request

git pull upstream pull/<id>/head

Undo last unsent commit (done on wrong branch, for example)

git reset HEAD~1

Remove files later added to .gitignore

git rm -r --cached . 
git add .
git commit -am "Remove ignored files"

Apply the changes introduced by some existing commits

Find the commit hash with git log command
Go to the desired branch to do this commit

git cherry-pick <hash_commit>
git add .
git commit

Export project to zip (taking into account ignored files such as builds, logs, etc)

git archive --format zip --output <file_name>.zip master

murillocg/git-help