summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Collapse)AuthorFilesLines
2006-05-14Merge branch 'se/rebase' into nextLibravatar Junio C Hamano1-6/+5
* se/rebase: Make git rebase interactive help match documentation.
2006-05-14Merge branch 'se/rev-parse' into nextLibravatar Junio C Hamano1-0/+9
* se/rev-parse: Add "--branches", "--tags" and "--remotes" options to git-rev-parse.
2006-05-14Make git rebase interactive help match documentation.Libravatar Sean1-6/+5
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-14Add "--branches", "--tags" and "--remotes" options to git-rev-parse.Libravatar Sean1-0/+9
"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>
2006-05-14Merge branch 'ml/cvs'Libravatar Junio C Hamano1-1/+8
* ml/cvs: Change to allow subdir updates from Eclipse Many fixes for most operations in Eclipse. Added logged warnings for CVS error returns cvsserver: use git-rev-list instead of git-log git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.
2006-05-09Merge branch 'jc/grep' into nextLibravatar Junio C Hamano1-1/+1
* jc/grep: builtin-grep: -F (--fixed-strings) builtin-grep: -w fix builtin-grep: typofix
2006-05-09builtin-grep: -F (--fixed-strings)Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-09Merge branch 'jc/clean'Libravatar Junio C Hamano1-1/+4
* jc/clean: Teach git-clean optional <paths>... parameters.
2006-05-09Merge branch 'jc/again'Libravatar Junio C Hamano1-1/+5
* jc/again: Fix users of prefix_path() to free() only when necessary update-index --again: take optional pathspecs update-index --again
2006-05-09Merge branch 'ml/cvs' into nextLibravatar Junio C Hamano1-1/+8
* ml/cvs: Change to allow subdir updates from Eclipse Many fixes for most operations in Eclipse. Added logged warnings for CVS error returns cvsserver: use git-rev-list instead of git-log git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.
2006-05-09Merge branch 'tojunio' of ↵Libravatar Junio C Hamano1-1/+8
http://locke.catalyst.net.nz/git/git-martinlanghoff into ml/cvs * 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff: Change to allow subdir updates from Eclipse Many fixes for most operations in Eclipse. Added logged warnings for CVS error returns cvsserver: use git-rev-list instead of git-log git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.
2006-05-08Merge branch 'jc/clean' into nextLibravatar Junio C Hamano2-4/+8
* jc/clean: Teach git-clean optional <paths>... parameters. Separate object name errors from usage errors Documentation: {caret} fixes (git-rev-list.txt) Fix "git diff --stat" with long filenames Fix repo-config set-multivar error return path.
2006-05-08Merge branch 'jc/grep' into nextLibravatar Junio C Hamano1-23/+62
* jc/grep: builtin-grep: documentation Teach -f <file> option to builtin-grep.
2006-05-08Teach git-clean optional <paths>... parameters.Libravatar Junio C Hamano1-1/+4
When optional paths arguments are given, git-clean passes them to underlying git-ls-files; with this, you can say: git clean 'temp-*' to clean only the garbage files whose names begin with 'temp-'. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Pavel Roskin <proski@gnu.org>
2006-05-08Merge branch 'fix'Libravatar Junio C Hamano1-3/+4
* fix: Separate object name errors from usage errors Documentation: {caret} fixes (git-rev-list.txt) Fix "git diff --stat" with long filenames Fix repo-config set-multivar error return path.
2006-05-08Documentation: {caret} fixes (git-rev-list.txt)Libravatar Junio C Hamano1-3/+4
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-08builtin-grep: documentationLibravatar Junio C Hamano1-23/+62
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-07Merge branch 'jc/gitlink' into nextLibravatar Junio C Hamano2-2/+17
* jc/gitlink: write-tree: --prefix=<path> read-tree: --prefix=<path>/ option.
2006-05-07Merge branch 'mw/alternates' into nextLibravatar Junio C Hamano2-5/+6
* mw/alternates: clone: don't clone the info/alternates file test case for transitive info/alternates Transitively read alternatives repack: honor -d even when no new pack was created clone: keep --reference even with -l -s repo-config: document what value_regexp does a bit more clearly. Release config lock if the regex is invalid core-tutorial.txt: escape asterisk Sparse fix for builtin-diff Fix users of prefix_path() to free() only when necessary
2006-05-07Merge branch 'fix'Libravatar Junio C Hamano2-5/+6
* fix: repack: honor -d even when no new pack was created clone: keep --reference even with -l -s repo-config: document what value_regexp does a bit more clearly. Release config lock if the regex is invalid core-tutorial.txt: escape asterisk
2006-05-07repo-config: document what value_regexp does a bit more clearly.Libravatar Junio C Hamano1-4/+5
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-08Merge with git://kernel.org/pub/scm/git/git.gitLibravatar Martin Langhoff25-205/+317
2006-05-07core-tutorial.txt: escape asteriskLibravatar Matthias Lederhofer1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-05update-index --againLibravatar Junio C Hamano1-1/+5
After running 'git-update-index' for some paths, you may want to do the update on the same set of paths again. The new flag --again checks the paths whose index entries are are different from the HEAD commit and updates them from the working tree contents. This was brought up by Carl Worth on #git. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-05core.prefersymlinkrefs: use symlinks for .git/HEADLibravatar Junio C Hamano1-3/+5
When inspecting a project whose build infrastructure used to assume that .git/HEAD is a symlink ref, core.prefersymlinkrefs in the config file of such a project would help to bisect its history. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 9f0bb90d161edf8c43f5261d12bf83f14eb02ff4 commit)
2006-05-05Clarify git-cherry documentation.Libravatar sean1-5/+14
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-05Update git-unpack-objects documentation.Libravatar sean1-3/+10
Document that git-unpack-objects will not produce any results when used on a pack that exists in a repository; move it first. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-05Fix up docs where "--" isn't displayed correctly.Libravatar sean12-13/+13
A bare "--" doesn't show up in man or html pages correctly as two individual dashes unless backslashed as \-- in the asciidoc source. Note, no backslash is needed inside a literal block. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-05Several trivial documentation touch ups.Libravatar sean6-6/+10
Move incorrect asciidoc level 2 titles back to level 1. Show output of git-name-rev in man page example. Reword sentences that begin with a period (.) in asciidoc numbered lists to work around conversion to man page bug. Mention that git-repack now calls git-prune-packed when the -d option is passed to it. [imap] section headers in the config file example need to be contained in a literal block. imap.pass is the proper config file variable to use, not imap.password. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03Merge branch 'jc/symref'Libravatar Junio C Hamano1-3/+5
* jc/symref: core.prefersymlinkrefs: use symlinks for .git/HEAD
2006-05-03Merge branch 'js/repoconfig'Libravatar Junio C Hamano1-1/+4
* js/repoconfig: repo-config: deconvolute logics repo-config: readability fixups. repo-config: support --get-regexp
2006-05-03Merge branch 'jc/count'Libravatar Junio C Hamano1-1/+11
* jc/count: builtin-count-objects: open packs when running -v builtin-count-objects: make it official. built-in count-objects.
2006-05-03Merge branch 'maint'Libravatar Junio C Hamano2-169/+242
* maint: Add a few more words to the glossary. Added definitions for a few words: Alphabetize the glossary.
2006-05-03Add a few more words to the glossary.Libravatar Jon Loeliger1-12/+51
Clean up a few entries and fix typos. bare repository cherry-picking hook topic branch [jc: removing questionable "symbolic ref -- see 'ref'" for now.] Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03Added definitions for a few words:Libravatar Jon Loeliger2-1/+34
fast forward pickaxe refspec tracking branch Wild hack allows "link:git-" prefix to reference commands too. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03Alphabetize the glossary.Libravatar Jon Loeliger1-169/+170
Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03Merge branch 'fix'Libravatar Junio C Hamano2-3/+3
* fix: fix various typos in documentation
2006-05-03add documentation for update-index --unresolveLibravatar Matthias Kestenholz1-1/+5
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03fix various typos in documentationLibravatar Matthias Kestenholz2-3/+3
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03Merge with git://kernel.org/pub/scm/git/git.gitLibravatar Martin Langhoff1-13/+63
2006-05-02core.prefersymlinkrefs: use symlinks for .git/HEADLibravatar Junio C Hamano1-3/+5
When inspecting a project whose build infrastructure used to assume that .git/HEAD is a symlink ref, core.prefersymlinkrefs in the config file of such a project would help to bisect its history. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02repo-config: support --get-regexpLibravatar Johannes Schindelin1-1/+4
With --get-regexp, output all key/value pairs where the key matches a regexp. Example: git-repo-config --get-regexp remote.*.url will output something like remote.junio.url git://git.kernel.org/pub/scm/git/git.git remote.gitk.url git://git.kernel.org/pub/scm/gitk/gitk.git Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-01builtin-count-objects: make it official.Libravatar Junio C Hamano1-1/+11
Remove the shell-script version, make the hardlink from the git binary, and update the documentation to describe a new option. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-01Merge branch 'se/rebase'Libravatar Junio C Hamano1-13/+63
* se/rebase: Add --continue and --abort options to git-rebase.
2006-05-01write-tree: --prefix=<path>Libravatar Junio C Hamano1-1/+7
The "bind" commit can express an aggregation of multiple projects into a single commit. In such an organization, there would be one project, root of whose tree object is at the same level of the root of the aggregated projects, and other projects have their toplevel in separate subdirectories. Let's call that root level project the "primary project", and call other ones just "subprojects". You would first read-tree the primary project, and then graft the subprojects under their appropriate location using read-tree --prefix=<subdir>/ repeatedly. To write out a tree object from such an index for a subproject, write-tree --prefix=<subdir>/ is used. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-01read-tree: --prefix=<path>/ option.Libravatar Junio C Hamano1-1/+10
With "--prefix=<path>/" option, read-tree keeps the current index contents, and reads the contents of named tree-ish under directory at `<prefix>`. The original index file cannot have anything at the path `<prefix>` itself, and have nothing in `<prefix>/` directory. This can be used to graft an independent tree into a subdirectory of the current index. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-01Merge with git://kernel.org/pub/scm/git/git.gitLibravatar Martin Langhoff12-132/+169
2006-04-28Merge branch 'fix'Libravatar Junio C Hamano10-131/+163
* fix: Fix trivial typo in git-log man page. Properly render asciidoc "callouts" in git man pages. Fix up remaining man pages that use asciidoc "callouts". Update the git-branch man page to include the "-r" option, annotate: display usage information if no filename was given annotate: fix warning about uninitialized scalar git-am --resolved: more usable error message.
2006-04-28Fix trivial typo in git-log man page.Libravatar Sean Estabrooks1-4/+3
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
2006-04-28Properly render asciidoc "callouts" in git man pages.Libravatar Sean Estabrooks2-1/+17
Adds an xsl fragment to render docbook callouts when converting to man page format. Update the Makefile to have "xmlto" use it when generating man pages. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>