2 Title: Collecting information about git
5 Author: Oleg Broytman <phd@phdru.name>
8 Content-Type: text/x-rst
15 This Informational PEP collects information about git. There is, of
16 course, a lot of documentation for git, so the PEP concentrates on
17 more complex issues, scenarios and topics.
19 The plan is to extend the PEP in the future collecting information
20 about equivalence of Mercurial and git scenarios to help migrating
21 Python development from Mercurial to git.
23 The author of the PEP doesn't currently plan to write a Process PEP on
24 migration from Mercurial to git.
30 Git is accompanied with a lot of documentation, both online and
33 Documentation for starters
34 --------------------------
37 <https://www.kernel.org/pub/software/scm/git/docs/gittutorial.html>`_,
39 <https://www.kernel.org/pub/software/scm/git/docs/gittutorial-2.html>`_.
42 <https://www.kernel.org/pub/software/scm/git/docs/user-manual.html>`_.
43 `Everyday GIT With 20 Commands Or So
44 <https://www.kernel.org/pub/software/scm/git/docs/everyday.html>`_.
46 <https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html>`_.
48 Advanced documentation
49 ----------------------
52 <http://www-cs-students.stanford.edu/~blynn/gitmagic/index.html>`_,
53 with a number of translations.
55 `Pro Git <https://git-scm.com/book>`_. The Book about git. Buy it at
56 Amazon or download in PDF, mobi, or ePub form. Has translations to
57 many different languages. Download Russian translation from `GArik
58 <https://github.com/GArik/progit/wiki>`_.
60 `Git Wiki <https://git.wiki.kernel.org/index.php/Main_Page>`_.
65 Git has builtin help: run ``git help $TOPIC``. For example, run
66 ``git help git`` or ``git help help``.
72 Download and installation
73 -------------------------
75 Unix users: `download and install using your package manager
76 <https://git-scm.com/download/linux>`_.
78 Microsoft Windows: download `git-for-windows
79 <https://github.com/git-for-windows/git/releases>`_ or `msysGit
80 <https://github.com/msysgit/msysgit/releases>`_.
82 MacOS X: use git installed with `XCode
83 <https://developer.apple.com/xcode/downloads/>`_ or download from
84 `MacPorts <https://www.macports.org/ports.php?by=name&substr=git>`_ or
86 <http://sourceforge.net/projects/git-osx-installer/files/>`_ or
87 install git with `Homebrew <http://brew.sh/>`_: ``brew install git``.
89 `git-cola <https://git-cola.github.io/index.html>`_ is a Git GUI
90 written in Python and GPL licensed. Linux, Windows, MacOS X.
92 `TortoiseGit <https://tortoisegit.org/>`_ is a Windows Shell Interface
93 to Git based on TortoiseSVN; open source.
98 This simple code is often appears in documentation, but it is
99 important so let repeat it here. Git stores author and committer
100 names/emails in every commit, so configure your real name and
103 $ git config --global user.name "User Name"
104 $ git config --global user.email user.name@example.org
110 Examples of git commands in this PEP use the following approach. It is
111 supposed that you, the user, works with a local repository named
112 ``python`` that has an upstream remote repo named ``origin``. Your
113 local repo has two branches ``v1`` and ``master``. For most examples
114 the currently checked out branch is ``master``. That is, it's assumed
115 you have done something like that::
117 $ git clone http://git.python.org/python.git
119 $ git branch v1 origin/v1
121 The first command clones remote repository into local directory
122 `python``, creates a new local branch master, sets
123 remotes/origin/master as its upstream remote-tracking branch and
124 checks it out into the working directory.
126 The last command creates a new local branch v1 and sets
127 remotes/origin/v1 as its upstream remote-tracking branch.
129 The same result can be achieved with commands::
131 $ git clone -b v1 http://git.python.org/python.git
133 $ git checkout --track origin/master
135 The last command creates a new local branch master, sets
136 remotes/origin/master as its upstream remote-tracking branch and
137 checks it out into the working directory.
140 Branches and branches
141 =====================
143 Git terminology can be a bit misleading. Take, for example, the term
144 "branch". In git it has two meanings. A branch is a directed line of
145 commits (possibly with merges). And a branch is a label or a pointer
146 assigned to a line of commits. It is important to distinguish when you
147 talk about commits and when about their labels. Lines of commits are
148 by itself unnamed and are usually only lengthening and merging.
149 Labels, on the other hand, can be created, moved, renamed and deleted
153 Remote repositories and remote branches
154 =======================================
156 Remote-tracking branches are branches (pointers to commits) in your
157 local repository. They are there for you to remember what branches and
158 commits have been pulled from and pushed to what remote repos (you can
159 pull from and push to many remotes). Remote-tracking branches live
160 under ``remotes/$REMOTE`` namespaces, e.g. ``remotes/origin/master``.
162 To see the status of remote-tracking branches run::
166 To see local and remote-tracking branches (and tags) pointing to
171 You never do your own development on remote-tracking branches. You
172 create a local branch that has a remote branch as upstream and do
173 development on that local branch. On push git pushes commits to the
174 remote repo and updates remote-tracking branches, on pull git fetches
175 commits from the remote repo, updates remote-tracking branches and
176 fast-forwards, merges or rebases local branches.
178 When you do an initial clone like this::
180 $ git clone -b v1 http://git.python.org/python.git
182 git clones remote repository ``http://git.python.org/python.git`` to
183 directory ``python``, creates a remote named ``origin``, creates
184 remote-tracking branches, creates a local branch ``v1``, configure it
185 to track upstream remotes/origin/v1 branch and checks out ``v1`` into
186 the working directory.
188 Updating local and remote-tracking branches
189 -------------------------------------------
191 There is a major difference between
195 $ git fetch $REMOTE $BRANCH
201 $ git fetch $REMOTE $BRANCH:$BRANCH
203 The first command fetches commits from the named $BRANCH in the
204 $REMOTE repository that are not in your repository, updates
205 remote-tracking branch and leaves the id (the hash) of the head commit
206 in file .git/FETCH_HEAD.
208 The second command fetches commits from the named $BRANCH in the
209 $REMOTE repository that are not in your repository and updates both
210 the local branch $BRANCH and its upstream remote-tracking branch. But
211 it refuses to update branches in case of non-fast-forward. And it
212 refuses to update the current branch (currently checked out branch,
213 where HEAD is pointing to).
215 The first command is used internally by ``git pull``.
219 $ git pull $REMOTE $BRANCH
225 $ git fetch $REMOTE $BRANCH
226 $ git merge FETCH_HEAD
228 Certainly, $BRANCH in that case should be your current branch. If you
229 want to merge a different branch into your current branch first update
230 that non-current branch and then merge::
232 $ git fetch origin v1:v1 # Update v1
233 $ git pull --rebase origin master # Update the current branch master
234 # using rebase instead of merge
237 If you have not yet pushed commits on ``v1``, though, the scenario has
238 to become a bit more complex. Git refuses to update
239 non-fast-forwardable branch, and you don't want to do force-pull
240 because that would remove your non-pushed commits and you would need
241 to recover. So you want to rebase ``v1`` but you cannot rebase
242 non-current branch. Hence, checkout ``v1`` and rebase it before
246 $ git pull --rebase origin v1
247 $ git checkout master
248 $ git pull --rebase origin master
251 It is possible to configure git to make it fetch/pull a few branches
252 or all branches at once, so you can simply run
264 Default remote repository for fetching/pulling is origin. Default set
265 of references to fetch is calculated using matching algorithm: git
266 fetches all branches having the same name on both ends.
271 Pushing is a bit simpler. There is only one command ``push``. When you
276 $ git push origin v1 master
278 git pushes local v1 to remote v1 and local master to remote master.
281 $ git push origin v1:v1 master:master
283 Git pushes commits to the remote repo and updates remote-tracking
284 branches. Git refuses to push commits that aren't fast-forwardable.
285 You can force-push anyway, but please remember - you can force-push to
286 your own repositories but don't force-push to public or shared repos.
287 If you find git refuses to push commits that aren't fast-forwardable,
288 better fetch and merge commits from the remote repo (or rebase your
289 commits on top of the fetched commits), then push. Only force-push if
290 you know what you do and why you do it. See the section `Commit
291 editing and caveats`_ below.
293 It is possible to configure git to make it push a few branches or all
294 branches at once, so you can simply run
306 Default remote repository for pushing is origin. Default set
307 of references to push in git before 2.0 is calculated using matching
308 algorithm: git pushes all branches having the same name on both ends.
309 Default set of references to push in git 2.0+ is calculated using
310 simple algorithm: git pushes the current branch back to its
313 To configure git before 2.0 to the new behaviour run::
315 $ git config push.default simple
317 To configure git 2.0+ to the old behaviour run::
319 $ git config push.default matching
321 Git refuses to push a branch if it's the current branch in the remote
322 non-bare repository: git refuses to update remote working directory.
323 You really should push only to bare repositories. For non-bare
324 repositories git prefers pull-based workflow.
326 When you want to deploy code on a remote host and can only use push
327 (because your workstation is behind a firewall and you cannot pull
328 from it) you do that in two steps using two repositories: you push
329 from the workstation to a bare repo on the remote host, ssh to the
330 remote host and pull from the bare repo to a non-bare deployment repo.
332 That changed in git 2.3, but see `the blog post
333 <https://github.com/blog/1957-git-2-3-has-been-released#push-to-deploy>`_
334 for caveats; in 2.4 the push-to-deploy feature was `further improved
335 <https://github.com/blog/1994-git-2-4-atomic-pushes-push-to-deploy-and-more#push-to-deploy-improvements>`_.
340 Git automatically fetches tags that point to commits being fetched
341 during fetch/pull. To fetch all tags (and commits they point to) run
342 ``git fetch --tags origin``. To fetch some specific tags fetch them
345 $ git fetch origin tag $TAG1 tag $TAG2...
349 $ git fetch origin tag 1.4.2
350 $ git fetch origin v1:v1 tag 2.1.7
352 Git doesn't automatically pushes tags. That allows you to have private
353 tags. To push tags list them explicitly::
355 $ git push origin tag 1.4.2
356 $ git push origin v1 master tag 2.1.7
358 Don't move tags with ``git tag -f`` or remove tags with ``git tag -d``
359 after they have been published.
364 When cloning/fetching/pulling/pushing git copies only database objects
365 (commits, trees, files and tags) and symbolic references (branches and
366 lightweight tags). Everything else is private to the repository and
367 never cloned, updated or pushed. It's your config, your hooks, your
368 private exclude file.
370 If you want to distribute hooks, copy them to the working tree, add,
371 commit, push and instruct the team to update ind install the hook
375 Commit editing and caveats
376 ==========================
378 A warning not to edit published (pushed) commits also appears in
379 documentation but it's repeated here anyway as it's very important.
381 It is possible to recover from forced push but it's PITA for the
382 entire team. Please avoid it.
384 To see what commits have not been published yet compare the head of the
385 branch with its upstream remote-tracking branch::
387 $ git log origin/master..
388 $ git log origin/v1..v1
390 For every branch that has an upstream remote-tracking branch git
391 maintains an alias @{upstream} (short version @{u}), so the commands
392 above can be given as::
397 To see the status of all branches::
401 To compare the status of local branches with a remote repo::
403 $ git remote show origin
405 Read `how to recover from upstream rebase
406 <https://git-scm.com/docs/git-rebase#_recovering_from_upstream_rebase>`_.
407 It is in ``git help rebase``.
409 On the other hand don't be too afraid about commit editing. You can
410 safely edit, remove, reorder, combine and split commits that haven't
411 been pushed yet. You can even push commits to your own (backup) repo,
412 edit them later and force-push edited commits to replace what have
413 already been pushed. Not a problem until commits are in a public
414 or shared repository.
420 Whatever you do, don't panic. Almost anything in git can be undone.
422 git checkout: restore file's content
423 ------------------------------------
425 ``git checkout``, for example, can be used to restore the content of
426 file(s) to that one of a commit. Like this::
428 git checkout HEAD~ README
430 The commands restores the contents of README file to the last but one
431 commit in the current branch. By default the commit ID is simply HEAD;
432 i.e. ``git checkout README`` restores README to the latest commit.
434 (Do not use ``git checkout`` to view a content of a file in a commit,
435 use ``git cat-file -p``; e.g. ``git cat-file -p HEAD~:path/to/README``).
437 git reset: remove (non-pushed) commits
438 --------------------------------------
440 ``git reset`` moves the head of the current branch. The head can be
441 moved to point to any commit but it's often used to remove a commit or
442 a few (preferably, non-pushed ones) from the top of the branch - that
443 is, to move the branch backward in order to undo a few (non-pushed)
446 ``git reset`` has three modes of operation - soft, hard and mixed.
447 Default is mixed. ProGit `explains
448 <https://git-scm.com/book/en/Git-Tools-Reset-Demystified>`_ the
449 difference very clearly. Bare repositories don't have indices or
450 working trees so in a bare repo only soft reset is possible.
455 Mixed mode reset with a path or paths can be used to unstage changes -
456 that is, to remove from index changes added with ``git add`` for
457 committing. See `The Book
458 <https://git-scm.com/book/en/Git-Basics-Undoing-Things>`_ for details
459 about unstaging and other undo tricks.
461 git reflog: reference log
462 -------------------------
464 Removing commits with ``git reset`` or moving the head of a branch
465 sounds dangerous and it is. But there is a way to undo: another
466 reset back to the original commit. Git doesn't remove commits
467 immediately; unreferenced commits (in git terminology they are called
468 "dangling commits") stay in the database for some time (default is two
469 weeks) so you can reset back to it or create a new branch pointing to
472 For every move of a branch's head - with ``git commit``, ``git
473 checkout``, ``git fetch``, ``git pull``, ``git rebase``, ``git reset``
474 and so on - git stores a reference log (reflog for short). For every
475 move git stores where the head was. Command ``git reflog`` can be used
476 to view (and manipulate) the log.
478 In addition to the moves of the head of every branch git stores the
479 moves of the HEAD - a symbolic reference that (usually) names the
480 current branch. HEAD is changed with ``git checkout $BRANCH``.
482 By default ``git reflog`` shows the moves of the HEAD, i.e. the
483 command is equivalent to ``git reflog HEAD``. To show the moves of the
484 head of a branch use the command ``git reflog $BRANCH``.
486 So to undo a ``git reset`` lookup the original commit in ``git
487 reflog``, verify it with ``git show`` or ``git log`` and run ``git
488 reset $COMMIT_ID``. Git stores the move of the branch's head in
489 reflog, so you can undo that undo later again.
491 In a more complex situation you'd want to move some commits along with
492 resetting the head of the branch. Cherry-pick them to the new branch.
493 For example, if you want to reset the branch ``master`` back to the
494 original commit but preserve two commits created in the current branch
497 $ git branch save-master # create a new branch saving master
498 $ git reflog # find the original place of master
499 $ git reset $COMMIT_ID
500 $ git cherry-pick save-master~ save-master
501 $ git branch -D save-master # remove temporary branch
503 git revert: revert a commit
504 ---------------------------
506 ``git revert`` reverts a commit or commits, that is, it creates a new
507 commit or commits that revert(s) the effects of the given commits.
508 It's the only way to undo published commits (``git commit --amend``,
509 ``git rebase`` and ``git reset`` change the branch in
510 non-fast-forwardable ways so they should only be used for non-pushed
513 There is a problem with reverting a merge commit. ``git revert`` can
514 undo the code created by the merge commit but it cannot undo the fact
515 of merge. See the discussion `How to revert a faulty merge
516 <https://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.html>`_.
518 One thing that cannot be undone
519 -------------------------------
521 Whatever you undo, there is one thing that cannot be undone -
522 overwritten uncommitted changes. Uncommitted changes don't belong to
523 git so git cannot help preserving them.
525 Most of the time git warns you when you're going to execute a command
526 that overwrites uncommitted changes. Git warns you when you try to
527 switch branches with ``git checkout``. It warns you when you're going
528 to rebase with non-clean working tree. It refuses to pull new commits
529 over non-committed files.
531 But there are commands that do exactly that - overwrite files in the
532 working tree. Commands like ``git checkout $PATHs`` or ``git reset
533 --hard`` silently overwrite files including your uncommitted changes.
535 With that in mind you can understand the stance "commit early, commit
536 often". Commit as often as possible. Commit on every save in your
537 editor or IDE. You can edit your commits before pushing - change,
538 reorder, combine, remove. But save your changes in git database,
539 either commit changes or at least stash them with ``git stash``.
545 Internet is full of heated discussions on the topic: "merge or
546 rebase?" Most of them are meaningless. When a DVCS is being used in a
547 big team with a big and complex project with many branches there is
548 simply no way to avoid merges. So the question's diminished to
549 "whether to use rebase, and if yes - when to use rebase?" Considering
550 that it is very much recommended not to rebase published commits the
551 question's diminished even further: "whether to use rebase on
554 That small question is for the team to decide. The author of the PEP
555 recommends to use rebase when pulling, i.e. always do ``git pull
556 --rebase`` or even configure automatic setup of rebase for every new
559 $ git config branch.autosetuprebase always
561 and configure rebase for existing branches::
563 $ git config branch.$NAME.rebase true
567 $ git config branch.v1.rebase true
568 $ git config branch.master.rebase true
570 After that ``git pull origin master`` becomes equivalent to ``git pull
571 --rebase origin master``.
573 In case when merge is preferred it is recommended to create new
574 commits in a separate feature or topic branch while using rebase to
575 update the mainline branch. When the topic branch is ready merge it
576 into mainline. To avoid a tedious task of resolving large number of
577 conflicts at once you can merge the topic branch to the mainline from
578 time to time and switch back to the topic branch to continue working
579 on it. The entire workflow would be something like::
581 $ git checkout -b issue-42 # create a new issue branch and switch to it
582 ...edit/test/commit...
583 $ git checkout master
584 $ git pull --rebase origin master # update master from the upstream
586 $ git branch -d issue-42 # delete the topic branch
587 $ git push origin master
589 When the topic branch is deleted only the label is removed, commits
590 are stayed in the database, they are now merged into master::
592 o--o--o--o--o--M--< master - the mainline branch
594 --*--*--* - the topic branch, now unnamed
596 The topic branch is deleted to avoid cluttering branch namespace with
597 small topic branches. Information on what issue was fixed or what
598 feature was implemented should be in the commit messages.
604 Git has a builtin merge strategy for what Python core developers call
607 $ git merge -s ours v1 # null-merge v1 into master
610 Advanced configuration
611 ======================
616 Git has builtin mechanisms to handle line endings between platforms
617 with different EOL styles. To allow git to do CRLF conversion assign
618 ``text`` attribute to files using `.gitattributes
619 <https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html>`_.
620 For files that have to have specific line ending assign ``eol``
621 attribute. For binary files the attribute is, naturally, ``binary``.
631 To check what attributes git uses for files use ``git check-attr``
632 command. For example::
634 $ git check-attr -a -- \*.py
643 Staging area aka index aka cache is a distinguishing feature of git.
644 Staging area is where git collects patches before committing them.
645 Separation between collecting patches and commit phases provides a
646 very useful feature of git: you can review collected patches before
647 commit and even edit them - remove some hunks, add new hunks and
650 To add files to the index use ``git add``. Collecting patches before
651 committing means you need to do that for every change, not only to add
652 new (untracked) files. To simplify committing in case you just want to
653 commit everything without reviewing run ``git commit --all`` (or just
654 ``-a``) - the command adds every changed tracked file to the index and
655 then commit. To commit a file or files regardless of patches collected
656 in the index run ``git commit [--only|-o] -- $FILE...``.
658 To add hunks of patches to the index use ``git add --patch`` (or just
659 ``-p``). To remove collected files from the index use ``git reset HEAD
660 -- $FILE...`` To add/inspect/remove collected hunks use ``git add
661 --interactive`` (``-i``).
663 To see the diff between the index and the last commit (i.e., collected
664 patches) use ``git diff --cached``. To see the diff between the
665 working tree and the index (i.e., uncollected patches) use just ``git
666 diff``. To see the diff between the working tree and the last commit
667 (i.e., both collected and uncollected patches) run ``git diff HEAD``.
670 <https://git.wiki.kernel.org/index.php/WhatIsTheIndex>`_ and
671 `IndexCommandQuickref
672 <https://git.wiki.kernel.org/index.php/IndexCommandQuickref>`_ in Git
679 Rerere is a mechanism that helps to resolve repeated merge conflicts.
680 The most frequent source of recurring merge conflicts are topic
681 branches that are merged into mainline and then the merge commits are
682 removed; that's often performed to test the topic branches and train
683 rerere; merge commits are removed to have clean linear history and
684 finish the topic branch with only one last merge commit.
686 Rerere works by remembering the states of tree before and after a
687 successful commit. That way rerere can automatically resolve conflicts
688 if they appear in the same files.
690 Rerere can be used manually with ``git rerere`` command but most often
691 it's used automatically. Enable rerere with these commands in a
694 $ git config rerere.enabled true
695 $ git config rerere.autoupdate true
697 You don't need to turn rerere on globally - you don't want rerere in
698 bare repositories or repositories without branches; you only need
699 rerere in repos where you often perform merges and resolve merge
702 See `Rerere <https://git-scm.com/book/en/Git-Tools-Rerere>`_ in The
709 Git object database and other files/directories under ``.git`` require
710 periodic maintenance and cleanup. For example, commit editing left
711 unreferenced objects (dangling objects, in git terminology) and these
712 objects should be pruned to avoid collecting cruft in the DB. The
713 command ``git gc`` is used for maintenance. Git automatically runs
714 ``git gc --auto`` as a part of some commands to do quick maintenance.
715 Users are recommended to run ``git gc --aggressive`` from time to
716 time; ``git help gc`` recommends to run it every few hundred
717 changesets; for more intensive projects it should be something like
718 once a week and less frequently (biweekly or monthly) for lesser
721 ``git gc --aggressive`` not only removes dangling objects, it also
722 repacks object database into indexed and better optimized pack(s); it
723 also packs symbolic references (branches and tags). Another way to do
724 it is to run ``git repack``.
726 There is a well-known `message
727 <https://gcc.gnu.org/ml/gcc/2007-12/msg00165.html>`_ from Linus
728 Torvalds regarding "stupidity" of ``git gc --aggressive``. The message
729 can safely be ignored now. It is old and outdated, ``git gc
730 --aggressive`` became much better since that time.
732 For those who still prefer ``git repack`` over ``git gc --aggressive``
733 the recommended parameters are ``git repack -a -d -f --depth=20
734 --window=250``. See `this detailed experiment
735 <http://vcscompare.blogspot.ru/2008/06/git-repack-parameters.html>`_
736 for explanation on the effects of these parameters.
738 From time to time run ``git fsck [--strict]`` to verify integrity of
739 the database. ``git fsck`` may produce a list of dangling objects;
740 that's not an error, just a reminder to perform regular maintenance.
746 Command-line options and arguments
747 ----------------------------------
750 <https://www.kernel.org/pub/software/scm/git/docs/gitcli.html>`_
751 recommends not to combine short options/flags. Most of the times it
752 works: ``git commit -av`` works perfectly, but there are situations
753 when it doesn't. E.g., ``git log -p -5`` cannot be combined as ``git
756 Some options have arguments, some even have default arguments. In that
757 case the argument for such option must be spelled in a sticky way:
758 ``-Oarg``, never ``-O arg`` because for an option that has a default
759 argument the latter means "use default value for option ``-O`` and
760 pass ``arg`` further to the option parser". For example, ``git grep``
761 has an option ``-O`` that passes found files to a program; default
762 program for ``-O`` is pager (usually ``less``), but you can use your
765 $ git grep -Ovim # but not -O vim
767 BTW, there is a difference between running ``git grep -O`` and ``git
768 grep -Oless`` - in the latter case ``git grep`` passes ``+/pattern``
774 It's a bit hard to type ``git rebase --interactive --preserve-merges
775 HEAD~5`` manually even for those who are happy to use command-line,
776 and this is where shell completion is of great help. Bash/zsh come
777 with programmable completion, often automatically preinstalled and
778 enabled, so if you have bash/zsh and git installed, chances are you
779 are already done - just go and use it at the command-line.
781 If you don't have necessary bits preinstalled, install and enable
782 bash_completion package. If you want to upgrade your git completion to
783 the latest and greatest download necessary file from `git contrib
784 <https://git.kernel.org/cgit/git/git.git/tree/contrib/completion>`_.
786 Git-for-windows comes with git-bash for which bash completion is
787 installed and enabled.
792 For command-line lovers shell prompt can carry a lot of useful
793 information. To include git information in the prompt use
795 <https://git.kernel.org/cgit/git/git.git/tree/contrib/completion/git-prompt.sh>`_.
796 Read the detailed instructions in the file.
798 Search the Net for "git prompt" to find other prompt variants.
804 The simplest way to publish a repository or a group of repositories is
805 ``git daemon``. The daemon provides anonymous access, by default it is
806 read-only. The repositories are accessible by git protocol (git://
807 URLs). Write access can be enabled but the protocol lacks any
808 authentication means, so it should be enabled only within a trusted
809 LAN. See ``git help daemon`` for details.
811 Git over ssh provides authentication and repo-level authorisation as
812 repositories can be made user- or group-writeable (see parameter
813 ``core.sharedRepository`` in ``git help config``). If that's too
814 permissive or too restrictive for some project's needs there is a
815 wrapper `gitolite <http://gitolite.com/gitolite/index.html>`_ that can
816 be configured to allow access with great granularity; gitolite has a
817 lot of documentation.
819 TODO: gitweb; cgit; Kallithea; pagure; gogs and gitea; gitlab.
821 https://git.kernel.org/cgit/git/git.git/tree/gitweb
823 http://git.zx2c4.com/cgit/
825 https://kallithea-scm.org/
829 http://gogs.io/ and http://gitea.io/
831 https://about.gitlab.com/
834 From Mercurial to git
835 =====================
837 Mercurial for Git users https://mercurial.selenic.com/wiki/GitConcepts
839 https://github.com/felipec/git-remote-hg
841 https://hg-git.github.io/
853 This document has been placed in the public domain.
860 indent-tabs-mode: nil
861 sentence-end-double-space: t
865 vim: set fenc=us-ascii tw=70 :