From: Junio C Hamano <junkio@cox.net>
Date: Thu, 4 May 2006 00:18:21 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e33b1dfe2834ceca1c449ec653dea636ca2d0200;p=git.git

Merge branch 'master' into next

* master:
  fix various typos in documentation
  blame: Fix path pruning
  cvsserver: use git-rev-list instead of git-log
  Fix "git-log --parents" breakage post v1.3.0
  add documentation for update-index --unresolve
---

e33b1dfe2834ceca1c449ec653dea636ca2d0200
diff --cc log-tree.c
index aaf2b942,b90ba676..d92abaf6
--- a/log-tree.c
+++ b/log-tree.c
@@@ -37,20 -49,14 +49,22 @@@ void show_log(struct rev_info *opt, str
  	/*
  	 * Print header line of header..
  	 */
 -	printf("%s%s",
 -		opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
 -		diff_unique_abbrev(commit->object.sha1, abbrev_commit));
 -	if (opt->parents)
 -		show_parents(commit, abbrev_commit);
 -	if (parent)
 -		printf(" (from %s)", diff_unique_abbrev(parent->object.sha1, abbrev_commit));
 -	putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
 +
 +	if (opt->commit_format == CMIT_FMT_EMAIL)
 +		printf("From %s  Thu Apr 7 15:13:13 2005\n",
 +		       sha1_to_hex(commit->object.sha1));
 +	else {
 +		printf("%s%s",
 +		       opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
 +		       diff_unique_abbrev(commit->object.sha1, abbrev_commit));
++		if (opt->parents)
++			show_parents(commit, abbrev_commit);
 +		if (parent) 
 +			printf(" (from %s)",
 +			       diff_unique_abbrev(parent->object.sha1,
 +						  abbrev_commit));
 +		putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
 +	}
  
  	/*
  	 * And then the pretty-printed message itself