summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* git add -p: new "quit" command at the prompt.Matthieu Moy2009-04-191-0/+1
| | | | | | | | | There's already 'd' to stop staging hunks in a file, but no explicit command to stop the interactive staging (for the current files and the remaining ones). Of course you can do 'd' and then ^C, but it would be more intuitive to allow 'quit' action. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.6.2.3v1.6.2.3Junio C Hamano2009-04-121-6/+0
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-121-0/+3
|\ | | | | | | | | | | * maint-1.6.1: State the effect of filter-branch on graft explicitly process_{tree,blob}: Remove useless xstrdup calls
| * Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-121-0/+3
| |\ | | | | | | | | | | | | | | | * maint-1.6.0: State the effect of filter-branch on graft explicitly process_{tree,blob}: Remove useless xstrdup calls
| | * State the effect of filter-branch on graft explicitlyDaniel Cheng (aka SDiZ)2009-04-121-0/+3
| | | | | | | | | | | | | | | Signed-off-by: Daniel Cheng (aka SDiZ) <j16sdiz+freenet@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1Junio C Hamano2009-04-081-9/+12
| |\ \ | | | | | | | | | | | | | | | | * tr/maint-1.6.1-doc-format-patch--root: Documentation: format-patch --root clarifications
* | | | Start 1.6.2.3 preparationJunio C Hamano2009-04-081-0/+28
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-073-9/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * maint-1.6.1: Documentation: clarify .gitattributes search git-checkout.txt: clarify that <branch> applies when no path is given. git-checkout.txt: fix incorrect statement about HEAD and index
| * | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-073-9/+13
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | * maint-1.6.0: Documentation: clarify .gitattributes search git-checkout.txt: clarify that <branch> applies when no path is given. git-checkout.txt: fix incorrect statement about HEAD and index
| | * | Documentation: clarify .gitattributes searchJason Merrill2009-04-072-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the term "toplevel of the work tree" in gitattributes.txt and gitignore.txt to define the limits of the search for those files. Signed-off-by: Jason Merrill <jason@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | * | git-checkout.txt: clarify that <branch> applies when no path is given.Matthieu Moy2009-04-071-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, the sentence "Defaults to HEAD." can be mis-read to mean that "git checkout -- hello.c" checks-out from HEAD. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | * | git-checkout.txt: fix incorrect statement about HEAD and indexMatthieu Moy2009-04-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The command "git checkout" checks out from the index by default, not HEAD (the introducing comment were correct, but the detailled explanation added below were not). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | doc/git-pack-refs: fix two grammar issuesMarkus Heidelberg2009-04-051-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | GIT 1.6.2.2v1.6.2.2Junio C Hamano2009-04-021-6/+9
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maintJunio C Hamano2009-04-021-9/+12
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * tr/maint-1.6.1-doc-format-patch--root: Documentation: format-patch --root clarifications
| * | | Documentation: format-patch --root clarificationsThomas Rast2009-03-271-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users were confused about the meaning and use of the --root option. Notably, since 68c2ec7 (format-patch: show patch text for the root commit, 2009-01-10), --root has nothing to do with showing the patch text for the root commit any more. Shorten and clarify the corresponding paragraph in the DESCRIPTION section, document --root under OPTIONS, and add an explicit note that root commits are formatted regardless. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'dm/maint-docco' into maintJunio C Hamano2009-04-0210-230/+234
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dm/maint-docco: Documentation: Remove spurious uses of "you" in git-bisect.txt. Documentation: minor grammatical fix in git-check-ref-format.txt Documentation: minor grammatical fixes in git-check-attr.txt Documentation: minor grammatical fixes in git-cat-file.txt Documentation: minor grammatical fixes and rewording in git-bundle.txt Documentation: remove some uses of the passive voice in git-bisect.txt Documentation: reword example text in git-bisect.txt. Documentation: reworded the "Description" section of git-bisect.txt. Documentation: minor grammatical fixes in git-branch.txt. Documentation: minor grammatical fixes in git-blame.txt. Documentation: reword the "Description" section of git-bisect.txt. Documentation: minor grammatical fixes in git-archive.txt.
| * | | | Documentation: Remove spurious uses of "you" in git-bisect.txt.David J. Mellor2009-03-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were added by accident in a42dea3. This patch also rewords the description of how ranges of commits can be skipped. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Documentation: minor grammatical fix in git-check-ref-format.txtDavid J. Mellor2009-03-221-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Documentation: minor grammatical fixes in git-check-attr.txtDavid J. Mellor2009-03-221-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Documentation: minor grammatical fixes in git-cat-file.txtDavid J. Mellor2009-03-221-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Documentation: minor grammatical fixes and rewording in git-bundle.txtDavid J. Mellor2009-03-221-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also converts all reference specifications to a monospaced font, as the embedded ~ character used in some of the references sometimes causes the text up to the next ~ to be displayed incorrectly as a subscript when the HTML pages are generated. This was tested with asciidoc 8.2.5. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Documentation: remove some uses of the passive voice in git-bisect.txtDavid J. Mellor2009-03-221-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Documentation: reword example text in git-bisect.txt.David J. Mellor2009-03-201-20/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid splitting sentences across examples of command usage. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Documentation: reworded the "Description" section of git-bisect.txt.David J. Mellor2009-03-191-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added fixes missing from 2364259. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Documentation: minor grammatical fixes in git-branch.txt.David J. Mellor2009-03-171-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Documentation: minor grammatical fixes in git-blame.txt.David J. Mellor2009-03-173-38/+37
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Documentation: reword the "Description" section of git-bisect.txt.David J. Mellor2009-03-171-77/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reword this section to make it less chatty. Also make minor grammatical fixes. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Documentation: minor grammatical fixes in git-archive.txt.David J. Mellor2009-03-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-011-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * maint-1.6.1: Documentation: Remove an odd "instead"
| * | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-011-1/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * maint-1.6.0: Documentation: Remove an odd "instead"
| | * | | Documentation: Remove an odd "instead"Holger Weiß2009-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Holger Weiß <holger@zedat.fu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Update draft release notes to 1.6.2.2Junio C Hamano2009-03-301-1/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-302-4/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-1.6.1: Fix bash completion in path with spaces bash completion: only show 'log --merge' if merging git-tag(1): add hint about commit messages Documentation: update graph api example. Conflicts: contrib/completion/git-completion.bash
| * | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-302-4/+5
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | | | | | | | | | | | | * maint-1.6.0: Fix bash completion in path with spaces bash completion: only show 'log --merge' if merging git-tag(1): add hint about commit messages Documentation: update graph api example.
| | * | git-tag(1): add hint about commit messagesNico -telmich- Schottelius2009-03-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a tag is not annotated, git tag displays the commit message instead. Add this hint to the manpage to unhide this secret. Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | * | Documentation: update graph api example.Allan Caffee2009-03-301-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of commit 03300c0 the graph API uses '*' for all nodes including merges. This updates the example in the documentation to match. Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | documentation: update cvsimport description of "-r" for recent cloneCarlo Marcelo Arenas Belon2009-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the "--use-separate-remote" option no longer exists, having since become the default for a clone. Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-221-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * maint-1.6.1: everyday: use the dashless form of git-init
| * | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-221-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * maint-1.6.0: everyday: use the dashless form of git-init
| | * | everyday: use the dashless form of git-initDavid Aguilar2009-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'Everyday GIT' guide was using the old dashed form of git-init. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Update draft release notes to 1.6.2.2Junio C Hamano2009-03-211-0/+35
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | format-patch: --numbered-files and --stdout aren't mutually exclusiveStephen Boyd2009-03-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example: git format-patch --numbered-files --stdout --attach HEAD~~ will create two messages with files 1 and 2 attached respectively. Without --attach/--inline but with --stdout, --numbered-files option can be simply ignored, because we are not creating any file ourselves. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | doc: clarify how -S worksJeff King2009-03-191-1/+4
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing text was very vague about what exactly it means for difference to "contain" a change. This seems to cause confusion on the mailing list every month or two. To fix it we: 1. use "introduce or remove an instance of" instead of "contain" 2. point the user to gitdiffcore(7), which contains a more complete explanation Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | GIT 1.6.2.1v1.6.2.1Junio C Hamano2009-03-151-6/+0
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Update draft release notes for 1.6.2.1Junio C Hamano2009-03-111-0/+19
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'js/maint-send-email' into maintJunio C Hamano2009-03-111-8/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * js/maint-send-email: send-email: don't create temporary compose file until it is needed send-email: --suppress-cc improvements send-email: handle multiple Cc addresses when reading mbox message send-email: allow send-email to run outside a repo
| * | | send-email: --suppress-cc improvementsJay Soffian2009-02-141-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 6564828 (git-send-email: Generalize auto-cc recipient mechanism., 2007-12-25) we can suppress automatic Cc generation separately for each of the possible address sources. However, --suppress-cc=sob suppressed both SOB lines and body (but not header) Cc lines, contrary to the name. Change --suppress-cc=sob to mean only SOB lines, and add separate choices 'bodycc' (body Cc lines) and 'body' (both 'sob' and 'bodycc'). The option --no-signed-off-by-cc now acts like --suppress-cc=sob, which is not backwards compatible but matches the name of the option. Also update the documentation and add a few tests. Original patch by me. Revised by Thomas Rast, who contributed the documentation and test updates. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'jc/maint-add-p-unquote' into maintJunio C Hamano2009-03-111-7/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * jc/maint-add-p-unquote: git-add -i/-p: learn to unwrap C-quoted paths
| * | | | git-add -i/-p: learn to unwrap C-quoted pathsJunio C Hamano2009-02-181-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The underlying plumbing commands are not run with -z option, so the paths returned from them need to be unquoted as needed. Remove the now stale BUGS section from git-add documentaiton as suggested by Teemu Likonen. Signed-off-by: Junio C Hamano <gitster@pobox.com>
View Lorry Controller Status