-
Notifications
You must be signed in to change notification settings - Fork 105
/
gitless.1
664 lines (482 loc) · 16.6 KB
/
gitless.1
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
.TH gitless "1" Manual
.SH NAME
gl
.SH SYNOPSIS
.B gl
[-h] [--version] {track,tr,untrack,un,status,st,diff,df,commit,ci,branch,br,tag,tg,checkout,co,merge,mg,resolve,rs,fuse,fs,remote,rt,publish,pb,switch,sw,init,in,history,hs} ...
.SH DESCRIPTION
Gitless: a version control system built on top of Git.
More info, downloads and documentation at http://gitless.com
.SH OPTIONS
.TP
\fB\-\-version\fR
show program's version number and exit
.SS
\fBSub-commands\fR
.TP
\fBgl\fR \fI\,track\/\fR
start tracking changes to files
.TP
\fBgl\fR \fI\,untrack\/\fR
stop tracking changes to files
.TP
\fBgl\fR \fI\,status\/\fR
show status of the repo
.TP
\fBgl\fR \fI\,diff\/\fR
show changes to files
.TP
\fBgl\fR \fI\,commit\/\fR
save changes to the local repository
.TP
\fBgl\fR \fI\,branch\/\fR
list, create, delete, or edit branches
.TP
\fBgl\fR \fI\,tag\/\fR
list, create, or delete tags
.TP
\fBgl\fR \fI\,checkout\/\fR
checkout committed versions of files
.TP
\fBgl\fR \fI\,merge\/\fR
merge the divergent changes of one branch onto another
.TP
\fBgl\fR \fI\,resolve\/\fR
mark files with conflicts as resolved
.TP
\fBgl\fR \fI\,fuse\/\fR
fuse the divergent changes of a branch onto the current branch
.TP
\fBgl\fR \fI\,remote\/\fR
list, create, edit or delete remotes
.TP
\fBgl\fR \fI\,publish\/\fR
publish commits upstream
.TP
\fBgl\fR \fI\,switch\/\fR
switch branches
.TP
\fBgl\fR \fI\,init\/\fR
create an empty git repository or clone remote
.TP
\fBgl\fR \fI\,history\/\fR
show commit history
.SH OPTIONS 'gl track'
usage: gl track [-h] files [files ...]
Start tracking changes to files
.TP
\fBfiles\fR
the file(s) to track
.SH OPTIONS 'gl tr'
usage: gl track [-h] files [files ...]
Start tracking changes to files
.TP
\fBfiles\fR
the file(s) to track
.SH OPTIONS 'gl untrack'
usage: gl untrack [-h] files [files ...]
Stop tracking changes to files
.TP
\fBfiles\fR
the file(s) to untrack
.SH OPTIONS 'gl un'
usage: gl untrack [-h] files [files ...]
Stop tracking changes to files
.TP
\fBfiles\fR
the file(s) to untrack
.SH OPTIONS 'gl status'
usage: gl status [-h] [paths [paths ...]]
Show status of the repo
.TP
\fBpaths\fR
the specific path(s) to status
.SH OPTIONS 'gl st'
usage: gl status [-h] [paths [paths ...]]
Show status of the repo
.TP
\fBpaths\fR
the specific path(s) to status
.SH OPTIONS 'gl diff'
usage: gl diff [-h] [-e file [file ...]] [-i file [file ...]]
[file [file ...]]
Show changes to files. By default all tracked modified files are diffed. To customize the set of files to diff use the only, exclude, and include flags
.TP
\fBfile\fR
use only files given (tracked modified or untracked)
.TP
\fB\-e\fR file [file ...], \fB\-\-exclude\fR file [file ...]
exclude files given (files must be tracked modified)
.TP
\fB\-i\fR file [file ...], \fB\-\-include\fR file [file ...]
include files given (files must be untracked)
.SH OPTIONS 'gl df'
usage: gl diff [-h] [-e file [file ...]] [-i file [file ...]]
[file [file ...]]
Show changes to files. By default all tracked modified files are diffed. To customize the set of files to diff use the only, exclude, and include flags
.TP
\fBfile\fR
use only files given (tracked modified or untracked)
.TP
\fB\-e\fR file [file ...], \fB\-\-exclude\fR file [file ...]
exclude files given (files must be tracked modified)
.TP
\fB\-i\fR file [file ...], \fB\-\-include\fR file [file ...]
include files given (files must be untracked)
.SH OPTIONS 'gl commit'
usage: gl commit [-h] [-m M] [-p] [-e file [file ...]]
[-i file [file ...]]
[file [file ...]]
Save changes to the local repository. By default all tracked modified files are committed. To customize the set of files to be committed use the only, exclude, and include flags
.TP
\fBfile\fR
use only files given (tracked modified or untracked)
.TP
\fB\-m\fR \fI\,M\/\fR, \fB\-\-message\fR \fI\,M\/\fR
Commit message
.TP
\fB\-p\fR, \fB\-\-partial\fR
Interactively select segments of files to commit
.TP
\fB\-e\fR file [file ...], \fB\-\-exclude\fR file [file ...]
exclude files given (files must be tracked modified)
.TP
\fB\-i\fR file [file ...], \fB\-\-include\fR file [file ...]
include files given (files must be untracked)
.SH OPTIONS 'gl ci'
usage: gl commit [-h] [-m M] [-p] [-e file [file ...]]
[-i file [file ...]]
[file [file ...]]
Save changes to the local repository. By default all tracked modified files are committed. To customize the set of files to be committed use the only, exclude, and include flags
.TP
\fBfile\fR
use only files given (tracked modified or untracked)
.TP
\fB\-m\fR \fI\,M\/\fR, \fB\-\-message\fR \fI\,M\/\fR
Commit message
.TP
\fB\-p\fR, \fB\-\-partial\fR
Interactively select segments of files to commit
.TP
\fB\-e\fR file [file ...], \fB\-\-exclude\fR file [file ...]
exclude files given (files must be tracked modified)
.TP
\fB\-i\fR file [file ...], \fB\-\-include\fR file [file ...]
include files given (files must be untracked)
.SH OPTIONS 'gl branch'
usage: gl branch [-h] [-r] [-v] [-c branch [branch ...]]
[-dp DP] [-d branch [branch ...]]
[-sh commit_id] [-su branch] [-uu]
[-rn RENAME_B [RENAME_B ...]]
List, create, delete, or edit branches
.TP
\fB\-r\fR, \fB\-\-remote\fR
list remote branches in addition to local branches
.TP
\fB\-v\fR, \fB\-\-verbose\fR
be verbose, will output the head of each branch
.TP
\fB\-c\fR branch [branch ...], \fB\-\-create\fR branch [branch ...]
create branch(es)
.TP
\fB\-dp\fR \fI\,DP\/\fR, \fB\-\-divergent\-point\fR \fI\,DP\/\fR
the commit from where to 'branch out' (only relevant if a new branch is created; defaults to HEAD)
.TP
\fB\-d\fR branch [branch ...], \fB\-\-delete\fR branch [branch ...]
delete branch(es)
.TP
\fB\-sh\fR commit_id, \fB\-\-set\-head\fR commit_id
set the head of the current branch
.TP
\fB\-su\fR branch, \fB\-\-set\-upstream\fR branch
set the upstream branch of the current branch
.TP
\fB\-uu\fR, \fB\-\-unset\-upstream\fR
unset the upstream branch of the current branch
.TP
\fB\-rn\fR \fI\,RENAME_B\/\fR [\fI\,RENAME_B\/\fR ...], \fB\-\-rename\-branch\fR \fI\,RENAME_B\/\fR [\fI\,RENAME_B\/\fR ...]
renames the current branch (gl branch \-rn new_name) or another specified branch (gl branch \-rn branch_name new_name)
.SH OPTIONS 'gl br'
usage: gl branch [-h] [-r] [-v] [-c branch [branch ...]]
[-dp DP] [-d branch [branch ...]]
[-sh commit_id] [-su branch] [-uu]
[-rn RENAME_B [RENAME_B ...]]
List, create, delete, or edit branches
.TP
\fB\-r\fR, \fB\-\-remote\fR
list remote branches in addition to local branches
.TP
\fB\-v\fR, \fB\-\-verbose\fR
be verbose, will output the head of each branch
.TP
\fB\-c\fR branch [branch ...], \fB\-\-create\fR branch [branch ...]
create branch(es)
.TP
\fB\-dp\fR \fI\,DP\/\fR, \fB\-\-divergent\-point\fR \fI\,DP\/\fR
the commit from where to 'branch out' (only relevant if a new branch is created; defaults to HEAD)
.TP
\fB\-d\fR branch [branch ...], \fB\-\-delete\fR branch [branch ...]
delete branch(es)
.TP
\fB\-sh\fR commit_id, \fB\-\-set\-head\fR commit_id
set the head of the current branch
.TP
\fB\-su\fR branch, \fB\-\-set\-upstream\fR branch
set the upstream branch of the current branch
.TP
\fB\-uu\fR, \fB\-\-unset\-upstream\fR
unset the upstream branch of the current branch
.TP
\fB\-rn\fR \fI\,RENAME_B\/\fR [\fI\,RENAME_B\/\fR ...], \fB\-\-rename\-branch\fR \fI\,RENAME_B\/\fR [\fI\,RENAME_B\/\fR ...]
renames the current branch (gl branch \-rn new_name) or another specified branch (gl branch \-rn branch_name new_name)
.SH OPTIONS 'gl tag'
usage: gl tag [-h] [-r] [-c tag [tag ...]] [-ci CI]
[-d tag [tag ...]]
List, create, or delete tags
.TP
\fB\-r\fR, \fB\-\-remote\fR
list remote tags in addition to local tags
.TP
\fB\-c\fR tag [tag ...], \fB\-\-create\fR tag [tag ...]
create tag(s)
.TP
\fB\-ci\fR \fI\,CI\/\fR, \fB\-\-commit\fR \fI\,CI\/\fR
the commit to tag (only relevant if a new tag is created; defaults to the HEAD commit)
.TP
\fB\-d\fR tag [tag ...], \fB\-\-delete\fR tag [tag ...]
delete tag(s)
.SH OPTIONS 'gl tg'
usage: gl tag [-h] [-r] [-c tag [tag ...]] [-ci CI]
[-d tag [tag ...]]
List, create, or delete tags
.TP
\fB\-r\fR, \fB\-\-remote\fR
list remote tags in addition to local tags
.TP
\fB\-c\fR tag [tag ...], \fB\-\-create\fR tag [tag ...]
create tag(s)
.TP
\fB\-ci\fR \fI\,CI\/\fR, \fB\-\-commit\fR \fI\,CI\/\fR
the commit to tag (only relevant if a new tag is created; defaults to the HEAD commit)
.TP
\fB\-d\fR tag [tag ...], \fB\-\-delete\fR tag [tag ...]
delete tag(s)
.SH OPTIONS 'gl checkout'
usage: gl checkout [-h] [-cp CP] files [files ...]
Checkout committed versions of files
.TP
\fBfiles\fR
the file(s) to checkout
.TP
\fB\-cp\fR \fI\,CP\/\fR, \fB\-\-commit\-point\fR \fI\,CP\/\fR
the commit point to checkout the files at. Defaults to HEAD.
.SH OPTIONS 'gl co'
usage: gl checkout [-h] [-cp CP] files [files ...]
Checkout committed versions of files
.TP
\fBfiles\fR
the file(s) to checkout
.TP
\fB\-cp\fR \fI\,CP\/\fR, \fB\-\-commit\-point\fR \fI\,CP\/\fR
the commit point to checkout the files at. Defaults to HEAD.
.SH OPTIONS 'gl merge'
usage: gl merge [-h] [-a] [src]
Merge the divergent changes of one branch onto another
.TP
\fBsrc\fR
the source branch to read changes from
.TP
\fB\-a\fR, \fB\-\-abort\fR
abort the merge in progress
.SH OPTIONS 'gl mg'
usage: gl merge [-h] [-a] [src]
Merge the divergent changes of one branch onto another
.TP
\fBsrc\fR
the source branch to read changes from
.TP
\fB\-a\fR, \fB\-\-abort\fR
abort the merge in progress
.SH OPTIONS 'gl resolve'
usage: gl resolve [-h] files [files ...]
Mark files with conflicts as resolved
.TP
\fBfiles\fR
the file(s) to resolve
.SH OPTIONS 'gl rs'
usage: gl resolve [-h] files [files ...]
Mark files with conflicts as resolved
.TP
\fBfiles\fR
the file(s) to resolve
.SH OPTIONS 'gl fuse'
usage: gl fuse [-h] [-o commit_id [commit_id ...]]
[-e commit_id [commit_id ...]] [-ip [commit_id]]
[-a]
[src]
Fuse the divergent changes of a branch onto the current branch. By default all divergent changes from the given source branch are fused. To customize the set of commits to fuse use the only and exclude flags
.TP
\fBsrc\fR
the source branch to read changes from. If none is given the upstream branch of the current branch is used as the source
.TP
\fB\-o\fR commit_id [commit_id ...], \fB\-\-only\fR commit_id [commit_id ...]
fuse only the commits given (commits must belong to the set of divergent commits from the given src branch)
.TP
\fB\-e\fR commit_id [commit_id ...], \fB\-\-exclude\fR commit_id [commit_id ...]
exclude from the fuse the commits given (commits must belong to the set of divergent commits from the given src branch)
.TP
\fB\-ip\fR [commit_id], \fB\-\-insertion\-point\fR [commit_id]
the divergent changes will be inserted after the commit given, dp for divergent point is the default
.TP
\fB\-a\fR, \fB\-\-abort\fR
abort the fuse in progress
.SH OPTIONS 'gl fs'
usage: gl fuse [-h] [-o commit_id [commit_id ...]]
[-e commit_id [commit_id ...]] [-ip [commit_id]]
[-a]
[src]
Fuse the divergent changes of a branch onto the current branch. By default all divergent changes from the given source branch are fused. To customize the set of commits to fuse use the only and exclude flags
.TP
\fBsrc\fR
the source branch to read changes from. If none is given the upstream branch of the current branch is used as the source
.TP
\fB\-o\fR commit_id [commit_id ...], \fB\-\-only\fR commit_id [commit_id ...]
fuse only the commits given (commits must belong to the set of divergent commits from the given src branch)
.TP
\fB\-e\fR commit_id [commit_id ...], \fB\-\-exclude\fR commit_id [commit_id ...]
exclude from the fuse the commits given (commits must belong to the set of divergent commits from the given src branch)
.TP
\fB\-ip\fR [commit_id], \fB\-\-insertion\-point\fR [commit_id]
the divergent changes will be inserted after the commit given, dp for divergent point is the default
.TP
\fB\-a\fR, \fB\-\-abort\fR
abort the fuse in progress
.SH OPTIONS 'gl remote'
usage: gl remote [-h] [-c [remote]] [-d remote [remote ...]]
[-rn RENAME_R [RENAME_R ...]]
[remote_url]
List, create, edit or delete remotes
.TP
\fBremote_url\fR
the url of the remote (only relevant if a new remote is created)
.TP
\fB\-c\fR [remote], \fB\-\-create\fR [remote]
create remote
.TP
\fB\-d\fR remote [remote ...], \fB\-\-delete\fR remote [remote ...]
delete remote(es)
.TP
\fB\-rn\fR \fI\,RENAME_R\/\fR [\fI\,RENAME_R\/\fR ...], \fB\-\-rename\fR \fI\,RENAME_R\/\fR [\fI\,RENAME_R\/\fR ...]
renames the specified remote: accepts two arguments (current remote name and new remote name)
.SH OPTIONS 'gl rt'
usage: gl remote [-h] [-c [remote]] [-d remote [remote ...]]
[-rn RENAME_R [RENAME_R ...]]
[remote_url]
List, create, edit or delete remotes
.TP
\fBremote_url\fR
the url of the remote (only relevant if a new remote is created)
.TP
\fB\-c\fR [remote], \fB\-\-create\fR [remote]
create remote
.TP
\fB\-d\fR remote [remote ...], \fB\-\-delete\fR remote [remote ...]
delete remote(es)
.TP
\fB\-rn\fR \fI\,RENAME_R\/\fR [\fI\,RENAME_R\/\fR ...], \fB\-\-rename\fR \fI\,RENAME_R\/\fR [\fI\,RENAME_R\/\fR ...]
renames the specified remote: accepts two arguments (current remote name and new remote name)
.SH OPTIONS 'gl publish'
usage: gl publish [-h] [dst]
Publish commits upstream
.TP
\fBdst\fR
the branch where to publish commits
.SH OPTIONS 'gl pb'
usage: gl publish [-h] [dst]
Publish commits upstream
.TP
\fBdst\fR
the branch where to publish commits
.SH OPTIONS 'gl switch'
usage: gl switch [-h] [-mo] branch
Switch branches
.TP
\fBbranch\fR
switch to branch
.TP
\fB\-mo\fR, \fB\-\-move\-over\fR
move uncomitted changes made in the current branch to the destination branch
.SH OPTIONS 'gl sw'
usage: gl switch [-h] [-mo] branch
Switch branches
.TP
\fBbranch\fR
switch to branch
.TP
\fB\-mo\fR, \fB\-\-move\-over\fR
move uncomitted changes made in the current branch to the destination branch
.SH OPTIONS 'gl init'
usage: gl init [-h] [-o ONLY [ONLY ...]]
[-e EXCLUDE [EXCLUDE ...]]
[repo]
Create an empty git repository or clone remote
.TP
\fBrepo\fR
an optional remote repo address from where to read to create the local repo
.TP
\fB\-o\fR \fI\,ONLY\/\fR [\fI\,ONLY\/\fR ...], \fB\-\-only\fR \fI\,ONLY\/\fR [\fI\,ONLY\/\fR ...]
use only branches given from remote repo
.TP
\fB\-e\fR \fI\,EXCLUDE\/\fR [\fI\,EXCLUDE\/\fR ...], \fB\-\-exclude\fR \fI\,EXCLUDE\/\fR [\fI\,EXCLUDE\/\fR ...]
use everything but these branches from remote repo
.SH OPTIONS 'gl in'
usage: gl init [-h] [-o ONLY [ONLY ...]]
[-e EXCLUDE [EXCLUDE ...]]
[repo]
Create an empty git repository or clone remote
.TP
\fBrepo\fR
an optional remote repo address from where to read to create the local repo
.TP
\fB\-o\fR \fI\,ONLY\/\fR [\fI\,ONLY\/\fR ...], \fB\-\-only\fR \fI\,ONLY\/\fR [\fI\,ONLY\/\fR ...]
use only branches given from remote repo
.TP
\fB\-e\fR \fI\,EXCLUDE\/\fR [\fI\,EXCLUDE\/\fR ...], \fB\-\-exclude\fR \fI\,EXCLUDE\/\fR [\fI\,EXCLUDE\/\fR ...]
use everything but these branches from remote repo
.SH OPTIONS 'gl history'
usage: gl history [-h] [-v] [-l LIMIT] [-c] [-b [branch_name]]
Show commit history
.TP
\fB\-v\fR, \fB\-\-verbose\fR
be verbose, will output the diffs of the commit
.TP
\fB\-l\fR \fI\,LIMIT\/\fR, \fB\-\-limit\fR \fI\,LIMIT\/\fR
limit number of commits displayed
.TP
\fB\-c\fR, \fB\-\-compact\fR
output history in a compact format
.TP
\fB\-b\fR [branch_name], \fB\-\-branch\fR [branch_name]
the branch to show history of (defaults to the current branch)
.SH OPTIONS 'gl hs'
usage: gl history [-h] [-v] [-l LIMIT] [-c] [-b [branch_name]]
Show commit history
.TP
\fB\-v\fR, \fB\-\-verbose\fR
be verbose, will output the diffs of the commit
.TP
\fB\-l\fR \fI\,LIMIT\/\fR, \fB\-\-limit\fR \fI\,LIMIT\/\fR
limit number of commits displayed
.TP
\fB\-c\fR, \fB\-\-compact\fR
output history in a compact format
.TP
\fB\-b\fR [branch_name], \fB\-\-branch\fR [branch_name]
the branch to show history of (defaults to the current branch)
.SH AUTHORS
.B gitless
was written by Santiago Perez De Rosso <sperezde@csail.mit.edu>.
.SH DISTRIBUTION
The latest version of gitless may be downloaded from
.UR http://gitless.com
.UE