Skip to content

G
git

李少辉-开发者 / git
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

体验新版 GitCode，发现更多精彩内容 >>

切换分支/标签
  1. 07 9月, 2008 1 次提交
  3. 05 9月, 2008 3 次提交
    • J
      Mention the fact that 'git annotate' is only for backward compatibility. · f22a432b
      由 Junio C Hamano 提交于 
      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: NJunio C Hamano <gitster@pobox.com>
      f22a432b
    • J
      "blame -c" should be compatible with "annotate" · 7ceacdff
      由 Junio C Hamano 提交于 
      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: NJunio C Hamano <gitster@pobox.com>
      7ceacdff
    • S
      git-gui: Fix diff parsing for lines starting with "--" or "++" · ca53c3fd
      由 Shawn O. Pearce 提交于 
      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: NAlexander Gladysh <agladysh@gmail.com>
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
      ca53c3fd
  5. 04 9月, 2008 13 次提交
  7. 03 9月, 2008 1 次提交
  9. 02 9月, 2008 7 次提交
  11. 01 9月, 2008 3 次提交
  13. 31 8月, 2008 7 次提交
  15. 30 8月, 2008 5 次提交