diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-27 14:58:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-27 14:58:08 -0800 |
| commit | 2b0a564e02528e006d23e3318d0d2869fb239425 (patch) | |
| tree | 76f46ae7b059ac9ca0e8b725fa67f89a3c078f16 /commit.c | |
| parent | Merge branch 'jk/rev-parse-double-dashes' (diff) | |
| parent | rebase: use reflog to find common base with upstream (diff) | |
| download | git-2b0a564e02528e006d23e3318d0d2869fb239425.tar.gz git-2b0a564e02528e006d23e3318d0d2869fb239425.zip | |
Merge branch 'jk/pull-rebase-using-fork-point'
* jk/pull-rebase-using-fork-point:
rebase: use reflog to find common base with upstream
pull: use merge-base --fork-point when appropriate
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions