diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2013-12-07 07:08:37 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-12-09 14:12:24 -0800 |
| commit | 0a54f709057729d0aa9f1e767e4f201834f14834 (patch) | |
| tree | bac3456c4c93bdc3b5b15cd83b1c29dd1120521f /t/t8004-blame-with-conflicts.sh | |
| parent | fetch: add missing documentation (diff) | |
| download | tgif-0a54f709057729d0aa9f1e767e4f201834f14834.tar.xz | |
remote: fix status with branch...rebase=preserve
Commit 66713ef (pull: allow pull to preserve merges when rebasing)
didn't include an update so 'git remote status' parses branch.<name>.rebase=preserve
correctly, let's do that.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t8004-blame-with-conflicts.sh')
0 files changed, 0 insertions, 0 deletions