Andrew's git / gitweb.git / diff
?
Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Sat, 18 Mar 2006 22:58:20 +0000 (14:58 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 18 Mar 2006 22:58:20 +0000 (14:58 -0800)
* master:
Makefile: Add TAGS and tags targets
ls-files: Don't require exclude files to end with a newline.

1  2 
Makefile patch | diff1 | diff2 | blob | history
ls-files.c patch | diff1 | diff2 | blob | history
diff --cc Makefile
Simple merge
diff --cc ls-files.c
Simple merge