【git技巧】 git help everyday 每天会经常用到的大概20个命令

Everyday Git in twenty commands

【git技巧】 git help everyday 每天会经常用到的大概20个命令-王树东的博客

git help everyday

输入命令后输出如下

GITEVERYDAY(7)                    Git Manual                    GITEVERYDAY(7)

NNAAMMEE
       giteveryday - A useful minimum set of commands for Everyday Git

SSYYNNOOPPSSIISS
       Everyday Git With 20 Commands Or So

DDEESSCCRRIIPPTTIIOONN
       Git users can broadly be grouped into four categories for the purposes
       of describing here a small set of useful command for everyday Git.

       +o   Individual Developer (Standalone) commands are essential for
           anybody who makes a commit, even for somebody who works alone.

       +o   If you work with other people, you will need commands listed in the
           Individual Developer (Participant) section as well.

       +o   People who play the Integrator role need to learn some more
           commands in addition to the above.

       +o   Repository Administration commands are for system administrators
           who are responsible for the care and feeding of Git repositories.

IINNDDIIVVIIDDUUAALL DDEEVVEELLOOPPEERR ((SSTTAANNDDAALLOONNEE))
       A standalone individual developer does not exchange patches with other
       people, and works alone in a single repository, using the following
       commands.

       +o   ggiitt--iinniitt(1) to create a new repository.

       +o   ggiitt--lloogg(1) to see what happened.

       +o   ggiitt--cchheecckkoouutt(1) and ggiitt--bbrraanncchh(1) to switch branches.

       +o   ggiitt--aadddd(1) to manage the index file.

       +o   ggiitt--ddiiffff(1) and ggiitt--ssttaattuuss(1) to see what you are in the middle of
           doing.

       +o   ggiitt--ccoommmmiitt(1) to advance the current branch.

       +o   ggiitt--rreesseett(1) and ggiitt--cchheecckkoouutt(1) (with pathname parameters) to undo
           changes.

       +o   ggiitt--mmeerrggee(1) to merge between local branches.

       +o   ggiitt--rreebbaassee(1) to maintain topic branches.

       +o   ggiitt--ttaagg(1) to mark a known point.

   EExxaammpplleess
       Use a tarball as a starting point for a new repository.

               $ tar zxf frotz.tar.gz
               $ cd frotz
               $ git init
               $ git add . ((11))
               $ git commit -m "import of frotz source tree."
               $ git tag v2.43 ((22))

           11.. add everything under the current directory.
           22.. make a lightweight, unannotated tag.

       Create a topic branch and develop.

               $ git checkout -b alsa-audio ((11))
               $ edit/compile/test
               $ git checkout -- curses/ux_audio_oss.c ((22))
               $ git add curses/ux_audio_alsa.c ((33))
               $ edit/compile/test
               $ git diff HEAD ((44))
               $ git commit -a -s ((55))
               $ edit/compile/test
               $ git diff HEAD^ ((66))
               $ git commit -a --amend ((77))
               $ git checkout master ((88))
               $ git merge alsa-audio ((99))
               $ git log --since='3 days ago' ((1100))
               $ git log v2.43.. curses/ ((1111))

           11.. create a new topic branch.
           22.. revert your botched changes in ccuurrsseess//uuxx__aauuddiioo__oossss..cc.
           33.. you need to tell Git if you added a new file; removal and
           modification will be caught if you do ggiitt ccoommmmiitt --aa later.
           44.. to see what changes you are committing.
           55.. commit everything, as you have tested, with your sign-off.
           66.. look at all your changes including the previous commit.
           77.. amend the previous commit, adding all your new changes, using
           your original message.
           88.. switch to the master branch.
           99.. merge a topic branch into your master branch.
           1100.. review commit logs; other forms to limit output can be combined
           and include --1100 (to show up to 10 commits), ----uunnttiill==22000055--1122--1100,
           etc.
           1111.. view only the changes that touch what's in ccuurrsseess// directory,
           since vv22..4433 tag.

