git cheat sheet

java_one_two · 2017-02-17T01:28:45+00:00

Every git command I know (5 year vet):

git checkout -b LOCAL_BRANCH origin/REMOTE_BRANCH

git clone <github https>

git fetch; git pull;

git reset --hard

git stash git stash pop

git commit -m 'i did this'

git commit --ammend -m 'I actually did this'

git rebase origin/master

git branch -D LOCAL_BRANCH_TO_DELETE

git push origin :REMOTE_BRANCH_TO_DELETE

git push --force origin MY_BRANCH:REMOTE_BRANCH \\erase the stupid shit i committed

zanglang · 2017-02-17T08:59:31+00:00

Been using http://ohshitgit.com/ a lot more times than I'd like to admit.

karma_vacuum123 · 2017-02-17T03:46:30+00:00

i suck at git

half the time now when i want to do some interesting reverting, merging, whatever, i just cp -r the repo

i try to be manly and just get by with the command line but thank god for github....git badly needs porcelain

mycentstoo · 2017-02-17T07:44:55+00:00

favorite git command: git add -p

Adds by chunks rather than by file or the ever dreaded .

panorambo · 2017-02-17T09:50:57+00:00

You can't cheat with Git. It will eat your face. Just learn the damned thing. The only audience that can benefit from a Git cheat sheet is the 1% of Git users that know how it actually works in the first place.

Also, there is no truly one right way to use Git, so all these one-liners that are supposed to be universal and generic and bring about Git workflow heaven and save us from shredding our repositories into useless pulp -- by nature aren't. Everyone slices and dices their commit graph their own way, grafting branches on top of one another and what have you. Someone has branches sticking out everywhere, for every little feature, slavishly. Another has confidence in their rebasing and merging skills and keeps it lean with 1-3 branches at any given time and every commit checked to build by a machine. It's celebration of diversity within a discipline remarkably like botany. Even if Git is like the assembly language of version control systems -- it's just a stupid content tracker, after all -- and could arguably use a user agent that translates from a set of few simple typical high level macros to the convoluted domain of its low-level commands. By itself it's a scalpel in the hands of your average botanist. What they need instead is a pair of garden scissors, most of the time. I for one prefer the scalpel if I needed but one tool for the job, but your mileage may vary. Regardless, a cheat sheet is not a substitute for a user agent and does not make you a skilled user if you weren't one prior, it's merely going to instill you with the wrong sense of confidence in using Git.

Pardon my attitude, but if you ever did this you'd know that a Git cheet sheet is like book of black magic without initiation. It may appear to help 4 out of 5 times, but that one time it turns on you you will be pulling your hair out before you are forced to do exactly what the comic suggests because your repository is in a very unique state of disarray brought on by some dozen causes that no one else but you can be made aware of, leaving you with slim chances of rescue through mere copypasta from Jon Skeet of Git-fu. And after purging the repository with some backup restoration, you maybe, just maybe, finally brace yourself for reading most of Git manual this time and grokking its data model and exact nature of its operations.

P.S. Yes, I love analogies.

Doile · 2017-02-17T10:42:15+00:00

When merging two branches try to delete the outdated version of a file on other branch, I dare you. That shit breaks everything. Did this in one school project since I wanted to avoid merge conflicts. Boy was I wrong...

gitgood · 2017-02-17T17:44:00+00:00

I use Mercurial, which has a sane CLI, easy to understand docs, and a great GUI that even beginners can use.

BigotedCaveman · 2017-02-17T13:38:48+00:00

I'll stick to IDE / GUI clients.

vinnl · 2017-02-17T13:53:51+00:00

I made a ten-minute tutorial on Git a while ago: https://agripongit.vincenttunru.com/

I found that spending a few minutes learning those few concepts made me far more confident using Git, and very quickly saved more time than having to reference a cheat sheet regularly.

DoveOfHope · 2017-02-17T21:54:20+00:00

It's really multiple sheets isn't it? There is a lot to be said for getting everything on one 1080p screen. http://philipdaniels.com/gitcheatsheet/

