diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-11-04 01:26:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-04 01:26:02 -0700 |
| commit | 02273fdbd07ddaa13a232db0ae63a720c4a013f0 (patch) | |
| tree | 714a6c735a550296c9edd073129d327feb7c87ce /parse-options.h | |
| parent | Merge branch 'ss/mailsplit' (diff) | |
| parent | cherry-pick/revert -m: add tests (diff) | |
| download | tgif-02273fdbd07ddaa13a232db0ae63a720c4a013f0.tar.xz | |
Merge branch 'jc/revert-merge'
* jc/revert-merge:
cherry-pick/revert -m: add tests
revert/cherry-pick: work on merge commits as well
Conflicts:
builtin-revert.c
Diffstat (limited to 'parse-options.h')
0 files changed, 0 insertions, 0 deletions