diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-10-25 15:34:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-25 15:34:41 -0700 |
| commit | 071b489682f68c5e205ed3af2a7fe997f1d7c467 (patch) | |
| tree | d4c23836931ae859a95e1c62246a1618ae0338df /builtin-merge-recursive.c | |
| parent | t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test (diff) | |
| parent | Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4 (diff) | |
| download | tgif-071b489682f68c5e205ed3af2a7fe997f1d7c467.tar.xz | |
Merge branch 'maint-1.6.4' into maint
* maint-1.6.4:
ls-files: excludes should not impact tracked files
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions