cool git tricks (that i learn when things go badly) [2/2]

27
@cczona Cool Git Tricks (That I learn when things go badly.) (Part 2) Monday, January 28, 13

Upload: carina-c-zona

Post on 18-Dec-2014

3.225 views

Category:

Documents


1 download

DESCRIPTION

A quick and cheeky intro to some very handy features that even experienced users are frequently unaware of. View part I at http://www.slideshare.net/cczona/cool-git-tricks Women Who Code Lightning Talks 2013-01-10.

TRANSCRIPT

Page 1: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

@cczona

Cool Git Tricks(That I learn when things go badly.)

(Part 2)

Monday, January 28, 13

Page 2: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

@cczona

I use ‘git status’

Monday, January 28, 13

Page 3: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

@cczona

I use ‘git status’(A lot.)

Monday, January 28, 13

Page 4: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

�3 "+3*+�+,*

�3�&3�)�&�!3%�*+�)

�3�!�& �*3+'3��3�'%%"++���

�333�,*�3� "+3)�*�+3����3��"$� ����3+'3,&*+� ��

�3 &�.3�"$��333&"�+0��"/�+/+

�3333��$�+���333��"$����/(�)"%�&+�+/+

�3�!�& �*3&'+3*+� ��3�')3�'%%"+�

�333�,*�3� "+3���3��"$� ����3+'3,(��+�3.!�+3."$$3��3�'%%"++���

�333�,*�3� "+3�!��#',+3��3��"$� ����3+'3�"*��)�3�!�& �*3"&3.')#"& 3�")��+')0�

��3 %'�"�"���333&'+��-�&+�*,)��.!�+�+!"*�"*�+/+

�3 %'�"�"���333"&�()' )�**�+/+

�3�&+)��#��3�"$�*�

�333�,*�3� "+3���3��"$� ����3+'3"&�$,��3"&3.!�+3."$$3��3�'%%"++���

�3 �-"%�,&�$�-"%��, "+"-�

�3 �-"%�'$')*�$',�*�-"%

Monday, January 28, 13

Page 5: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

�3 "+3*+�+,*3��*!')+

��3�-"%�,&�$�-"%��, "+"-�

��3�-"%�'$')*�$',�*�-"%

�33��"$����/(�)"%�&+�+/+

3�3"&�()' )�**�+/+

�33&"�+0��"/�+/+

3�3&'+��-�&�*,)��.!�+�+!"*�"*�+/+

Monday, January 28, 13

Page 6: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

@cczona

I create many branches

Monday, January 28, 13

Page 7: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

@cczona

I create many branches(Which then never go away.)

Monday, January 28, 13

Page 8: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

�3 "+3�)�&�!

�, �"/�/(�)"%�&+%�*+�)1'% ���

Monday, January 28, 13

Page 9: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

�3 "+3�)�&�!3��%�) ��3�3%�*+�)

�, �"/�/(�)"%�&+

Monday, January 28, 13

Page 10: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

�3 "+3�)�&�!3��%�) ��3���323 )�(3�-3����323/�) *3 "+3�)�&�!3���3 "+3�)�&�!

�, �"/�/(�)"%�&+

Monday, January 28, 13

Page 11: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

@cczona

I want to make All The Things

go away

Monday, January 28, 13

Page 12: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

@cczona

I want to make All The Things

go away(Temporarily.)

Monday, January 28, 13

Page 13: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

�3 "+3*+�*!

Monday, January 28, 13

Page 14: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

�3 "+3*+�*!�,&*+� ��3�!�& ��3�'&�+3*+�*!��

Monday, January 28, 13

Page 15: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

�3 "+3*+�*!�,&*+� ��3�!�& ��3�'&�+3*+�*!�� ����

Monday, January 28, 13

Page 16: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

�3 "+3*+�*!�,&*+� ��3�!�& ��3�'&�+3*+�*!�� ���� �3 "+3���3�

Monday, January 28, 13

Page 17: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

�3 "+3*+�*!�,&*+� ��3�!�& ��3�'&�+3*+�*!�� ���� �3 "+3���3��3 "+3*+�*!

Monday, January 28, 13

Page 18: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

�3 "+3*+�*!�,&*+� ��3�!�& ��3�'&�+3*+�*!�� ���� �3 "+3���3��3 "+3*+�*!�����-�&+,�$$0���

Monday, January 28, 13

Page 19: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

�3 "+3*+�*!�,&*+� ��3�!�& ��3�'&�+3*+�*!�� ���� �3 "+3���3��3 "+3*+�*!�����-�&+,�$$0��� �3 "+3*+�*!3('(

Monday, January 28, 13

Page 20: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

�3 "+3*+�*!�,&*+� ��3�!�& ��3�'&�+3*+�*!�� ���� �3 "+3���3��3 "+3*+�*!�����-�&+,�$$0��� �3 "+3*+�*!3('(�3 "+3)�*�+3����3����!3�"$�

Monday, January 28, 13

Page 21: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

�3 "+3*+�*!�,&*+� ��3�!�& ��3�'&�+3*+�*!�� ���� �3 "+3���3��3 "+3*+�*!�����-�&+,�$$0��� �3 "+3*+�*!3('(�3 "+3)�*�+3����3����!3�"$�

Monday, January 28, 13

Page 22: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

�3 "+3*+�*!3��"&�$,���,&+)��#��

Monday, January 28, 13

Page 23: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

@cczona

I push things to GitHub

Monday, January 28, 13

Page 24: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

@cczona

I push things to GitHub

(Just to see how they're doing.)

Monday, January 28, 13

Page 25: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

�3 "+3"&*+�.��

Monday, January 28, 13

Page 26: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

@cczona

• https://twitter.com/kytrinyx/status/277460071649259520

• https://git.wiki.kernel.org/index.php/Gitweb

• http://byte.kde.org/~zrusin/git/git-cheat-sheet-medium.png

Learn More

Monday, January 28, 13

Page 27: Cool Git Tricks (That I Learn When Things Go Badly) [2/2]

@cczona

Carina C. Zona@cczona

www.cczona.com

Monday, January 28, 13