Cheatsheet Fork
Cliente Git rápido e intuitivo para Windows e Mac
Fork
20
cards found
Categories:
Versions:
Interface
Main Shortcuts
Ctrl + N (new repo / clone)
Ctrl + O (open repo)
Ctrl + Enter (commit)
Ctrl + P (push)
Ctrl + Shift + P (pull)
Ctrl + F (search)
Essential shortcuts.
Views
Commits # graphical history
Changes # changed files
Branches # branch list
Remotes # remote repositories
Stashes # stash list
Tags # repo tags
Fork panels.
Diff and Preview
Click the file → inline diff
Side-by-side: button in the diff
Image diff: view visual changes
Blame: right-click → Blame
View differences.
Commits
Commit
Ctrl + Enter (commit)
Select files (checkbox)
Message + description
Amend: "Amend" checkbox
Create a commit.
Partial Stage
Click the file → view diff
Select specific lines/hunks
Stage Selected Lines
Stage File / Unstage File
Partial commit (by lines).
Interactive History
Right-click the commit:
→ Edit (reword)
→ Squash with previous
→ Fixup
→ Drop (delete)
→ Reorder (drag)
Edit history.
Revert and Reset
Right-click the commit:
→ Revert (inverse commit)
→ Reset branch to here
Soft / Mixed / Hard
→ Create branch from here
Undo changes.
Branches e Tags
Create and Manage
Ctrl + B (new branch)
Right-click → New Branch
Checkout (double click)
Delete / Rename
Push to remote
Branch operations.
Tags
Right-click the commit
→ Create Tag
Name: v2.0.0
Message (annotated tag)
Push: Push → include tags
Create and push tags.
Compare
Select 2 commits/branches
→ Compare
See differing commits and files
Diff Against Current Branch
Compare branches.
Synchronization
Push and Pull
Ctrl + P (push)
Ctrl + Shift + P (pull)
Push → select branches
Pull → Rebase (checkbox)
Prune remote branches
Sync with remote.
Fetch
Ctrl + T (fetch)
Fetch All Remotes
Auto-fetch: Settings → Repository
See remote changes without merge
Get remote refs.
Remotes
Repository → Remotes
Add Remote (name + URL)
Edit / Remove
Push/Pull to a specific remote
Manage remotes.
Merge and Rebase
Merge
Right-click the branch
→ Merge into current branch
→ Squash commits
Fast-forward: option in Settings
No-FF: force merge commit
Integrate branches.
Rebase
Right-click the base branch
→ Rebase current branch
Interactive: edit/squash/reorder
Abort: conflict bar → Abort
Interactive rebase.
Resolve Conflicts
Conflict → yellow bar
→ Open in Merge Tool
Built-in 3-way merge
Accept Left / Right / Both
Mark the Resolved → Continue
Resolve conflicts.
Advanced
Stash
Ctrl + Shift + S (stash)
Changes → Stash Changes
Apply / Pop / Drop
Include untracked: checkbox
Save temporary changes.
Cherry-pick
Right-click the commit
→ Cherry Pick
Applies commit to another branch
Multiple: select several
Apply specific commits.
Git Flow
Repository → Git Flow
Init / Start Feature
Start Release / Hotfix
Finish (merge + delete)
Native integration in Fork
Git Flow workflow.
Submodules and LFS
Submodules: visible in the tree
→ Init / Update / Open
Git LFS: native support
→ Large files tracked
→ LFS tab in the diff
Submodules and large files.