diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-29 16:50:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-29 16:50:31 -0700 |
| commit | d1c8c0c8c42912eb768a05115c798de50e595f8b (patch) | |
| tree | 6fdc20e6a100a21c0c9dbae6bcb0ab9e543a4fed /diff-no-index.c | |
| parent | daemon.c: fix segfault on OS X (diff) | |
| parent | Merge branch 'maint-1.6.1' into maint (diff) | |
| download | git-d1c8c0c8c42912eb768a05115c798de50e595f8b.tar.gz git-d1c8c0c8c42912eb768a05115c798de50e595f8b.zip | |
Merge branch 'maint'
* maint:
diff -c -p: do not die on submodules
Conflicts:
combine-diff.c
Diffstat (limited to 'diff-no-index.c')
0 files changed, 0 insertions, 0 deletions