b2185ebf1a
This commit starts the rebase ofb213911f46to49800c9407This merging rebase was started not because upstream's `maint` branch advanced (it did not), but to replace a couple of patches with newer iterations, as sent to the upstream Git project independently. In particular, those are: - The patch series merged byfe73baf344(jeffhostetler/jeffhostetler/quick_add_index_entry) was replaced by the most recent iteration of 'jh/add-index-entry-optim' (b986df5c35) - The Pull Request jeffhostetler/jeffhostetler/string_list_realloc merged viac775bdd100was replaced by the latest iteration of 'jh/string-list-micro-optim' (950a234cbd) - The jh/memihash-opt patches merged by2862058e9dwere replaced by the newest iteration (41b3eb4a6b) - The bug fix where difftool used a buffer after freeing it (d33e487771) was replaced by the one that made it into upstream (882add136f) - The patch in the `coverity` series that tried to fix a resource leak in git-am (a5208164e2) was replaced by a better patch submitted by Ren_ Scharfe (ac8ce18d89) - The patch in the `coverity` series that tried to fix a resource leak in the `handle_ssh_variant()` function (f07be76f51) has been dropped, as a different patch had been accepted into `pu` already - The rebase-i-extra patches (e1be548aaf) were replaced by the latest iteration (1d3d10b9e15) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git - fast, scalable, distributed revision control system
Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.
Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.
Please read the file INSTALL for installation instructions.
Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.
See Documentation/gittutorial.txt to get started, then see
Documentation/giteveryday.txt for a useful minimum set of commands, and
Documentation/git-.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with man gittutorial or git help tutorial, and the
documentation of each command with man git-<commandname> or git help <commandname>.
CVS users may also want to read Documentation/gitcvs-migration.txt
(man gitcvs-migration or git help cvs-migration if git is
installed).
The user discussion and development of Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission). To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org. The mailing list archives are available at https://public-inbox.org/git/, http://marc.info/?l=git and other archival sites.
The maintainer frequently sends the "What's cooking" reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.
The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (depending on your mood):
- random three-letter combination that is pronounceable, and not actually used by any common UNIX command. The fact that it is a mispronunciation of "get" may or may not be relevant.
- stupid. contemptible and despicable. simple. Take your pick from the dictionary of slang.
- "global information tracker": you're in a good mood, and it actually works for you. Angels sing, and a light suddenly fills the room.
- "goddamn idiotic truckload of sh*t": when it breaks