diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-27 07:44:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-27 07:44:14 (GMT) |
| commit | d93067d9c7fb210766c7282d662289f54d53f93a (patch) | |
| tree | a463ad3ce94a987ec3d00e10eaa98ede1fe0495d /diff-delta.c | |
| parent | f4e96f97e85c145616bc2e23e9441bc0daa2906e (diff) | |
| parent | b0a3de42316a4e8f1d561cbe12b7bb282631a0d6 (diff) | |
| download | git-d93067d9c7fb210766c7282d662289f54d53f93a.zip git-d93067d9c7fb210766c7282d662289f54d53f93a.tar.gz git-d93067d9c7fb210766c7282d662289f54d53f93a.tar.bz2 | |
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
Diffstat (limited to 'diff-delta.c')
0 files changed, 0 insertions, 0 deletions