Code

Merge branch 'maint-1.6.5' into maint-1.6.6
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Feb 2010 23:04:55 +0000 (15:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Feb 2010 23:04:55 +0000 (15:04 -0800)
commiteb0bcd0fbe34befe7648a398efc7f4156b07da48
tree997b4970db45623e0267704c81a130202cb86c0e
parent7283bbc70a55d7364fbeaefc1009c03fcfc8d929
parent003c6abdb27c367747847a76b0a7890d67c794be
Merge branch 'maint-1.6.5' into maint-1.6.6

* maint-1.6.5:
  dwim_ref: fix dangling symref warning
  stash pop: remove 'apply' options during 'drop' invocation
  diff: make sure --output=/bad/path is caught
diff.c
git-stash.sh
sha1_name.c