From: Junio C Hamano <junkio@cox.net>
Date: Sun, 1 Oct 2006 07:34:58 +0000 (-0700)
Subject: Merge branch 'sb/fetch' into jc/refs-and-fetch
X-Git-Tag: v1.4.4-rc1~43^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/12f9b8a3152ff9fa48464187a83f7c6279fe5094?ds=inline;hp=-c

Merge branch 'sb/fetch' into jc/refs-and-fetch

* sb/fetch: (41 commits)
merge and resolve: Output short hashes and .. in "Updating ..."
fetch: Misc output cleanup
gitweb: tree view: hash_base and hash are now context sensitive
fetch: Reset remote refs list each time fetch_main is called
Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34
git-diff -B output fix.
Make cvsexportcommit remove files.
diff --stat: ensure at least one '-' for deletions, and one '+' for additions
diff --stat=width[,name-width]: allow custom diffstat output width.
gitweb: History: blob and tree are first, then commitdiff, etc
gitweb: Remove redundant "commit" from history
http/ftp: optionally ask curl to not use EPSV command
gitweb: Don't use quotemeta on internally generated strings
gitweb: Add snapshot to shortlog
gitweb: Factor out gitweb_have_snapshot()
gitweb: Remove redundant "commit" link from shortlog
gitweb: "alternate" starts with shade (i.e. 1)
git-format-patch: fix bug using -o in subdirectories
do not discard constness in interp_set_entry value argument
Fix approxidate() to understand more extended numbers
...
---

12f9b8a3152ff9fa48464187a83f7c6279fe5094
diff --combined Makefile
index 65fb8284f3,e649d72f60..efcf3fb293
--- a/Makefile
+++ b/Makefile
@@@ -271,7 -271,6 +271,7 @@@ BUILTIN_OBJS = 
  	builtin-diff-stages.o \
  	builtin-diff-tree.o \
  	builtin-fmt-merge-msg.o \
 +	builtin-for-each-ref.o \
  	builtin-grep.o \
  	builtin-init-db.o \
  	builtin-log.o \
@@@ -300,9 -299,7 +300,9 @@@
  	builtin-update-ref.o \
  	builtin-upload-archive.o \
  	builtin-verify-pack.o \
 -	builtin-write-tree.o
 +	builtin-write-tree.o \
 +	builtin-show-ref.o \
 +	builtin-pack-refs.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
@@@ -525,6 -522,9 +525,9 @@@ endi
  ifdef NO_INET_NTOP
  	LIB_OBJS += compat/inet_ntop.o
  endif
+ ifdef NO_INET_PTON
+ 	LIB_OBJS += compat/inet_pton.o
+ endif
  
  ifdef NO_ICONV
  	ALL_CFLAGS += -DNO_ICONV