aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
* GIT 1.5.1v1.5.1Junio C Hamano2007-04-03
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge 1.5.0.7 inJunio C Hamano2007-04-03
|\ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * GIT 1.5.0.7v1.5.0.7Junio C Hamano2007-04-03
| | | | | | | | | | | | | | | | Not that this release really matters, as we will be doing 1.5.1 tomorrow. This commit is to tie the loose ends and merge all of "maint" branch into "master" in preparation. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation: A few minor fixes to Git User's ManualJakub Narebski2007-04-03
| | | | | | | | | | | | | | | | Mainly consistent usage of "git command" and not "git-command" syntax Signed-off-by: Jakub Narebski <jnareb@gmail.com> Acked-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Hopefully final update to the draft Release Notes, preparing for 1.5.1Junio C Hamano2007-04-02
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | cvsserver: Don't lie about binary mode in asciidoc documentationFrank Lichtenheld2007-03-31
| | | | | | | | | | | | | | | | | | | | The git-cvsserver documentation claims that the server will set -k modes if appropriate which is not really the case. On the other hand the available gitcvs.allbinary variable is not documented at all. Fix both these issues by rewording the related paragraph. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Update draft release notes for 1.5.1Junio C Hamano2007-03-30
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-03-29
|\ \ | |/ | | | | | | | | | | * maint: git-upload-pack: make sure we close unused pipe ends Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES. Documentation/git-svnimport.txt: fix typo.
| * Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.Gerrit Pape2007-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Please see http://bugs.debian.org/404795: In git-rev-parse(1), there is an example commit tree, which is used twice. The explanation for this tree is very clear: B and C are commit *parents* to A. However, when the tree is reused as an example in the SPECIFYING RANGES, the manpage author screws up and uses A as a commit *parent* to B and C! I.e., he inverts the tree. And the fact that for this example you need to read the tree backwards is not explained anywhere (and it would be confusing even if it was). Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation/git-svnimport.txt: fix typo.Gerrit Pape2007-03-29
| | | | | | | | | | | | | | | | This was noticed by Frederik Schwarzer. SVN's repository by default has trunk, tags/, and branch_es_/. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'master' of git://repo.or.cz/git/mergetool.gitJunio C Hamano2007-03-29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://repo.or.cz/git/mergetool.git: mergetool: Clean up description of files and prompts for merge resolutions mergetool: Make git-rm quiet when resolving a deleted file conflict mergetool: Add support for Apple Mac OS X's opendiff command mergetool: Fix abort command when resolving symlinks and deleted files mergetool: Remove spurious error message if merge.tool config option not set mergetool: factor out common code mergetool: portability fix: don't use reserved word function mergetool: portability fix: don't assume true is in /bin mergetool: Don't error out in the merge case where the local file is deleted mergetool: Replace use of "echo -n" with printf(1) to be more portable Fix minor formatting issue in man page for git-mergetool
| * | Fix minor formatting issue in man page for git-mergetoolTheodore Ts'o2007-03-29
| | | | | | | | | | | | Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* | | Update main git.html page to point at 1.5.0.6 documentationJunio C Hamano2007-03-28
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint' to synchronize with 1.5.0.6Junio C Hamano2007-03-28
|\ \ \ | | |/ | |/|
| * | GIT 1.5.0.6v1.5.0.6Junio C Hamano2007-03-28
| | |
* | | Document git-log --first-parentJunio C Hamano2007-03-27
| |/ |/| | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 1.5.1-rc2v1.5.1-rc2Junio C Hamano2007-03-25
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-03-25
|\ \ | |/ | | | | | | | | | | | | | | | | * maint: user-manual: introduce "branch" and "branch head" differently glossary: clean up cross-references glossary: stop generating automatically user-manual: Use def_ instead of ref_ for glossary references. user-manual.txt: fix a tiny typo. user-manual: run xsltproc without --nonet option
| * Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maintJunio C Hamano2007-03-25
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'maint' of git://linux-nfs.org/~bfields/git: user-manual: introduce "branch" and "branch head" differently glossary: clean up cross-references glossary: stop generating automatically user-manual: Use def_ instead of ref_ for glossary references. user-manual.txt: fix a tiny typo. user-manual: run xsltproc without --nonet option
| | * user-manual: introduce "branch" and "branch head" differentlyJ. Bruce Fields2007-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was using "branch" to mean "head", but that's perhaps a little sloppy; so instead start by using the terms "branch head" and "head", while still quickly falling back on "branch", since that's what people actually say more frequently. Also include glossary references on the first uses of "head" and "tag". Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| | * glossary: clean up cross-referencesJ. Bruce Fields2007-03-18
| | | | | | | | | | | | | | | | | | | | | Manual clean-up of cross-references, and also clean up a few definitions (e.g. git-rebase). Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| | * glossary: stop generating automaticallyJ. Bruce Fields2007-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sort_glossary.pl script sorts the glossary, checks for duplicates, and automatically adds cross-references. But it's not so hard to do all that by hand, and sometimes the automatic cross-references are a little wrong; so let's run the script one last time and check in its output. Note: to make the output fit better into the user manual I also deleted the acknowledgements at the end, which was maybe a little rude; feel free to object and I can find a different solution. Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| | * user-manual: Use def_ instead of ref_ for glossary references.J. Bruce Fields2007-03-18
| | | | | | | | | | | | | | | | | | | | | | | | I'd like to start using references to the glossary in the user manual. The "ref_" prefix for these references seems a little generic; so replace with "def_". Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| | * user-manual.txt: fix a tiny typo.Jim Meyering2007-03-18
| | | | | | | | | | | | | | | | | | | | | | | | "file patch" was doubtless intended to be "file path", but "directory name" is clearer. Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| | * user-manual: run xsltproc without --nonet optionJ. Bruce Fields2007-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The --nonet option prevents xsltproc from going to the network to find anything. But it always tries to find them locally first, so for a user with the necessary docbook stylesheets installed the build will work just fine without xsltproc attempting to use the network; all --nonet does is make it fail rather than falling back on that. That doesn't seem particularly helpful. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
* | | Document --quiet option to git-diffAlex Riesen2007-03-24
| | | | | | | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | git-am documentation: describe what is taken from where.Junio C Hamano2007-03-24
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Documentation: bisect: make a comment fit better in the man page.Christian Couder2007-03-23
| | | | | | | | | | | | | | | Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Documentation: bisect: add some titles to some paragraphs.Christian Couder2007-03-23
| | | | | | | | | | | | | | | Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Documentation: bisect: reformat more paragraphs.Christian Couder2007-03-23
| | | | | | | | | | | | | | | Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Documentation: bisect: reword one paragraph.Christian Couder2007-03-23
| | | | | | | | | | | | | | | Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Documentation: bisect: reformat some paragraphs.Christian Couder2007-03-23
| | | | | | | | | | | | | | | Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Bisect: implement "git bisect run <cmd>..." to automatically bisect.Christian Couder2007-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This idea was suggested by Bill Lear (Message-ID: <17920.38942.364466.642979@lisa.zopyra.com>) and I think it is a very good one. This patch adds a new test file for "git bisect run", but there is currently only one basic test. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint'Junio C Hamano2007-03-22
|\ \ \ | |/ / | | | | | | | | | | | | * maint: Documentation/pack-format.txt: Clear up description of types. fix typo in git-am manpage
| * | Documentation/pack-format.txt: Clear up description of types.Peter Eriksen2007-03-22
| | | | | | | | | | | | | | | Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | fix typo in git-am manpageMichael S. Tsirkin2007-03-21
| |/ | | | | | | | | | | | | Fix typo in git-am manpage Signed-off-by: Michael S. Tsirkin <mst@dev.mellanox.co.il> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Provide some technical documentation for shallow clonesJohannes Schindelin2007-03-19
| | | | | | | | | | | | | | | | | | | | There has not been any work on the shallow stuff lately, so it is hard to find out what it does, and how. This document describes the ideas as well as the current problems, and can serve as a starting point for shallow people. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add a HOWTO for setting up a standalone git daemonJohannes Schindelin2007-03-19
| | | | | | | | | | | | | | | | Setting up a git-daemon came up the other day on IRC, and it is slightly non trivial for the uninitiated. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 1.5.1-rc1v1.5.1-rc1Junio C Hamano2007-03-19
| | | | | | | | | | | | | | | | | | I think we can start to slow down, as we now have covered everything I listed earlier in the short-term release plan. The last release 1.5.0 took painfully too long. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Limit the size of the new delta_base_cacheShawn O. Pearce2007-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new configuration variable core.deltaBaseCacheLimit allows the user to control how much memory they are willing to give to Git for caching base objects of deltas. This is not normally meant to be a user tweakable knob; the "out of the box" settings are meant to be suitable for almost all workloads. We default to 16 MiB under the assumption that the cache is not meant to consume all of the user's available memory, and that the cache's main purpose was to cache trees, for faster path limiters during revision traversal. Since trees tend to be relatively small objects, this relatively small limit should still allow a large number of objects. On the other hand we don't want the cache to start storing 200 different versions of a 200 MiB blob, as this could easily blow the entire address space of a 32 bit process. We evict OBJ_BLOB from the cache first (credit goes to Junio) as we want to favor OBJ_TREE within the cache. These are the objects that have the highest inflate() startup penalty, as they tend to be small and thus don't have that much of a chance to ammortize that penalty over the entire data. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Make git-send-email aware of Cc: lines.J. Bruce Fields2007-03-18
| | | | | | | | | | | | | | | | | | | | In the Linux kernel, for example, it's common to include Cc: lines for cases when you want to remember to cc someone on a patch without necessarily claiming they signed off on it. Make git-send-email aware of these. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | mergetool: Add support for vimdiff.James Bowes2007-03-18
| | | | | | | | | | Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* | Update main git.html page to point at 1.5.0.5 documentationJunio C Hamano2007-03-18
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'ar/diff'Junio C Hamano2007-03-18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ar/diff: Add tests for --quiet option of diff programs try-to-simplify-commit: use diff-tree --quiet machinery. revision.c: explain what tree_difference does Teach --quiet to diff backends. diff --quiet Remove unused diffcore_std_no_resolve Allow git-diff exit with codes similar to diff(1)
| * | Allow git-diff exit with codes similar to diff(1)Alex Riesen2007-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a new command-line option: --exit-code. The diff programs will return 1 for differences, return 0 for equality, and something else for errors. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge 1.5.0.5 in from 'maint'Junio C Hamano2007-03-18
|\ \ \ | | |/ | |/|
| * | GIT 1.5.0.5v1.5.0.5Junio C Hamano2007-03-18
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | git-fetch, git-branch: Support local --track via a special remote '.'Paolo Bonzini2007-03-16
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for a dummy remote '.' to avoid having to declare a fake remote like [remote "local"] url = . fetch = refs/heads/*:refs/heads/* Such a builtin remote simplifies the operation of "git-fetch", which will populate FETCH_HEAD but will not pretend that two repositories are in use, will not create a thin pack, and will not perform any useless remapping of names. The speed improvement is around 20%, and it should improve more if "git-fetch" is converted to a builtin. To this end, git-parse-remote is grown with a new kind of remote, 'builtin'. In git-fetch.sh, we treat the builtin remote specially in that it needs no pack/store operations. In fact, doing git-fetch on a builtin remote will simply populate FETCH_HEAD appropriately. The patch also improves of the --track/--no-track support, extending it so that branch.<name>.remote items referring '.' can be created. Finally, it fixes a typo in git-checkout.sh. Signed-off-by: Paolo Bonzini <bonzini@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge GIT 1.5.0.4Junio C Hamano2007-03-14
|\ \ | |/
| * GIT 1.5.0.4v1.5.0.4Junio C Hamano2007-03-14
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-08-01 18:52:37 +0000