aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
* Do not use "diff" found on PATH while building and installingGary V. Vaughan2010-05-31
| | | | | | | | Some of the flags used with the first diff found in PATH cause the vendor diff to choke. Signed-off-by: Gary V. Vaughan <gary@thewrittenword.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 1.7.1v1.7.1Junio C Hamano2010-04-23
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'maint'Junio C Hamano2010-04-23
|\ | | | | | | | | * maint: Documentation improvements for the description of short format.
| * Documentation improvements for the description of short format.Eric Raymond2010-04-23
| | | | | | | | | | | | | | | | | | | | Incorporates the detailed explanation from Jeff King in <20100410040959.GA11977@coredump.intra.peff.net> and fixes the bug noted by Junio C Hamano in <7vmxxc1i8g.fsf@alter.siamese.dyndns.org>. Signed-off-by: Eric S. Raymond <esr@thyrsus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.7.0.6Junio C Hamano2010-04-22
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Git 1.7.0.6v1.7.0.6Junio C Hamano2010-04-22
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Merge branch 'wp/doc-filter-direction' into maintJunio C Hamano2010-04-22
| |\ | | | | | | | | | | | | * wp/doc-filter-direction: documentation: clarify direction of core.autocrlf
* | \ Merge branch 'maint'Junio C Hamano2010-04-21
|\ \ \ | |/ / | | | | | | | | | * maint: Documentation/Makefile: fix interrupted builds of user-manual.xml
| * | Documentation/Makefile: fix interrupted builds of user-manual.xmlJonathan Nieder2010-04-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike gcc, asciidoc does not atomically write its output file or delete it when interrupted. If it is interrupted in the middle of writing an XML file, the result will be truncated input for xsltproc. XSLTPROC user-manual.html user-manual.xml:998: parser error : Premature end of data in t Take care of this case by writing to a temporary and renaming it when finished. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.7.1-rc2v1.7.1-rc2Junio C Hamano2010-04-18
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'rr/remote-helper-doc'Junio C Hamano2010-04-18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rr/remote-helper-doc: Documentation/remote-helpers: Fix typos and improve language Fixup: Second argument may be any arbitrary string Documentation/remote-helpers: Add invocation section Documentation/urls: Rewrite to accomodate <transport>::<address> Documentation/remote-helpers: Rewrite description
| * | | Documentation/remote-helpers: Fix typos and improve languageRamkumar Ramachandra2010-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some typos and errors in grammar and tense. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | Fixup: Second argument may be any arbitrary stringRamkumar Ramachandra2010-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is intended to be a fixup for commit ad466d1 in pu. As Jonathan Neider pointed out, the second argument may be any arbitrary string, and need not conform to any URL-like shape. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | Documentation/remote-helpers: Add invocation sectionRamkumar Ramachandra2010-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an 'Invocation' section to specify what the command line arguments mean. Also include a link to git-remote in the 'See Also' section. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | Documentation/urls: Rewrite to accomodate <transport>::<address>Ramkumar Ramachandra2010-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite the first part of the document to explicitly show differences between the URLs that can be used with different transport protocols. Mention <transport>::<address> format to explicitly invoke a remote helper. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | Documentation/remote-helpers: Rewrite descriptionRamkumar Ramachandra2010-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite the description section to describe what exactly remote helpers are and the need for them. Also mention the curl family of remote helpers as an example. [jc: with readability fixes from Jonathan squashed in] Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'wp/doc-filter-direction'Junio C Hamano2010-04-18
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * wp/doc-filter-direction: documentation: clarify direction of core.autocrlf
| * | | documentation: clarify direction of core.autocrlfWill Palmer2010-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The description for core.autocrlf refers to reads from / writes to "the filesystem", the only use of this rather ambiguous term, which technically could be referring to the git object database. (All other mentions are part of phrases such as "..filesystems (like NFS).."). Other sections, including the section on core.safecrlf, use the term "work tree" for the same purpose as the term "the filesystem" is used in the core.autocrlf section, so that seems like a good alternative, which makes it clearer what direction the addition/removal of CR characters occurs in. Signed-off-by: Will Palmer <wmpalmer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'maint'Junio C Hamano2010-04-18
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * maint: Documentation: Describe other situations where -z affects git diff
| * | | Documentation: Describe other situations where -z affects git diffCharles Bailey2010-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -z also alters the behaviour of --name-only and --name-status. Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'maint'Junio C Hamano2010-04-17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * maint: t1010-mktree: Adjust expected result to code and documentation combined diff: correctly handle truncated file Document new "already-merged" rule for branch -d
| * | | Document new "already-merged" rule for branch -dJonathan Nieder2010-04-15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v1.7.0-rc0~18^2 (branch -d: base the "already-merged" safety on the branch it merges with, 2009-12-29) taught ‘git branch’ a new heuristic for when it is safe to delete a branch without forcing the issue. It is safe to delete a branch "topic" without second thought if: - the branch "topic" is set up to pull from a (remote-tracking, usually) branch and is fully merged in that "upstream" branch, or - there is no branch.topic.merge configuration and branch "topic" is fully merged in the current HEAD. Update the man page to acknowledge the new rules. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'maint'Junio C Hamano2010-04-13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * maint: Documentation/config.txt: default gc.aggressiveWindow is 250, not 10 Docs: Add -X option to git-merge's synopsis. Conflicts: Documentation/merge-options.txt
| * | Documentation/config.txt: default gc.aggressiveWindow is 250, not 10Jay Soffian2010-04-13
| | | | | | | | | | | | | | | | | | | | | | | | The default for gc.aggressiveWindow has been 250 since 1c192f3 (gc --aggressive: make it really aggressive, 2007-12-06). Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Docs: Add -X option to git-merge's synopsis.Marc Branchaud2010-04-12
| | | | | | | | | | | | | | | | | | | | | | | | Also move -X's description next to -s's in merge-options.txt. This makes it easier to learn how to specify merge strategy options. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Sync with 1.7.0.5Junio C Hamano2010-04-11
|\ \ \ | |/ /
| * | Git 1.7.0.5v1.7.0.5Junio C Hamano2010-04-11
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | blame documentation: -M/-C notice copied lines as well as moved onesJunio C Hamano2010-04-11
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'jc/doc-submit-gmail'Junio C Hamano2010-04-11
|\ \ \ | | | | | | | | | | | | | | | | * jc/doc-submit-gmail: SubmittingPatches: update GMail section
| * | | SubmittingPatches: update GMail sectionJunio C Hamano2010-04-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if you use imap-send to throw your drafts in the outbox, using their web interface will mangle your patches. Clarify that the imap-send is meant to be used together with a real MUA that can use IMAP drafts, and remove instructions related to the web interface, which is irrelevant. Add description of send-email as an alternative. Use --cover-letter, and do not use -C nor --no-color, on the example command line for format-patch. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Git 1.7.1-rc1v1.7.1-rc1Junio C Hamano2010-04-10
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'maint'Junio C Hamano2010-04-09
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | * maint: Let check_preimage() use memset() to initialize "struct checkout" fetch/push: fix usage strings
| * | | Merge branch 'rr/imap-send-unconfuse-from-line' into maintJunio C Hamano2010-04-09
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * rr/imap-send-unconfuse-from-line: imap-send: Remove limitation on message body
| * | | | fetch/push: fix usage stringsTay Ray Chuan2010-04-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use "<options>" instead of just "options". - use "[<repository> [<refspec>...]]" to indicate that <repository> and <refspec> are optional, and that <refspec> cannot be specified without specifying <repository>. Note that when called without specifying <repository> (eg. "git fetch -f"), it is accurate to say that the "git fetch [<options>] [<repository> ...]" case takes precedence over "git fetch [<options>] <group>". Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'maint'Junio C Hamano2010-04-08
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * maint: docs: clarify "branch -l"
| * | | | docs: clarify "branch -l"Jeff King2010-04-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option is mostly useless these days because we turn on reflogs by default in non-bare repos. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | fix typos and grammar in 1.7.1 draft release notesJeff King2010-04-07
| |_|/ / |/| | | | | | | | | | | | | | | Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Git 1.7.1-rc0v1.7.1-rc0Junio C Hamano2010-04-06
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'sb/fmt-merge-msg'Junio C Hamano2010-04-06
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sb/fmt-merge-msg: fmt-merge-msg: hide summary option fmt-merge-msg: remove custom string_list implementation string-list: add unsorted_string_list_lookup() fmt-merge-msg: use pretty.c routines t6200: test fmt-merge-msg more t6200: modernize with test_tick fmt-merge-msg: be quiet if nothing to merge
| * | | string-list: add unsorted_string_list_lookup()Stephen Boyd2010-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes users need to lookup a string in an unsorted string_list. In that case they should use this function instead of the version for sorted strings. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'maint'Junio C Hamano2010-04-04
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | * maint: pack-protocol.txt: fix pkt-line lengths pack-protocol.txt: fix spelling
| * | | pack-protocol.txt: fix pkt-line lengthsTay Ray Chuan2010-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the lengths were 4-bytes short. Fix it such that the lengths reflect the total length of the pkt-line, as per spec. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | pack-protocol.txt: fix spellingTay Ray Chuan2010-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | s/paramater/parameter/. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'mb/rebase-i-no-ff'Junio C Hamano2010-04-03
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mb/rebase-i-no-ff: Teach rebase the --no-ff option. Conflicts: git-rebase--interactive.sh t/t3404-rebase-interactive.sh
| * | | | Teach rebase the --no-ff option.Marc Branchaud2010-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For git-rebase.sh, --no-ff is a synonym for --force-rebase. For git-rebase--interactive.sh, --no-ff cherry-picks all the commits in the rebased branch, instead of fast-forwarding over any unchanged commits. --no-ff offers an alternative way to deal with reverted merges. Instead of "reverting the revert" you can use "rebase --no-ff" to recreate the branch with entirely new commits (they're new because at the very least the committer time is different). This obviates the need to revert the reversion, as you can re-merge the new topic branch directly. Added an addendum to revert-a-faulty-merge.txt describing the situation and how to use --no-ff to handle it. Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'rr/imap-send-unconfuse-from-line'Junio C Hamano2010-04-03
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * rr/imap-send-unconfuse-from-line: imap-send: Remove limitation on message body
| * | | | imap-send: Remove limitation on message bodyRamkumar Ramachandra2010-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a documented limitation on the body of any email not being able to contain lines starting with "From ". This patch removes that limitation by improving the parser to search for "From", "Date", and "Subject" fields in the email before considering it to be an email. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'ak/everyday-git'Junio C Hamano2010-04-03
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ak/everyday-git: everyday: fsck and gc are not everyday operations
| * | | | | everyday: fsck and gc are not everyday operationsAnders Kaseorg2010-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Back in 2005 when this document was written, it may have made sense to introduce ‘git fsck’ (then ‘git fsck-objects’) as the very first example command for new users of Git 0.99.9. Now that Git has been stable for years and does not actually tend to eat your data, it makes significantly less sense. In fact, it sends an entirely wrong message. ‘git gc’ is also unnecessary for the purposes of this document, especially with gc.auto enabled by default. The only other commands in the “Basic Repository” section were ‘git init’ and ‘git clone’. ‘clone’ is already listed in the “Participant” section, so move ‘init’ to the “Standalone” section and get rid of “Basic Repository” entirely. Signed-off-by: Anders Kaseorg <andersk@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | Sync with 1.7.0.4Junio C Hamano2010-03-31
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-08-02 03:55:12 +0000