summaryrefslogtreecommitdiffstats
path: root/man7/giteveryday.7
blob: 5eb52aad5cb23aa3c7ce1420ad72cf34599aabf9 (plain)
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
'\" t
.\"     Title: giteveryday
.\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\"      Date: 2024-04-12
.\"    Manual: Git Manual
.\"    Source: Git 2.44.0.591.g8f7582d995
.\"  Language: English
.\"
.TH "GITEVERYDAY" "7" "2024\-04\-12" "Git 2\&.44\&.0\&.591\&.g8f7582" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el       .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
giteveryday \- A useful minimum set of commands for Everyday Git
.SH "SYNOPSIS"
.sp
Everyday Git With 20 Commands Or So
.SH "DESCRIPTION"
.sp
Git users can broadly be grouped into four categories for the purposes of describing here a small set of useful commands for everyday Git\&.
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
Individual Developer (Standalone)
commands are essential for anybody who makes a commit, even for somebody who works alone\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
If you work with other people, you will need commands listed in the
Individual Developer (Participant)
section as well\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
People who play the
Integrator
role need to learn some more commands in addition to the above\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
Repository Administration
commands are for system administrators who are responsible for the care and feeding of Git repositories\&.
.RE
.SH "INDIVIDUAL DEVELOPER (STANDALONE)"
.sp
A standalone individual developer does not exchange patches with other people, and works alone in a single repository, using the following commands\&.
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-init\fR(1)
to create a new repository\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-log\fR(1)
to see what happened\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-switch\fR(1)
and
\fBgit-branch\fR(1)
to switch branches\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-add\fR(1)
to manage the index file\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-diff\fR(1)
and
\fBgit-status\fR(1)
to see what you are in the middle of doing\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-commit\fR(1)
to advance the current branch\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-restore\fR(1)
to undo changes\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-merge\fR(1)
to merge between local branches\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-rebase\fR(1)
to maintain topic branches\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-tag\fR(1)
to mark a known point\&.
.RE
.SS "Examples"
.PP
Use a tarball as a starting point for a new repository\&.
.RS 4
.sp
.if n \{\
.RS 4
.\}
.nf
$ tar zxf frotz\&.tar\&.gz
$ cd frotz
$ git init
$ git add \&. \fB(1)\fR
$ git commit \-m "import of frotz source tree\&."
$ git tag v2\&.43 \fB(2)\fR
.fi
.if n \{\
.RE
.\}
.sp
.TS
tab(:);
r lw(\n(.lu*75u/100u).
\fB1.\fR\h'-2n':T{
add everything under the current directory\&.
T}
\fB2.\fR\h'-2n':T{
make a lightweight, unannotated tag\&.
T}
.TE
.RE
.PP
Create a topic branch and develop\&.
.RS 4
.sp
.if n \{\
.RS 4
.\}
.nf
$ git switch \-c alsa\-audio \fB(1)\fR
$ edit/compile/test
$ git restore curses/ux_audio_oss\&.c \fB(2)\fR
$ git add curses/ux_audio_alsa\&.c \fB(3)\fR
$ edit/compile/test
$ git diff HEAD \fB(4)\fR
$ git commit \-a \-s \fB(5)\fR
$ edit/compile/test
$ git diff HEAD^ \fB(6)\fR
$ git commit \-a \-\-amend \fB(7)\fR
$ git switch master \fB(8)\fR
$ git merge alsa\-audio \fB(9)\fR
$ git log \-\-since=\*(Aq3 days ago\*(Aq \fB(10)\fR
$ git log v2\&.43\&.\&. curses/ \fB(11)\fR
.fi
.if n \{\
.RE
.\}
.sp
.TS
tab(:);
r lw(\n(.lu*75u/100u).
\fB1.\fR\h'-2n':T{
create a new topic branch\&.
T}
\fB2.\fR\h'-2n':T{
revert your botched changes in
\fBcurses/ux_audio_oss\&.c\fR\&.
T}
\fB3.\fR\h'-2n':T{
you need to tell Git if you added a new file; removal and modification will be caught if you do
\fBgit commit \-a\fR
later\&.
T}
\fB4.\fR\h'-2n':T{
to see what changes you are committing\&.
T}
\fB5.\fR\h'-2n':T{
commit everything, as you have tested, with your sign\-off\&.
T}
\fB6.\fR\h'-2n':T{
look at all your changes including the previous commit\&.
T}
\fB7.\fR\h'-2n':T{
amend the previous commit, adding all your new changes, using your original message\&.
T}
\fB8.\fR\h'-2n':T{
switch to the master branch\&.
T}
\fB9.\fR\h'-2n':T{
merge a topic branch into your master branch\&.
T}
\fB10.\fR\h'-2n':T{
review commit logs; other forms to limit output can be combined and include
\fB\-10\fR
(to show up to 10 commits),
\fB\-\-until=2005\-12\-10\fR, etc\&.
T}
\fB11.\fR\h'-2n':T{
view only the changes that touch what\(cqs in
\fBcurses/\fR
directory, since
\fBv2\&.43\fR
tag\&.
T}
.TE
.RE
.SH "INDIVIDUAL DEVELOPER (PARTICIPANT)"
.sp
A developer working as a participant in a group project needs to learn how to communicate with others, and uses these commands in addition to the ones needed by a standalone developer\&.
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-clone\fR(1)
from the upstream to prime your local repository\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-pull\fR(1)
and
\fBgit-fetch\fR(1)
from "origin" to keep up\-to\-date with the upstream\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-push\fR(1)
to shared repository, if you adopt CVS style shared repository workflow\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-format-patch\fR(1)
to prepare e\-mail submission, if you adopt Linux kernel\-style public forum workflow\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-send-email\fR(1)
to send your e\-mail submission without corruption by your MUA\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-request-pull\fR(1)
to create a summary of changes for your upstream to pull\&.
.RE
.SS "Examples"
.PP
Clone the upstream and work on it\&. Feed changes to upstream\&.
.RS 4
.sp
.if n \{\
.RS 4
.\}
.nf
$ git clone git://git\&.kernel\&.org/pub/scm/\&.\&.\&./torvalds/linux\-2\&.6 my2\&.6
$ cd my2\&.6
$ git switch \-c mine master \fB(1)\fR
$ edit/compile/test; git commit \-a \-s \fB(2)\fR
$ git format\-patch master \fB(3)\fR
$ git send\-email \-\-to="person <email@example\&.com>" 00*\&.patch \fB(4)\fR
$ git switch master \fB(5)\fR
$ git pull \fB(6)\fR
$ git log \-p ORIG_HEAD\&.\&. arch/i386 include/asm\-i386 \fB(7)\fR
$ git ls\-remote \-\-heads http://git\&.kernel\&.org/\&.\&.\&./jgarzik/libata\-dev\&.git \fB(8)\fR
$ git pull git://git\&.kernel\&.org/pub/\&.\&.\&./jgarzik/libata\-dev\&.git ALL \fB(9)\fR
$ git reset \-\-hard ORIG_HEAD \fB(10)\fR
$ git gc \fB(11)\fR
.fi
.if n \{\
.RE
.\}
.sp
.TS
tab(:);
r lw(\n(.lu*75u/100u).
\fB1.\fR\h'-2n':T{
checkout a new branch
\fBmine\fR
from master\&.
T}
\fB2.\fR\h'-2n':T{
repeat as needed\&.
T}
\fB3.\fR\h'-2n':T{
extract patches from your branch, relative to master,
T}
\fB4.\fR\h'-2n':T{
and email them\&.
T}
\fB5.\fR\h'-2n':T{
return to
\fBmaster\fR, ready to see what\(cqs new
T}
\fB6.\fR\h'-2n':T{
\fBgit pull\fR
fetches from
\fBorigin\fR
by default and merges into the current branch\&.
T}
\fB7.\fR\h'-2n':T{
immediately after pulling, look at the changes done upstream since last time we checked, only in the area we are interested in\&.
T}
\fB8.\fR\h'-2n':T{
check the branch names in an external repository (if not known)\&.
T}
\fB9.\fR\h'-2n':T{
fetch from a specific branch
\fBALL\fR
from a specific repository and merge it\&.
T}
\fB10.\fR\h'-2n':T{
revert the pull\&.
T}
\fB11.\fR\h'-2n':T{
garbage collect leftover objects from reverted pull\&.
T}
.TE
.RE
.PP
Push into another repository\&.
.RS 4
.sp
.if n \{\
.RS 4
.\}
.nf
satellite$ git clone mothership:frotz frotz \fB(1)\fR
satellite$ cd frotz
satellite$ git config \-\-get\-regexp \*(Aq^(remote|branch)\e\&.\*(Aq \fB(2)\fR
remote\&.origin\&.url mothership:frotz
remote\&.origin\&.fetch refs/heads/*:refs/remotes/origin/*
branch\&.master\&.remote origin
branch\&.master\&.merge refs/heads/master
satellite$ git config remote\&.origin\&.push \e
           +refs/heads/*:refs/remotes/satellite/* \fB(3)\fR
satellite$ edit/compile/test/commit
satellite$ git push origin \fB(4)\fR

mothership$ cd frotz
mothership$ git switch master
mothership$ git merge satellite/master \fB(5)\fR
.fi
.if n \{\
.RE
.\}
.sp
.TS
tab(:);
r lw(\n(.lu*75u/100u).
\fB1.\fR\h'-2n':T{
mothership machine has a frotz repository under your home directory; clone from it to start a repository on the satellite machine\&.
T}
\fB2.\fR\h'-2n':T{
clone sets these configuration variables by default\&. It arranges
\fBgit pull\fR
to fetch and store the branches of mothership machine to local
\fBremotes/origin/*\fR
remote\-tracking branches\&.
T}
\fB3.\fR\h'-2n':T{
arrange
\fBgit push\fR
to push all local branches to their corresponding branch of the mothership machine\&.
T}
\fB4.\fR\h'-2n':T{
push will stash all our work away on
\fBremotes/satellite/*\fR
remote\-tracking branches on the mothership machine\&. You could use this as a back\-up method\&. Likewise, you can pretend that mothership "fetched" from you (useful when access is one sided)\&.
T}
\fB5.\fR\h'-2n':T{
on mothership machine, merge the work done on the satellite machine into the master branch\&.
T}
.TE
.RE
.PP
Branch off of a specific tag\&.
.RS 4
.sp
.if n \{\
.RS 4
.\}
.nf
$ git switch \-c private2\&.6\&.14 v2\&.6\&.14 \fB(1)\fR
$ edit/compile/test; git commit \-a
$ git checkout master
$ git cherry\-pick v2\&.6\&.14\&.\&.private2\&.6\&.14 \fB(2)\fR
.fi
.if n \{\
.RE
.\}
.sp
.TS
tab(:);
r lw(\n(.lu*75u/100u).
\fB1.\fR\h'-2n':T{
create a private branch based on a well known (but somewhat behind) tag\&.
T}
\fB2.\fR\h'-2n':T{
forward port all changes in
\fBprivate2\&.6\&.14\fR
branch to
\fBmaster\fR
branch without a formal "merging"\&. Or longhand

\fBgit format\-patch \-k \-m \-\-stdout v2\&.6\&.14\&.\&.private2\&.6\&.14 | git am \-3 \-k\fR
T}
.TE
.RE
.sp
An alternate participant submission mechanism is using the \fBgit request\-pull\fR or pull\-request mechanisms (e\&.g\&. as used on GitHub (www\&.github\&.com) to notify your upstream of your contribution\&.
.SH "INTEGRATOR"
.sp
A fairly central person acting as the integrator in a group project receives changes made by others, reviews and integrates them and publishes the result for others to use, using these commands in addition to the ones needed by participants\&.
.sp
This section can also be used by those who respond to \fBgit request\-pull\fR or pull\-request on GitHub (www\&.github\&.com) to integrate the work of others into their history\&. A sub\-area lieutenant for a repository will act both as a participant and as an integrator\&.
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-am\fR(1)
to apply patches e\-mailed in from your contributors\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-pull\fR(1)
to merge from your trusted lieutenants\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-format-patch\fR(1)
to prepare and send suggested alternative to contributors\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-revert\fR(1)
to undo botched commits\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-push\fR(1)
to publish the bleeding edge\&.
.RE
.SS "Examples"
.PP
A typical integrator\(cqs Git day\&.
.RS 4
.sp
.if n \{\
.RS 4
.\}
.nf
$ git status \fB(1)\fR
$ git branch \-\-no\-merged master \fB(2)\fR
$ mailx \fB(3)\fR
& s 2 3 4 5 \&./+to\-apply
& s 7 8 \&./+hold\-linus
& q
$ git switch \-c topic/one master
$ git am \-3 \-i \-s \&./+to\-apply \fB(4)\fR
$ compile/test
$ git switch \-c hold/linus && git am \-3 \-i \-s \&./+hold\-linus \fB(5)\fR
$ git switch topic/one && git rebase master \fB(6)\fR
$ git switch \-C seen next \fB(7)\fR
$ git merge topic/one topic/two && git merge hold/linus \fB(8)\fR
$ git switch maint
$ git cherry\-pick master~4 \fB(9)\fR
$ compile/test
$ git tag \-s \-m "GIT 0\&.99\&.9x" v0\&.99\&.9x \fB(10)\fR
$ git fetch ko && for branch in master maint next seen \fB(11)\fR
    do
        git show\-branch ko/$branch $branch \fB(12)\fR
    done
$ git push \-\-follow\-tags ko \fB(13)\fR
.fi
.if n \{\
.RE
.\}
.sp
.TS
tab(:);
r lw(\n(.lu*75u/100u).
\fB1.\fR\h'-2n':T{
see what you were in the middle of doing, if anything\&.
T}
\fB2.\fR\h'-2n':T{
see which branches haven\(cqt been merged into
\fBmaster\fR
yet\&. Likewise for any other integration branches e\&.g\&.
\fBmaint\fR,
\fBnext\fR
and
\fBseen\fR\&.
T}
\fB3.\fR\h'-2n':T{
read mails, save ones that are applicable, and save others that are not quite ready (other mail readers are available)\&.
T}
\fB4.\fR\h'-2n':T{
apply them, interactively, with your sign\-offs\&.
T}
\fB5.\fR\h'-2n':T{
create topic branch as needed and apply, again with sign\-offs\&.
T}
\fB6.\fR\h'-2n':T{
rebase internal topic branch that has not been merged to the master or exposed as a part of a stable branch\&.
T}
\fB7.\fR\h'-2n':T{
restart
\fBseen\fR
every time from the next\&.
T}
\fB8.\fR\h'-2n':T{
and bundle topic branches still cooking\&.
T}
\fB9.\fR\h'-2n':T{
backport a critical fix\&.
T}
\fB10.\fR\h'-2n':T{
create a signed tag\&.
T}
\fB11.\fR\h'-2n':T{
make sure master was not accidentally rewound beyond that already pushed out\&.
T}
\fB12.\fR\h'-2n':T{
In the output from
\fBgit show\-branch\fR,
\fBmaster\fR
should have everything
\fBko/master\fR
has, and
\fBnext\fR
should have everything
\fBko/next\fR
has, etc\&.
T}
\fB13.\fR\h'-2n':T{
push out the bleeding edge, together with new tags that point into the pushed history\&.
T}
.TE
.RE
.sp
In this example, the \fBko\fR shorthand points at the Git maintainer\(cqs repository at kernel\&.org, and looks like this:
.sp
.if n \{\
.RS 4
.\}
.nf
(in \&.git/config)
[remote "ko"]
        url = kernel\&.org:/pub/scm/git/git\&.git
        fetch = refs/heads/*:refs/remotes/ko/*
        push = refs/heads/master
        push = refs/heads/next
        push = +refs/heads/seen
        push = refs/heads/maint
.fi
.if n \{\
.RE
.\}
.sp
.SH "REPOSITORY ADMINISTRATION"
.sp
A repository administrator uses the following tools to set up and maintain access to the repository by developers\&.
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-daemon\fR(1)
to allow anonymous download from repository\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-shell\fR(1)
can be used as a
\fIrestricted login shell\fR
for shared central repository users\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgit-http-backend\fR(1)
provides a server side implementation of Git\-over\-HTTP ("Smart http") allowing both fetch and push services\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fBgitweb\fR(1)
provides a web front\-end to Git repositories, which can be set\-up using the
\fBgit-instaweb\fR(1)
script\&.
.RE
.sp
\m[blue]\fBupdate hook howto\fR\m[]\&\s-2\u[1]\d\s+2 has a good example of managing a shared central repository\&.
.sp
In addition there are a number of other widely deployed hosting, browsing and reviewing solutions such as:
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
gitolite, gerrit code review, cgit and others\&.
.RE
.SS "Examples"
.PP
We assume the following in /etc/services
.RS 4
.sp
.if n \{\
.RS 4
.\}
.nf
$ grep 9418 /etc/services
git             9418/tcp                # Git Version Control System
.fi
.if n \{\
.RE
.\}
.sp
.RE
.PP
Run git\-daemon to serve /pub/scm from inetd\&.
.RS 4
.sp
.if n \{\
.RS 4
.\}
.nf
$ grep git /etc/inetd\&.conf
git     stream  tcp     nowait  nobody \e
  /usr/bin/git\-daemon git\-daemon \-\-inetd \-\-export\-all /pub/scm
.fi
.if n \{\
.RE
.\}
.sp
The actual configuration line should be on one line\&.
.RE
.PP
Run git\-daemon to serve /pub/scm from xinetd\&.
.RS 4
.sp
.if n \{\
.RS 4
.\}
.nf
$ cat /etc/xinetd\&.d/git\-daemon
# default: off
# description: The Git server offers access to Git repositories
service git
{
        disable = no
        type            = UNLISTED
        port            = 9418
        socket_type     = stream
        wait            = no
        user            = nobody
        server          = /usr/bin/git\-daemon
        server_args     = \-\-inetd \-\-export\-all \-\-base\-path=/pub/scm
        log_on_failure  += USERID
}
.fi
.if n \{\
.RE
.\}
.sp
Check your xinetd(8) documentation and setup, this is from a Fedora system\&. Others might be different\&.
.RE
.PP
Give push/pull only access to developers using git\-over\-ssh\&.
.RS 4
e\&.g\&. those using:
\fB$ git push/pull ssh://host\&.xz/pub/scm/project\fR
.sp
.if n \{\
.RS 4
.\}
.nf
$ grep git /etc/passwd \fB(1)\fR
alice:x:1000:1000::/home/alice:/usr/bin/git\-shell
bob:x:1001:1001::/home/bob:/usr/bin/git\-shell
cindy:x:1002:1002::/home/cindy:/usr/bin/git\-shell
david:x:1003:1003::/home/david:/usr/bin/git\-shell
$ grep git /etc/shells \fB(2)\fR
/usr/bin/git\-shell
.fi
.if n \{\
.RE
.\}
.sp
.TS
tab(:);
r lw(\n(.lu*75u/100u).
\fB1.\fR\h'-2n':T{
log\-in shell is set to /usr/bin/git\-shell, which does not allow anything but
\fBgit push\fR
and
\fBgit pull\fR\&. The users require ssh access to the machine\&.
T}
\fB2.\fR\h'-2n':T{
in many distributions /etc/shells needs to list what is used as the login shell\&.
T}
.TE
.RE
.PP
CVS\-style shared repository\&.
.RS 4
.sp
.if n \{\
.RS 4
.\}
.nf
$ grep git /etc/group \fB(1)\fR
git:x:9418:alice,bob,cindy,david
$ cd /home/devo\&.git
$ ls \-l \fB(2)\fR
  lrwxrwxrwx   1 david git    17 Dec  4 22:40 HEAD \-> refs/heads/master
  drwxrwsr\-x   2 david git  4096 Dec  4 22:40 branches
  \-rw\-rw\-r\-\-   1 david git    84 Dec  4 22:40 config
  \-rw\-rw\-r\-\-   1 david git    58 Dec  4 22:40 description
  drwxrwsr\-x   2 david git  4096 Dec  4 22:40 hooks
  \-rw\-rw\-r\-\-   1 david git 37504 Dec  4 22:40 index
  drwxrwsr\-x   2 david git  4096 Dec  4 22:40 info
  drwxrwsr\-x   4 david git  4096 Dec  4 22:40 objects
  drwxrwsr\-x   4 david git  4096 Nov  7 14:58 refs
  drwxrwsr\-x   2 david git  4096 Dec  4 22:40 remotes
$ ls \-l hooks/update \fB(3)\fR
  \-r\-xr\-xr\-x   1 david git  3536 Dec  4 22:40 update
$ cat info/allowed\-users \fB(4)\fR
refs/heads/master       alice\e|cindy
refs/heads/doc\-update   bob
refs/tags/v[0\-9]*       david
.fi
.if n \{\
.RE
.\}
.sp
.TS
tab(:);
r lw(\n(.lu*75u/100u).
\fB1.\fR\h'-2n':T{
place the developers into the same git group\&.
T}
\fB2.\fR\h'-2n':T{
and make the shared repository writable by the group\&.
T}
\fB3.\fR\h'-2n':T{
use update\-hook example by Carl from Documentation/howto/ for branch policy control\&.
T}
\fB4.\fR\h'-2n':T{
alice and cindy can push into master, only bob can push into doc\-update\&. david is the release manager and is the only person who can create and push version tags\&.
T}
.TE
.RE
.SH "GIT"
.sp
Part of the \fBgit\fR(1) suite
.SH "NOTES"
.IP " 1." 4
update hook howto
.RS 4
\%git-htmldocs/howto/update-hook-example.html
.RE