summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* Clarify git-cherry documentation.sean2006-05-051-5/+14
| | | | | Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update git-unpack-objects documentation.sean2006-05-051-3/+10
| | | | | | | | | Document that git-unpack-objects will not produce any results when used on a pack that exists in a repository; move it first. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix up docs where "--" isn't displayed correctly.sean2006-05-0512-13/+13
| | | | | | | | | | A bare "--" doesn't show up in man or html pages correctly as two individual dashes unless backslashed as \-- in the asciidoc source. Note, no backslash is needed inside a literal block. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Several trivial documentation touch ups.sean2006-05-056-6/+10
| | | | | | | | | | | | | | | | | | | Move incorrect asciidoc level 2 titles back to level 1. Show output of git-name-rev in man page example. Reword sentences that begin with a period (.) in asciidoc numbered lists to work around conversion to man page bug. Mention that git-repack now calls git-prune-packed when the -d option is passed to it. [imap] section headers in the config file example need to be contained in a literal block. imap.pass is the proper config file variable to use, not imap.password. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'jc/symref'Junio C Hamano2006-05-031-3/+5
|\ | | | | | | | | * jc/symref: core.prefersymlinkrefs: use symlinks for .git/HEAD
| * core.prefersymlinkrefs: use symlinks for .git/HEADJunio C Hamano2006-05-021-3/+5
| | | | | | | | | | | | | | | | | | When inspecting a project whose build infrastructure used to assume that .git/HEAD is a symlink ref, core.prefersymlinkrefs in the config file of such a project would help to bisect its history. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'js/repoconfig'Junio C Hamano2006-05-031-1/+4
|\ \ | | | | | | | | | | | | | | | | | | * js/repoconfig: repo-config: deconvolute logics repo-config: readability fixups. repo-config: support --get-regexp
| * | repo-config: support --get-regexpJohannes Schindelin2006-05-021-1/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | With --get-regexp, output all key/value pairs where the key matches a regexp. Example: git-repo-config --get-regexp remote.*.url will output something like remote.junio.url git://git.kernel.org/pub/scm/git/git.git remote.gitk.url git://git.kernel.org/pub/scm/gitk/gitk.git Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'jc/count'Junio C Hamano2006-05-031-1/+11
|\ \ | | | | | | | | | | | | | | | | | | * jc/count: builtin-count-objects: open packs when running -v builtin-count-objects: make it official. built-in count-objects.
| * | builtin-count-objects: make it official.Junio C Hamano2006-05-011-1/+11
| | | | | | | | | | | | | | | | | | | | | Remove the shell-script version, make the hardlink from the git binary, and update the documentation to describe a new option. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint'Junio C Hamano2006-05-032-169/+242
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * maint: Add a few more words to the glossary. Added definitions for a few words: Alphabetize the glossary.
| * | | Add a few more words to the glossary.v1.3.2Jon Loeliger2006-05-031-12/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up a few entries and fix typos. bare repository cherry-picking hook topic branch [jc: removing questionable "symbolic ref -- see 'ref'" for now.] Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Added definitions for a few words:Jon Loeliger2006-05-032-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fast forward pickaxe refspec tracking branch Wild hack allows "link:git-" prefix to reference commands too. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Alphabetize the glossary.Jon Loeliger2006-05-031-169/+170
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'fix'Junio C Hamano2006-05-032-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * fix: fix various typos in documentation
| * | | fix various typos in documentationMatthias Kestenholz2006-05-032-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | add documentation for update-index --unresolveMatthias Kestenholz2006-05-031-1/+5
| |_|/ |/| | | | | | | | | | | Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'se/rebase'Junio C Hamano2006-05-011-13/+63
|\ \ \ | | | | | | | | | | | | | | | | * se/rebase: Add --continue and --abort options to git-rebase.
| * | | Add --continue and --abort options to git-rebase.sean2006-04-261-13/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git rebase [--onto <newbase>] <upstream> [<branch>] git rebase --continue git rebase --abort Add "--continue" to restart the rebase process after manually resolving conflicts. The user is warned if there are still differences between the index and the working files. Add "--abort" to restore the original branch, and remove the .dotest working files. Some minor additions to the git-rebase documentation. [jc: fix that applies to the maintenance track has been dealt with separately.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'fix'Junio C Hamano2006-04-2810-131/+163
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | | | | | | | | | | | | | | | | * fix: Fix trivial typo in git-log man page. Properly render asciidoc "callouts" in git man pages. Fix up remaining man pages that use asciidoc "callouts". Update the git-branch man page to include the "-r" option, annotate: display usage information if no filename was given annotate: fix warning about uninitialized scalar git-am --resolved: more usable error message.
| * | Fix trivial typo in git-log man page.Sean Estabrooks2006-04-281-4/+3
| | | | | | | | | | | | Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
| * | Properly render asciidoc "callouts" in git man pages.Sean Estabrooks2006-04-282-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | Adds an xsl fragment to render docbook callouts when converting to man page format. Update the Makefile to have "xmlto" use it when generating man pages. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
| * | Fix up remaining man pages that use asciidoc "callouts".Sean Estabrooks2006-04-286-108/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately docbook does not allow a callout to be referenced from inside a callout list description. Rewrite one paragraph in git-reset man page to work around this limitation. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
| * | Update the git-branch man page to include the "-r" option,Sean Estabrooks2006-04-281-18/+39
| |/ | | | | | | | | | | and fix up asciidoc "callouts" Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
* | Deprecate usage of git-var -l for getting config vars listPetr Baudis2006-04-241-1/+2
| | | | | | | | | | | | | | | | This has been an unfortunate sideway in the git API evolution. We use git-repo-config for all the other .git/config interaction so let's also use git-repo-config -l for the variable listing. Signed-off-by: Petr Baudis <pasky@suse.cz>
* | git-repo-config --list supportPetr Baudis2006-04-241-0/+4
|/ | | | | | | | | This adds git-repo-config --list (or git-repo-config -l) support, similar to what git-var -l does now (to be phased out so that we have a single sane interface to the config file instead of fragmented and confused API). Signed-off-by: Petr Baudis <pasky@suse.cz>
* Document the configuration filePetr Baudis2006-04-242-13/+197
| | | | | | | | | | This patch adds a Documentation/config.txt file included by git-repo-config and currently aggregating hopefully all the available git plumbing / core porcelain configuration variables, as well as briefly describing the format. It also updates an outdated bit of the example in git-repo-config(1). Signed-off-by: Petr Baudis <pasky@suse.cz>
* Document git-var -l listing also configuration variablesPetr Baudis2006-04-241-1/+4
| | | | Signed-off-by: Petr Baudis <pasky@suse.cz>
* Document git-clone --referenceShawn Pearce2006-04-181-1/+20
| | | | | | | | | | | | The new --reference flag introduced to git-clone in GIT 1.3.0 was not documented but is rather handy. So document it. Also corrected a minor issue with the documentation for the -s flag; the info/alternates file name was spelled wrong. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add git-annotate(1) and git-blame(1)Jonas Fonseca2006-04-183-0/+92
| | | | | | | [jc: with entries in git.txt] Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* diff-options: add --patch-with-statJohannes Schindelin2006-04-151-0/+3
| | | | | | | | | | With this option, git prepends a diffstat in front of the patch. Since I really, really do not know what a diffstat of a combined diff ("merge diff") should look like, the diffstat is not generated for these. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'js/diffstat'Junio C Hamano2006-04-141-0/+3
|\ | | | | | | | | | | | | * js/diffstat: diff --stat: no need to ask funcnames nor context. diff-options: add --stat (take 2) diff-options: add --stat (take 2)
| * diff-options: add --stat (take 2)Johannes Schindelin2006-04-131-0/+3
| | | | | | | | | | | | | | | | | | Now, you can say "git diff --stat" (to get an idea how many changes are uncommitted), or "git log --stat". Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-log <diff-options> <paths> documentationJunio C Hamano2006-04-141-4/+20
|/ | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: add a couple of missing docs.Junio C Hamano2006-04-133-0/+93
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'jc/withraw' into nextJunio C Hamano2006-04-111-0/+3
|\ | | | | | | | | | | * jc/withraw: Separate the raw diff and patch with a newline Document --patch-with-raw
| * Document --patch-with-rawPetr Baudis2006-04-111-0/+3
| | | | | | | | | | Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Implement limited context matching in git-apply.Eric W. Biederman2006-04-101-1/+7
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ok this really should be the good version. The option handling has been reworked to be automation safe. Currently to import the -mm tree I have to work around git-apply by using patch. Because some of Andrews patches in quilt will only apply with fuzz. I started out implementing a --fuzz option and then I realized fuzz is not a very safe concept for an automated system. What you really want is a minimum number of context lines that must match. This allows policy to be set without knowing how many lines of context a patch actually provides. By default the policy remains to match all provided lines of context. Allowng git-apply to match a restricted set of context makes it much easier to import the -mm tree into git. I am still only processing 1.5 to 1.6 patches a second for the 692 patches in 2.6.17-rc1-mm2 is still painful but it does help. If I just loop through all of Andrews patches in order and run git-apply --index -C1 I process the entire patchset in 1m53s or about 6 patches per second. So running git-mailinfo, git-write-tree, git-commit-tree, and git-update-ref everytime has a measurable impact, and shows things can be speeded up even more. All of these timings were taking on my poor 700Mhz Athlon with 512MB of ram. So people with fast machiens should see much better performance. When a match is found after the number of context are reduced a warning is generated. Since this is a rare event and possibly dangerous this seems to make sense. Unless you are patching a single file the error message is a little bit terse at the moment, but it should be easy to go back and fix. I have also updated the documentation for git-apply to reflect the new -C option that sets the minimum number of context lines that must match. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Improve the git-diff-tree -c/-cc documentationPetr Baudis2006-04-091-9/+16
| | | | | | | | This tries to clarify the -c/-cc documentation and clean up the style and grammar. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add Documentation/technical/pack-format.txtJunio C Hamano2006-04-071-0/+111
| | | | | | | ... along with the previous one, pack-heuristics, by popular demand. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Added Packing Heursitics IRC writeup.Jon Loeliger2006-04-071-0/+466
| | | | | Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add documentation for git-imap-send.Mike McCormack2006-04-051-0/+60
| | | | | Signed-off-by: Mike McCormack <mike@codeweavers.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Tweaks to make asciidoc play nice.Francis Daly2006-04-051-4/+5
| | | | | | | | Once the content has been generated, the formatting elves can reorder it to be pretty... Signed-off-by: Francis Daly <francis@daoine.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-commit: document --amendMarco Roeland2006-04-051-1/+23
| | | | | | | | | | | | | | The "--amend" option is used to amend the tip of the current branch. This documentation text was copied straight from the commit that implemented it. Some minor format tweaks for asciidoc were taken from work by Francis Daly in commit b0d08a5.. It looks good now also in the html page. [jc: amended further to follow the recommendation by Francis in commit 3070b60]. Signed-off-by: Marco Roeland <marco.roeland@xs4all.nl> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'pb/regex'Junio C Hamano2006-04-051-0/+4
|\ | | | | | | | | | | * pb/regex: On some platforms, certain headers need to be included before regex.h Support for pickaxe matching regular expressions
| * Support for pickaxe matching regular expressionsPetr Baudis2006-04-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | git-diff-* --pickaxe-regex will change the -S pickaxe to match POSIX extended regular expressions instead of fixed strings. The regex.h library is a rather stupid interface and I like pcre too, but with any luck it will be everywhere we will want to run Git on, it being POSIX.2 and all. I'm not sure if we can expect platforms like AIX to conform to POSIX.2 or if win32 has regex.h. We might add a flag to Makefile if there is a portability trouble potential. Signed-off-by: Petr Baudis <pasky@suse.cz>
* | Add git-clean commandPavel Roskin2006-04-051-0/+50
|/ | | | | | | | | | | This command removes untracked files from the working tree. This implementation is based on cg-clean with some simplifications. The documentation is included. [jc: with trivial documentation fix, noticed by Jakub Narebski] Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: revise top of git man pageJ. Bruce Fields2006-04-021-48/+41
| | | | | | | | | | | | | | | | | | | | I'm afraid I'll be accused of trying to suck all the jokes and the personality out of the git documentation. I'm not! Really! That said, "man git" is one of the first things a new user is likely try, and it seems a little cruel to start off with a somewhat obscure joke about the architecture of git. So instead I'm trying for a relatively straightforward description of what git does, and what features distinguish it from other systems, together with immediate links to introductory documentation. I also did some minor reorganization in an attempt to clarify the classification of commands. And revised a bit for conciseness (as is obvious from the diffstat--hopefully I didn't cut anything important). Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'master' into nextJunio C Hamano2006-03-262-0/+15
|\ | | | | | | | | | | | | * master: Optionally do not list empty directories in git-ls-files --others Document git-rebase behavior on conflicts. Fix error handling for nonexistent names
| * Optionally do not list empty directories in git-ls-files --othersPetr Baudis2006-03-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the --directory flag, git-ls-files wouldn't ever list directories, producing no output for empty directories, which is good since they cannot be added and they bear no content, even untracked one (if Git ever starts tracking directories on their own, this should obviously change since the content notion will change). With the --directory flag however, git-ls-files would list even empty directories. This may be good in some situations but sometimes you want to prevent that. This patch adds a --no-empty-directory option which makes git-ls-files omit empty directories. Signed-off-by: Petr Baudis <pasky@suse.cz>
View Lorry Controller Status