summaryrefslogtreecommitdiffstats
path: root/Documentation (follow)
Commit message (Collapse)AuthorAgeFilesLines
* GIT 1.5.1-rc2v1.5.1-rc2Junio C Hamano2007-03-261-13/+40
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'maint'Junio C Hamano2007-03-264-453/+416
|\ | | | | | | | | | | | | | | | | | | * 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-264-453/+416
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-191-22/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-29/+29
| | | | | | | | | | | | | | | | | | | | | 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-194-428/+392
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | "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-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-0/+3
| | | | | | | | | | | | | | | 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-241-0/+27
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Documentation: bisect: make a comment fit better in the man page.Christian Couder2007-03-241-3/+3
| | | | | | | | | | | | | | | 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-241-0/+21
| | | | | | | | | | | | | | | 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-241-34/+39
| | | | | | | | | | | | | | | 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-241-3/+3
| | | | | | | | | | | | | | | 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-241-6/+6
| | | | | | | | | | | | | | | 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-231-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-222-5/+7
|\| | | | | | | | | | | | | | | | | * 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-221-4/+6
| | | | | | | | | | | | | | | 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-211-1/+1
| |/ | | | | | | | | | | | | 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-201-0/+49
| | | | | | | | | | | | | | | | | | | | 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-201-0/+52
| | | | | | | | | | | | | | | | 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-191-1/+49
| | | | | | | | | | | | | | | | | | 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-191-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-1/+2
| | | | | | | | | | | | | | | | | | | | 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-192-2/+2
| | | | | | | | | | 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-181-1/+3
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'ar/diff'Junio C Hamano2007-03-181-0/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-181-0/+28
|\ \ \ | | |/ | |/|
| * | GIT 1.5.0.5v1.5.0.5Junio C Hamano2007-03-181-0/+28
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | git-fetch, git-branch: Support local --track via a special remote '.'Paolo Bonzini2007-03-161-0/+4
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-142-1/+25
|\|
| * GIT 1.5.0.4v1.5.0.4Junio C Hamano2007-03-141-0/+24
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Clarify doc for git-config --unset-all.Yann Dirson2007-03-141-1/+1
| | | | | | | | | | | | | | | | | | Previous formulation could make it appear as removing all lines matching a regexp (at least, I was looking for such a flag, and confused this flag for what I was looking for). Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-03-141-8/+11
|\| | | | | | | | | * maint: cvsserver: asciidoc formatting changes
| * cvsserver: asciidoc formatting changesFrank Lichtenheld2007-03-141-8/+11
| | | | | | | | | | | | | | | | Format some lists really as lists. Improves both html and man output. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'pb/branch-track'Junio C Hamano2007-03-142-3/+21
|\ \ | | | | | | | | | | | | | | | * pb/branch-track: Fix broken create_branch() in builtin-branch. git-branch, git-checkout: autosetup for remote branch tracking
| * | git-branch, git-checkout: autosetup for remote branch trackingPaolo Bonzini2007-03-112-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to track and build on top of a branch 'topic' you track from your upstream repository, you often would end up doing this sequence: git checkout -b mytopic origin/topic git config --add branch.mytopic.remote origin git config --add branch.mytopic.merge refs/heads/topic This would first fork your own 'mytopic' branch from the 'topic' branch you track from the 'origin' repository; then it would set up two configuration variables so that 'git pull' without parameters does the right thing while you are on your own 'mytopic' branch. This commit adds a --track option to git-branch, so that "git branch --track mytopic origin/topic" performs the latter two actions when creating your 'mytopic' branch. If the configuration variable branch.autosetupmerge is set to true, you do not have to pass the --track option explicitly; further patches in this series allow setting the variable with a "git remote add" option. The configuration variable is off by default, and there is a --no-track option to countermand it even if the variable is set. Signed-off-by: Paolo Bonzini <bonzini@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Documentation: add git-mergetool to the command list.Junio C Hamano2007-03-141-0/+1
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'master' of git://repo.or.cz/git/mergetoolJunio C Hamano2007-03-142-0/+51
|\ \ \ | | | | | | | | | | | | | | | | * 'master' of git://repo.or.cz/git/mergetool: Add git-mergetool to run an appropriate merge conflict resolution program
| * | | Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o2007-03-142-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The git-mergetool program can be used to automatically run an appropriate merge resolution program to resolve merge conflicts. It will automatically run one of kdiff3, tkdiff, meld, xxdiff, or emacs emerge programs. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* | | | git-svn: add -l/--local command to "git svn rebase"Eric Wong2007-03-141-0/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | This avoids fetching new revisions remotely, and is usefuly versus plain "git rebase" because the user does not have to specify which remote head to rebase against. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | git-send-email: configurable bcc and chain-reply-toAvi Kivity2007-03-121-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chain-reply-to is a personal perference, and is unlikely to change from patchset to patchset. Similarly, bcc is likely to have the same values every invocation is one likes to bcc oneself. So, allow both to be set via configuration variables. Signed-off-by: Avi Kivity <avi@qumranet.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint'Junio C Hamano2007-03-121-0/+13
|\ \ \ | | |/ | |/| | | | | | | | | | * maint: git-send-email: Document configuration options git-merge: warn when -m provided on a fast forward
| * | git-send-email: Document configuration optionsAvi Kivity2007-03-121-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Wishing to implement an email aliases file, I found that they were already implmented. Document them for the next user. Signed-off-by: Avi Kivity <avi@qumranet.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Change {pre,post}-receive hooks to use stdinShawn O. Pearce2007-03-121-16/+16
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sergey Vlasov, Andy Parkins and Alex Riesen all pointed out that it is possible for a single invocation of receive-pack to be given more refs than the OS might allow us to pass as command line parameters to a single hook invocation. We don't want to break these up into multiple invocations (like xargs might do) as that makes it impossible for the pre-receive hook to verify multiple related ref updates occur at the same time, and it makes it harder for post-receive to send out a single batch notification. Instead we pass the reference data on a pipe connected to the hook's stdin, supplying one ref per line to the hook. This way a single hook invocation can obtain an infinite amount of ref data, without bumping into any operating system limits. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'js/attach'Junio C Hamano2007-03-111-4/+12
|\ \ | | | | | | | | | | | | | | | * js/attach: format-patch --attach: not folding some long headers. format-patch: add --inline option and make --attach a true attachment
| * | format-patch: add --inline option and make --attach a true attachmentJohannes Schindelin2007-03-051-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing --attach option did not create a true "attachment" but multipart/mixed with Content-Disposition: inline. It should have been with Content-Disposition: attachment. Introduce --inline to add multipart/mixed that is inlined, and make --attach to create an attachement. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'pb/commit-i'Junio C Hamano2007-03-111-2/+7
|\ \ \ | | | | | | | | | | | | | | | | * pb/commit-i: git-commit: add a --interactive option
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 17:23:14 +0100