diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:38 -0800 |
| commit | 2fb11ec6c175e8a380d91daccc3bbf9fc5bbea8b (patch) | |
| tree | 1f6c6ed0942f20d97705b9e3e4dd603d122fafa8 /t/t8004-blame-with-conflicts.sh | |
| parent | Merge branch 'ld/p4-worktree' (diff) | |
| parent | pull: fast-forward "pull --rebase=true" (diff) | |
| download | tgif-2fb11ec6c175e8a380d91daccc3bbf9fc5bbea8b.tar.xz | |
Merge branch 'jc/pull-rebase-ff'
"git pull --rebase", when there is no new commits on our side since
we forked from the upstream, should be able to fast-forward without
invoking "git rebase", but it didn't.
* jc/pull-rebase-ff:
pull: fast-forward "pull --rebase=true"
Diffstat (limited to 't/t8004-blame-with-conflicts.sh')
0 files changed, 0 insertions, 0 deletions