![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Feb 2010 23:05:02 +0000 (15:05 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Feb 2010 23:05:02 +0000 (15:05 -0800) | ||
| commit | e7b3cea0f7589c57f7bb808330e32bdd7f901c95 | |
| tree | f5612fd7df20b7d7273ddf44b30117e6eb1764a9 | tree | snapshot |
| parent | b599672316ae0e0cf827e5e2cd6d3bb403d7b8cd | commit | diff |
| parent | eb0bcd0fbe34befe7648a398efc7f4156b07da48 | commit | diff |
Merge branch 'maint-1.6.6' into maint
* maint-1.6.6:
dwim_ref: fix dangling symref warning
stash pop: remove 'apply' options during 'drop' invocation
diff: make sure --output=/bad/path is caught
Remove hyphen from "git-command" in two error messages
* maint-1.6.6:
dwim_ref: fix dangling symref warning
stash pop: remove 'apply' options during 'drop' invocation
diff: make sure --output=/bad/path is caught
Remove hyphen from "git-command" in two error messages
| diff.c | diff1 | | diff2 | | blob | history |
| git.c | diff1 | | diff2 | | blob | history |
| sha1_name.c | diff1 | | diff2 | | blob | history |