| b3cf6f3 | Junio C Hamano | 22 December 2012, 19:48:47 UTC | Git 1.8.1-rc3 The changes since -rc2 are mostly documentation updates. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2012, 19:48:47 UTC |
| b10c4ad | Junio C Hamano | 21 December 2012, 23:19:25 UTC | Merge branch 'ta/new-command-howto' * ta/new-command-howto: Move ./technical/api-command.txt to ./howto/new-command.txt | 21 December 2012, 23:19:25 UTC |
| 814a192 | Junio C Hamano | 21 December 2012, 23:19:13 UTC | Merge branch 'jc/doc-diff-blobs' "git diff <blob> <blob>" was not documented and was only hinted as an extension to "git diff <commit> <commit> -- <pathspec>", but comparison between two blobs are more special than that. It does not take any pathspec to begin with. * jc/doc-diff-blobs: Documentation: Describe "git diff <blob> <blob>" separately | 21 December 2012, 23:19:13 UTC |
| 51bf6be | Junio C Hamano | 21 December 2012, 23:19:08 UTC | Merge branch 'cr/doc-checkout-branch' Document the magic "git checkout <no-such-branch>" hack to create local branch out of a remote tracking branch that hasn't been documented so far. * cr/doc-checkout-branch: Documentation/git-checkout.txt: document 70c9ac2 behavior Documentation/git-checkout.txt: clarify usage | 21 December 2012, 23:19:08 UTC |
| 6600dcb | Junio C Hamano | 21 December 2012, 23:19:04 UTC | Merge branch 'ta/api-index-doc' * ta/api-index-doc: Remove misleading date from api-index-skel.txt | 21 December 2012, 23:19:04 UTC |
| 53096bf | Junio C Hamano | 21 December 2012, 23:18:57 UTC | Merge branch 'jk/avoid-mailto-invalid-in-doc' Avoids invalid sample e-mail addresses from becoming mailto links in the formatted output. * jk/avoid-mailto-invalid-in-doc: Documentation: don't link to example mail addresses | 21 December 2012, 23:18:57 UTC |
| c2c6a70 | Junio C Hamano | 21 December 2012, 23:18:47 UTC | Merge branch 'as/doc-for-devs' It might be a better idea to move the text the bottom one adds to the extended description from the quick checklist part. * as/doc-for-devs: Documentation: move support for old compilers to CodingGuidelines SubmittingPatches: add convention of prefixing commit messages | 21 December 2012, 23:18:47 UTC |
| 19b4520 | Junio C Hamano | 21 December 2012, 23:18:41 UTC | Merge branch 'sl/readme-gplv2' Clarify that the project as a whole is GPLv2 only, with some parts borrowed under different licenses that are compatible with GPLv2. * sl/readme-gplv2: README: it does not matter who the current maintainer is README: Git is released under the GPLv2, not just "the GPL" | 21 December 2012, 23:18:41 UTC |
| 73cf1b5 | Junio C Hamano | 21 December 2012, 23:18:35 UTC | Merge branch 'jc/fetch-tags-doc' "git fetch --tags" was explained as if it were "git fetch --no-no-tags", which is not the case, causing confusion. * jc/fetch-tags-doc: fetch --tags: clarify documentation | 21 December 2012, 23:18:35 UTC |
| d34ccd6 | Junio C Hamano | 21 December 2012, 23:18:31 UTC | Merge branch 'nd/index-format-doc' * nd/index-format-doc: index-format.txt: clarify what is "invalid" | 21 December 2012, 23:18:32 UTC |
| 80c78e1 | Junio C Hamano | 21 December 2012, 23:18:27 UTC | Merge branch 'sl/git-svn-docs' * sl/git-svn-docs: git-svn: Note about tags. git-svn: Expand documentation for --follow-parent git-svn: Recommend use of structure options. git-svn: Document branches with at-sign(@). | 21 December 2012, 23:18:27 UTC |
| 675a0fe | Junio C Hamano | 21 December 2012, 23:18:20 UTC | Merge branch 'jk/mailmap-cleanup' Update various entries in our .mailmap file. * jk/mailmap-cleanup: contrib: update stats/mailmap script .mailmap: normalize emails for Linus Torvalds .mailmap: normalize emails for Jeff King .mailmap: fix broken entry for Martin Langhoff .mailmap: match up some obvious names/emails | 21 December 2012, 23:18:20 UTC |
| 81670e9 | Thomas Ackermann | 21 December 2012, 18:05:28 UTC | Move ./technical/api-command.txt to ./howto/new-command.txt The contents of this document does not describe any particular API, but is more about the way to add a new command, which belongs to the "How To" section of the documentation suite. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2012, 18:35:53 UTC |
| 18499ba | Thomas Ackermann | 19 December 2012, 18:15:25 UTC | Remove duplicate entry in ./Documentation/Makefile Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2012, 18:24:23 UTC |
| 252f922 | Junio C Hamano | 18 December 2012, 23:35:01 UTC | Merge branch 'maint' * maint: t7004: do not create unneeded gpghome/gpg.conf when GPG is not used | 18 December 2012, 23:35:01 UTC |
| bd52900 | Junio C Hamano | 18 December 2012, 19:35:28 UTC | Documentation: Describe "git diff <blob> <blob>" separately As it was not a common operation, it was described as if it is a side note for the more common two-commit variant, but this mode behaves very differently, e.g. it does not make any sense to ask recursive behaviour, or give the command a pathspec. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2012, 19:35:28 UTC |
| 086cb91 | Junio C Hamano | 18 December 2012, 19:26:24 UTC | t7004: do not create unneeded gpghome/gpg.conf when GPG is not used These tests themselves are properly protected by the GPG prerequisite, but one of the set-up steps outside the test_expect_success block unconditionally assumed that there is a gpghome/ directory, which is not true if GPG is not being used. It may be a good idea to move the whole set-up steps in the test but that is a follow-up topic. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2012, 19:26:24 UTC |
| 00bb437 | Chris Rorvick | 17 December 2012, 06:45:02 UTC | Documentation/git-checkout.txt: document 70c9ac2 behavior Document the behavior implemented in 70c9ac2 (DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"). Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2012, 19:07:44 UTC |
| e1cdf63 | Chris Rorvick | 17 December 2012, 06:45:01 UTC | Documentation/git-checkout.txt: clarify usage The forms of checkout that do not take a path are lumped together in the DESCRIPTION section, but the description for this group is dominated by explanation of the -b|-B form. Split these apart for more clarity. Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2012, 19:04:52 UTC |
| b7cd0c9 | Junio C Hamano | 18 December 2012, 18:51:22 UTC | Sync with 'maint' | 18 December 2012, 18:51:22 UTC |
| 8e8c881 | Junio C Hamano | 18 December 2012, 18:50:07 UTC | Merge branch 'jk/pickaxe-textconv' into maint "git log -p -S<string>" now looks for the <string> after applying the textconv filter (if defined); earlier it inspected the contents of the blobs without filtering. | 18 December 2012, 18:50:07 UTC |
| 31d66aa | Sitaram Chamarty | 18 December 2012, 10:47:09 UTC | clarify -M without % symbol in diff-options Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2012, 16:46:15 UTC |
| a26fd03 | Adam Spiers | 16 December 2012, 19:36:00 UTC | Documentation: move support for old compilers to CodingGuidelines The "Try to be nice to older C compilers" text is clearly a guideline to be borne in mind whilst coding rather than when submitting patches. Signed-off-by: Adam Spiers <git@adamspiers.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2012, 02:30:53 UTC |
| 6a5b649 | Adam Spiers | 16 December 2012, 19:35:59 UTC | SubmittingPatches: add convention of prefixing commit messages Conscientious newcomers to git development will read SubmittingPatches and CodingGuidelines, but could easily miss the convention of prefixing commit messages with a single word identifying the file or area the commit touches. Signed-off-by: Adam Spiers <git@adamspiers.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2012, 02:30:50 UTC |
| f430ed8 | John Keeping | 16 December 2012, 14:00:29 UTC | Documentation: don't link to example mail addresses Email addresses in documentation are converted into mailto: hyperlinks in the HTML output and footnotes in man pages. This isn't desirable for cases where the address is used as an example and is not valid. Particularly annoying is the example "jane@laptop.(none)" which appears in git-shortlog(1) as "jane@laptop[1].(none)", with note 1 saying: 1. jane@laptop mailto:jane@laptop Fix this by escaping these email addresses with a leading backslash, to prevent Asciidoc expanding them as inline macros. In the case of mailmap.txt, render the address monospaced so that it matches the block examples surrounding that paragraph. Helped-by: Jeff King <peff@peff.net> Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2012, 01:59:07 UTC |
| a041c9c | Thomas Ackermann | 16 December 2012, 08:42:49 UTC | Remove misleading date from api-index-skel.txt Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2012, 19:57:41 UTC |
| 71ce415 | Junio C Hamano | 16 December 2012, 06:24:10 UTC | README: it does not matter who the current maintainer is The audience of this introductory document does not have to know nor interact with the maintainer, so drop the mention of him. Other documents such as SubmittingPatches may be a more suitable place to have it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2012, 06:24:10 UTC |
| 779d7e9 | Stefano Lattarini | 14 December 2012, 15:37:47 UTC | README: Git is released under the GPLv2, not just "the GPL" And this is clearly stressed by Linus in the COPYING file. So make it clear in the README as well, to avoid possible misunderstandings. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2012, 06:22:53 UTC |
| 2e90029 | Junio C Hamano | 15 December 2012, 19:19:02 UTC | Git 1.8.1-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2012, 19:19:02 UTC |
| fef1196 | Thomas Ackermann | 15 December 2012, 08:29:07 UTC | Renumber list in api-command.txt Start list with 1 instead of 0; ASCIIDOC will renumber it anyway. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2012, 18:46:47 UTC |
| bfae342 | Jeff King | 14 December 2012, 22:11:44 UTC | remote-testsvn: fix unitialized variable In remote-test-svn, there is a parse_rev_note function to parse lines of the form "Revision-number" from notes. If it finds such a line and parses it, it returns 0, copying the value into a "struct rev_note". If it finds an entry that is garbled or out of range, it returns -1 to signal an error. However, if it does not find any "Revision-number" line at all, it returns success but does not put anything into the rev_note. So upon a successful return, the rev_note may or may not be initialized, and the caller has no way of knowing. gcc does not usually catch the use of the unitialized variable because the conditional assignment happens in a separate function from the point of use. However, when compiling with -O3, gcc will inline parse_rev_note and notice the problem. We can fix it by returning "-1" when no note is found (so on a zero return, we always found a valid value). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2012, 18:43:11 UTC |
| f0cb2f1 | Junio C Hamano | 14 December 2012, 00:19:45 UTC | fetch --tags: clarify documentation Explain that --tags is just like another explicit refspec on the command line and as such overrides the default refspecs configured via the remote.$name.fetch variable. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2012, 00:19:45 UTC |
| 790c83c | Junio C Hamano | 13 December 2012, 19:13:56 UTC | Merge branch 'maint' | 13 December 2012, 19:13:56 UTC |
| bdd478d | Matthew Daley | 13 December 2012, 13:36:30 UTC | Fix sizeof usage in get_permutations Currently it gets the size of an otherwise unrelated, unused variable instead of the expected struct size. Signed-off-by: Matthew Daley <mattjd@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2012, 19:13:44 UTC |
| 538d123 | Junio C Hamano | 13 December 2012, 19:00:15 UTC | Merge branch 'mh/doc-remote-helpers' * mh/doc-remote-helpers: git-remote-helpers.txt: clarify options & ref list attributes git-remote-helpers.txt: clarify command <-> capability correspondences git-remote-helpers.txt: rearrange description of capabilities git-remote-helpers.txt: minor grammar fix git-remote-helpers.txt: document missing capabilities git-remote-helpers.txt: document invocation before input format | 13 December 2012, 19:00:15 UTC |
| 75940a0 | Manlio Perillo | 13 December 2012, 17:57:19 UTC | git.txt: add missing info about --git-dir command-line option Unlike other environment variables (e.g. GIT_WORK_TREE, GIT_NAMESPACE), the Documentation/git.txt file did not mention that the GIT_DIR environment variable can also be set using the --git-dir command line option. Signed-off-by: Manlio Perillo <manlio.perillo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2012, 18:54:01 UTC |
| 4a6385f | Nguyễn Thái Ngọc Duy | 13 December 2012, 01:14:47 UTC | index-format.txt: clarify what is "invalid" A cache-tree entry with a negative entry count is considered invalid by the current Git; it records that we do not know the object name of a tree that would result by writing the directory covered by the cache-tree as a tree object. Clarify that any entry with a negative entry count is invalid, but the implementations must write -1 there. This way, we can later decide to allow writers to use negative values other than -1 to encode optional information on such invalidated entries without harming interoperability; we do not know what will be encoded and how, so we keep these other negative values as reserved for now. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2012, 18:12:25 UTC |
| 24a62db | Junio C Hamano | 12 December 2012, 18:06:24 UTC | git(1): show link to contributor summary page We earlier removed a link to list of contributors that pointed to a defunct page; let's use a working one from Ohloh.net to replace it instead. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2012, 19:58:17 UTC |
| 53474eb | Jeff King | 12 December 2012, 11:41:41 UTC | contrib: update stats/mailmap script This version changes quite a few things: 1. The original parsed the mailmap file itself, and it did it wrong (it did not understand entries with an extra email key). Instead, this version uses git's "%aE" and "%aN" formats to have git perform the mapping, meaning we do not have to read .mailmap at all, but still operate on the current state that git sees (and it also works properly from subdirs). 2. The original would find multiple names for an email, but not the other way around. This version can do either or both. If we find multiple emails for a name, the resolution is less obvious than the other way around. However, it can still be a starting point for a human to investigate. 3. The original would order only by count, not by recency. This version can do either. Combined with showing the counts, it can be easier to decide how to resolve. 4. This version shows similar entries in a blank-delimited stanza, which makes it more clear which options you are picking from. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2012, 19:09:11 UTC |
| 0e23064 | Jeff King | 12 December 2012, 11:41:04 UTC | .mailmap: normalize emails for Linus Torvalds Linus used a lot of different per-machine email addresses in the early days. This means that "git shortlog -nse" does not aggregate his counts, and he is listed well below where he should be (8th instead of 3rd). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2012, 19:09:11 UTC |
| c4878fd | Jeff King | 12 December 2012, 11:38:26 UTC | .mailmap: normalize emails for Jeff King I never meant anything special by using my @github.com address; it is merely a mistake that it has sometimes bled through to patches. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2012, 19:09:11 UTC |
| 32d979e | Jeff King | 12 December 2012, 11:38:06 UTC | .mailmap: fix broken entry for Martin Langhoff Commit adc3192 (Martin Langhoff has a new e-mail address, 2010-10-05) added a mailmap entry, but forgot that both the old and new email addresses need to appear for one to be mapped to the other (i.e., we do not key mailmap emails by name). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2012, 19:09:11 UTC |
| 055e578 | Jeff King | 12 December 2012, 11:36:35 UTC | .mailmap: match up some obvious names/emails This patch updates git's .mailmap in cases where multiple names are matched to a single email. The "master" name for each email was chosen by: 1. If the only difference is in the presence or absence of accented characters, the accented form is chosen (under the assumption that it is the natural spelling, and accents are sometimes stripped in email). 2. Otherwise, the most commonly used name is chosen. 3. If all names are equally common, the most recently used name is chosen. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2012, 19:09:11 UTC |
| 4881616 | Junio C Hamano | 12 December 2012, 19:08:13 UTC | Merge branch 'so/prompt-command' * so/prompt-command: git-prompt.sh: update PROMPT_COMMAND documentation | 12 December 2012, 19:08:13 UTC |
| de29a7a | Junio C Hamano | 11 December 2012, 23:04:36 UTC | git-prompt.sh: update PROMPT_COMMAND documentation The description of __git_ps1 function operating in two-arg mode was not very clear. It said "set PROMPT_COMMAND=__git_ps1" which is not the right usage for this mode, followed by "To customize the prompt, do this", giving a false impression that those who do not want to customize it can get away with no-arg form, which was incorrect. Make it clear that this mode always takes two arguments, pre and post, with an example. The straight-forward one should be listed as the primary usage, and the confusing one should be an alternate for advanced users. Swap the order of these two. Acked-by: Simon Oosthoek <s.oosthoek@xs4all.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2012, 19:07:48 UTC |
| 75ed918 | Marc Khouzam | 11 December 2012, 21:36:57 UTC | Add file completion to tcsh git completion. For bash completion, the option '-o bashdefault' is used to indicate that when no other choices are available, file completion should be performed. Since this option is not available in tcsh, no file completion is ever performed. Therefore, commands like 'git add ', 'git send-email ', etc, require the user to manually type out the file name. This can be quite annoying. To improve the user experience we try to simulate file completion directly in this script (although not perfectly). The known issues with the file completion simulation are: - Possible completions are shown with their directory prefix. - Completions containing shell variables are not handled. - Completions with ~ as the first character are not handled. Signed-off-by: Marc Khouzam <marc.khouzam@ericsson.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2012, 05:49:25 UTC |
| 7348159 | Junio C Hamano | 11 December 2012, 23:51:14 UTC | Merge branch 'ef/mingw-rmdir' MinGW has a workaround when rmdir unnecessarily fails to retry with a prompt, but the logic was kicking in when the rmdir failed with ENOTEMPTY, i.e. was expected to fail and there is no point retrying. * ef/mingw-rmdir: mingw_rmdir: do not prompt for retry when non-empty | 11 December 2012, 23:51:14 UTC |
| 1bfe99e | Junio C Hamano | 11 December 2012, 23:51:09 UTC | Merge branch 'ef/mingw-tty-getpass' Update getpass() emulation for MinGW. * ef/mingw-tty-getpass: mingw: get rid of getpass implementation mingw: reuse tty-version of git_terminal_prompt compat/terminal: separate input and output handles compat/terminal: factor out echo-disabling mingw: make fgetc raise SIGINT if apropriate mingw: correct exit-code for SIGALRM's SIG_DFL | 11 December 2012, 23:51:09 UTC |
| f993e2e | Junio C Hamano | 11 December 2012, 23:50:10 UTC | Merge branch 'maint' * maint: git-prompt: Document GIT_PS1_DESCRIBE_STYLE | 11 December 2012, 23:50:10 UTC |
| 50b03b0 | Anders Kaseorg | 11 December 2012, 23:20:24 UTC | git-prompt: Document GIT_PS1_DESCRIBE_STYLE GIT_PS1_DESCRIBE_STYLE was introduced in v1.6.3.2~35. Document it in the header comments. Signed-off-by: Anders Kaseorg <andersk@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2012, 23:36:13 UTC |
| 7e0651a | Junio C Hamano | 10 December 2012, 21:07:12 UTC | Sync with 1.8.0.2 * maint: Git 1.8.0.2 Documentation/git-stash.txt: add a missing verb git(1): remove a defunct link to "list of authors" Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2012, 21:07:12 UTC |
| 3e53891 | Junio C Hamano | 10 December 2012, 21:05:47 UTC | Git 1.8.0.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2012, 21:05:47 UTC |
| dd6fc7c | Stefano Lattarini | 09 December 2012, 10:36:17 UTC | Makefile: whitespace style fixes in macro definitions Consistently use a single space before and after the "=" (or ":=", "+=", etc.) in assignments to make macros. Granted, this was not a big deal, but I did find the needless inconsistency quite distracting. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2012, 16:35:56 UTC |
| a83b2b5 | Erik Faye-Lund | 10 December 2012, 14:42:27 UTC | mingw_rmdir: do not prompt for retry when non-empty in ab1a11be ("mingw_rmdir: set errno=ENOTEMPTY when appropriate"), a check was added to prevent us from retrying to delete a directory that is both in use and non-empty. However, this logic was slightly flawed; since we didn't return immediately, we end up falling out of the retry-loop, but right into the prompting-loop. Fix this by setting errno, and guarding the prompting-loop with an errno-check. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2012, 16:23:53 UTC |
| 5badfdc | Sébastien Loriot | 10 December 2012, 07:22:34 UTC | Documentation/git-stash.txt: add a missing verb Signed-off-by: Sébastien Loriot <sloriot.ml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2012, 16:18:25 UTC |
| ac046c0 | Junio C Hamano | 07 December 2012, 17:54:50 UTC | git(1): remove a defunct link to "list of authors" The linked page has not been showing the promised "more complete list" for more than 6 months by now, and nobody has resurrected the list there nor elsewhere since then. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2012, 08:33:04 UTC |
| 816f290 | Junio C Hamano | 07 December 2012, 22:18:55 UTC | Git 1.8.1-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2012, 23:17:21 UTC |
| 00704e4 | Junio C Hamano | 07 December 2012, 23:15:59 UTC | Documentation/diff-config: work around AsciiDoc misfortune The line that happens to begin with indent followed by "3. " was interpreted as if it was an enumerated list; just wrap the lines differently to work it around for now. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2012, 23:15:59 UTC |
| 5a2c11b | Junio C Hamano | 07 December 2012, 22:16:52 UTC | Merge branch 'maint' * maint: Update draft release notes to 1.8.0.2 | 07 December 2012, 22:16:52 UTC |
| a859d3e | Junio C Hamano | 07 December 2012, 22:16:38 UTC | Update draft release notes to 1.8.0.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2012, 22:16:38 UTC |
| f07f413 | Junio C Hamano | 07 December 2012, 22:11:21 UTC | Merge branch 'jc/doc-push-satellite' into maint * jc/doc-push-satellite: Documentation/git-push.txt: clarify the "push from satellite" workflow | 07 December 2012, 22:11:21 UTC |
| fff26a6 | Junio C Hamano | 07 December 2012, 22:10:56 UTC | Merge branch 'jc/same-encoding' into maint Various codepaths checked if two encoding names are the same using ad-hoc code and some of them ended up asking iconv() to convert between "utf8" and "UTF-8". The former is not a valid way to spell the encoding name, but often people use it by mistake, and we equated them in some but not all codepaths. Introduce a new helper function to make these codepaths consistent. * jc/same-encoding: reencode_string(): introduce and use same_encoding() | 07 December 2012, 22:10:56 UTC |
| 6a40284 | Junio C Hamano | 07 December 2012, 22:10:17 UTC | Merge branch 'lt/diff-stat-show-0-lines' into maint "git diff --stat" miscounted the total number of changed lines when binary files were involved and hidden beyond --stat-count. It also miscounted the total number of changed files when there were unmerged paths. * lt/diff-stat-show-0-lines: t4049: refocus tests diff --shortstat: do not count "unmerged" entries diff --stat: do not count "unmerged" entries diff --stat: move the "total count" logic to the last loop diff --stat: use "file" temporary variable to refer to data->files[i] diff --stat: status of unmodified pair in diff-q is not zero test: add failing tests for "diff --stat" to t4049 Fix "git diff --stat" for interesting - but empty - file changes | 07 December 2012, 22:10:17 UTC |
| 9ec8bcd | Max Horn | 27 November 2012, 23:03:26 UTC | git-remote-helpers.txt: clarify options & ref list attributes The documentation was misleading in that it gave the impression that 'for-push' could be used as a ref attribute in the output of the 'list' command. That is wrong. Also, explicitly point out the connection between the commands 'list' and 'options' on the one hand, and the sections 'REF LIST ATTRIBUTES' and 'OPTIONS' on the other hand. Signed-off-by: Max Horn <max@quendi.de> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2012, 21:54:15 UTC |
| 754cb1a | Max Horn | 27 November 2012, 23:03:25 UTC | git-remote-helpers.txt: clarify command <-> capability correspondences In particular, document 'list for-push' separately from 'list', as the former needs only be supported for the push/export capabilities, and the latter only for fetch/import. Indeed, a hypothetically 'push-only' helper would only need to support the former, not the latter. Signed-off-by: Max Horn <max@quendi.de> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2012, 21:54:15 UTC |
| 0673bb2 | Max Horn | 27 November 2012, 23:03:24 UTC | git-remote-helpers.txt: rearrange description of capabilities This also remove some duplication in the descriptions (e.g. refspec was explained twice with similar level of detail). Signed-off-by: Max Horn <max@quendi.de> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2012, 21:54:15 UTC |
| b20c457 | Max Horn | 27 November 2012, 23:03:23 UTC | git-remote-helpers.txt: minor grammar fix Signed-off-by: Max Horn <max@quendi.de> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2012, 21:54:15 UTC |
| b4b106e | Max Horn | 27 November 2012, 23:03:22 UTC | git-remote-helpers.txt: document missing capabilities Specifically, document the 'export' and '(im|ex)port-marks' capabilities as well as the export command, which were undocumented (but in active use). Signed-off-by: Max Horn <max@quendi.de> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2012, 21:54:15 UTC |
| f829a9e | Max Horn | 27 November 2012, 23:03:21 UTC | git-remote-helpers.txt: document invocation before input format In the distant past, the order things were documented was 'Invocation', 'Commands', 'Capabilities', ... Then it was decided that before giving a list of Commands, there should be an overall description of the 'Input format', which was a wise decision. However, this description was put as the very first thing, with the rationale that any implementor would want to know that first. However, it seems an implementor would actually first need to know how the remote helper will be invoked, so moving 'Invocation' to the front again seems logical. Moreover, we now don't switch from discussing the input format to the invocation style and then back to input related stuff. Signed-off-by: Max Horn <max@quendi.de> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2012, 21:54:14 UTC |
| feeb42e | Junio C Hamano | 07 December 2012, 18:32:22 UTC | Merge branch 'master' of git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: de.po: translate 22 new messages l10n: de.po: translate 825 new messages l10n: Update Swedish translation (1979t0f0u) l10n: vi.po: update to git-v1.8.0.1-347-gf94c3 l10n: Update git.pot (5 new, 1 removed messages) | 07 December 2012, 18:32:22 UTC |
| 7e2ef8b | Junio C Hamano | 07 December 2012, 18:31:19 UTC | Merge branch 'rr/t4041-cleanup' * rr/t4041-cleanup: t4041 (diff-submodule-option): modernize style t4041 (diff-submodule-option): rewrite add_file() routine t4041 (diff-submodule-option): parse digests sensibly t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs | 07 December 2012, 18:31:19 UTC |
| 167e2f9 | Jiang Xin | 07 December 2012, 09:28:58 UTC | Merge branch git://github.com/ralfth/git-po-de * 'rt/de-l10n-updates-for-1.8.1' of git://github.com/ralfth/git-po-de: l10n: de.po: translate 22 new messages l10n: de.po: translate 825 new messages Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 07 December 2012, 09:30:02 UTC |
| df264e4 | Ralf Thielow | 02 December 2012, 15:57:38 UTC | l10n: de.po: translate 22 new messages Translate 22 new messages came from git.pot updates in 9306b5b (l10n: Update git.pot (3 new, 6 removed messages)), fe52cd6 (l10n: Update git.pot (14 new, 3 removed messages)) and f9472e3 (l10n: Update git.pot (5 new, 1 removed messages)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Reviewed-by: Michael J Gruber <git@drmicha.warpmail.net> | 06 December 2012, 06:32:39 UTC |
| 6d0e699 | Ralf Thielow | 16 September 2012, 11:15:34 UTC | l10n: de.po: translate 825 new messages Translate 825 new messages came from git.pot update in cc76011 ("l10n: Update git.pot (825 new, 24 removed messages)"). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Reviewed-by: Thomas Rast <trast@student.ethz.ch> Helped-by: Michael J Gruber <git@drmicha.warpmail.net> | 06 December 2012, 06:31:52 UTC |
| dd465ce | Sebastian Leske | 23 November 2012, 07:29:38 UTC | git-svn: Note about tags. Document that 'git svn' will import SVN tags as branches. Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2012, 22:39:55 UTC |
| 0d35bfe | Sebastian Leske | 30 November 2012, 07:16:30 UTC | git-svn: Expand documentation for --follow-parent Describe what the option --follow-parent does, and what happens if it is set or unset. Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2012, 22:39:55 UTC |
| 92166fd | Sebastian Leske | 30 November 2012, 07:16:30 UTC | git-svn: Recommend use of structure options. Document that when using git svn, one should usually either use the directory structure options to import branches as branches, or only import one subdirectory. The default behaviour of cloning all branches and tags as subdirectories in the working copy is usually not what the user wants. Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2012, 22:39:55 UTC |
| 7cad29d | Sebastian Leske | 30 November 2012, 07:16:30 UTC | git-svn: Document branches with at-sign(@). git svn sometimes creates branches with an at-sign in the name (branchname@revision). These branches confuse many users and it is a FAQ why they are created. Document when git svn creates them. Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2012, 22:39:55 UTC |
| fb4c622 | Junio C Hamano | 04 December 2012, 21:34:10 UTC | Merge branch 'mm/status-push-pull-advise' * mm/status-push-pull-advise: document that statusHints affects git checkout | 04 December 2012, 21:34:10 UTC |
| f7a4cea | Erik Faye-Lund | 04 December 2012, 08:10:42 UTC | mingw: get rid of getpass implementation There's no remaining call-sites, and as pointed out in the previous commit message, it's not quite ideal. So let's just lose it. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2012, 16:03:42 UTC |
| afb4356 | Erik Faye-Lund | 04 December 2012, 08:10:41 UTC | mingw: reuse tty-version of git_terminal_prompt The getpass-implementation we use on Windows isn't at all ideal; it works in raw-mode (as opposed to cooked mode), and as a result does not deal correcly with deletion, arrow-keys etc. Instead, use cooked mode to read a line at the time, allowing the C run-time to process the input properly. Since we set files to be opened in binary-mode by default on Windows, introduce a FORCE_TEXT macro that expands to the "t" modifier that forces the terminal to be opened in text-mode so we do not have to deal with CRLF issues. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2012, 16:03:08 UTC |
| 67fe735 | Erik Faye-Lund | 04 December 2012, 08:10:40 UTC | compat/terminal: separate input and output handles On Windows, the terminal cannot be opened in read-write mode, so we need distinct pairs for reading and writing. Since this works fine on other platforms as well, always open them in pairs. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2012, 16:02:55 UTC |
| 9df92e6 | Erik Faye-Lund | 04 December 2012, 08:10:39 UTC | compat/terminal: factor out echo-disabling By moving the echo-disabling code to a separate function, we can implement OS-specific versions of it for non-POSIX platforms. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2012, 16:01:59 UTC |
| 176478a | Erik Faye-Lund | 04 December 2012, 08:10:38 UTC | mingw: make fgetc raise SIGINT if apropriate Set a control-handler to prevent the process from terminating, and simulate SIGINT so it can be handled by a signal-handler as usual. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2012, 16:00:58 UTC |
| f4f5498 | Erik Faye-Lund | 04 December 2012, 08:10:37 UTC | mingw: correct exit-code for SIGALRM's SIG_DFL Make sure SIG_DFL for SIGALRM exits with 128 + SIGALRM so other processes can diagnose why it exits. While we're at it, make sure we only write to stderr if it's a terminal, and change the output to match that of Linux. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2012, 16:00:29 UTC |
| 552755a | Matthieu Moy | 04 December 2012, 09:15:03 UTC | document that statusHints affects git checkout Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2012, 15:57:30 UTC |
| ee26a6e | Junio C Hamano | 03 December 2012, 17:49:51 UTC | Git 1.8.1-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2012, 17:49:51 UTC |
| 90ae9f2 | Junio C Hamano | 03 December 2012, 17:27:29 UTC | Merge branch 'mm/status-push-pull-advise' Finishing touch to allow the new advice message squelched with an advice.* configuration variable. * mm/status-push-pull-advise: status: respect advice.statusHints for ahead/behind advice | 03 December 2012, 17:28:43 UTC |
| 491e307 | Jeff King | 03 December 2012, 06:16:57 UTC | status: respect advice.statusHints for ahead/behind advice If the user has unset advice.statusHints, we already suppress the "use git reset to..." hints in each stanza. The new "use git push to publish..." hint is the same type of hint. Let's respect statusHints for it, rather than making the user set yet another advice flag. Signed-off-by: Jeff King <peff@peff.net> Acked-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2012, 17:10:47 UTC |
| a1549f9 | Ramkumar Ramachandra | 30 November 2012, 11:37:36 UTC | t4041 (diff-submodule-option): modernize style - Enclose tests in single quotes as opposed to double quotes. This is the prevalent style in other tests. - Remove the unused variable $head4_full. - Indent the expected output so that it lines up with the rest of the test text. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2012, 10:02:15 UTC |
| 2934975 | Ramkumar Ramachandra | 30 November 2012, 11:37:35 UTC | t4041 (diff-submodule-option): rewrite add_file() routine Instead of "cd there and then come back", use the "cd there in a subshell" pattern. Also fix '&&' chaining in one place. Suggested-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2012, 10:02:05 UTC |
| 20fa538 | Ramkumar Ramachandra | 30 November 2012, 11:37:34 UTC | t4041 (diff-submodule-option): parse digests sensibly `git rev-list --max-count=1 HEAD` is a roundabout way of saying `git rev-parse --verify HEAD`; replace a bunch of instances of the former with the latter. Also, don't unnecessarily `cut -c1-7` the rev-parse output when the `--short` option is available. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2012, 09:58:40 UTC |
| bf3e8fe | Peter Krefting | 30 November 2012, 09:51:14 UTC | l10n: Update Swedish translation (1979t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 30 November 2012, 09:51:14 UTC |
| 77cc392 | Tran Ngoc Quan | 30 November 2012, 06:43:11 UTC | l10n: vi.po: update to git-v1.8.0.1-347-gf94c3 * updated all new messages (1979t0f0u) Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 30 November 2012, 06:43:11 UTC |
| f9472e3 | Jiang Xin | 30 November 2012, 04:41:47 UTC | l10n: Update git.pot (5 new, 1 removed messages) L10n for git 1.8.1 round 2: Generate po/git.pot from v1.8.0.1-347-gf94c3. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 30 November 2012, 04:41:47 UTC |
| f94c325 | Junio C Hamano | 29 November 2012, 21:57:09 UTC | Update draft release notes to 1.8.1 | 29 November 2012, 21:57:09 UTC |
| 15470c6 | Junio C Hamano | 29 November 2012, 21:44:28 UTC | Merge branch 'pw/p4-various-fixes' * pw/p4-various-fixes: git p4: remove unneeded cmd initialization git p4: fix labelDetails typo in exception git p4 test: display unresolvable host error git p4: catch p4 errors when streaming file contents git p4: handle servers without move support git p4: catch p4 describe errors | 29 November 2012, 21:44:28 UTC |
| a4eab8f | Junio C Hamano | 29 November 2012, 20:53:54 UTC | Merge branch 'lt/diff-stat-show-0-lines' "git diff --stat" miscounted the total number of changed lines when binary files were involved and hidden beyond --stat-count. It also miscounted the total number of changed files when there were unmerged paths. * lt/diff-stat-show-0-lines: t4049: refocus tests diff --shortstat: do not count "unmerged" entries diff --stat: do not count "unmerged" entries diff --stat: move the "total count" logic to the last loop diff --stat: use "file" temporary variable to refer to data->files[i] diff --stat: status of unmodified pair in diff-q is not zero test: add failing tests for "diff --stat" to t4049 | 29 November 2012, 20:53:54 UTC |
| 545492f | Junio C Hamano | 29 November 2012, 20:53:50 UTC | Merge branch 'fc/remote-hg' New remote helper for hg. * fc/remote-hg: (22 commits) remote-hg: fix for older versions of python remote-hg: fix for files with spaces remote-hg: avoid bad refs remote-hg: try the 'tip' if no checkout present remote-hg: fix compatibility with older versions of hg remote-hg: add missing config for basic tests remote-hg: the author email can be null remote-hg: add option to not track branches remote-hg: add extra author test remote-hg: add tests to compare with hg-git remote-hg: add bidirectional tests test-lib: avoid full path to store test results remote-hg: add basic tests remote-hg: fake bookmark when there's none remote-hg: add compat for hg-git author fixes remote-hg: add support for hg-git compat mode remote-hg: match hg merge behavior remote-hg: make sure the encoding is correct remote-hg: add support to push URLs remote-hg: add support for remote pushing ... | 29 November 2012, 20:53:50 UTC |
| 05ea76e | Junio C Hamano | 29 November 2012, 20:53:38 UTC | Merge branch 'mk/complete-tcsh' Finishing touches for tcsh completion. * mk/complete-tcsh: Support for git aliasing for tcsh completion | 29 November 2012, 20:53:38 UTC |
