| commit | 0a54f709057729d0aa9f1e767e4f201834f14834 | |
| author | Felipe Contreras <felipe.contreras@gmail.com> | |
| Sat, 7 Dec 2013 13:08:37 +0000 (7 07:08 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Dec 2013 22:12:24 +0000 (9 14:12 -0800) | ||
| tree | bac3456c4c93bdc3b5b15cd83b1c29dd1120521f | treesnapshot (tar.gz zip) |
| parent | 379484b55155d65d9e721b48aca29f6f3d24d95e | commitdiff |
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>
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>
| builtin/remote.c | diffblobblamehistory |