Junio C Hamano 261f315beb merge & sequencer: turn "Conflicts:" hint into a comment
Just like other hints such as "Changes to be committed" we show in
the editor to remind the committer what paths were involved in the
resulting commit to help improving their log message, this section
is merely a reminder.

Traditionally, it was not made into comments primarily because it
has to be generated outside the wt-status infrastructure, and also
because it was meant as a bit stronger reminder than the others
(i.e. explaining how you resolved conflicts is much more important
than mentioning what you did to every paths involved in the commit).

But that still does not make this hint a part of the log message
proper, and not showing it as a comment is inviting mistakes.

Note that we still notice "Conflicts:" followed by list of indented
pathnames as an old-style cruft and insert a new Signed-off-by:
before it.  This is so that "commit --amend -s" adds the new S-o-b
at the right place when used on an older commit.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-10-28 14:04:28 -07:00
2013-09-09 14:50:36 -07:00
2013-12-09 14:54:48 -08:00
2013-07-22 16:06:49 -07:00
2013-07-22 16:06:49 -07:00
2013-09-09 14:36:15 -07:00
2013-10-23 13:21:31 -07:00
2013-10-23 13:21:31 -07:00
2013-09-11 15:03:28 -07:00
2013-07-19 09:26:15 -07:00
2013-12-09 14:54:47 -08:00
2013-11-12 09:24:27 -08:00
2013-09-18 11:44:50 -07:00
2013-09-17 11:42:34 -07:00
2013-10-18 13:50:12 -07:00
2013-12-02 15:34:44 -08:00
2014-02-13 13:41:53 -08:00
2013-10-18 13:49:57 -07:00
2013-10-30 12:09:53 -07:00
2013-07-22 16:06:49 -07:00
2013-10-30 12:10:33 -07:00
2013-10-18 13:49:57 -07:00
2013-07-29 12:32:25 -07:00
2013-10-23 13:21:31 -07:00
2013-10-23 13:21:31 -07:00
2013-07-30 08:13:38 -07:00
2013-07-30 08:13:38 -07:00
2013-11-01 07:38:58 -07:00
2013-11-01 07:38:58 -07:00
2014-02-13 13:41:53 -08:00
2013-09-09 14:30:29 -07:00
2013-09-09 14:36:15 -07:00
2013-07-15 10:56:07 -07:00
2013-09-09 14:36:15 -07:00
2013-10-31 13:46:03 -07:00
2013-10-31 13:48:26 -07:00
2013-10-31 13:48:32 -07:00
2013-07-22 11:23:35 -07:00
2013-12-09 14:54:48 -08:00
2013-09-17 11:37:33 -07:00
2013-09-17 11:37:33 -07:00
2013-11-18 12:25:28 -08:00
2013-11-12 09:24:27 -08:00

////////////////////////////////////////////////////////////////

	Git - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, 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

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.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands, and
Documentation/git-commandname.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).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

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 http://news.gmane.org/gmane.comp.version-control.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.
Description
No description provided
Readme 637 MiB
Languages
C 50.5%
Shell 38.7%
Perl 4.5%
Tcl 3.2%
Python 0.8%
Other 2.1%