diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-09 12:25:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-09 12:25:21 -0700 |
| commit | 5c222ce2c415ccf7ce1e9281eb49f0a6f26657fa (patch) | |
| tree | 1fb8b26f2502bdf652cd09b523d3a41b6806d6d2 /git-resolve.sh | |
| parent | 45f75a0167b4a4693f2c6005bf7db231ca91ecc8 (diff) | |
| parent | 82000d74642f1c9f55ad4b0516c59d829014839a (diff) | |
| download | git-5c222ce2c415ccf7ce1e9281eb49f0a6f26657fa.tar.gz git-5c222ce2c415ccf7ce1e9281eb49f0a6f26657fa.tar.xz | |
Merge branch 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff into ml/cvs
* 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff:
Change to allow subdir updates from Eclipse
Many fixes for most operations in Eclipse.
Added logged warnings for CVS error returns
cvsserver: use git-rev-list instead of git-log
git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.
Diffstat (limited to 'git-resolve.sh')
0 files changed, 0 insertions, 0 deletions