summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Collapse)AuthorFilesLines
2006-05-31Merge branch 'ff/svnimport' into nextLibravatar Junio C Hamano1-3/+8
* ff/svnimport: git-svnimport: Improved detection of merges. Improved pack format documentation. git_exec_path, execv_git_cmd: ignore empty environment variables execv_git_cmd: Fix stack buffer overflow. Fixed Cygwin CR-munging problem in mailsplit
2006-05-30Improved pack format documentation.Libravatar Shawn Pearce1-3/+8
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>
2006-05-30Merge branch 'master' into nextLibravatar Junio C Hamano4-8/+16
* master: send-email: do not pass bogus address to local sendmail binary Add a basic test case for git send-email, and fix some real bugs discovered. Fix a bug in email extraction used in git-send-email. Add support for --bcc to git-send-email. git-send-email: Add References: headers to emails, in addition to In-Reply-To: git-clean fails on files beginning with a dash git-svn: remove assertion that broke with older versions of svn git-svn: t0001: workaround a heredoc bug in old versions of dash Documentation: fix a tutorial-2 typo Documentation: retitle the git-core tutorial documentation: add brief mention of cat-file to tutorial part I documentation: mention gitk font adjustment in tutorial Fix some documentation typoes
2006-05-29Documentation: fix a tutorial-2 typoLibravatar J. Bruce Fields1-1/+1
Fix a typo. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-29Documentation: retitle the git-core tutorialLibravatar J. Bruce Fields1-2/+2
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>
2006-05-29documentation: add brief mention of cat-file to tutorial part ILibravatar J. Bruce Fields1-1/+7
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>
2006-05-29documentation: mention gitk font adjustment in tutorialLibravatar J. Bruce Fields1-1/+3
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>
2006-05-29Fix some documentation typoesLibravatar Horst von Brand1-3/+3
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>
2006-05-28Merge branch 'master' into nextLibravatar Junio C Hamano1-2/+7
* master: Fix memory leak in "git rev-list --objects" gitview: Move the console error messages to message dialog gitview: Add key binding for F5. Let git-clone to pass --template=dir option to git-init-db. Make cvsexportcommit create parent directories as needed. Document current cvsexportcommit limitations. Do not call 'cmp' with non-existant -q flag. Fix "--abbrev=xyz" for revision listing t1002: use -U0 instead of --unified=0 format-patch: -n and -k are mutually exclusive.
2006-05-28Let git-clone to pass --template=dir option to git-init-db.Libravatar Junio C Hamano1-2/+7
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-26Merge branch 'ew/tests' into nextLibravatar Junio C Hamano1-3/+3
* ew/tests: t6000lib: workaround a possible dash bug t5500-fetch-pack: remove local (bashism) usage. tests: Remove heredoc usage inside quotes t3300-funny-names: shell portability fixes git-format-patch --start-number <n> Don't write directly to a make target ($@). bogus "fatal: Not a git repository" Documentation/Makefile: remove extra / cvsimport: avoid "use" with :tag
2006-05-25Documentation/Makefile: remove extra /Libravatar Martin Waitz1-3/+3
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>
2006-05-24Merge branch 'jc/fetchupload' into nextLibravatar Junio C Hamano1-2/+7
* jc/fetchupload: fetch-pack: give up after getting too many "ack continue" cat-file: document -p option Built git-upload-tar should be ignored. ls-remote: fix rsync:// to report HEAD
2006-05-24cat-file: document -p optionLibravatar Jeff King1-2/+7
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-23Merge branch 'sp/reflog' into nextLibravatar Junio C Hamano6-4/+67
* sp/reflog: 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.
2006-05-22Merge branch 'se/http' into nextLibravatar Junio C Hamano1-1/+1
* se/http: Remove possible segfault in http-fetch. Install git builtins into gitexecdir rather than bindir. Change GIT-VERSION-GEN to call git commands with "git" not "git-". cvsimport: replace anonymous sub ref with a normal sub cvsimport: minor fixups Problem: 'trap...exit' causes error message when /bin/sh is ash. Avoid segfault in diff --stat rename output. Tutorial #2: broken link fix. git help: remove whatchanged from list of common commands
2006-05-22Tutorial #2: broken link fix.Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-21Merge branch 'jc/mailinfo' into nextLibravatar Junio C Hamano6-63/+538
* jc/mailinfo: mailinfo: skip bogus UNIX From line inside body tutorial-2: typofix in examples. tutorial: add discussion of index file, object database tutorial: expanded discussion of commit history tutorial: replace "whatchanged" by "log" NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin). remove superflous "const" checkdiff_consume: strtol parameter fix. Elaborate on why ':' is a bad idea in a ref name. Reference git-check-ref-format in git-branch.
2006-05-21tutorial-2: typofix in examples.Libravatar Junio C Hamano1-2/+2
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-21tutorial: add discussion of index file, object databaseLibravatar J. Bruce Fields3-6/+414
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>
2006-05-21tutorial: expanded discussion of commit historyLibravatar J. Bruce Fields1-53/+112
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>
2006-05-21tutorial: replace "whatchanged" by "log"Libravatar J. Bruce Fields1-6/+6
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>
2006-05-21Merge branch 'js/fmt-patch' into nextLibravatar Junio C Hamano1-1/+4
* js/fmt-patch: git-format-patch: now built-in. fmt-patch: Support --attach diff family: add --check option Document that "git add" only adds non-ignored files.
2006-05-21Elaborate on why ':' is a bad idea in a ref name.Libravatar Shawn Pearce1-0/+2
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>
2006-05-21Reference git-check-ref-format in git-branch.Libravatar Shawn Pearce2-1/+7
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>
2006-05-20Document that "git add" only adds non-ignored files.Libravatar Santi1-1/+4
Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19Merge branch 'eb/quilt'Libravatar Junio C Hamano1-0/+61
* eb/quilt: Implement a --dry-run option to git-quiltimport Implement git-quiltimport
2006-05-19Enable ref log creation in git checkout -b.Libravatar Shawn Pearce1-1/+6
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>
2006-05-19Create/delete branch ref logs.Libravatar Shawn Pearce1-2/+8
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>
2006-05-19Change order of -m option to update-ref.Libravatar Shawn Pearce1-1/+1
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>
2006-05-19Change 'master@noon' syntax to 'master@{noon}'.Libravatar Shawn Pearce1-5/+6
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>
2006-05-19Added logs/ directory to repository layout.Libravatar Shawn Pearce1-0/+11
Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-18Merge branch 'eb/quilt' into nextLibravatar Junio C Hamano1-0/+61
* eb/quilt: Implement a --dry-run option to git-quiltimport Implement git-quiltimport
2006-05-18Implement a --dry-run option to git-quiltimportLibravatar Eric W. Biederman1-1/+7
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>
2006-05-18Implement git-quiltimportLibravatar Eric W. Biederman1-0/+55
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>
2006-05-18Merge branch 'ts/doctar' into nextLibravatar Junio C Hamano2-4/+8
* ts/doctar: Documentation/Makefile: create tarballs for the man pages and html files SubmittingPatches: The download location of External Editor has moved Make git-check-format-ref a builtin. Make "git rev-list" be a builtin builtin-diff: do not say files are renamed when blob and file are given Provide a way to flush git-diff-tree's output
2006-05-18Documentation/Makefile: create tarballs for the man pages and html filesLibravatar Tilman Sauerbeck1-2/+6
[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>
2006-05-18SubmittingPatches: The download location of External Editor has movedLibravatar Lukas Sandström1-2/+2
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-17Support 'master@2 hours ago' syntaxLibravatar Shawn Pearce1-0/+6
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>
2006-05-17Log ref updates to logs/refs/<ref>Libravatar Shawn Pearce2-0/+34
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>
2006-05-17Convert update-ref to use ref_lock API.Libravatar Shawn Pearce1-1/+1
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>
2006-05-16Merge branch 'master' into nextLibravatar Junio C Hamano1-4/+14
* master: Remove old "git-grep.sh" remnants merge-base: Clarify the comments on post processing. Update the documentation for git-merge-base
2006-05-16Merge branch 'maint'Libravatar Junio C Hamano1-4/+14
* maint: merge-base: Clarify the comments on post processing. Update the documentation for git-merge-base
2006-05-15Merge branch 'se/rev-parse'Libravatar Junio C Hamano1-0/+9
* se/rev-parse: Add "--branches", "--tags" and "--remotes" options to git-rev-parse.
2006-05-15Merge branch 'se/diff'Libravatar Junio C Hamano1-0/+4
* se/diff: Convert some "apply --summary" users to "diff --summary". Add "--summary" option to git diff.
2006-05-15Merge branch 'se/rebase'Libravatar Junio C Hamano1-6/+5
* se/rebase: Make git rebase interactive help match documentation.
2006-05-15Update the documentation for git-merge-baseLibravatar Fredrik Kuivinen1-4/+14
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-15Merge branch 'jc/grep'Libravatar Junio C Hamano1-23/+62
* 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. ...
2006-05-14Merge branch 'se/diff' into nextLibravatar Junio C Hamano1-0/+4
* se/diff: Convert some "apply --summary" users to "diff --summary". Add "--summary" option to git diff.
2006-05-14Merge branch 'se/rebase' into nextLibravatar Junio C Hamano1-6/+5
* se/rebase: Make git rebase interactive help match documentation.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 20:31:18 +0000