| commit | 07d406b742b577a39d7cbdacd76d0dde021ff788 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Dec 2013 20:58:27 +0000 (5 12:58 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Dec 2013 20:58:27 +0000 (5 12:58 -0800) | ||
| tree | b9c83d886e3b8a5d0169f85b08ac8f52091a4d7b | treesnapshot (tar.gz zip) |
| parent | 219ea0e79d1e5cdb5f1133aff70fe4e5737dd59d | commitdiff |
| parent | d96855ff517560650c62eca51a8bb78263f6a3ef | commitdiff |
Merge branch 'jc/merge-base-reflog'
Code the logic in "pull --rebase" that figures out a fork point
from reflog entries in C.
* jc/merge-base-reflog:
merge-base: teach "--fork-point" mode
merge-base: use OPT_CMDMODE and clarify the command line parsing
Code the logic in "pull --rebase" that figures out a fork point
from reflog entries in C.
* jc/merge-base-reflog:
merge-base: teach "--fork-point" mode
merge-base: use OPT_CMDMODE and clarify the command line parsing