summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Collapse)Author
2005-08-17[PATCH] Add merge detection to git-cvsimportMartin Langhoff
Added -m and -M flags for git-cvsimport to detect merge commits in cvs. While this trusts the commit message, in repositories where merge commits indicate 'merged from FOOBRANCH' the import works surprisingly well. Even if some merges from CVS are bogus or incomplete, the resulting branches are in better state to go forward (and merge) than without any merge detection. Signed-off-by: Martin Langhoff <martin.langhoff@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-17[PATCH] Add GIT glossaryJohannes Schindelin
[jc: This is the version without asciidoc cross references; Johannes says that the cross referenced one is generated from this file using a Perl script, so I am placing this as the source, and expecting to later receive the script and a Makefile entry or two to massage this file into the final HTML or whatever form.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-17[PATCH] use it's and its correctly in documentationGreg Louis
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-17[PATCH] Also handle CVS branches with a '/' in their nameJohannes Schindelin
I track a CVS project which has a branch with a '/' in the branch name. Since git wants the branch name to be a file name at the same time, substitute that character to a '-' by default (override with "-s <subst>"). This should work well, despite the fact that a division and a difference are completely different :-) Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-17[PATCH] Add a bit more links to the commands to the main git(7) page.Junio C Hamano
There are many programs like git-add not described at all, and the organization of the list of commands may be suboptimal, but we have to start somewhere. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-17[PATCH] Reformat git-show-branches-script documentation.Junio C Hamano
... using ListingBlock of asciidoc. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-16[PATCH] Add -k kill keyword expansion option to git-cvsimport - revisedMartin Langhoff
Early versions of git-cvsimport defaulted to using preexisting keyword expansion settings. This change preserves compatibility with existing cvs imports and allows new repository migrations to kill keyword expansion. After exploration of the different -k modes in the cvs protocol, we use -kk which kills keyword expansion wherever possible. Against the protocol spec, -ko and -kb will sometimes expand keywords. Should improve our chances of detecting merges and reduce imported repository size. Signed-off: Martin Langhoff <martin.langhoff@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-16[PATCH] Fixed two bugs in git-cvsimport-script.iso-8859-1?Q?David_K=E5gedal
The git-cvsimport-script had a copule of small bugs that prevented me from importing a big CVS repository. The first was that it didn't handle removed files with a multi-digit primary revision number. The second was that it was asking the CVS server for "F" messages, although they were not handled. I also updated the documentation for that script to correspond to actual flags. Signed-off-by: David K?5gedal <davidk@lysator.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-15[PATCH] Add documentation for git repack and git-prune-packed.Junio C Hamano
[jc: the patch forgot to update the main git.txt documentation, making all these new documentation practically no-op, so I added a minimum attempt linking them from there.] Signed-off-by: Ryan Anderson <ryan@michonline.com>
2005-08-15Keep excellent tutorial for using topic branches by Tony LuckJunio C Hamano
I would eventually like to move this to become a part of the tutorial, but anyway, this was an excellent post that describes how topic branches can be used to keep track of local changes.
2005-08-15[PATCH] Run Ispell through git.txtYasushi SHOJI
Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-15Add git-show-branches-scriptJunio C Hamano
Often I find myself wanting to do quick branches check when I am not in the windowing environment and cannot run gitk. This stupid script shows commits leading to the heads of interesting branches with indication which ones belong to which branches, so that fork point is somewhat discernible without using gitk. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-15[PATCH] Add some simple howtos, culled from the mailing list.Ryan Anderson
I think these are useful, and I think putting them in a new "howto" directory might help some users until we get to the point of splitting up the tutorial to be easier to read. Given the authorship, I think it's safe to put these in the repository. Signed-off-by: Ryan Anderson <ryan@michonline.com>
2005-08-15Documentation updates.Junio C Hamano
Linus brought up that documentation for many commands have incorrect attribution. I started counting lines again, but ended up adding a handful of missing manual pages. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-14Add SubmittingPatchesJunio C Hamano
Not that I have stricter patch submission standard than ordinary projects, I wanted to have it to make sure people understand what they are doing when they add their own Signed-off-by line. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-12[PATCH] Use $DESTDIR instead of $destPetr Baudis
$DESTDIR is more usual during the build than $dest and is what is usually used in the makefiles, so let's use it too. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-12fetch-pack: start multi-head pulling.Junio C Hamano
This is a beginning of resurrecting the multi-head pulling support for git-fetch-pack command. The git-fetch-script wrapper still only knows about fetching a single head, without renaming, so it is not very useful unless you directly call git-fetch-pack itself yet. It also fixes a longstanding obsolete description of how the command discovers the list of local commits.
2005-08-12Update unpack-objects usage and documentation.Junio C Hamano
It long supported -q flag to suppress progress meter without properly being documented.
2005-08-10ls-remote: drop storing operation and add documentation.Junio C Hamano
The store operation was never useful because we needed to fetch the objects needed to complete the reference. Remove it. The fetch command fetch multiple references shortly to replace the lost "store" functionality in more a generic way. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-10Document "git commit"Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-06[PATCH] Assorted documentation patchesJohannes Schindelin
[jc: Johannes spent time and effort to see how consistent our use of terminilogy is, and as a byproduct made these corrections not related to the terminology unification. I really appreciate it.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-04Retire git-check-files documentation too.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-04Retire check-files.Junio C Hamano
The king penguin said: It has no point any more, all the tools check the file status on their own, and yes, the thing should probably be removed. and the faithful servant makes it so. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-04git-send-pack: documentationJunio C Hamano
Describe the renaming push. The wording is horrible and I would appreciate a rewrite, but it is better than nothing ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-03[PATCH] Doc: update git-send-email-script documentation.Ryan Anderson
Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-03[PATCH] Add documentation for git-send-email-scriptRyan Anderson
Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-03receive-pack hooks updates.Junio C Hamano
The earlier one conflated update and post-update hooks for no good reason. Correct that ugly hack. Now post-update hooks will take the list of successfully updated refs. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-01[PATCH] git-merge-cache -q doesn't complain about failing merge programPetr Baudis
git-merge-cache reporting failed merge program is undesirable for Cogito, since it emits its own more appropriate error message in that case. However, I want to show other possible git-merge-cache error messages. So -q will just silence this particular error. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-01[PATCH] Updates to tutorial.txtJohannes Schindelin
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-08-01CVS-like push-pull description update.Junio C Hamano
- Yes, push does not lock, but that does not mean it is not meant for multi-user repository. It just ought to perform correctly without using locks. - Let's not pretend we know _the_ right way. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-01[PATCH] Updates for cvs-migration.txtJohannes Schindelin
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-01[PATCH] Added hook in git-receive-packJosef Weidendorfer
Just before updating a ref, $GIT_DIR/hooks/update refname old-sha1 new-sha1 is called if executable. The hook can decline the ref to be updated by exiting with a non-zero status, or allow it to be updated by exiting with a zero status. The mechanism also allows e.g sending of a mail with pushed commits on the remote repository. Documentation update with an example hook is included. jc: The credits of the basic idea and initial implementation go to Josef, but I ended up rewriting major parts of his patch, so bugs are all mine. Also I changed the semantics for the hook from his original version (which were post-update hook) so that the hook can optionally decline to update the ref, and also can be used to implement the overall cleanups. The latter was primarily to implement a suggestion from Linus that calling update-server-info should be made optional. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-30[PATCH] document git-rev-list betterMatthias Urlichs
Document new (and not-so-new) flags of git-rev-list. Signed-off-By: Matthias Urlichs <smurf@smurf.noris.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-30[PATCH] Trivial tidyupsPetr Baudis
Simple whitespace-related tidyups ensuring style consistency. This is carried over from my old git-pb branch. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-30Documentation and tests: ls-files exclude pattern.Junio C Hamano
Update the tests and documentation to match the new "last one determines its fate" semantics. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-29Tutorial: use a bit longer sample filenames.Junio C Hamano
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-28[PATCH] Add documentation for git-rename-scriptRyan Anderson
Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-28Document --strict flag to the fsck-cache command.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-27Tutorial typofix.Linus Torvalds
Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-26Documentation: describe git-ls-files --exclude patterns.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-25Update the documentation for git-tag-script to reflect current behavior.Ryan Anderson
[jc: I updated Ryan's patch to mention -a to create an unsigned tag.] Signed-off-by: Ryan Anderson <ryan@michonline.com>
2005-07-24[PATCH] Document update-server-info.Junio C Hamano
This adds a minimum documentation to the new command. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-24[PATCH] Documentation: git-peek-remote.Junio C Hamano
Add documentation for the git-peek-remote and link it from the main index. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-23Update tutorial.txt branches/tags to use the nicer helper syntaxLinus Torvalds
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-23[PATCH] tutorial: mention "git clone" records .git/branches/originJunio C Hamano
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-23[PATCH] Fix a typo in git-unpack-objects documentation.Jan Veldeman
Fix a typo in git-unpack-objects documentation. Signed-off-by: Jan Veldeman <jan@mind.be> Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-16[PATCH] Documentation: describe short-hand used in fetch/pull.Junio C Hamano
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-16[PATCH] Documentation: update recommended workflow when working with others.Junio C Hamano
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-16[PATCH] Documentation: adjust cvsimport command line.Junio C Hamano
The cvsimport example in the cvs migration document was still using the old syntax for target repository after new and improved cvsimport-script was merged. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-15Fix up "make doc"Linus Torvalds
Fix 'git-var.txt' and use "-b xhtml11" instead of "-b css-embedded" to make asciidoc 7.0.1 happy.