Page History

...

creating a new git branch called “dev”

$ git branch dev

Deleted branch dev

$ git branch -d dev

merge

Merges [branch] into current branch.

$ git merge [branch]

Synopsis: 

git merge [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
	[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
	[--[no-]allow-unrelated-histories]
	[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>…​]
git merge (--continue | --abort | --quit)

Options:

• --commit : Perform the merge and commit the result.
• -e,–edit : Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge.
• --log[=<n>] : In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged.
• --progress  , --no-progress :Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. 

diff

Shows diff of the unstaged changes.

...