diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-08-18 22:07:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-18 22:07:54 -0700 |
| commit | d8308c79fc2cae2d1891f92b9e0f9ec0361fe7df (patch) | |
| tree | 25598aff5456212a2ea45cff89c72fd49dc5a848 /resolve-undo.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | am: Document new --exclude=<path> option (diff) | |
| download | tgif-d8308c79fc2cae2d1891f92b9e0f9ec0361fe7df.tar.xz | |
Merge branch 'ma/am-exclude'
* ma/am-exclude:
am: Document new --exclude=<path> option
am: pass exclude down to apply
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions