git/Documentation/git.txt, branch v1.2.2

git-rerere: reuse recorded resolve.

2006-02-07T05:53:11Z

In a workflow that employs relatively long lived topic branches, the developer sometimes needs to resolve the same conflict over and over again until the topic branches are done (either merged to the "release" branch, or sent out and accepted upstream). This commit introduces a new command, "git rerere", to help this process by recording the conflicted automerge results and corresponding hand-resolve results on the initial manual merge, and later by noticing the same conflicted automerge and applying the previously recorded hand resolution using three-way merge. Signed-off-by: Junio C Hamano

Don't include ../README in git.txt - make a local copy

2006-01-25T07:16:31Z

asciidoc 7.0.4 and newer considers such includes from parent directory unsafe. Signed-off-by: Pavel Roskin Signed-off-by: Junio C Hamano

Documentation: finishing touches to the new tutorial.

2006-01-23T06:43:59Z

We forgot to update the primary link from git.html leading to the tutorial, and also forgot to build and install the renamed core-tutorial document. Signed-off-by: Junio C Hamano

Merge fixes up to GIT 1.0.7

2006-01-06T04:54:42Z

Signed-off-by: Junio C Hamano

Fix git-symbolic-ref typo in git.txt.

2006-01-06T04:29:52Z

Signed-off-by: Junio C Hamano

git-describe: documentation.

2005-12-28T01:57:28Z

Signed-off-by: Junio C Hamano

Remove "octopus".

2005-12-20T02:05:49Z

We still advertise "git resolve" as a standalone command, but never "git octopus", so nobody should be using it and it is safe to retire it. The functionality is still available as a strategy backend. Signed-off-by: Junio C Hamano

Documentation: not learning core git commands.

2005-12-13T10:38:24Z

The initial section of tutorial was too heavy on internal workings for the first-time readers, so rewrite the introductory section of git(7) to start with "not learning core git commands" section and refer them to README to grasp the basic concepts, then Everyday to give overview with task/role oriented examples for minimum set of commands, and finally the tutorial. Also add to existing note in the tutorial that many too technical descriptions can be skipped by a casual reader. I initially started to review the tutorial, with the objective of ripping out the detailed technical information altogether, but I found that the level of details in the initial couple of sections that talk about refs and the object database in a hands-on fashion was about rigth, and left all of them there. I feel that reading about fsck-index and repack is too abstract without being aware of these directories and files. Signed-off-by: Junio C Hamano

Documentation: fix missing links to git(7)

2005-12-13T07:55:09Z

Also move pack protocol description to technical/. Signed-off-by: Junio C Hamano

Link Everyday GIT to main documentation tree.

2005-12-10T07:41:03Z

Signed-off-by: Junio C Hamano