aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
* Some doc typo fixesFrancis Daly2006-06-07
| | | | | | | | | | | All should be clear enough, except perhaps committish / commitish. I just kept the more-used one within the current docs. [jc: with rephrasing of check-ref-format description later discussed on the list] Signed-off-by: Francis Daly <francis@daoine.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-format-patch: add --output-directory long option againJunio C Hamano2006-06-06
| | | | | | | | | | | | | | Additionally notices and complains to an -o option without directory or a duplicated -o option, -o and --stdout given together. Also delays the creation of directory until all arguments are parsed, so that the command does not leave an empty directory behind when it exits after seeing an unrelated invalid option. [jc: originally from Dennis Stosberg but with minor fixes, and documentation updates from Dennis.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* A Perforce importer for git.Sean2006-06-05
| | | | | Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix typo in tutorial-2.txtLinus Torvalds2006-06-05
| | | | | | | | | | This should be obvious enough. I didn't actually _test_ the tutorial, but if the old command worked, something is really wrong! Signed-off-by: Linus "Duh!" Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix Documentation/everyday.txt: Junio's workflowHorst H. von Brand2006-06-05
| | | | | | | The workflow for Junio was badly formatted. Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add example xinetd(8) configuration to Documentation/everyday.txtHorst H. von Brand2006-06-05
| | | | | | | | Many Linux distributions use xinetd(8), not inetd(8). Give a sample configuration file. Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'sp/reflog'Junio C Hamano2006-06-03
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sp/reflog: fetch.c: do not pass uninitialized lock to unlock_ref(). Test that git-branch -l works. Verify git-commit provides a reflog message. Enable ref log creation in git checkout -b. Create/delete branch ref logs. Include ref log detail in commit, reset, etc. Change order of -m option to update-ref. Correct force_write bug in refs.c Change 'master@noon' syntax to 'master@{noon}'. Log ref updates made by fetch. Force writing ref if it doesn't exist. Added logs/ directory to repository layout. General ref log reading improvements. Fix ref log parsing so it works properly. Support 'master@2 hours ago' syntax Log ref updates to logs/refs/<ref> Convert update-ref to use ref_lock API. Improve abstraction of ref lock/write.
| * Merge branch 'master' into sp/reflogJunio C Hamano2006-05-24
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (90 commits) fetch.c: remove an unused variable and dead code. Clean up sha1 file writing Builtin git-cat-file builtin format-patch: squelch content-type for 7-bit ASCII CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields. add more informative error messages to git-mktag remove the artificial restriction tagsize < 8kb git-rebase: use canonical A..B syntax to format-patch git-format-patch: now built-in. fmt-patch: Support --attach fmt-patch: understand old <his> notation Teach fmt-patch about --keep-subject Teach fmt-patch about --numbered fmt-patch: implement -o <dir> fmt-patch: output file names to stdout Teach fmt-patch to write individual files. built-in tar-tree and remote tar-tree Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree. Builtin git-show-branch. Builtin git-apply. ...
| * | Enable ref log creation in git checkout -b.Shawn Pearce2006-05-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch git checkout -b to use git-update-ref rather than echo and a shell I/O redirection. This is more in line with typical GIT commands and allows -b to be logged according to the normal ref logging rules. Added -l option to allow users to create the ref log at the same time as creating a branch. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Create/delete branch ref logs.Shawn Pearce2006-05-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When crating a new branch offer '-l' as a way for the user to quickly enable ref logging for the new branch. When deleting a branch also delete its ref log. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Change order of -m option to update-ref.Shawn Pearce2006-05-19
| | | | | | | | | | | | | | | | | | | | | | | | The actual position doesn't matter but most people prefer to see options appear before the arguments. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Change 'master@noon' syntax to 'master@{noon}'.Shawn Pearce2006-05-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Its ambiguous to parse "master@2006-05-17 18:30:foo" when foo is meant as a file name and ":30" is meant as 30 minutes past 6 pm. Therefore all date specifications in a sha1 expression must now appear within brackets and the ':' splitter used for the path name in a sha1 expression ignores ':' appearing within brackets. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Added logs/ directory to repository layout.Shawn Pearce2006-05-19
| | | | | | | | | | | | | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Support 'master@2 hours ago' syntaxShawn Pearce2006-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extended sha1 expressions may now include date specifications which indicate a point in time within the local repository's history. If the ref indicated to the left of '@' has a log in $GIT_DIR/logs/<ref> then the value of the ref at the time indicated by the specification is obtained from the ref's log. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Log ref updates to logs/refs/<ref>Shawn Pearce2006-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If config parameter core.logAllRefUpdates is true or the log file already exists then append a line to ".git/logs/refs/<ref>" whenever git-update-ref <ref> is executed. Each log line contains the following information: oldsha1 <SP> newsha1 <SP> committer <LF> where committer is the current user, date, time and timezone in the standard GIT ident format. If the caller is unable to append to the log file then git-update-ref will fail without updating <ref>. An optional message may be included in the log line with the -m flag. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Convert update-ref to use ref_lock API.Shawn Pearce2006-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | This conversion also adds the '-m' switch to update-ref allowing the caller to record why the ref is changing. At present this is merely copied down into the ref_lock API. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'jc/fmt-patch'Junio C Hamano2006-06-03
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * jc/fmt-patch: Update documentation for git-format-patch format-patch: resurrect extra headers from config format-patch --signoff
| * | | Update documentation for git-format-patchDennis Stosberg2006-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [jc: adjusted for recently resurrected features] Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Documentation: Spelling fixesHorst H. von Brand2006-06-03
|/ / / | | | | | | | | | | | | Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Improved pack format documentation.Shawn Pearce2006-05-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | While trying to implement a pack reader in Java I was mislead by some facts listed in this documentation as well as found a few details to be missing about the pack header. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Documentation: fix a tutorial-2 typoJ. Bruce Fields2006-05-29
| | | | | | | | | | | | | | | | | | | | | Fix a typo. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Documentation: retitle the git-core tutorialJ. Bruce Fields2006-05-29
| | | | | | | | | | | | | | | | | | | | | | | | Give the git-core tutorial a name that better reflects its intended audience. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | documentation: add brief mention of cat-file to tutorial part IJ. Bruce Fields2006-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'd rather avoid git cat-file so early on, but the git-cat-file -p old-commit:/path/to/file trick is too useful.... Also fix a nearby typo while we're at it. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | documentation: mention gitk font adjustment in tutorialJ. Bruce Fields2006-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kind of silly, but the font I get by default in gitk makes it mostly unusable for me, so this is the first thing I'd want to know about. (But maybe there's a better suggestion than just Ctrl-='ing until satisfied.) Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Fix some documentation typoesHorst von Brand2006-05-29
| | | | | | | | | | | | | | | | | | | | | Fix some typoes in Documentation/everyday.txt Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Let git-clone to pass --template=dir option to git-init-db.Junio C Hamano2006-05-28
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Documentation/Makefile: remove extra /Martin Waitz2006-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As both DESTDIR and the prefix are supposed to be absolute pathnames they can simply be concatenated without an extra / (like in the main Makefile). The extra slash may even break installation on Windows. [jc: adjusted an earlier workaround for this problem in the dist-doc target in the main Makefile as well. ] Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | cat-file: document -p optionJeff King2006-05-24
| |/ |/| | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Tutorial #2: broken link fix.Junio C Hamano2006-05-22
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | tutorial-2: typofix in examples.Junio C Hamano2006-05-21
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | tutorial: add discussion of index file, object databaseJ. Bruce Fields2006-05-21
| | | | | | | | | | | | | | | | Add a sequel to tutorial.txt which discusses the index file and the object database. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | tutorial: expanded discussion of commit historyJ. Bruce Fields2006-05-21
| | | | | | | | | | | | | | | | | | | | | | | | | | Expand the history-browsing section of the tutorial a bit, in part to address Junio's suggestion that we mention "git grep" and Linus's complaint that people are missing the flexibility of the commandline interfaces for selecting commits. This reads a little more like a collection of examples than a "tutorial", but maybe that's what people need at this point. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | tutorial: replace "whatchanged" by "log"J. Bruce Fields2006-05-21
| | | | | | | | | | | | | | Junio suggested changing references to git-whatchanged to git-log. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Elaborate on why ':' is a bad idea in a ref name.Shawn Pearce2006-05-21
| | | | | | | | | | | | | | | | With the new cat-file syntax of 'v1.3.3:refs.c' we should mention it as part of the reason why ':' is not permitted in a ref name. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Reference git-check-ref-format in git-branch.Shawn Pearce2006-05-21
| | | | | | | | | | | | | | | | | | Its nice to have git-check-ref-format actually get mentioned in git-branch's documentation as the syntax of a ref name must conform to what is described in git-check-ref-format. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Document that "git add" only adds non-ignored files.Santi2006-05-20
| | | | | | | | | | Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'eb/quilt'Junio C Hamano2006-05-19
|\ \ | | | | | | | | | | | | | | | * eb/quilt: Implement a --dry-run option to git-quiltimport Implement git-quiltimport
| * | Implement a --dry-run option to git-quiltimportEric W. Biederman2006-05-18
| | | | | | | | | | | | | | | | | | | | | | | | Since large quilt trees like -mm can easily have patches without clear authorship information, add a --dry-run option to make the problem patches easy to find. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Implement git-quiltimportEric W. Biederman2006-05-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Importing a quilt patch series into git is not very difficult but parsing the patch descriptions and all of the other minutia take a bit of effort to get right, so this automates it. Since git and quilt complement each other it makes sense to make it easy to go back and forth between the two. If a patch is encountered that it cannot derive the author from the user is asked. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Documentation/Makefile: create tarballs for the man pages and html filesTilman Sauerbeck2006-05-18
|/ / | | | | | | | | | | | | | | [jc: rewrote by stealing from what I run to update html and man branches automatically] Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | SubmittingPatches: The download location of External Editor has movedLukas Sandström2006-05-18
|/ | | | | Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'maint'Junio C Hamano2006-05-16
|\ | | | | | | | | | | * maint: merge-base: Clarify the comments on post processing. Update the documentation for git-merge-base
| * Update the documentation for git-merge-baseFredrik Kuivinen2006-05-15
| | | | | | | | | | Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'se/rev-parse'Junio C Hamano2006-05-15
|\ \ | | | | | | | | | | | | * se/rev-parse: Add "--branches", "--tags" and "--remotes" options to git-rev-parse.
| * | Add "--branches", "--tags" and "--remotes" options to git-rev-parse.Sean2006-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | "git branch" uses "rev-parse --all" and becomes much too slow when there are many tags (it scans all refs). Use the new "--branches" option of rev-parse to speed things up. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'se/diff'Junio C Hamano2006-05-15
|\ \ \ | | | | | | | | | | | | | | | | | | | | * se/diff: Convert some "apply --summary" users to "diff --summary". Add "--summary" option to git diff.
| * | | Add "--summary" option to git diff.Sean2006-05-14
| |/ / | | | | | | | | | | | | | | | | | | | | | Remove the need to pipe git diff through git apply to get the extended headers summary. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'se/rebase'Junio C Hamano2006-05-15
|\ \ \ | | | | | | | | | | | | | | | | * se/rebase: Make git rebase interactive help match documentation.
| * | | Make git rebase interactive help match documentation.Sean2006-05-14
| |/ / | | | | | | | | | | | | Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'jc/grep'Junio C Hamano2006-05-15
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jc/grep: (22 commits) Fix silly typo in new builtin grep builtin-grep: unparse more command line options. builtin-grep: use external grep when we can take advantage of it builtin-grep: -F (--fixed-strings) builtin-grep: -w fix builtin-grep: typofix builtin-grep: tighten argument parsing. builtin-grep: documentation Teach -f <file> option to builtin-grep. builtin-grep: -L (--files-without-match). builtin-grep: binary files -a and -I builtin-grep: terminate correctly at EOF builtin-grep: tighten path wildcard vs tree traversal. builtin-grep: support -w (--word-regexp). builtin-grep: support -c (--count). builtin-grep: allow more than one patterns. builtin-grep: allow -<n> and -[ABC]<n> notation for context lines. builtin-grep: printf %.*s length is int, not ptrdiff_t. builtin-grep: do not use setup_revisions() builtin-grep: support '-l' option. ...