summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2007-04-169-133/+212
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: Have sample update hook not refuse deleting a branch through push. variable $projectdesc needs to be set before checking against unchanged default. Update git-annotate/git-blame documentation Update git-apply documentation Update git-applymbox documentation Update git-am documentation user-manual: use detached head when rewriting history user-manual: start revising "internals" chapter user-manual: detached HEAD user-manual: fix discussion of default clone Documentation: clarify track/no-track option. Documentation: clarify git-checkout -f, minor editing Documentation: minor edits of git-lost-found manpage
| * Update git-annotate/git-blame documentationAndrew Ruder2007-04-163-64/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved options that pertained to both git-blame and git-annotate to a common file blame-options.txt. builtin-blame.c: Removed --compatibility, --long, --time from the short usage as they are not handled in the code. Documentation/git-blame.txt: Removed common options to git-annotate. Added documentation for --score-debug. Removed --compatibility. Adjusted usage at top to not wrap on 80 columns. Documentation/git-annotate.txt: Using common options blame-options.txt. Documentation/blame-options.txt: Added -b note about associated config option, added --root note about associated config option, added documentation for --show-stats. Removed --long, --time, --rev-file as those options do not really exist. Added documentation for -M/-C taking an optional score argument for detection of moved lines. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Update git-apply documentationAndrew Ruder2007-04-161-6/+7
| | | | | | | | | | | | | | | | | | Document -v (short form of --verbose). Redo usage to not wrap on 80 column terminal with typical settings. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Update git-applymbox documentationAndrew Ruder2007-04-161-4/+10
| | | | | | | | | | | | | | | | | | Documentation/git-applymbox.txt: updating -u documentation to include fact that it encodes to the i18n.commitencoding setting, not just utf-8. Added documentation of -n option to pass -n to git-mailinfo. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Update git-am documentationAndrew Ruder2007-04-161-9/+16
| | | | | | | | | | | | | | | | | | Documentation/git-am.txt missing several short versions of options. Added documentation for --resolvemsg=<msg> command-line option. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * user-manual: use detached head when rewriting historyJ. Bruce Fields2007-04-161-7/+8
| | | | | | | | | | | | | | | | This is slightly simpler if we use a detached head. And it's probably good to have another example that uses this feature. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * user-manual: start revising "internals" chapterJ. Bruce Fields2007-04-161-18/+20
| | | | | | | | | | | | | | Minor revisions, cross-references. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * user-manual: detached HEADJ. Bruce Fields2007-04-161-2/+42
| | | | | | | | | | | | | | Add a brief mention of detached HEADs and .git/HEAD. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * user-manual: fix discussion of default cloneJ. Bruce Fields2007-04-161-3/+3
| | | | | | | | | | | | | | | | The name "master" isn't actually quite so special. Also, fix some bad grammar. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: clarify track/no-track option.J. Bruce Fields2007-04-161-4/+8
| | | | | | | | | | | | | | | | | | Fix the description of the --no-track option so it no longer says the opposite of what was intended. Also mention branch.autosetupmerge explicitly. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: clarify git-checkout -f, minor editingJ. Bruce Fields2007-04-161-4/+5
| | | | | | | | | | | | | | | | | | "Force a re-read of everything" doesn't mean much to me. Also some minor grammar fixes. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: minor edits of git-lost-found manpageJ. Bruce Fields2007-04-161-12/+11
| | | | | | | | | | | | | | Minor improvements to grammar and clarity of lost-found manpage. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add --quiet option to suppress output of "rm" commands for removed files.Steven Grimm2007-04-161-0/+4
| | | | | | | | | | Signed-off-by: Steven Grimm <koreth@midwinter.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add policy on user-interface changesAndrew Ruder2007-04-151-0/+3
| | | | | | | | | | | | | | | | Documentation/SubmittingPatches: Add note that all user interface changes should include associated documentation updates. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-04-151-0/+5
|\ \ | |/ | | | | | | | | | | | | | | * maint: Document -g (--walk-reflogs) option of git-log sscanf/strtoul: parse integers robustly git-blame: Fix overrun in fake_working_tree_commit() [PATCH] Improve look-and-feel of the gitk tool. [PATCH] Teach gitk to use the user-defined UI font everywhere.
| * Document -g (--walk-reflogs) option of git-logAlex Riesen2007-04-151-0/+5
| | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-04-141-3/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | * maint: git-quiltimport complaining yet still working config.txt: Fix grammatical error in description of http.noEPSV config.txt: Change pserver to server in description of gitcvs.* config.txt: Document core.autocrlf config.txt: Document gitcvs.allbinary Do not default to --no-index when given two directories. Use rev-list --reverse in git-rebase.sh
| * config.txt: Fix grammatical error in description of http.noEPSVFrank Lichtenheld2007-04-131-1/+1
| | | | | | | | | | | | | | s/doesn't/don't/ since "ftp servers" is plural Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * config.txt: Change pserver to server in description of gitcvs.*Frank Lichtenheld2007-04-131-2/+2
| | | | | | | | | | | | | | | | These variables apply to the SSH access as well, so don't use pserver here which might confuse users. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * config.txt: Document core.autocrlfFrank Lichtenheld2007-04-131-0/+10
| | | | | | | | | | | | | | Text shamelessly stolen from the 1.5.1 release notes. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * config.txt: Document gitcvs.allbinaryFrank Lichtenheld2007-04-131-0/+7
| | | | | | | | | | Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation: --cherry-pickJunio C Hamano2007-04-111-0/+15
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add %m to '--pretty=format:'Junio C Hamano2007-04-111-0/+1
| | | | | | | | | | | | | | | | | | When used with '--boundary A...B', this shows the -/</> marker you would get with --left-right option to 'git-log' family. When symmetric diff is not used, everybody is shown to be on the "right" branch. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add custom subject prefix support to format-patch (take 3)Robin H. Johnson2007-04-111-5/+12
| | | | | | | | | | | | | | | | | | | | | | Add a new option to git-format-patch, entitled --subject-prefix that allows control of the subject prefix '[PATCH]'. Using this option, the text 'PATCH' is replaced with whatever input is provided to the option. This allows easily generating patches like '[PATCH 2.6.21-rc3]' or properly numbered series like '[-mm3 PATCH N/M]'. This patch provides the implementation and documentation. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-04-111-7/+22
|\ \ | |/ | | | | | | | | | | | | * maint: GIT 1.5.1.1 cvsserver: Fix handling of diappeared files on update fsck: do not complain on detached HEAD. (encode_85, decode_85): Mark source buffer pointer as "const".
| * GIT 1.5.1.1v1.5.1.1Junio C Hamano2007-04-111-7/+22
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-04-101-0/+16
|\ \ | |/ | | | | | | | | * maint: Documentation: show-ref: document --exclude-existing cvsexportcommit -p : fix the usage of git-apply -C.
| * Documentation: show-ref: document --exclude-existingJulian Phillips2007-04-091-0/+16
| | | | | | | | | | | | | | | | Use the comment in the code to document the --exclude-existing function to git-show-ref. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-archive: make tar the default formatRené Scharfe2007-04-091-1/+2
| | | | | | | | | | | | | | | | As noted by Junio, --format=tar should be assumed if no format was specified. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-04-081-0/+1
|\ \ | |/ | | | | | | | | | | | | * maint: Add Documentation/cmd-list.made to .gitignore git-svn: fix log command to avoid infinite loop on long commit messages git-svn: dcommit/rebase confused by patches with git-svn-id: lines git-svn: bail out on incorrect command-line options
| * Add Documentation/cmd-list.made to .gitignoreJunio C Hamano2007-04-081-0/+1
| | | | | | | | | | | | Noticed by Randal L. Schwartz. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Start 1.5.2 cycle by prepareing RelNotes for it.Junio C Hamano2007-04-071-0/+76
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-04-072-4/+50
|\ \ | |/ | | | | | | | | * maint: Prepare for 1.5.1.1 cvsserver: small corrections to asciidoc documentation
| * Prepare for 1.5.1.1Junio C Hamano2007-04-071-0/+46
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * cvsserver: small corrections to asciidoc documentationFrank Lichtenheld2007-04-071-4/+4
| | | | | | | | | | | | | | | | | | | | Fix a typo: s/Not/Note/ Some formating fixes: Use ` ` syntax for all filenames and ' ' syntax for all commandline switches. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'jc/index-output'Junio C Hamano2007-04-071-1/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * jc/index-output: git-read-tree --index-output=<file> _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file. Conflicts: builtin-apply.c
| * | git-read-tree --index-output=<file>Junio C Hamano2007-04-032-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This corrects the interface mistake of the previous one, and gives a command line parameter to the only plumbing command that currently needs it: "git-read-tree". We can add the calls to set_alternate_index_output() to other plumbing commands that update the index if/when needed. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.Junio C Hamano2007-04-031-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When defined, this allows plumbing commands that update the index (add, apply, checkout-index, merge-recursive, mv, read-tree, rm, update-index, and write-tree) to write their resulting index to an alternative index file while holding a lock to the original index file. With this, git-commit that jumps the index does not have to make an extra copy of the index file, and more importantly, it can do the update while holding the lock on the index. However, I think the interface to let an environment variable specify the output is a mistake, as shown in the documentation. If a curious user has the environment variable set to something other than the file GIT_INDEX_FILE points at, almost everything will break. This should instead be a command line parameter to tell these plumbing commands to write the result in the named file, to prevent stupid mistakes. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'cc/bisect'Junio C Hamano2007-04-071-4/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cc/bisect: git-bisect: allow bisecting with only one bad commit. t6030: add a bit more tests to git-bisect git-bisect: modernization Documentation: bisect: "start" accepts one bad and many good commits Bisect: teach "bisect start" to optionally use one bad and many good revs.
| * | | Documentation: bisect: "start" accepts one bad and many good commitsChristian Couder2007-04-051-4/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'maint'Junio C Hamano2007-04-074-41/+60
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: Documentation: tighten dependency for git.{html,txt} Makefile: iconv() on Darwin has the old interface t5300-pack-object.sh: portability issue using /usr/bin/stat t3200-branch.sh: small language nit usermanual.txt: some capitalization nits Make builtin-branch.c handle the git config file rename_ref(): only print a warning when config-file update fails Distinguish branches by more than case in tests. Avoid composing too long "References" header. cvsimport: Improve formating consistency cvsimport: Reorder options in documentation for better understanding cvsimport: Improve usage error reporting cvsimport: Improve documentation of CVSROOT and CVS module determination cvsimport: sync usage lines with existing options Conflicts: Documentation/Makefile
| * | | Documentation: tighten dependency for git.{html,txt}Junio C Hamano2007-04-062-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every time _any_ documentation page changed, cmds-*.txt files were regenerated, which caused git.{html,txt} to be remade. Try not to update cmds-*.txt files if their new contents match the old ones. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | usermanual.txt: some capitalization nitsArjen Laarhoven2007-04-061-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | cvsimport: Improve formating consistencyFrank Lichtenheld2007-04-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ' ' syntax for all commandline options mentioned in text. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | cvsimport: Reorder options in documentation for better understandingFrank Lichtenheld2007-04-061-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current order the options are documented in makes no sense at all to me. Reorder them so that similar options are grouped together and also order them somehwhat by importance. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | cvsimport: Improve documentation of CVSROOT and CVS module determinationFrank Lichtenheld2007-04-061-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the fact that git-cvsimport tries to find out CVSROOT from CVS/Root and $ENV{CVSROOT} and CVS_module from CVS/Repository. Also use ` ` syntax for all filenames for consistency. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | cvsimport: sync usage lines with existing optionsFrank Lichtenheld2007-04-061-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync both the usage lines in the code and the asciidoc documentation with the real list of options. While all options seems to be documented in the asciidoc document, not all of them were listed in the usage line. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'maint'Junio C Hamano2007-04-051-0/+31
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: Fix lseek(2) calls with args 2 and 3 swapped Honor -p<n> when applying git diffs Fix dependency of common-cmds.h Fix renaming branch without config file DESTDIR support for git/contrib/emacs gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches Document --left-right option to rev-list. Revert "builtin-archive: use RUN_SETUP" rename contrib/hooks/post-receieve-email to contrib/hooks/post-receive-email. rerere: make sorting really stable. Fix t4200-rerere for white-space from "wc -l"
| * | Document --left-right option to rev-list.Brian Gernhardt2007-04-051-0/+31
| |/ | | | | | | | | | | Explanation is paraphrased from "577ed5c... rev-list --left-right" Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix lost-found to show commits only referenced by reflogsShawn O. Pearce2007-04-051-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to 1.5.0 the git-lost-found utility was useful to locate commits that were not referenced by any ref. These were often amends, or resets, or tips of branches that had been deleted. Being able to locate a 'lost' commit and recover it by creating a new branch was a useful feature in those days. Unfortunately 1.5.0 added the reflogs to the reachability analysis performed by git-fsck, which means that most commits users would consider to be lost are still reachable through a reflog. So most (or all!) commits are reachable, and nothing gets output from git-lost-found. Now git-fsck can be told to ignore reflogs during its reachability analysis, making git-lost-found useful again to locate commits that are no longer referenced by a ref itself, but may still be referenced by a reflog. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status