From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 23 May 2008 23:05:46 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6-rc0~24
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e13067a7499f3cbf543d4a30865c70613f055b4b;p=git.git

Merge branch 'maint'

* maint:
  rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
  Add missing "short" alternative to --date in rev-list-options.txt
  git-show.txt: Not very stubby these days.
  Clarify repack -n documentation
---

e13067a7499f3cbf543d4a30865c70613f055b4b
diff --cc Documentation/rev-list-options.txt
index 3558348b7,9cd677105..dfcef79a6
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@@ -13,11 -13,10 +13,11 @@@ include::pretty-options.txt[
  
  	Synonym for `--date=relative`.
  
- --date={relative,local,default,iso,rfc}::
+ --date={relative,local,default,iso,rfc,short}::
  
  	Only takes effect for dates shown in human-readable format, such
 -	as when using "--pretty".
 +	as when using "--pretty". `log.date` config variable sets a default
 +	value for log command's --date option.
  +
  `--date=relative` shows dates relative to the current time,
  e.g. "2 hours ago".
diff --cc builtin-rev-parse.c
index f8d8548e9,00b607824..ab3e85054
--- a/builtin-rev-parse.c
+++ b/builtin-rev-parse.c
@@@ -100,9 -110,8 +108,7 @@@ static void show_rev(int type, const un
  	if (!(filter & DO_REVS))
  		return;
  	def = NULL;
 -	revs_count++;
  
- 	if (type != show_type)
- 		putchar('^');
  	if (symbolic && name) {
  		if (symbolic == SHOW_SYMBOLIC_FULL) {
  			unsigned char discard[20];