diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:39 -0800 |
| commit | 9ca8f834116fab64e31e368e97001c75fd3c1b05 (patch) | |
| tree | 70cb43bd9497bb38a31f991ca4fd2862f61ddb98 /resolve-undo.c | |
| parent | Merge branch 'rr/core-tutorial' (diff) | |
| parent | Merge branch 'jc/maint-refresh-index-is-optional-for-status' into maint (diff) | |
| download | tgif-9ca8f834116fab64e31e368e97001c75fd3c1b05.tar.xz | |
Merge branch 'maint'
* maint:
status: don't require the repository to be writable
Conflicts:
builtin-commit.c
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions