![[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) |
* maint:
add-interactive: fix deletion of non-empty files
pull: clarify advice for the unconfigured error case
add-interactive: fix deletion of non-empty files
pull: clarify advice for the unconfigured error case
| 1 | 2 | |||
|---|---|---|---|---|
| git-add--interactive.perl | patch | | diff1 | | diff2 | | blob | history |
| git-pull.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc git-add--interactive.perl
Simple merge
diff --cc git-pull.sh
Simple merge