summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* Documentation: rebase-from-internal minor updates.Junio C Hamano2005-11-191-5/+2
| | | | | | | git-commit -v flag has been the default for quite some time, so do not mention it. Also a typofix. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document the "ignore objects" feature of git-pack-redundantLukas Sandström2005-11-181-0/+8
| | | | | Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update pull/fetch --tags documentationLuck, Tony2005-11-181-1/+3
| | | | | | | | | When fetching/pulling from a remote repository the "--tags" option can be used to pull tags too. Document that it will limit the pull to only commits reachable from the tags. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-am: --binary; document --resume and --binary.Junio C Hamano2005-11-171-8/+16
| | | | | | | | | | | Now git-apply can grok binary replacement patches, give --binary flag to git-am. As a safety measure, this is not by default enabled, so that you do not let malicious e-mailed patch to replace an arbitrary path with just a couple of lines (diff index lines, the filename and string "Binary files "...) by accident. Signed-off-by: Junio C Hamano <junkio@cox.net>
* diff: --full-indexJunio C Hamano2005-11-161-0/+5
| | | | | | | | | A new option, --full-index, is introduced to diff family. This causes the full object name of pre- and post-images to appear on the index line of patch formatted output, to be used in conjunction with --allow-binary-replacement option of git-apply. Signed-off-by: Junio C Hamano <junkio@cox.net>
* apply: allow-binary-replacement.Junio C Hamano2005-11-161-1/+12
| | | | | | | | | | | | | | | | A new option, --allow-binary-replacement, is introduced. When you feed a diff that records full SHA1 name of pre- and post-image blob on its index line to git-apply with this option, the post-image blob replaces the path if what you have in the working tree matches the pre-image _and_ post-image blob is already available in the object directory. Later we _might_ want to enhance the diff output to also include the full binary data of the post-image, to make this more useful, but this is good enough for local rebasing application. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-log.txt: trivial typo fix.Alecs King2005-11-161-1/+1
| | | | | Signed-off-by: Alecs King <alecsk@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git --help COMMAND brings up the git-COMMAND man-page.Andreas Ericsson2005-11-151-0/+2
| | | | | | | | It's by design a bit stupid (matching ^git rather than ^git-), so as to work with 'gitk' and 'git' as well. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update git(7) man-page for the C wrapper.Andreas Ericsson2005-11-151-7/+28
| | | | | | | | | | | | The program 'git' now has --exec-path which needs explaining. Renamed old "DESCRIPTION" to "CORE GIT COMMANDS" to make room for "OPTIONS" while following follow some sort of convention. Also updated AUTHORS section to pat my own back a bit. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix git(1) link to git-index-packJonas Fonseca2005-11-151-1/+1
| | | | | Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: do not blindly run 'cat' .git/HEAD, or echo into it.Junio C Hamano2005-11-156-10/+11
| | | | | | | | | Many places in the documentation we still talked about reading what commit is recorded in .git/HEAD or writing the new head information into it, both assuming .git/HEAD is a symlink. That is not necessarily so. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-daemon: --inetd implies --syslogAndreas Ericsson2005-11-151-1/+1
| | | | | | | Otherwise nothing is logged anywhere, which is a Bad Thing. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation nitpickingNikolai Weibull2005-11-142-2/+2
| | | | | | | This patch fixes some small problems with the documentation. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document a couple of missing command-line options.Nikolai Weibull2005-11-143-5/+15
| | | | | | | This patch adds documentation to quite a few command-line options. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document the -n command-line option to git-unpack-objectsNikolai Weibull2005-11-141-1/+5
| | | | | | | | This patch documents the -n command-line option to git-unpack-objects, as it was previously undocumented. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-branch: Mention -d and -D in man-page.Andreas Ericsson2005-11-141-4/+11
| | | | | Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Remove git-rename. git-mv does the sameJosef Weidendorfer2005-11-142-35/+0
| | | | | Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Rename lost+found to lost-found.Junio C Hamano2005-11-132-5/+5
| | | | | | | | Because we use "lost-found" as the directory name to hold dangling object names, it is confusing to call the command git-lost+found, although it makes sense and is even cute ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: asciidoc sources are utf-8Junio C Hamano2005-11-112-3/+3
| | | | | | | | | | | git-pack-redundant documentation was encoded in latin1, which caused asciidoc to barf, which expected to see utf-8. Run tcs to re-encode it in utf-8. Also just for fun try my name in Japanese in git-lost+found documentation ;-) Signed-off-by: Junio C Hamano <junkio@cox.net>
* Rename .git/lost+found to .git/lost-found.Junio C Hamano2005-11-111-4/+4
| | | | | | | | | | Just to avoid confusion that scripts poorly written by somebody else ;-) might mistake this as a mount point, or backup tools ignoring the directory. The latter is probably not a big loss, however, considering that this directory's contents are to be used while fresh anyway. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-lost+foundJunio C Hamano2005-11-112-0/+81
| | | | | | This command helps you resurrect accidentally lost tags and commits. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Make git-pack-redundant consider alt-odbsLukas_Sandström2005-11-111-7/+10
| | | | | | | | | | | | | | This patch changes git-pack-redundant so that packfiles in alternate object directories also are considered when deciding which objects are redundant. This functionality is controlled by the flag '--alt-odb'. Also convert the other flags to the long form, and update docs and git-repack accordingly. Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Rename git-pack-intersect to git-pack-redundantLukas_Sandström2005-11-111-3/+3
| | | | | | | | | | | This patch renames git-pack-intersect to git-pack-redundant as suggested by Petr Baudis. The new name reflects what the program does, rather than how it does it. Also fix a small argument parsing bug. Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add documentation for git-pack-intersectLukas_Sandström2005-11-111-0/+47
| | | | | Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: git-apply --no-addJunio C Hamano2005-11-111-1/+7
| | | | | | | This is a specialized hack to help no-base merges, but other people might find it useful, so let's document it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Change 'cache' to 'index' in the docsLukas_Sandström2005-11-1117-71/+71
| | | | | | | | | This patch makes the documentation refer to the index as index instead of cache, but some references still remain. (e.g. git-update-index.txt) Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-clone: Keep remote names when cloning unless explicitly told not to.Andreas Ericsson2005-11-111-5/+7
| | | | | | | | | | | | | | | 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-111-1/+5
| | | | | | | | | | 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-111-1/+1
| | | | | | | | | | 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-081-7/+7
| | | | | | | | "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-081-1/+3
| | | | | | | 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-081-4/+0
| | | | | | | | | 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-081-88/+138
| | | | | 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-081-0/+3
| | | | | 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-081-7/+8
| | | | | | Use 'git merge' instead. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: fix dependency generation.Junio C Hamano2005-11-082-11/+36
| | | | | | | 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-071-0/+65
| | | | | 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-073-9/+36
| | | | | | | | | 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-071-1/+1
| | | | | | | 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-071-0/+56
| | | | | | | | | | | | | | 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-073-3/+4
| | | | | | | | 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-061-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>
* Refactored merge options into separate merge-options.txt.Jon Loeliger2005-11-067-47/+55
| | | | | | | | | | | | | 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-061-1/+2
| | | | | | | | | | | | | 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-063-35/+38
| | | | | 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-061-0/+89
|\
| * Add support for pushing to a remote repository using HTTP/DAVNick Hengeveld2005-11-061-0/+89
| | | | | | | | | | | | | | 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-061-2/+2
|/ | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: pull/clone ref mapping clarification.Junio C Hamano2005-11-062-14/+33
| | | | | | | | | 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-051-0/+20
| | | | | | | Add examples section and talk about using this to cherry-pick commits. Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status