![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 27 Mar 2006 07:44:14 +0000 (23:44 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 27 Mar 2006 07:44:14 +0000 (23:44 -0800) | ||
| commit | d93067d9c7fb210766c7282d662289f54d53f93a | |
| tree | a463ad3ce94a987ec3d00e10eaa98ede1fe0495d | tree | snapshot |
| parent | f4e96f97e85c145616bc2e23e9441bc0daa2906e | commit | diff |
| parent | b0a3de42316a4e8f1d561cbe12b7bb282631a0d6 | commit | diff |
Merge branch 'master' into next
* master:
Optionally do not list empty directories in git-ls-files --others
Document git-rebase behavior on conflicts.
Fix error handling for nonexistent names
* master:
Optionally do not list empty directories in git-ls-files --others
Document git-rebase behavior on conflicts.
Fix error handling for nonexistent names
| Documentation/git-ls-files.txt | diff1 | | diff2 | | blob | history |
| ls-files.c | diff1 | | diff2 | | blob | history |