Skip to content

Git.md

Latest commit

 

History

History
67 lines (41 loc) · 1.34 KB

Git.md

File metadata and controls

67 lines (41 loc) · 1.34 KB

GIT

To delete all untracked files

git clean

Undoing in Git

Fixing un-committed mistakes

git reset --hard HEAD

Undoing in Git - Reset, Checkout and Revert

Remote

git remote add [some name] git://github.com/[user]/[project].git
git fetch [some name]

Diff

git diff [some name]/[branch]

Test the code in temporary read-only non-branch

git checkout [some name]/[branch]

Merge and commit

git merge [some name]/[branch]

Update from remote

git fetch [some name]

Origin Master

.git/config

[branch "master"]
    remote = origin
    merge = refs/heads/master

Or

git config branch.master.remote origin
git config branch.master.merge refs/heads/master

Globally

git config --global branch.master.remote origin
git config --global branch.master.merge refs/heads/master

Converting from Mercurial (hg)

Use fast-export

git clone git://repo.or.cz/fast-export.git
git init git_repo
cd git_repo
~/fast-export/hg-fast-export.sh -r /path/to/old/mercurial_repo
git checkout HEAD

Remove files in .gitignore from version control

From http://www.lemoda.net/git/rm-gitignore-files/

git rm -r --cached .
git add .
git commit -m ".gitignore is now working"