![[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) |
* master:
Optionally do not list empty directories in git-ls-files --others
Document git-rebase behavior on conflicts.
Fix error handling for nonexistent names
Optionally do not list empty directories in git-ls-files --others
Document git-rebase behavior on conflicts.
Fix error handling for nonexistent names
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/git-ls-files.txt | patch | | diff1 | | diff2 | | blob | history |
| ls-files.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git-ls-files.txt
Simple merge
diff --cc ls-files.c
Simple merge