Merge branch 'cc/replace'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Nov 2009 06:24:01 +0000 (22:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Nov 2009 06:24:01 +0000 (22:24 -0800)
* cc/replace:
  Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
  Documentation: fix typos and spelling in replace documentation
  replace: use a GIT_NO_REPLACE_OBJECTS env variable

1  2 
cache.h
connect.c
environment.c
git.c

diff --cc cache.h
Simple merge
diff --cc connect.c
Simple merge
diff --cc environment.c
Simple merge
diff --cc git.c
Simple merge