Git commands

gistfile1.txt

# Compare branches

# Show name of files only
git diff [branch1] [branch2] --name-only

# Merge branches

# Merge with no auto commit
git merge [branch] --no-commit --no-ff


# Log

# One line log
git log --pretty=oneline -10
# Graph log
git log --all --decorate --oneline --graph
# Display status of two branches as a graph, 25 commits
git log -25 --graph --oneline [branch] [other_branch]

# Commit

# Amend to last commit
$ git commit --amend --no-edit

# Delete local branch followed by remote
$ git branch -d <branch_name>
git push origin :<branch_name>