summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'nd/diffstat-gramnum' into maintJunio C Hamano2012-02-212-3/+3
|\ | | | | | | | | * nd/diffstat-gramnum: Use correct grammar in diffstat summary line
| * Use correct grammar in diffstat summary linend/diffstat-gramnumNguyễn Thái Ngọc Duy2012-02-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "git diff --stat" and "git apply --stat" now learn to print the line "%d files changed, %d insertions(+), %d deletions(-)" in singular form whenever applicable. "0 insertions" and "0 deletions" are also omitted unless they are both zero. This matches how versions of "diffstat" that are not prehistoric produced their output, and also makes this line translatable. [jc: with help from Thomas Dickey in archaeology of "diffstat"] [jc: squashed Jonathan's updates to illustrations in tutorials and a test] Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Update draft release notes to 1.7.9.2Junio C Hamano2012-02-201-0/+3
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Update draft release notes to 1.7.9.2Junio C Hamano2012-02-161-0/+27
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | man: rearrange git synopsis to fit in 80 linesZbigniew Jędrzejewski-Szmek2012-02-161-3/+3
| | | | | | | | | | | | | | | | | | The line was extended in 2dd8c3 ('git: add --info-path and --man-path options'), and the formatted man output stopped fitting into the 80 column window. Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Git 1.7.9.1v1.7.9.1Junio C Hamano2012-02-142-1/+13
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Update draft release notes to 1.7.9.1Junio C Hamano2012-02-131-3/+19
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Update draft release notes to 1.7.9.1Junio C Hamano2012-02-101-0/+17
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'jc/maint-request-pull-for-tag' into maintJunio C Hamano2012-02-101-2/+2
|\ \ | | | | | | | | | | | | * jc/maint-request-pull-for-tag: request-pull: explicitly ask tags/$name to be pulled
| * | request-pull: explicitly ask tags/$name to be pulledjc/maint-request-pull-for-tagJunio C Hamano2012-01-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When asking for a tag to be pulled, disambiguate by leaving tags/ prefix in front of the name of the tag. E.g. ... in the git repository at: git://example.com/git/git.git/ tags/v1.2.3 for you to fetch changes up to 123456... This way, older versions of "git pull" can be used to respond to such a request more easily, as "git pull $URL v1.2.3" did not DWIM to fetch v1.2.3 tag in older versions. Also this makes it clearer for humans that the pull request is made for a tag and he should anticipate a signed one. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Prepare for 1.7.9.1Junio C Hamano2012-02-061-0/+19
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Sync with 1.7.6.6Junio C Hamano2012-02-051-1/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | * maint-1.7.8: Git 1.7.6.6 imap-send: remove dead code
| * | Sync with 1.7.6.6Junio C Hamano2012-02-051-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | * maint-1.7.7: Git 1.7.6.6 imap-send: remove dead code
| | * \ Sync with 1.7.6.6Junio C Hamano2012-02-051-1/+2
| | |\ \ | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | | * | Git 1.7.6.6v1.7.6.6maint-1.7.6Junio C Hamano2012-02-051-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Git 1.7.9v1.7.9Junio C Hamano2012-01-271-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | docs: minor grammar fixes for v1.7.9 release notesJeff King2012-01-261-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Fix typo in 1.7.9 release notesMichael Haggerty2012-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Git 1.7.9-rc2v1.7.9-rc2Junio C Hamano2012-01-181-9/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'maint'Junio C Hamano2012-01-183-2/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: Git 1.7.8.4 Git 1.7.7.6 diff-index: enable recursive pathspec matching in unpack_trees Conflicts: GIT-VERSION-GEN
| * | | | Git 1.7.8.4v1.7.8.4Junio C Hamano2012-01-182-2/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-181-0/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-1.7.7: Git 1.7.7.6 diff-index: enable recursive pathspec matching in unpack_trees Conflicts: GIT-VERSION-GEN
| | * | | Git 1.7.7.6v1.7.7.6Junio C Hamano2012-01-181-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'jc/pull-signed-tag-doc'Junio C Hamano2012-01-182-1/+221
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * jc/pull-signed-tag-doc: pulling signed tag: add howto document
| * | | | pulling signed tag: add howto documentjc/pull-signed-tag-docJunio C Hamano2012-01-182-1/+221
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'nd/pathspec-recursion-cleanup'Junio C Hamano2012-01-181-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nd/pathspec-recursion-cleanup: diff-index: enable recursive pathspec matching in unpack_trees Document limited recursion pathspec matching with wildcards
| * | | | | Document limited recursion pathspec matching with wildcardsNguyễn Thái Ngọc Duy2012-01-141-0/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's actually unlimited recursion if wildcards are active regardless --max-depth Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'mh/maint-show-ref-doc'Junio C Hamano2012-01-181-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | * mh/maint-show-ref-doc: git-show-ref doc: typeset regexp in fixed width font git-show-ref: fix escaping in asciidoc source
| * | | | git-show-ref doc: typeset regexp in fixed width fontmh/maint-show-ref-docMichael Haggerty2012-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | git-show-ref: fix escaping in asciidoc sourceMichael Haggerty2012-01-131-3/+3
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two "^" characters were incorrectly being interpreted as markup for superscripting. Fix them by writing them as attribute references "{caret}". Although a single "^" character in a paragraph cannot be misinterpreted in this way, also write other "^" characters as "{caret}" in the interest of good hygiene (unless they are in literal paragraphs, of course, in which context attribute references are not recognized). Spell "{}" consistently, namely *not* quoted as "\{\}". Since the braces are empty, they cannot be interpreted as an attribute reference, and either spelling is OK. So arbitrarily choose one variation and use it consistently. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Git 1.7.9-rc1v1.7.9-rc1Junio C Hamano2012-01-121-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'tr/maint-mailinfo'Junio C Hamano2012-01-121-7/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * tr/maint-mailinfo: mailinfo documentation: accurately describe non -k case
| * | | | mailinfo documentation: accurately describe non -k caseThomas Rast2012-01-111-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since its very first description of -k, the documentation for git-mailinfo claimed that (in the case without -k) after cleaning up bracketed strings [blah], it would insert [PATCH]. It doesn't; on the contrary, one of the important jobs of mailinfo is to remove those strings. Since we're already there, rewrite the paragraph to give a complete enumeration of all the transformations. Specifically, it was missing the whitespace normalization (run of isspace(c) -> ' ') and the removal of leading ':'. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'maint'Junio C Hamano2012-01-123-0/+15
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: Update draft release notes to 1.7.8.4 Update draft release notes to 1.7.7.6 Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base
| * | | | Update draft release notes to 1.7.8.4Junio C Hamano2012-01-121-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-122-0/+10
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | * maint-1.7.7: Update draft release notes to 1.7.7.6 Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base
| | * | | Update draft release notes to 1.7.7.6Junio C Hamano2012-01-121-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | * | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-121-0/+5
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | * maint-1.7.6: Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base
| | | * | Update draft release notes to 1.7.6.6Junio C Hamano2012-01-121-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Sync with maintJunio C Hamano2012-01-104-1/+38
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Prepare for 1.7.8.4Junio C Hamano2012-01-101-0/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Merge the attributes fix in from maint-1.6.7 branchJunio C Hamano2012-01-103-1/+24
| |\ \ \ \ | | |/ / / | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | * | | Prepare for 1.7.7.6Junio C Hamano2012-01-101-0/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | * | | Merge the attributes fix in from maint-1.6.6 branchJunio C Hamano2012-01-102-1/+13
| | |\ \ \ | | | |/ / | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | | * | Prepare for 1.7.6.6Junio C Hamano2012-01-101-0/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | | * | Documentation: rerere's rr-cache auto-creation and rerere.enabledJunio C Hamano2012-01-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The description of rerere.enabled left the user in the dark as to who might create an rr-cache directory. Add a note that simply invoking rerere does this. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Git 1.7.9-rc0v1.7.9-rc0Junio C Hamano2012-01-061-0/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'jc/show-sig'Junio C Hamano2012-01-063-7/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jc/show-sig: log --show-signature: reword the common two-head merge case log-tree: show mergetag in log --show-signature output log-tree.c: small refactor in show_signature() commit --amend -S: strip existing gpgsig headers verify_signed_buffer: fix stale comment gpg-interface: allow use of a custom GPG binary pretty: %G[?GS] placeholders test "commit -S" and "log --show-signature" log: --show-signature commit: teach --gpg-sign option Conflicts: builtin/commit-tree.c builtin/commit.c builtin/merge.c notes-cache.c pretty.c
| * | | | | gpg-interface: allow use of a custom GPG binaryjc/signed-commitJunio C Hamano2011-11-292-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | Merge branch 'jh/fetch-head-update'Junio C Hamano2012-01-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jh/fetch-head-update: write first for-merge ref to FETCH_HEAD first
View Lorry Controller Status