![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 9 Dec 2009 06:47:09 +0000 (22:47 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 9 Dec 2009 06:47:09 +0000 (22:47 -0800) | ||
| commit | ff86bdd5cac70850eea4791bea78efa19b228ebe | |
| tree | e80c89fbffa06c6990886a92112547cf66ca2a07 | tree | snapshot |
| parent | ca83dc53916d485e6654c6cce701794dd3a1ed32 | commit | diff |
| parent | 5c30b8f7dd2640a1b75fcbcdd3e175329c5b7bbe | commit | diff |
Merge branch 'maint'
* maint:
add-interactive: fix deletion of non-empty files
pull: clarify advice for the unconfigured error case
* maint:
add-interactive: fix deletion of non-empty files
pull: clarify advice for the unconfigured error case
| git-add--interactive.perl | diff1 | | diff2 | | blob | history |
| git-pull.sh | diff1 | | diff2 | | blob | history |