Please enable JavaScript.
Coggle requires JavaScript to display documents.
BRANCHING - Coggle Diagram
BRANCHING
CONFLICT
Resolve
Accept
Current
Incoming
Both
When
Colliding
Changes
Evil
Commit
New
Code
Tool
Cmd
git mergetool
REBASING
Base
Change
Master
Linear
History
Doing
Current
Cmd
git rebase
master
Conflict
Continue
Skip
Abort
BRANCH
Comparing
See
Changes
git diff
current..other
Files
Affected
git diff
--name-status
branchName
Cmd
git log
current..other
Commits
Not-In
Current
Operations
List
Graph
git log
--graph --oneline
Git branch
Rename
git branch
-m old new
Delete
-d
Force
-D
Create
git branch
bName
Switch
With
Create
Option
-C
Git
Switch
branch
STASH
Temporary
Storage
Using
Untracked
push -am "msg"
Cmd
git stash
push -m "msg"
Operations
View
git stash list
Apply
git stash apply 1
Remove
All
git stash clear
Cmd
git stash drop 1
MERGE
Types
Fast-Forward
Linear
Disable
Option
git merge
--no-ff bName
Permanent
git config ff no
3-way
Diverged
Using
Ancestor
Common
Current
Commit
Squash
Mediocre
Commit
Cmd
git merge
--squash bName
Staged
Operations
Abort
git merge --abort
Undo
Delete
Commit
Local
Cmd
git reset
--hard HEAD~1
Changes
Revert
Cmd
git revert
-m 1 HEAD
Ways
Viewing
Unmerged
git branch --no-merged
Merged
git branch --merged
Tools
Visual
Configure
Default
Git config --global
merge.tool p4merge
Location
mergetool.p4merge.path
toolPath
CHERRY-PICK
Apply
Commit
Foreign
Cmd
git cherry-pick
commitId
Conflict
Continue
Commit