diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:37:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:37:52 -0700 |
| commit | 81de16a5d5d1efffb472eac9d2a7f373cdcd906b (patch) | |
| tree | 9a2a507c5484d1700a566dafed6dcb5091ad9be7 /revision.h | |
| parent | 7f3447cce83ebe80c498a4455c03b0c8f37ac938 (diff) | |
| parent | a765499a0884375c47c78d0d1e2926e875074427 (diff) | |
Merge branch 'kb/ancestry-path-threedots' into maint
* kb/ancestry-path-threedots:
revision.c: treat A...B merge bases as if manually specified
t6019: demonstrate --ancestry-path A...B breakage
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/revision.h b/revision.h index 01bd2b7c07..878a5556fd 100644 --- a/revision.h +++ b/revision.h @@ -35,6 +35,7 @@ struct rev_cmdline_info { REV_CMD_PARENTS_ONLY, REV_CMD_LEFT, REV_CMD_RIGHT, + REV_CMD_MERGE_BASE, REV_CMD_REV } whence; unsigned flags; |