summaryrefslogtreecommitdiff
path: root/Documentation/tutorial.txt
AgeCommit message (Collapse)AuthorFilesLines
2005-11-08Use consistent shell prompts and example style.Libravatar Jon Loeliger1-88/+138
Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-08Tutorial: do not use 'git resolve'.Libravatar Junio C Hamano1-7/+8
Use 'git merge' instead. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-06Documentation: talk about guts of merge in tutorial.Libravatar Junio C Hamano1-8/+159
While discussing Jon's ASCII art on merge operations with him, I realized that the tutorial stops talking about the plumbing details halfway. So fill in the gory details, and update the examples to use 'git-merge', not 'git-resolve'. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-03Illustration: "Git Diff Types"Libravatar Junio C Hamano1-0/+35
Jon Loeliger's ASCII art in the Tutorial. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-01Document the use of "current directory" as pull source.Libravatar Junio C Hamano1-1/+3
The repository to pull from can be a local repository, and as a special case the current directory can be specified to perform merges across local branches. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-15Merge branch 'fixes'Libravatar Junio C Hamano1-22/+57
2005-10-13tutorial: update the initial commit example.Libravatar Junio C Hamano1-6/+8
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-13Adapt tutorial to cygwin and add test caseLibravatar Johannes Schindelin1-19/+52
Lacking reliable symlinks, the instructions in the tutorial did not work in a cygwin setup. Also, a few outputs were not correct. This patch fixes these, and adds a test case which follows the instructions of the tutorial (except git-clone, -fetch and -push, which I have not done yet). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-10Convert usage of GIT and Git into gitLibravatar Christian Meder1-9/+9
Convert usage of GIT and Git into git. Signed-off-by: Christian Meder <chris@absolutegiganten.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-10Remove the version tags from the manpagesLibravatar Junio C Hamano1-1/+0
Signed-off-by: Christian Meder <chris@absolutegiganten.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-22[PATCH] Retitle 'inspecting what happened' section.Libravatar Jon Loeliger1-2/+2
In the tutorial, there is a section entitled "Checking it out" that shows how to use diff log and whatchanged to insect some of the repository state. As the phrase "checkout" ususally carries some baggage WRT other revision control mechanism, I suggest that we re-title this section something like "Inspecting Changes". Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-21Update tutorial with Octopus usage.Libravatar Junio C Hamano1-1/+103
Making an Octopus is simply a natural extension of merging just one branch into the current branch. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-11[PATCH] Escape asciidoc's built-in em-dash replacementLibravatar Yasushi SHOJI1-2/+2
AsciiDoc replace '--' with em-dash (&#8212) by default. em-dash looks a lot like a single long dash and it's very confusing when we are talking about command options. Section 21.2.8 'Replacements' of AsciiDoc's User Guide says that a backslash in front of double dash prevent the replacement. This patch does just that. Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-09[PATCH] fix tutorial typoLibravatar jdl@freescale.com1-1/+1
Fix a minor typo in the tutorial.txt. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-09[PATCH] Fix tutorial reference to git-*-scripts.Libravatar jdl@freescale.com1-5/+5
There was a lingering reference to the git-*-scripts in the tutorial. This patch reworks that paragraph a bit. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07Big tool rename.Libravatar Junio C Hamano1-27/+27
As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-02Mention post-update when we first talk about publishing a repository.Libravatar Junio C Hamano1-0/+6
There is more detailed instruction for `project lead` later in the tutorial to talk about the same, but at this point in the flow of tutorial, the first time reader has no way of knowing it. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-01Add repository-layout document.Libravatar Junio C Hamano1-0/+5
... and link to it from both the main index and the tutorial. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-30Update tutorial.Libravatar Junio C Hamano1-291/+370
Finally I bit the bullet and did a full sweep of this document. The changes are mostly clarifications, adjusting old terminology to the glossary compatible one, and asciidoc formatting. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-30Documentaion updates.Libravatar Junio C Hamano1-235/+284
Mostly making the formatted html prettier. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 7adf1f15ebe074d4767df941817a6cf86d8e2533 commit)
2005-08-28[PATCH] tutorial note about git branchLibravatar Amos Waterland1-0/+1
Explain that an asterisk will be displayed in front of the current branch when you run `git branch' to see which are available. Signed-off-by: Amos Waterland <apw@rossby.metr.ou.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-24Update tutorial to describe shared repository style a bit more.Libravatar Junio C Hamano1-20/+53
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-23Tutorial updates.Libravatar Junio C Hamano1-193/+270
- Use "working tree", "object name", "repository" as the canonical term consistenly. - Start formatting tutorial with asciidoc. - Mention shared repository style of cooperation. - Update with some usability enhancements recently made, such as the "-m" flag to the "git commit" command. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-17[PATCH] use it's and its correctly in documentationLibravatar Greg Louis1-1/+1
At one place in Documentation/tutorial.txt and several in the base README, its was wrongly used in place of it's or vice versa. One instance remains somewhere in Documentation/howto/, which I didn't correct because it's in a quotation. Signed-off-by: Greg Louis <glouis@dynamicro.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-01[PATCH] Updates to tutorial.txtLibravatar Johannes Schindelin1-19/+17
Fix a few typos. Adapt to git-http-pull not borking on packed repositories. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-29Tutorial: use a bit longer sample filenames.Libravatar Junio C Hamano1-40/+40
Darrin Thompson noticed when he was showing off GIT to others that the use of filenames "a" and "b" in the tutorial example was unnecessarily confusing, especially with our "patch -p1" prefix a/ and b/, without giving us any patch. I was very tempted to change them back to l/ and k/ prefixes, but decided to restrain myself and update the tutorial instead ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-27Tutorial typofix.Libravatar Linus Torvalds1-1/+1
Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-23Update tutorial.txt branches/tags to use the nicer helper syntaxLibravatar Linus Torvalds1-21/+31
Teach people to use "git tag <tag-name>" instead of writing the current HEAD by hand into the .git/refs/tags/<tag-name> file. Most people probably don't really want to know about how git does things internally.
2005-07-22[PATCH] tutorial: mention "git clone" records .git/branches/originLibravatar Junio C Hamano1-22/+18
Update the recommended workflow for individual developers. While they are tracking the origin, refs/heads/origin is updated by "git fetch", so there is no need to manually copy FETCH_HEAD to refs/heads/ anywhere. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-16[PATCH] Documentation: describe short-hand used in fetch/pull.Libravatar Junio C Hamano1-0/+28
Describe short-hand for remote repository used in fetch/pull. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-15[PATCH] Documentation: update recommended workflow when working with others.Libravatar Junio C Hamano1-19/+42
Clarify that the hierarchy implied by the recommended workflow is only informal. Refer readers to nice illustration by Randy Dunlap. Separate out the step to "push" to own public repository in the workflow. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-15[PATCH] Documentation: pull, push, packing repository and working with others.Libravatar Junio C Hamano1-74/+283
Describe where you can pull from with a bit more detail. Clarify description of pushing. Add a section on packing repositories. Add a section on recommended workflow for the project lead, subsystem maintainers and individual developers. Move "Tag" section around to make the flow of example simpler to follow. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-15[PATCH] Documentation: update tutorial to talk about push.Libravatar Junio C Hamano1-7/+80
Talk about publishing to a public repository. Also fixes a couple of typos. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-08Update the tutorial a bitLibravatar Linus Torvalds1-8/+242
Add notes on branches, merging, tagging, and update some of the usage to the friendlier "git cmd" syntax. It's still ridiculously lacking, but perhaps it's a _bit_ more useful.
2005-06-14Update tutorial a bit for scripted helpers.Libravatar Linus Torvalds1-7/+19
2005-06-12[PATCH] Tutorial update to adjust for -B fixLibravatar Junio C Hamano1-7/+0
Now -B does not say silly "complete rewrite" anymore for small files such as the one in the tutorial example. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-02Clarify git-diff-cache semantics in the tutorial.Libravatar Linus Torvalds1-13/+28
Adam Kropelin points out that it wasn't all that clear at all what the thing does. This hopefully helps a bit.
2005-06-02Run the tutorial through ispell once moreLibravatar Linus Torvalds1-6/+6
People are making fun of me for being a bad speeler.
2005-06-01tutorial.txt: start describing how to copy repositoriesLibravatar Linus Torvalds1-3/+97
Both locally and remotely.
2005-06-01Update tutorial for simplified "git" script.Libravatar Linus Torvalds1-8/+19
Use "git commit" instead of "git-commit-script", and talk about using "git log" before introducing the more complex "git-whatchanged". In short, try to make it feel a bit more normal to those poor souls using CVS. Do some whitspace edits too, to make the side notes stand out a bit more.
2005-06-01tutorial.txt: fix typos and a'git-whatchanged' exampleLibravatar Linus Torvalds1-11/+11
Pointed out by Junio. I kant't speel.
2005-05-31Add first cut at a simple git tutorial.Libravatar Linus Torvalds1-0/+413
This really is very basic stuff, no branches, no merging, no CVS imports. Let's start small.
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-30 11:31:51 +0000