diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-27 22:58:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-27 22:58:08 (GMT) |
| commit | 2b0a564e02528e006d23e3318d0d2869fb239425 (patch) | |
| tree | 76f46ae7b059ac9ca0e8b725fa67f89a3c078f16 /check_bindir | |
| parent | e9ecee0423f2b24eb4e51d337044721c761cb4c3 (diff) | |
| parent | ad8261d21221d27638c75f47b39892db6f7972f6 (diff) | |
| download | git-2b0a564e02528e006d23e3318d0d2869fb239425.zip git-2b0a564e02528e006d23e3318d0d2869fb239425.tar.gz git-2b0a564e02528e006d23e3318d0d2869fb239425.tar.bz2 | |
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 'check_bindir')
0 files changed, 0 insertions, 0 deletions