diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-29 17:03:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-29 17:03:12 -0700 |
| commit | 50cebdade1eb97ed667543b56e5b9d4db2a921f8 (patch) | |
| tree | eb9c02899f6351810f8d0e6c3804b50faf41e99f /rerere.h | |
| parent | 57e4d61686b20ef3ad4982753407cf0bd87335f2 (diff) | |
| parent | 150b493ad42757b60eacbf98ff11982456481982 (diff) | |
| download | git-50cebdade1eb97ed667543b56e5b9d4db2a921f8.tar.gz | |
Merge branch 'jk/maint-1.7.2-status-ignored'
* jk/maint-1.7.2-status-ignored:
git status --ignored: tests and docs
status: fix bug with missing --ignore files
Conflicts:
Documentation/git-status.txt
t/t7508-status.sh
Diffstat (limited to 'rerere.h')
0 files changed, 0 insertions, 0 deletions