1. 06 Sep, 2008 2 commits
  2. 05 Sep, 2008 3 commits
    • Junio C Hamano's avatar
      Mention the fact that 'git annotate' is only for backward compatibility. · f22a432b
      Junio C Hamano authored
      When somebody is reading git-blame.txt (or git-annotate.txt) for the first
      time, the message we would like to send is:
      
       (1) Here is why you would want to use this command, what it can do
           (perhaps more than what you would have expected from "$scm blame"),
           and how you tell it to do what it does.
      
           This is obvious.
      
       (2) You might have heard of the command with the other name.  There is no
           difference between the two, except they differ in their default
           output formats.
      
           This is essential to answer: "git has both?  how are they different?"
      
       (3) We tend to encourage blame over annotate for new scripts and new
           people, but there is no reason to choose one over the other.
      
           This is not as important as (2), but would be useful to avoid
           repeated questions about "when will we start deprecating this?"
      
      As long as we describe (2) on git-annotate page clearly enough, people who
      read git-blame page first and get curious can refer to git-annotate page.
      While at it, subtly hint (3) without being overly explicit.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      f22a432b
    • Junio C Hamano's avatar
      "blame -c" should be compatible with "annotate" · 7ceacdff
      Junio C Hamano authored
      There is no reason to have a separate variable cmd_is_annotate;
      OUTPUT_ANNOTATE_COMPAT option is supposed to produce the compatibility
      output, and we should produce the same output even when the command was
      not invoked as "annotate" but as "blame -c".
      
      Noticed by Pasky.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      7ceacdff
    • Shawn O. Pearce's avatar
      git-gui: Fix diff parsing for lines starting with "--" or "++" · ca53c3fd
      Shawn O. Pearce authored
      Languages like Lua and SQL use "--" to mark a line as commented out.
      If this appears at column 0 and is part of the pre-image we may see
      "--- foo" in the diff, indicating that the line whose content is
       "-- foo" has been removed from the new version.
      
      git-gui was incorrectly parsing "--- foo" as the old file name
      in the file header, causing it to generate a bad patch file when
      the user tried to stage or unstage a hunk or the selected line.
      We need to keep track of where we are in the parsing so that we do
      not misread a deletion or addition record as part of the header.
      Reported-by: default avatarAlexander Gladysh <[email protected]>
      Signed-off-by: default avatarShawn O. Pearce <[email protected]>
      ca53c3fd
  3. 04 Sep, 2008 2 commits
  4. 03 Sep, 2008 12 commits
  5. 02 Sep, 2008 5 commits
  6. 01 Sep, 2008 2 commits
  7. 31 Aug, 2008 7 commits
  8. 30 Aug, 2008 7 commits