OSEE/Developer Setup

git stash save <message>
git stash list
git stash show -p stash@{0}
git stash drop stash@{0}
git stash pop

git push origin HASH:remoate_branch_name

git show --name-only HASH path

git whatchanged --name-only
git whatchanged -2 --name-only #to display the last two
git whatchanged --format=email --name-only #display in email format

git rebase -i HEAD~5
git reset --hard HEAD
git reset --hard HEAD~3
git reset --hard <specific_commit_id>

git diff HASH

git diff OLDHASH NEWHASH

git diff branch1..branch2
git diff localBranchName..origin/remoteName

git merge-base branch1..branch2

git log --follow [current path]

git log --name-only HASH
git log --graph --pretty=format:'%Cred%h%Creset 
 -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' 
 --abbrev-commit --date=relative

git log -1 branch_name

git reflog show [log-options] master

git checkout -b newLocalBranchName sourceBranch

git checkout -b your_branch_name_here origin/0.9.7_dev 

git checkout [master|94|...]

git checkout <working_branch_name>
git push origin <working_branch_name>:refs/heads/<working_branch_name>

git merge branch

git checkout --[theirs|our] <path>

git checkout --conflict=merge -- <file you want to remerge>

git rebase --continue

git format-patch -o ../ trunk..HEAD

git format-patch -n

git diff trunk HEAD -p > Z:/backup_date_time.patch

--Rebase current working tree
git rebase -i HASH_WHERE_TO_START_FROM
-- mark 'e' or 'edit' the commit you want to Edit/Split.
-- When you get dropped back into the shell, issue:
git reset HEAD^
--which effectively undoes that 
-- commit and leaves the modified files unstaged ProGit Book Chapter 6-4
-- Afterwards you can 'add' and 'commit' changes as appr. 
--To resume rebase operation issue:
 git rebase --continue

git rebase -i SHA_OF_COMMIT_PREVIOUS_TO_TARGET
git commit --amend --reset-author -- Repeat this and the next step for each file
git rebase --continue

git clean -fdx

git tag -a -m "0.9.6.v201009271203 Release Candidate" 0.9.6.v201009271203_RC <COMMIT_ID TO TAG>
git push origin 0.9.6.v201009271203_RC

git tag -d 0.9.6.v201009271203_RC
git push origin :refs/tags/0.9.6.v201009271203_RC

git push origin --delete branchName

git tag -l

git symbolic-ref HEAD refs/heads/newbranch 
rm .git/index 
git clean -fdx 
<do work> 
git add your files 
git commit -m 'Initial commit'

git init --bare --shared=0600 /i/git/user.git
cd /c/Tools/git
git clone /i/git/user.git/
cd user
copy your files in
git add -A
git commit -m "initial commit"
git push origin master

on the remote host:
git init --bare --shared=0600 /<path>/user.git
chmod 700 /<path>/user.git

on local machine:
cd /c/Tools/git
git clone ssh://<user_name>@<host>/<path>/user.git
cd user
copy your files in
git add -A
git commit -m "initial commit"
git push origin master

git remote prune origin

git fsck --full --no-reflogs | grep commit
-- or to show the names of each run:
for i in `git fsck --full --no-reflogs | grep commit | awk '{print $3}'`; 
   do git show $i --name-only; done

git fast-export branchToExport pathOfSourceProject(s) | (cd destinationRepo && git fast-import)
-- done from source repo

git filter-branch --index-filter 'git ls-tree --name-only --full-tree $GIT_COMMIT | 
   grep "folder/my.file" | 
   xargs git rm --cached -r --ignore-unmatch test.txt ' --prune-empty -f -- --all

