@matheusbsbs / matheus-bagliano / commits / d93067d9c7
Fork 0

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

Junio C Hamano committed Mar 26, 2006 at 23:44 UTC d93067d9c7fb210766c7282d662289f54d53f93a

No changes.