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 /Documentation/diff-options.txt | |
parent | Merge branch 'jk/subtree-do-not-push-if-split-fails' into maint (diff) | |
parent | revision.c: treat A...B merge bases as if manually specified (diff) | |
download | tgif-81de16a5d5d1efffb472eac9d2a7f373cdcd906b.tar.xz |
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 'Documentation/diff-options.txt')
0 files changed, 0 insertions, 0 deletions