diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-09-18 14:46:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-18 14:46:44 -0700 |
| commit | 1125297ca1744be09f9e392aab0dd2c70d838583 (patch) | |
| tree | ac3bb72ed41bf015cebb23a9d9ee010b803b8ec8 /xdiff/xdiffi.c | |
| parent | git-rebase--interactive.sh: replace cut with ${v%% *} (diff) | |
| parent | ls-files documentation: reword for consistency (diff) | |
| download | tgif-1125297ca1744be09f9e392aab0dd2c70d838583.tar.xz | |
Merge branch 'js/ls-files-x-doc'
* js/ls-files-x-doc:
ls-files documentation: reword for consistency
git-ls-files.txt: clarify -x/--exclude option
Conflicts:
Documentation/git-ls-files.txt
Diffstat (limited to 'xdiff/xdiffi.c')
0 files changed, 0 insertions, 0 deletions