-
Notifications
You must be signed in to change notification settings - Fork 401
/
Prezto_Git.rb
1154 lines (1108 loc) · 34.6 KB
/
Prezto_Git.rb
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
cheatsheet do
title 'Prezto Git'
docset_file_name 'Prezto_Git'
keyword 'g'
source_url 'http://cheat.kapeli.com'
style '
td.td_notes code {
border: none;
box-shadow: none;
background: none;
font-family: "Open Sans", sans-serif;
font-size: medium;
color: #666666;
}
td, th {
white-space: nowrap;
min-width: 110px;
}
.no-min-width td, .no-min-width th {
min-width: 0;
}
td:last-child {
width: 99%;
}
.notes {
font-family: monospace;
}
'
category do
id 'Git'
entry do
td_command 'g'
name 'git'
notes 'is short for "git"'
end
end
category do
id 'Branch (b)'
entry do
td_command 'gb'
name 'Lists, creates, renames, and deletes branches'
notes 'git branch'
end
entry do
td_command 'gba'
name 'Creates a new branch'
notes 'git branch --all --verbose'
end
entry do
td_command 'gbc'
name 'Creates a new branch'
notes 'git checkout -b'
end
entry do
td_command 'gbd'
name 'Deletes a branch'
notes 'git branch --delete'
end
entry do
td_command 'gbD'
name 'Deletes the branch regardless of its push and merge status, so be careful using this one, see also "gbd"'
notes 'git branch --delete --force'
end
entry do
td_command 'gbl'
name 'Lists branches and their commits, see also "gbv"'
notes 'git branch --verbose'
end
entry do
td_command 'gbL'
name 'Lists all local and remote branches and their commits'
notes 'git branch --all --verbose'
end
entry do
td_command 'gbr'
name 'Renames/moves a branch, see also "gbm"'
notes 'git branch --move'
end
entry do
td_command 'gbR'
name 'Renames/moves a branch even if the new branch name already exists, see also "gbM"'
notes 'git branch --move --force'
end
entry do
td_command 'gbs'
name 'Lists branches and their commits with ancestry graphs'
notes 'git show-branch'
end
entry do
td_command 'gbS'
name 'Lists local and remote branches and their commits with ancestry graphs'
notes 'git show-branch --all'
end
entry do
td_command 'gbv'
name 'Lists branches with verbose information about their commits'
notes 'git branch --verbose'
end
entry do
td_command 'gbV'
name 'Lists branches with more verbose information about their commits'
notes 'git branch --verbose --verbose'
end
entry do
td_command 'gbx'
name 'Deletes a branch, see also "gbd"'
notes 'git branch --delete'
end
entry do
td_command 'gbX'
name 'Deletes a branch irrespective of its merged status, see also "gbD"'
notes 'git branch --delete --force'
end
end
category do
id 'Commit (c)'
entry do
td_command 'gc'
name 'Records changes to the repository'
notes 'git commit --verbose'
end
entry do
td_command 'gca'
name 'Stages all modified and deleted files'
notes 'git commit --verbose --all'
end
entry do
td_command 'gcm'
name 'Records changes to the repository with the given message'
notes 'git commit --message'
end
entry do
td_command 'gcS'
name 'Records changes to the repository. (Signed)'
notes 'git commit -S --verbose'
end
entry do
td_command 'gcSa'
name 'Stages all modified and deleted files. (Signed)'
notes 'git commit -S --verbose --all'
end
entry do
td_command 'gcSm'
name 'Records changes to the repository with the given message. (Signed)'
notes 'git commit -S --message'
end
entry do
td_command 'gcam'
name 'Stages all modified and deleted files, and records changes to the repository with the given message'
notes 'git commit --all --message'
end
entry do
td_command 'gco'
name 'Checks out a branch or paths to work tree'
notes 'git checkout'
end
entry do
td_command 'gcO'
name 'Checks out hunks from the index or the tree interactively'
notes 'git checkout --patch'
end
entry do
td_command 'gcf'
name 'Amends the tip of the current branch using the same log message as *HEAD*'
notes 'git commit --amend --reuse-message HEAD'
end
entry do
td_command 'gcSf'
name 'Amends the tip of the current branch using the same log message as *HEAD*. (Signed)'
notes 'git commit -S --amend --reuse-message HEAD'
end
entry do
td_command 'gcF'
name 'Amends the tip of the current branch'
notes 'git commit --verbose --amend'
end
entry do
td_command 'gcSF'
name 'Amends the tip of the current branch. (Signed)'
notes 'git commit -S --verbose --amend'
end
entry do
td_command 'gcp'
name 'Applies changes introduced by existing commits'
notes 'git cherry-pick --ff'
end
entry do
td_command 'gcP'
name 'Applies changes introduced by existing commits without committing'
notes 'git cherry-pick --no-commit'
end
entry do
td_command 'gcr'
name 'Reverts existing commits by reverting patches and recording new commits'
notes 'git revert'
end
entry do
td_command 'gcR'
name 'Removes the *HEAD* commit'
notes 'git reset "HEAD^"'
end
entry do
td_command 'gcs'
name 'Displays various types of objects'
notes 'git show'
end
entry do
td_command 'gcsS'
name 'Displays commits with GPG signature'
notes 'git show --pretty=short --show-signature'
end
entry do
td_command 'gcl'
name 'Lists lost commits'
notes 'git-commit-lost'
end
entry do
td_command 'gcy'
name 'Displays commits yet to be applied to upstream in the short format'
notes 'git cherry -v --abbrev'
end
entry do
td_command 'gcY'
name 'Displays commits yet to be applied to upstream'
notes 'git cherry -v'
end
end
category do
id 'Conflict (C)'
entry do
td_command 'gCl'
name 'Lists unmerged files'
notes 'git --no-pager diff --name-only --diff-filter=U'
end
entry do
td_command 'gCa'
name 'Adds unmerged file contents to the index'
notes 'git add $(gCl)'
end
entry do
td_command 'gCe'
name 'Executes merge-tool on all unmerged file'
notes 'git mergetool $(gCl)'
end
entry do
td_command 'gCo'
name 'Checks out our changes for unmerged paths'
notes 'git checkout --ours --'
end
entry do
td_command 'gCO'
name 'Checks out our changes for all unmerged paths'
notes 'gCo $(gCl)'
end
entry do
td_command 'gCt'
name 'Checks out their changes for unmerged paths'
notes 'git checkout --theirs --'
end
entry do
td_command 'gCT'
name 'Checks out their changes for all unmerged paths'
notes 'gCt $(gCl)'
end
end
category do
id 'Data (d)'
entry do
td_command 'gd'
name 'Displays information about files in the index and the work tree'
notes 'git ls-files'
end
entry do
td_command 'gdc'
name 'Lists cached files'
notes 'git ls-files --cached'
end
entry do
td_command 'gdx'
name 'Lists deleted files'
notes 'git ls-files --deleted'
end
entry do
td_command 'gdm'
name 'Lists modified files'
notes 'git ls-files --modified'
end
entry do
td_command 'gdu'
name 'Lists untracked files'
notes 'git ls-files --other --exclude-standard'
end
entry do
td_command 'gdk'
name 'Lists killed files'
notes 'git ls-files --killed'
end
entry do
td_command 'gdi'
name 'Lists ignored files'
notes 'git status --porcelain --short --ignored | sed -n "s/^!! //p"'
end
end
category do
id 'Fetch (f)'
entry do
td_command 'gf'
name 'Downloads objects and references from another repository'
notes 'git fetch'
end
entry do
td_command 'gfa'
name 'Downloads objects and references from all remote repositories'
notes 'git fetch --all'
end
entry do
td_command 'gfc'
name 'Clones a repository into a new directory'
notes 'git clone'
end
entry do
td_command 'gfcr'
name 'Clones a repository into a new directory including all submodules'
notes 'git clone --recurse-submodules'
end
entry do
td_command 'gfm'
name 'Fetches from and merges with another repository or local branch'
notes 'git pull'
end
entry do
td_command 'gfr'
name 'Fetches from and rebases on another repository or local branch'
notes 'git pull --rebase'
end
end
category do
id 'Flow (F)'
entry do
td_command 'gFi'
name 'Is short for "git flow init"'
notes 'git flow init'
end
end
category do
id 'Flow Feature (Ff)'
entry do
td_command 'gFf'
name 'Is short for "git flow feature"'
notes 'git flow feature'
end
entry do
td_command 'gFfl'
name 'Is short for "git flow feature list"'
notes 'git flow feature list'
end
entry do
td_command 'gFfs'
name 'Is short for "git flow feature start"'
notes 'git flow feature start'
end
entry do
td_command 'gFff'
name 'Is short for "git flow feature finish"'
notes 'git flow feature finish'
end
entry do
td_command 'gFfp'
name 'Is short for "git flow feature publish"'
notes 'git flow feature publish'
end
entry do
td_command 'gFft'
name 'Is short for "git flow feature track"'
notes 'git flow feature track'
end
entry do
td_command 'gFfd'
name 'Is short for "git flow feature diff"'
notes 'git flow feature diff'
end
entry do
td_command 'gFfr'
name 'Is short for "git flow feature rebase"'
notes 'git flow feature rebase'
end
entry do
td_command 'gFfc'
name 'Is short for "git flow feature checkout"'
notes 'git flow feature checkout'
end
entry do
td_command 'gFfm'
name 'Is short for "git flow feature pull"'
notes 'git flow feature pull'
end
entry do
td_command 'gFfx'
name 'Is short for "git flow feature delete"'
notes 'git flow feature delete'
end
end
category do
id 'Flow Bugfix (Fb)'
entry do
td_command 'gFb'
name 'Is short for "git flow bugfix"'
notes 'git flow bugfix'
end
entry do
td_command 'gFbl'
name 'Is short for "git flow bugfix list"'
notes 'git flow bugfix list'
end
entry do
td_command 'gFbs'
name 'Is short for "git flow bugfix start"'
notes 'git flow bugfix start'
end
entry do
td_command 'gFbf'
name 'Is short for "git flow bugfix finish"'
notes 'git flow bugfix finish'
end
entry do
td_command 'gFbp'
name 'Is short for "git flow bugfix publish"'
notes 'git flow bugfix publish'
end
entry do
td_command 'gFbt'
name 'Is short for "git flow bugfix track"'
notes 'git flow bugfix track'
end
entry do
td_command 'gFbd'
name 'Is short for "git flow bugfix diff"'
notes 'git flow bugfix diff'
end
entry do
td_command 'gFbr'
name 'Is short for "git flow bugfix rebase"'
notes 'git flow bugfix rebase'
end
entry do
td_command 'gFbc'
name 'Is short for "git flow bugfix checkout"'
notes 'git flow bugfix checkout'
end
entry do
td_command 'gFbm'
name 'Is short for "git flow bugfix pull"'
notes 'git flow bugfix pull'
end
entry do
td_command 'gFbx'
name 'Is short for "git flow bugfix delete"'
notes 'git flow bugfix delete'
end
end
category do
id 'Release'
entry do
td_command 'gFr'
name 'Is short for "git flow release"'
notes 'git flow release'
end
entry do
td_command 'gFrl'
name 'Is short for "git flow release list"'
notes 'git flow release list'
end
entry do
td_command 'gFrs'
name 'Is short for "git flow release start"'
notes 'git flow release start'
end
entry do
td_command 'gFrf'
name 'Is short for "git flow release finish"'
notes 'git flow release finish'
end
entry do
td_command 'gFrp'
name 'Is short for "git flow release publish"'
notes 'git flow release publish'
end
entry do
td_command 'gFrt'
name 'Is short for "git flow release track"'
notes 'git flow release track'
end
entry do
td_command 'gFrd'
name 'Is short for "git flow release diff"'
notes 'git flow release diff'
end
entry do
td_command 'gFrr'
name 'Is short for "git flow release rebase"'
notes 'git flow release rebase'
end
entry do
td_command 'gFrc'
name 'Is short for "git flow release checkout"'
notes 'git flow release checkout'
end
entry do
td_command 'gFrm'
name 'Is short for "git flow release pull"'
notes 'git flow release pull'
end
entry do
td_command 'gFrx'
name 'Is short for "git flow release delete"'
notes 'git flow release delete'
end
end
category do
id 'Flow Hotfix (Fh)'
entry do
td_command 'gFh'
name 'Is short for "git flow hotfix"'
notes 'git flow hotfix'
end
entry do
td_command 'gFhl'
name 'Is short for "git flow hotfix list"'
notes 'git flow hotfix list'
end
entry do
td_command 'gFhs'
name 'Is short for "git flow hotfix start"'
notes 'git flow hotfix start'
end
entry do
td_command 'gFhf'
name 'Is short for "git flow hotfix finish"'
notes 'git flow hotfix finish'
end
entry do
td_command 'gFhp'
name 'Is short for "git flow hotfix publish"'
notes 'git flow hotfix publish'
end
entry do
td_command 'gFht'
name 'Is short for "git flow hotfix track"'
notes 'git flow hotfix track'
end
entry do
td_command 'gFhd'
name 'Is short for "git flow hotfix diff"'
notes 'git flow hotfix diff'
end
entry do
td_command 'gFhr'
name 'Is short for "git flow hotfix rebase"'
notes 'git flow hotfix rebase'
end
entry do
td_command 'gFhc'
name 'Is short for "git flow hotfix checkout"'
notes 'git flow hotfix checkout'
end
entry do
td_command 'gFhm'
name 'Is short for "git flow hotfix pull"'
notes 'git flow hotfix pull'
end
entry do
td_command 'gFhx'
name 'Is short for "git flow hotfix delete"'
notes 'git flow hotfix delete'
end
end
category do
id 'Flow Support (Fs)'
entry do
td_command 'gFs'
name 'Is short for "git flow support"'
notes 'git flow support'
end
entry do
td_command 'gFsl'
name 'Is short for "git flow support list"'
notes 'git flow support list'
end
entry do
td_command 'gFss'
name 'Is short for "git flow support start"'
notes 'git flow support start'
end
entry do
td_command 'gFsf'
name 'Is short for "git flow support finish"'
notes 'git flow support finish'
end
entry do
td_command 'gFsp'
name 'Is short for "git flow support publish"'
notes 'git flow support publish'
end
entry do
td_command 'gFst'
name 'Is short for "git flow support track"'
notes 'git flow support track'
end
entry do
td_command 'gFsd'
name 'Is short for "git flow support diff"'
notes 'git flow support diff'
end
entry do
td_command 'gFsr'
name 'Is short for "git flow support rebase"'
notes 'git flow support rebase'
end
entry do
td_command 'gFsc'
name 'Is short for "git flow support checkout"'
notes 'git flow support checkout'
end
entry do
td_command 'gFsm'
name 'Is short for "git flow support pull"'
notes 'git flow support pull'
end
entry do
td_command 'gFsx'
name 'Is short for "git flow support delete"'
notes 'git flow support delete'
end
end
category do
id 'Grep (g)'
entry do
td_command 'gg'
name 'Displays lines matching a pattern'
notes 'git grep'
end
entry do
td_command 'ggi'
name 'Displays lines matching a pattern ignoring case'
notes 'git grep --ignore-case'
end
entry do
td_command 'ggl'
name 'Lists files matching a pattern'
notes 'git grep --files-with-matches'
end
entry do
td_command 'ggL'
name 'Lists files that are not matching a pattern'
notes 'git grep --files-without-matches'
end
entry do
td_command 'ggv'
name 'Displays lines not matching a pattern'
notes 'git grep --invert-match'
end
entry do
td_command 'ggw'
name 'Displays lines matching a pattern at word boundary'
notes 'git grep --word-regexp'
end
end
category do
id 'Index (i)'
entry do
td_command 'gia'
name 'Adds file contents to the index'
notes 'git add'
end
entry do
td_command 'giA'
name 'Adds file contents to the index interactively'
notes 'git add --patch'
end
entry do
td_command 'giu'
name 'Adds file contents to the index (updates only known files)'
notes 'git add --update'
end
entry do
td_command 'gid'
name 'Displays changes between the index and a named commit (diff)'
notes 'git diff --no-ext-diff --cached'
end
entry do
td_command 'giD'
name 'Displays changes between the index and a named commit (word diff)'
notes 'git diff --no-ext-diff --cached --word-diff'
end
entry do
td_command 'gii'
name 'Temporarily ignore differences in a given file'
notes 'git update-index --assume-unchanged'
end
entry do
td_command 'giI'
name 'Unignore differences in a given file'
notes 'git update-index --no-assume-unchanged'
end
entry do
td_command 'gir'
name 'Resets the current HEAD to the specified state'
notes 'git reset'
end
entry do
td_command 'giR'
name 'Resets the current index interactively'
notes 'git reset --patch'
end
entry do
td_command 'gix'
name 'Removes files/directories from the index (recursively)'
notes 'git rm -r --cached'
end
entry do
td_command 'giX'
name 'Removes files/directories from the index (recursively and forced)'
notes 'git rm -rf --cached'
end
end
category do
id 'Log (l)'
entry do
td_command 'gl'
name 'Displays the log'
notes 'git log --topo-order --pretty=format:"${_git_log_medium_format}"'
end
entry do
td_command 'gls'
name 'Displays the stats log'
notes 'git log --topo-order --stat --pretty=format:"${_git_log_medium_format}"'
end
entry do
td_command 'gld'
name 'Displays the diff log'
notes 'git log --topo-order --stat --patch --full-diff --pretty=format:"${_git_log_medium_format}"'
end
entry do
td_command 'glo'
name 'Displays the one line log'
notes 'git log --topo-order --pretty=format:"${_git_log_oneline_format}"'
end
entry do
td_command 'glg'
name 'Displays the graph log'
notes 'git log --topo-order --all --graph --pretty=format:"${_git_log_oneline_format}"'
end
entry do
td_command 'glb'
name 'Displays the brief commit log'
notes 'git log --topo-order --pretty=format:"${_git_log_brief_format}"'
end
entry do
td_command 'glc'
name 'Displays the commit count for each contributor in descending order'
notes 'git shortlog --summary --numbered'
end
entry do
td_command 'glS'
name 'Displays the log and checks the validity of signed commits'
notes 'git log --show-signature'
end
end
category do
id 'Merge (m)'
entry do
td_command 'gm'
name 'Joins two or more development histories together'
notes 'git merge'
end
entry do
td_command 'gmC'
name 'Joins two or more development histories together but does not commit'
notes 'git merge --no-commit'
end
entry do
td_command 'gmF'
name 'Joins two or more development histories together but does not commit generating a merge commit even if the merge resolved as a fast-forward'
notes 'git merge --no-ff'
end
entry do
td_command 'gma'
name 'Aborts the conflict resolution, and reconstructs the pre-merge state'
notes 'git merge --abort'
end
entry do
td_command 'gmt'
name 'Runs the merge conflict resolution tools to resolve conflicts'
notes 'git mergetool'
end
end
category do
id 'Push (p)'
entry do
td_command 'gp'
name 'Updates remote refs along with associated objects'
notes 'git push'
end
entry do
td_command 'gpf'
name 'Forcefully updates remote refs along with associated objects using the safer "--force-with-lease" option'
notes 'git push --force-with-lease'
end
entry do
td_command 'gpF'
name 'Forcefully updates remote refs along with associated objects using the riskier "--force" option'
notes 'git push --force'
end
entry do
td_command 'gpa'
name 'Updates remote branches along with associated objects'
notes 'git push --all'
end
entry do
td_command 'gpA'
name 'Updates remote branches and tags along with associated objects'
notes 'git push --all && git push --tags'
end
entry do
td_command 'gpt'
name 'Updates remote tags along with associated objects'
notes 'git push --tags'
end
entry do
td_command 'gpc'
name 'Updates remote refs along with associated objects and adds *origin* as an upstream reference for the current branch'
notes 'git push --set-upstream origin "$(git-branch-current 2> /dev/null)"'
end
entry do
td_command 'gpp'
name 'Pulls and pushes from origin to origin'
notes 'git pull origin "$(git-branch-current 2> /dev/null)" && git push origin "$(git-branch-current 2> /dev/null)"'
end
end
category do
id 'Rebase (r)'
entry do
td_command 'gr'
name 'Forward-ports local commits to the updated upstream head'
notes 'git rebase'
end
entry do
td_command 'gra'
name 'Aborts the rebase'
notes 'git rebase --abort'
end
entry do
td_command 'grc'
name 'Continues the rebase after merge conflicts are resolved'
notes 'git rebase --continue'
end
entry do
td_command 'gri'
name 'Makes a list of commits to be rebased and opens the editor'
notes 'git rebase --interactive'
end
entry do
td_command 'grs'
name 'Skips the current patch'
notes 'git rebase --skip'
end
end
category do
id 'Remote (R)'
entry do
td_command 'gR'
name 'Manages tracked repositories'
notes 'git remote'
end
entry do
td_command 'gRl'
name 'Lists remote names and their URLs'
notes 'git remote --verbose'
end
entry do
td_command 'gRa'
name 'Adds a new remote'
notes 'git remote add'
end
entry do
td_command 'gRx'
name 'Removes a remote'
notes 'git remote rm'
end
entry do
td_command 'gRm'
name 'Renames a remote'
notes 'git remote rename'
end
entry do
td_command 'gRu'
name 'Fetches remotes updates'
notes 'git remote update'
end
entry do
td_command 'gRp'
name 'Prunes all stale remote tracking branches'
notes 'git remote prune'
end
entry do
td_command 'gRs'
name 'Displays information about a given remote'
notes 'git remote show'
end
entry do
td_command 'gRb'
name 'Opens a remote on [GitHub][3] in the default browser'
notes 'git-hub-browse'
end
end
category do
id 'Stash (s)'
entry do
td_command 'gs'
name 'Stashes the changes of the dirty working directory'
notes 'git stash'
end
entry do
td_command 'gsa'
name 'Applies the changes recorded in a stash to the working directory'
notes 'git stash apply'
end
entry do
td_command 'gsx'
name 'Drops a stashed state'
notes 'git stash drop'
end
entry do
td_command 'gsX'
name 'Drops all the stashed states'
notes 'git-stash-clear-interactive'
end
entry do
td_command 'gsl'
name 'Lists stashed states'
notes 'git stash list'
end
entry do
td_command 'gsL'
name 'Lists dropped stashed states'
notes 'git-stash-dropped'
end
entry do
td_command 'gsd'
name 'Displays changes between the stash and its original parent'
notes 'git stash show --patch --stat'
end
entry do
td_command 'gsp'
name 'Removes and applies a single stashed state from the stash list'
notes 'git stash pop'
end
entry do
td_command 'gsr'
name 'Recovers a given stashed state'