Name	Description	Commands
Stash	Stores changes into a stack	git stash save <message> git stash list git stash show -p stash@{0} git stash drop stash@{0} git stash pop
Selective Push	Push only commits from a certain point (HASH) and prior	git push origin HASH:remoate_branch_name
Show Modified File Names	Lists files modified	git show --name-only HASH path
Show changes introduced by each commit	shows commit change information	git whatchanged --name-only git whatchanged -2 --name-only #to display the last two git whatchanged --format=email --name-only #display in email format
Undo	Undo local changes	git rebase -i HEAD~5 git reset --hard HEAD git reset --hard HEAD~3 git reset --hard <specific_commit_id>
Show Commit File Differences	Compares files from current commit with previous commit	git diff HASH
Compare two commits	Compares files between two commits	git diff OLDHASH NEWHASH
Compare two branches	Compares changes made between two branches	git diff branch1..branch2 git diff localBranchName..origin/remoteName
Find common ancestor	finds best common ancestor(s) between two commits	git merge-base branch1..branch2
Git Log	view history for a given path even if it has been moved/renamed	git log --follow [current path]
Git Log	vew current branch activity	git log --name-only HASH git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
Git Log	Print single log entry	git log -1 branch_name
Git Log	Show full history even with removed commits	git reflog show [log-options] master
Create a local branch	Creates a branch and switches working tree to new branch	git checkout -b newLocalBranchName sourceBranch
Create a local tracking branch	Creates a local tracking branch called your_branch_name_here and switches working tree	git checkout -b your_branch_name_here origin/0.9.7_dev
Switch branches	switches the working tree to a different branch	git checkout [master\|94\|...]
Sharing a local work branch with others	Switch to working branch, Push working branch to remote	git checkout <working_branch_name> git push origin <working_branch_name>:refs/heads/<working_branch_name>
Merge onto current branch	Merge branch into current branch, if there is nothing to merge a fast-forward will be performed. HEAD pointer moved to HEAD of branch	git merge branch
Branching and Merging	To replace with incoming file so you can re-make your changes (or abandon them)	git checkout --[theirs\|our] <path>
Merging Again	What to do if you are in the middle of a rebase and don't want the previous merge resolution	git checkout --conflict=merge -- <file you want to remerge>
Continue rebasing	After conflicts have been resolved	git rebase --continue
Patches	Generating individual patches (one per commit) to submit by email (or bug report), exports all commits made to current branch, from trunk to HEAD "-o ../" puts them one level above in individual .patch files	git format-patch -o ../ trunk..HEAD
Patches	Create a patch with the top n number of commits	git format-patch -n
Local Change Patch	Generate a big patch for your local changes, (good for backup), In this case Z:\ is mounted as a shared windows folder, so if you do not have faith in your local backup software, this could help you quickly restore your work.	git diff trunk HEAD -p > Z:/backup_date_time.patch
Splitting commits	In case you have multiple, conceptually unrelated changes in a single commit you can split them by doing an interactive rebase	--Rebase current working tree git rebase -i HASH_WHERE_TO_START_FROM -- mark 'e' or 'edit' the commit you want to Edit/Split. -- When you get dropped back into the shell, issue: git reset HEAD^ --which effectively undoes that -- commit and leaves the modified files unstaged ProGit Book Chapter 6-4 -- Afterwards you can 'add' and 'commit' changes as appr. --To resume rebase operation issue: git rebase --continue
Change author name/email of a commit with yours	Edit commit author, email, or comments using the following. This should only be performed on commits that have not been pushed to the remote repository. If you just need to change the author name you can change --reset-author with --author AUTHOR NAME	git rebase -i SHA_OF_COMMIT_PREVIOUS_TO_TARGET git commit --amend --reset-author -- Repeat this and the next step for each file git rebase --continue
Clean up untracked files from repository	Remove untracked files and directories from the working tree	git clean -fdx
Tagging a Build	Create, and Push a Tag	git tag -a -m "0.9.6.v201009271203 Release Candidate" 0.9.6.v201009271203_RC <COMMIT_ID TO TAG> git push origin 0.9.6.v201009271203_RC
Deleting a Tag	Delete a Tag locally and push change to remote	git tag -d 0.9.6.v201009271203_RC git push origin :refs/tags/0.9.6.v201009271203_RC
delete remote branch	different than just deleting a local branch	git push origin --delete branchName
List all Tags	List tags	git tag -l
Create empty branch	Create an empty branch for disjoint histories	git symbolic-ref HEAD refs/heads/newbranch rm .git/index git clean -fdx <do work> git add your files git commit -m 'Initial commit'
Create Mapped Drive Git Repo	Use mapped drive to host remote Repo for personal use	Note: in this example i is mapped to a remote disk share git init --bare --shared=0600 /i/git/user.git cd /c/Tools/git git clone /i/git/user.git/ cd user copy your files in git add -A git commit -m "initial commit" git push origin master
Create Git Repo using SSH	Use SSH to host remote Repo for personal use	on the remote host: git init --bare --shared=0600 /<path>/user.git chmod 700 /<path>/user.git on local machine: cd /c/Tools/git git clone ssh://<user_name>@<host>/<path>/user.git cd user copy your files in git add -A git commit -m "initial commit" git push origin master
Remove stale remote branches	Use Prune to remove stale remote branches (add --dry-run to preview what will be changed)	git remote prune origin
Find dangling Commits	Find dangling commits	git fsck --full --no-reflogs \| grep commit -- or to show the names of each run: for i in `git fsck --full --no-reflogs \| grep commit \| awk '{print $3}'`; do git show $i --name-only; done
Fast Export/Fast Import	Use to move a project from one repo to another repo preserving history	git fast-export branchToExport pathOfSourceProject(s) \| (cd destinationRepo && git fast-import) -- done from source repo
Remove all instances of a file from history	Run through all commits in history and remove the named file/s. Also delete commits that would be empty once the file is deleted. Useful for things like large binary files that are taking up too much space and shouldn't have been committed.	git filter-branch --index-filter 'git ls-tree --name-only --full-tree $GIT_COMMIT \| grep "folder/my.file" \| xargs git rm --cached -r --ignore-unmatch test.txt ' --prune-empty -f -- --all

Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.

OSEE/Developer Setup

Contents

Initial Setup

Git Setup

OSEE Workspace Setup

Other Programs & System Configuration

Reading & Training Material

Git Information & Support

Breadcrumbs

Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.

OSEE/Developer Setup

Contents

Initial Setup

Git Setup

OSEE Workspace Setup

Other Programs & System Configuration

Reading & Training Material

Git Information & Support