IINNDDIIVVIIDDUUAALL DDEEVVEELLOOPPEERR ((PPAARRTTIICCIIPPAANNTT))
       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.

       +o   ggiitt--cclloonnee(1) from the upstream to prime your local repository.

       +o   ggiitt--ppuullll(1) and ggiitt--ffeettcchh(1) from "origin" to keep up-to-date with
           the upstream.

       +o   ggiitt--ppuusshh(1) to shared repository, if you adopt CVS style shared
           repository workflow.

       +o   ggiitt--ffoorrmmaatt--ppaattcchh(1) to prepare e-mail submission, if you adopt
           Linux kernel-style public forum workflow.

       +o   ggiitt--sseenndd--eemmaaiill(1) to send your e-mail submission without corruption
           by your MUA.

       +o   ggiitt--rreeqquueesstt--ppuullll(1) to create a summary of changes for your
           upstream to pull.

   EExxaammpplleess
       Clone the upstream and work on it. Feed changes to upstream.

               $ git clone git://git.kernel.org/pub/scm/.../torvalds/linux-2.6 my2.6
               $ cd my2.6
               $ git checkout -b mine master ((11))
               $ edit/compile/test; git commit -a -s ((22))
               $ git format-patch master ((33))
               $ git send-email --to="person <email@example.com>" 00*.patch ((44))
               $ git checkout master ((55))
               $ git pull ((66))
               $ git log -p ORIG_HEAD.. arch/i386 include/asm-i386 ((77))
               $ git ls-remote --heads http://git.kernel.org/.../jgarzik/libata-dev.git ((88))
               $ git pull git://git.kernel.org/pub/.../jgarzik/libata-dev.git ALL ((99))
               $ git reset --hard ORIG_HEAD ((1100))
               $ git gc ((1111))

           11.. checkout a new branch mmiinnee from master.
           22.. repeat as needed.
           33.. extract patches from your branch, relative to master,
           44.. and email them.
           55.. return to mmaasstteerr, ready to see what's new
           66.. ggiitt ppuullll fetches from oorriiggiinn by default and merges into the
           current branch.
           77.. immediately after pulling, look at the changes done upstream
           since last time we checked, only in the area we are interested in.
           88.. check the branch names in an external repository (if not known).
           99.. fetch from a specific branch AALLLL from a specific repository and
           merge it.
           1100.. revert the pull.
           1111.. garbage collect leftover objects from reverted pull.

       Push into another repository.

               satellite$ git clone mothership:frotz frotz ((11))
               satellite$ cd frotz
               satellite$ git config --get-regexp '^(remote|branch)\.' ((22))
               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 \
                          +refs/heads/*:refs/remotes/satellite/* ((33))
               satellite$ edit/compile/test/commit
               satellite$ git push origin ((44))

               mothership$ cd frotz
               mothership$ git checkout master
               mothership$ git merge satellite/master ((55))

           11.. mothership machine has a frotz repository under your home
           directory; clone from it to start a repository on the satellite
           machine.
           22.. clone sets these configuration variables by default. It arranges
           ggiitt ppuullll to fetch and store the branches of mothership machine to
           local rreemmootteess//oorriiggiinn//** remote-tracking branches.
           33.. arrange ggiitt ppuusshh to push all local branches to their
           corresponding branch of the mothership machine.
           44.. push will stash all our work away on rreemmootteess//ssaatteelllliittee//**
           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).
           55.. on mothership machine, merge the work done on the satellite
           machine into the master branch.

       Branch off of a specific tag.

               $ git checkout -b private2.6.14 v2.6.14 ((11))
               $ edit/compile/test; git commit -a
               $ git checkout master
               $ git cherry-pick v2.6.14..private2.6.14 ((22))

           11.. create a private branch based on a well known (but somewhat
           behind) tag.
           22.. forward port all changes in pprriivvaattee22..66..1144 branch to mmaasstteerr
           branch without a formal "merging". Or longhand

           ggiitt ffoorrmmaatt--ppaattcchh --kk --mm ----ssttddoouutt vv22..66..1144....pprriivvaattee22..66..1144 || ggiitt aamm --33
           --kk

       An alternate participant submission mechanism is using the ggiitt
       rreeqquueesstt--ppuullll or pull-request mechanisms (e.g as used on GitHub
       (www.github.com) to notify your upstream of your contribution.

IINNTTEEGGRRAATTOORR
       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.

       This section can also be used by those who respond to ggiitt rreeqquueesstt--ppuullll
       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.

       +o   ggiitt--aamm(1) to apply patches e-mailed in from your contributors.

       +o   ggiitt--ppuullll(1) to merge from your trusted lieutenants.

       +o   ggiitt--ffoorrmmaatt--ppaattcchh(1) to prepare and send suggested alternative to
           contributors.

       +o   ggiitt--rreevveerrtt(1) to undo botched commits.

       +o   ggiitt--ppuusshh(1) to publish the bleeding edge.

   EExxaammpplleess
       A typical integrator's Git day.

               $ git status ((11))
               $ git branch --no-merged master ((22))
               $ mailx ((33))
               & s 2 3 4 5 ./+to-apply
               & s 7 8 ./+hold-linus
               & q
               $ git checkout -b topic/one master
               $ git am -3 -i -s ./+to-apply ((44))
               $ compile/test
               $ git checkout -b hold/linus && git am -3 -i -s ./+hold-linus ((55))
               $ git checkout topic/one && git rebase master ((66))
               $ git checkout pu && git reset --hard next ((77))
               $ git merge topic/one topic/two && git merge hold/linus ((88))
               $ git checkout maint
               $ git cherry-pick master~4 ((99))
               $ compile/test
               $ git tag -s -m "GIT 0.99.9x" v0.99.9x ((1100))
               $ git fetch ko && for branch in master maint next pu ((1111))
                   do
                       git show-branch ko/$branch $branch ((1122))
                   done
               $ git push --follow-tags ko ((1133))

           11.. see what you were in the middle of doing, if anything.
           22.. see which branches haven't been merged into mmaasstteerr yet. Likewise
           for any other integration branches e.g.  mmaaiinntt, nneexxtt and ppuu
           (potential updates).
           33.. read mails, save ones that are applicable, and save others that
           are not quite ready (other mail readers are available).
           44.. apply them, interactively, with your sign-offs.
           55.. create topic branch as needed and apply, again with sign-offs.
           66.. rebase internal topic branch that has not been merged to the
           master or exposed as a part of a stable branch.
           77.. restart ppuu every time from the next.
           88.. and bundle topic branches still cooking.
           99.. backport a critical fix.
           1100.. create a signed tag.
           1111.. make sure master was not accidentally rewound beyond that
           already pushed out.
           1122.. In the output from ggiitt sshhooww--bbrraanncchh, mmaasstteerr should have
           everything kkoo//mmaasstteerr has, and nneexxtt should have everything kkoo//nneexxtt
           has, etc.
           1133.. push out the bleeding edge, together with new tags that point
           into the pushed history.

       In this example, the kkoo shorthand points at the Git maintainer's
       repository at kernel.org, and looks like this:

           (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/pu
                   push = refs/heads/maint

RREEPPOOSSIITTOORRYY AADDMMIINNIISSTTRRAATTIIOONN
       A repository administrator uses the following tools to set up and
       maintain access to the repository by developers.

       +o   ggiitt--ddaaeemmoonn(1) to allow anonymous download from repository.

       +o   ggiitt--sshheellll(1) can be used as a _r_e_s_t_r_i_c_t_e_d _l_o_g_i_n _s_h_e_l_l for shared
           central repository users.

       +o   ggiitt--hhttttpp--bbaacckkeenndd(1) provides a server side implementation of
           Git-over-HTTP ("Smart http") allowing both fetch and push services.

       +o   ggiittwweebb(1) provides a web front-end to Git repositories, which can
           be set-up using the ggiitt--iinnssttaawweebb(1) script.

       uuppddaattee hhooookk hhoowwttoo[1] has a good example of managing a shared central
       repository.

       In addition there are a number of other widely deployed hosting,
       browsing and reviewing solutions such as:

       +o   gitolite, gerrit code review, cgit and others.

   EExxaammpplleess
       We assume the following in /etc/services

               $ grep 9418 /etc/services
               git             9418/tcp                # Git Version Control System

       Run git-daemon to serve /pub/scm from inetd.

               $ grep git /etc/inetd.conf
               git     stream  tcp     nowait  nobody \
                 /usr/bin/git-daemon git-daemon --inetd --export-all /pub/scm

           The actual configuration line should be on one line.

       Run git-daemon to serve /pub/scm from xinetd.

               $ 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
               }

           Check your xinetd(8) documentation and setup, this is from a Fedora
           system. Others might be different.

       Give push/pull only access to developers using git-over-ssh.
           e.g. those using: $$ ggiitt ppuusshh//ppuullll sssshh::////hhoosstt..xxzz//ppuubb//ssccmm//pprroojjeecctt

               $ grep git /etc/passwd ((11))
               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 ((22))
               /usr/bin/git-shell

           11.. log-in shell is set to /usr/bin/git-shell, which does not allow
           anything but ggiitt ppuusshh and ggiitt ppuullll. The users require ssh access to
           the machine.
           22.. in many distributions /etc/shells needs to list what is used as
           the login shell.

       CVS-style shared repository.

               $ grep git /etc/group ((11))
               git:x:9418:alice,bob,cindy,david
               $ cd /home/devo.git
               $ ls -l ((22))
                 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 ((33))
                 -r-xr-xr-x   1 david git  3536 Dec  4 22:40 update
               $ cat info/allowed-users ((44))
               refs/heads/master       alice\|cindy
               refs/heads/doc-update   bob
               refs/tags/v[0-9]*       david

           11.. place the developers into the same git group.
           22.. and make the shared repository writable by the group.
           33.. use update-hook example by Carl from Documentation/howto/ for
           branch policy control.
           44.. 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.

GGIITT
       Part of the ggiitt(1) suite

NNOOTTEESS
        1. update hook howto
           git-htmldocs/howto/update-hook-example.html

Git 2.22.0                        06/07/2019                    GITEVERYDAY(7)