diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-06-13 12:53:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-13 12:53:06 -0700 |
| commit | cec3f989dab861761ad83e264c3cd8a754e4ace5 (patch) | |
| tree | 77d70522bba442ac57625483a4dcbbbce078c222 /Documentation/merge-strategies.txt | |
| parent | Merge branch 'rc/maint-http-local-slot-fix' (diff) | |
| parent | t6030: test skipping away from an already skipped commit (diff) | |
| download | tgif-cec3f989dab861761ad83e264c3cd8a754e4ace5.tar.xz | |
Merge branch 'cc/bisect' (early part)
* 'cc/bisect' (early part):
t6030: test skipping away from an already skipped commit
bisect: when skipping, choose a commit away from a skipped commit
bisect: add parameters to "filter_skipped"
bisect: display first bad commit without forking a new process
bisect: drop unparse_commit() and use clear_commit_marks()
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions