dotfiles/docs/Git.md
2012-12-07 01:02:21 +04:00

2.1 KiB
Raw Blame History

Git Awesomeness

Aliases

Shorthands

  • git a → git add

  • git ua → git reset HEAD

  • git b → git branch

  • git c → git commit

  • git ca → git commit -a

  • git cm → git commit -m

  • git cam → git commit -am

  • git co → git checkout

  • git d → git diff --color-words

  • git s → git status -sb

git l

Simple one-line-per-commit log.

git ll

Log with list of changed files for each commit.

git ignore

Add new item to .gitignore.

git this

Initialize Git repo in current folder and commit all files.

git append

Add all staged files to previous commit.

git undo

Undo last commit withould loosing any changes.

gr

Jump to root folder of Git repo.

git-github [repo]

Setup syncronization of current Git repo with GitHub repo of the same name

git-bitbucket [repo]

Setup syncronization of current Git repo with Bitbucket repo of the same name

git-fork

Add remote upstream.

git-upstream [branch]

Sync branch with upstream.

git-friendly

pull

Stash any local changes, pull from remote using rebase, updates submodules, pop your stash, then run bundle install and/or npm install if necessary.

push

Push your changes to the remote + copy a sexy diff URL like http://github.com/jamiew/git-friendly/compare/e96033…5daed4 to your clipboard (works on Mac and Linux).

branch [name]

Switch branches or create new local branch if it doesnt exist. Intelligently sets up remote branch tracking so you can just type git pull and not always git pull origin newbranch. If no argument specified will list all local and remote branches.

merge [name]

Merge the specified branch into the current branch. Rebases first if the branch is local-only.

git-extras

See git extras --help or documentation for all available commands.

hub

See hub help or documentation for all available commands.