sfordevops / devops-june

MD- Markdown Language

This is a sample web-development project

Git Commands

Getting & Creating Projects

Command	Description
git init	Initialize a local Git repository
git clone ssh://[email protected]/[username]/[repository-name].git	Create a local copy of a remote repository

Basic Snapshotting

Command	Description
git status	Check status
git add [file-name.txt]	Add a file to the staging area
git add -A	Add all new and changed files to the staging area
git commit -m "[commit message]"	Commit changes
git rm -r [file-name.txt]	Remove a file (or folder)

Branching & Merging

Command	Description
git branch	List branches (the asterisk denotes the current branch)
git branch -a	List all branches (local and remote)
git branch [branch name]	Create a new branch
git branch -d [branch name]	Delete a branch
git push origin --delete [branch name]	Delete a remote branch
git checkout -b [branch name]	Create a new branch and switch to it
git checkout -b [branch name] origin/[branch name]	Clone a remote branch and switch to it
git branch -m [old branch name] [new branch name]	Rename a local branch
git checkout [branch name]	Switch to a branch
git checkout -	Switch to the branch last checked out
git checkout -- [file-name.txt]	Discard changes to a file
git merge [branch name]	Merge a branch into the active branch
git merge [source branch] [target branch]	Merge a branch into a target branch
git stash	Stash changes in a dirty working directory
git stash clear	Remove all stashed entries

Sharing & Updating Projects

Command	Description
git push origin [branch name]	Push a branch to your remote repository
git push -u origin [branch name]	Push changes to remote repository (and remember the branch)
git push	Push changes to remote repository (remembered branch)
git push origin --delete [branch name]	Delete a remote branch
git pull	Update local repository to the newest commit
git pull origin [branch name]	Pull changes from remote repository
git remote add origin ssh://[email protected]/[username]/[repository-name].git	Add a remote repository
git remote set-url origin ssh://[email protected]/[username]/[repository-name].git	Set a repository's origin branch to SSH

Inspection & Comparison

Command	Description
git log	View changes
git log --summary	View changes (detailed)
git log --oneline	View changes (briefly)
git diff [source branch] [target branch]	Preview changes before merging

Inspection & Comparison

Command	Description
git stash	The uncommitted changes (staged and unstaged files) and overlooks untracked and ignored files
git stash -u	stash untracked files
git stash -a	stash untracked files and ignored files.
git stash list	List all stash
git stash save "add style to our site"	Provide more context
git stash pop	apply recent stash

Git Reset vs Revert vs Checkout reference

Command	Scope	Common use cases
git reset	Commit-level	Discard commits in a private branch or throw away uncommited changes
git reset	File-level	Unstage a files
git checkout	Commit-level	Unstage a files
git checkout	File-levell	Discard changes in the working directory
git revert	Commit-level	Undo commits in a public branch
git revert	File-level	(N/A)

Commit Level Operations

Command	Comment
git checkout hotfix git reset HEAD~2	moves the hotfix branch backwards by two commits

Reset Flags

Reset-Flags	Comment
--soft	The staged snapshot and working directory are not altered in any way.
--mixed	The staged snapshot is updated to match the specified commit, but the working directory is not affected. This is the default option
--hard	The staged snapshot and the working directory are both updated to match the specified commit.