| commit | eb0bcd0fbe34befe7648a398efc7f4156b07da48 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Feb 2010 23:04:55 +0000 (16 15:04 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Feb 2010 23:04:55 +0000 (16 15:04 -0800) | ||
| tree | 997b4970db45623e0267704c81a130202cb86c0e | treesnapshot (tar.gz zip) |
| parent | 7283bbc70a55d7364fbeaefc1009c03fcfc8d929 | commitdiff |
| parent | 003c6abdb27c367747847a76b0a7890d67c794be | commitdiff |
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
* 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 | diff1 | diff2 | blobhistory |
| git-stash.sh | diff1 | diff2 | blobhistory |
| sha1_name.c | diff1 | diff2 | blobhistory |