From 88d50e78c339abd96270d2aad3c91dabbc7a8b1a Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Sat, 9 Jan 2010 00:18:07 +0530 Subject: [PATCH 1/2] Document git-blame triple -C option Lift the explanation of -CCC option in the source to the documentation. Signed-off-by: Ramkumar Ramachandra Signed-off-by: Junio C Hamano --- Documentation/blame-options.txt | 6 ++++-- Documentation/git-blame.txt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt index 1625ffce6..4833cac4b 100644 --- a/Documentation/blame-options.txt +++ b/Documentation/blame-options.txt @@ -98,8 +98,10 @@ commit. files that were modified in the same commit. This is useful when you reorganize your program and move code around across files. When this option is given twice, - the command additionally looks for copies from all other - files in the parent for the commit that creates the file. + the command additionally looks for copies from other + files in the commit that creates the file. When this + option is given three times, the command additionally + looks for copies from other files in any commit. + is optional but it is the lower bound on the number of alphanumeric characters that git must detect as moving diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index 8c7b7b083..b786471dd 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/git-blame.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m] - [-S ] [-M] [-C] [-C] [--since=] + [-S ] [-M] [-C] [-C] [-C] [--since=] [ | --contents | --reverse ] [--] DESCRIPTION From b9cb07726a7a288244b585939850348f319e5e0c Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Fri, 15 Jan 2010 00:28:59 +0100 Subject: [PATCH 2/2] Fix uninitialized variable in get_refs_via_rsync(). This fixes a crash when cloning via rsync://. Signed-off-by: Richard Weinberger Signed-off-by: Junio C Hamano --- transport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport.c b/transport.c index 7362ec09b..42b2c59a7 100644 --- a/transport.c +++ b/transport.c @@ -143,7 +143,7 @@ static const char *rsync_url(const char *url) static struct ref *get_refs_via_rsync(struct transport *transport, int for_push) { struct strbuf buf = STRBUF_INIT, temp_dir = STRBUF_INIT; - struct ref dummy, *tail = &dummy; + struct ref dummy = {0}, *tail = &dummy; struct child_process rsync; const char *args[5]; int temp_dir_len;