aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
* git-clone: Keep remote names when cloning unless explicitly told not to.Andreas Ericsson2005-11-11
| | | | | | | | | | | | | | | With this patch the following commands all clone into the local directory "repo". If repo exists, it will still barf. git-clone git://host.xz/repo.git git-clone /path/to/repo/.git git-clone host.xz:repo.git I ended up doing the same source-to-target sed'ing for all our company projects, so it was easier to add it directly to git-clone. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add --no-commit-id option for git-diff-tree, use it in gitkPavel Roskin2005-11-11
| | | | | | | | | | This patch introduces -no-commit-id option for git-diff-tree, which suppresses commit ID output. [jc: dropped gitk part for now.] Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: "host:path/to/repo" is git native over ssh.Junio C Hamano2005-11-11
| | | | | | | | | | You could also spell it ssh://host:/path/to/repo (or git+ssh, ssh+git), but without method:// is shorter to type, so mention only that one in the short and sweet list. Noticed by Pasky. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update howto using-topic-branchesLuck, Tony2005-11-08
| | | | | | | | "git resolve" is being deprecated in favour of "git merge". Update the documentation to reflect this. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-tag -d <tag>: delete tag <tag>Kai Ruemmler2005-11-08
| | | | | | | This adds option '-d' to git-tag.sh and documents it. Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Clean build annoyance.Junio C Hamano2005-11-08
| | | | | | | | | As Pasky pointed out, building in templates directory showed list of built template files which was unneeded. This commit also fixes another build annoyance I recently left in by accident. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use consistent shell prompts and example style.Jon Loeliger2005-11-08
| | | | | Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add --tags documentation, scraped from JC mail.Jon Loeliger2005-11-08
| | | | | Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Tutorial: do not use 'git resolve'.Junio C Hamano2005-11-08
| | | | | | Use 'git merge' instead. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: fix dependency generation.Junio C Hamano2005-11-08
| | | | | | | The previous rule misses the case where git.txt or tutorial.txt includes new files. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add bug isolation howto, scraped from Linus.Jon Loeliger2005-11-07
| | | | | Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix documentation dependency generation.Junio C Hamano2005-11-07
| | | | | | | | | Documentation/Makefile spent a lot of time to generate include dependencies, which was quite noticeable especially during "make clean". Rewrite it to generate just a single dependency file. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: asciidoc formatting fix for git-cvsexportcommit doc.Junio C Hamano2005-11-07
| | | | | | | Annoyingly enough, asciidoc wants the same number of '=' on the second line as there are characters on the first line. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Introducing: git-cvsexportcommitMartin Langhoff2005-11-07
| | | | | | | | | | | | | | A script that can replay commits git into a CVS checkout. Tries to ensure the sanity of the operation and supports mainly manual usage. If you are reckless enough, you can ask it to autocommit when everything has applied cleanly. Combined with a couple more scripts could become part of a git2cvs gateway. Should support adds/removes and binary files. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation update: use git branch -d foo where applicableKai Ruemmler2005-11-07
| | | | | | | | This updates documentation to use git branch -d foo in favour of rm .git/refs/heads/foo Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: talk about guts of merge in tutorial.Junio C Hamano2005-11-06
| | | | | | | | | 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>
* Refactored merge options into separate merge-options.txt.Jon Loeliger2005-11-06
| | | | | | | | | | | | | Refactored fetch options into separate fetch-options.txt. Made git-merge use merge-options. Made git-fetch use fetch-options. Made git-pull use merge-options and fetch-options. Added --help option to git-pull and git-format-patch scripts. Rewrote Documentation/Makefile to dynamically determine include dependencies. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Set up remotes/origin to track all remote branches.Junio C Hamano2005-11-06
| | | | | | | | | | | | | This implements the idea Daniel Barkalow came up with, to match the remotes/origin created by clone by default to the workflow I use myself in my guinea pig repository, to have me eat my own dog food. We probably would want to use either .git/refs/local/heads/* (idea by Linus) or .git/refs/heads/origin/* instead to reduce the local ref namespace pollution. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Refactor merge strategies into separate includable file.Jon Loeliger2005-11-06
| | | | | Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge in http-push first stage.Junio C Hamano2005-11-06
|\
| * Add support for pushing to a remote repository using HTTP/DAVNick Hengeveld2005-11-06
| | | | | | | | | | | | | | Add support for pushing to a remote repository using HTTP/DAV Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Install asciidoc sources as well.Junio C Hamano2005-11-06
|/ | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: pull/clone ref mapping clarification.Junio C Hamano2005-11-06
| | | | | | | | | Josef Weidendorfer points out that git-clone documentation does not mention the initial copying of remote branch heads into corresponding local branches. Also clarify the purpose of the ref mappings description in the "remotes" file and recommended workflow. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: format-patchJunio C Hamano2005-11-05
| | | | | | | Add examples section and talk about using this to cherry-pick commits. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: git-fetch/pull updates.Junio C Hamano2005-11-05
| | | | | | | | | | | | | | We do not accept multiple <refspecs> on one Pull:/Push: line right now (we could lift this tentative workaround for the broken refnames), but we have always accepted multiple such lines, so use that form in the examples and discussion. Also explicitly mention that Octopus is made only with an explicit command line request and never from Pull: lines. Add a couple of cross references. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Added a few examples to git-pull man page.Jon Loeliger2005-11-04
| | | | | | | | | | | | | | Clarified and added notes for pull/push refspecs. Converted to back-ticks for literal text examples. [jc: Also fixed git-pull description that still talked about its calling git-resolve or git-octopus (we do not anymore; instead we just call git-merge). BTW, I am reasonably impressed by how well "git-am -3" applied this patch, which had some conflicts because I've updated the documentation somewhat.] Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document the --no-commit flag betterJunio C Hamano2005-11-04
| | | | | | | | Pasky and I did overlapping documentation independently; this is to pick up better wordings from what he sent me. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: -merge and -pull: describe merge strategies.Junio C Hamano2005-11-04
| | | | | | | ... and give a couple of examples of running 'git pull' against local repository. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: git-add -- do not say "cache", add examples.Junio C Hamano2005-11-04
| | | | | | | Its use of git-ls-files --others is very nice, but sometimes gives surprising results, so we'd better talk about it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Illustration: "Commit DAG Revision Naming"Junio C Hamano2005-11-03
| | | | | | Jon Loeliger's ASCII art in the git-rev-parse(1) manual. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Illustration: "Git Diff Types"Junio C Hamano2005-11-03
| | | | | | Jon Loeliger's ASCII art in the Tutorial. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document --since and --until options to rev-parse.Junio C Hamano2005-11-02
| | | | | | | The usability magic were hidden in the source code without being documented, and even the maintainer did not know about them ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add -P to the documentation head.Junio C Hamano2005-11-01
| | | | | | | This is a companion patch for 211dcac6430cdf77fcf2a968ffaf9313b5c059b0 commit, to add the newly introduced -P option to the list of options. Signed-off-by: Junio C Hamano <junkio@cox.net>
* cvsimport: introduce -P <cvsps-output-file> optionMartin Langhoff2005-11-01
| | | | | | | | | -P:: <cvsps-output-file> Instead of calling cvsps, read the provided cvsps output file. Useful for debugging or when cvsps is being handled outside cvsimport. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-am.txt is no stub anymorePetr Baudis2005-11-01
| | | | | | | | | That notice was added by me for the emergency documentation, but Junio already expanded it to a full-fledged manual page. This patch removes the notice. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation for git-fmt-merge-msgPetr Baudis2005-11-01
| | | | | | | | | | Simple description. It appears to be mostly internal command, but hey, it is (it seems) the only undocumented one, so let's fix it up... Also add a note about it to git-merge documentation. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Remove 'Previously this command was known as ...' messages.Jon Loeliger2005-11-01
| | | | | | | | | | For a 1.0 release, there is no need to maintain the historical "Previously this command was known as..." information on the doc splash page. It is noise; command names should stand on their own now. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document the use of "current directory" as pull source.Junio C Hamano2005-11-01
| | | | | | | | 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>
* Add examples for git-log documentation and others.Linus Torvalds2005-10-30
| | | | | | | | | | | | | | | | | | | I don't think people really follow the links or think very abstractly at all in the first place. So I was thinking more of some explicit examples. I actually think every command should have an example in the man-page, and hey, here's a patch to start things off. Of course, I'm not exactly "Mr Documentation", and I don't know that this is the prettiest way to do this, but I checked that the resulting html and man-page seems at least reasonable. And hey, if the examples look like each other, that's just because I'm also not "Mr Imagination". Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix rev-list documentation again (--sparse and pathspec)Junio C Hamano2005-10-30
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update git-pack-objects documentation.Junio C Hamano2005-10-30
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update usage string and documentation for git-rev-list.Junio C Hamano2005-10-30
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add to usage and docs for git-add.shChris Shoemaker2005-10-30
| | | | | Signed-off-by: Chris Shoemaker <c.shoemaker@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add to documentation of git-update-index arguments and usage.Chris Shoemaker2005-10-30
| | | | | | | Removed unknown [--version] option. Signed-off-by: Chris Shoemaker <c.shoemaker@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation updates.Junio C Hamano2005-10-29
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix recent documentation format breakage.Junio C Hamano2005-10-29
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-apply --numstatJunio C Hamano2005-10-28
| | | | | | | | | The new option, --numstat, shows number of inserted and deleted lines for each path. It is similar to --stat output but is meant to be more machine friendly by giving number of added and deleted lines and unabbreviated paths. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Minor clarifications in diffcore documentationc.shoemaker@cox.net2005-10-28
| | | | | Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Remove -r from common diff options documentation in one more placec.shoemaker@cox.net2005-10-28
| | | | | Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation changes to recursive option for git-diff-treeChris Shoemaker2005-10-28
| | | | | | | | | | Update docs and usages regarding '-r' recursive option for git-diff-tree. Remove '-r' from common diff options, mention it only for git-diff-tree. Remove one extraneous use of '-r' with git-diff-files in get-merge.sh. Sync the synopsis and usage string for git-diff-tree. Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-15 07:58:06 +0000