diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-03-20 14:30:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-20 14:30:51 -0700 |
| commit | de2e3b04cd70a22016561547530f980c66807641 (patch) | |
| tree | fc842c0e91cff12f3c84f3da0f85042d937ec19e /Documentation/git-annotate.txt | |
| parent | Merge branch 'bw/autoconf' (diff) | |
| parent | ls-files: fix broken --no-empty-directory (diff) | |
| download | tgif-de2e3b04cd70a22016561547530f980c66807641.tar.xz | |
Merge branch 'mv/parseopt-ls-files'
* mv/parseopt-ls-files:
ls-files: fix broken --no-empty-directory
t3000: use test_cmp instead of diff
parse-opt: migrate builtin-ls-files.
Turn the flags in struct dir_struct into a single variable
Conflicts:
builtin-ls-files.c
t/t3000-ls-files-others.sh
Diffstat (limited to 'Documentation/git-annotate.txt')
0 files changed, 0 insertions, 0 deletions