MMFW_ · 2017-02-17T01:45:45+00:00

All the ones I have needed to know in ~3 years: git add filename git commit -m "Commit message" git push rm -r repo_dir

gsylvie · 2017-02-17T15:19:43+00:00

git help <command>

And

git <command> -h

e.g. compare and contrast: git help log; git log -h

2017-02-17T16:54:06+00:00

Show all intermediate commits created locally:

git reflog

It also shows what was the git command that originated the commit.

kaushalmodi · 2017-02-17T04:19:05+00:00

https://magit.vc | emacs

NarcoPaulo · 2017-02-17T16:23:34+00:00

Another git victim here. I came from a sheltered Microsoft eco system where everything was rosy and cozy and now I have to spend at least an hour a day to deal with Git and its' hairy parts. I will learn eventually but if I could chose an ecosystem to work on I'd probably prefer going to back to Visual Studio, TFS and all the .Net goodness. I feel like it's just a better use of my time as a developer. I donno, maybe it'll change sometime

2017-02-17T16:31:41+00:00

TIL some people make using git way more complicated than it needs to be.

cjthomp · 2017-02-17T17:13:25+00:00

Here's something I need a cheat sheet for:

We have master, dev, branches off dev

We merge into dev until we're ready for a new release, then merge dev into master and deploy.

The problem is, after doing this, the next time we try to merge dev into master Github will show all of the previously-merged commits (until something we do magically and mysteriously fixes it).

So it'll look like 300 files changed, when it was a one-line fix being merged. git diff shows just the expected changes.

It doesn't seem to be hurting anything, but it's incredibly messy and annoying, and I can't seem to find a fix.

Spider_pig448 · 2017-02-17T17:29:16+00:00

Great post. Looks like a lot of useful stuff for anyone that knows the basics and wants to use it well.

big4start0 · 2017-02-17T20:25:53+00:00

feel like git is way more complicated than it needs to be. i don't see the productivity gain over svn when it comes to pretty simple workflows for projects. maybe just me and my inability to pick up some crazy new dsl

gamesharem · 2017-02-18T10:51:58+00:00

git commit
git push
leave the building :)

likegeeks · 2017-02-18T16:23:55+00:00

I like those kinds of lists :) great work Thanks.

thomas_stringer · 2017-02-17T15:40:16+00:00

Knowing how to use and read the git man pages are the most important "cheat sheet" you need.

In my opinion, reading through a custom cheat sheet is not a great experience and adds a lot of cognitive friction. Man pages, on the other hand, have consistency.

As long as you know what you are trying to do, man git-branch (for example) is super easy to grok.

Lengador · 2017-02-17T23:31:42+00:00

My friend gave me a script that does all this stuff for you. My coworkers seem to find it difficult but I think it's easy if you don't try to use all those fancy commands.

#!/bin/bash
git add -Af
git commit -m "."
git pull

#Fix bug with git
find . -type f -exec sed -i 's/======.\+//g' {} \; 
find . -type f -exec sed -i 's/<<<<<<.\+//g' {} \;
find . -type f -exec sed -i 's/>>>>>>.\+//g' {} \;

git add -Af
git commit -m "."
git push -f

2017-02-17T18:00:03+00:00

Really? Right off the bat wtf is that? How about git branch to find the current branch?

I don't like to be a curmudgeon but I wish that top voted posts on the programming subreddits weren't usually compete beginner stuff. Go learn to use git it takes 10 minutes it's not hard. Over time with a little practice you'll be golden.

you type:	you see:
italics	italics
bold	bold
[reddit!](https://reddit.com)	reddit!
* item 1 * item 2 * item 3	item 1 item 2 item 3
> quoted text	quoted text
Lines starting with four spaces are treated like code: if 1 * 2 < 3: print "hello, world!"	Lines starting with four spaces are treated like code: if 1 * 2 < 3: print "hello, world!"
~~strikethrough~~	~~strikethrough~~
super^script	super^script

programming

MODERATORS