Re: [PATCH] remote: fix status with branch...rebase=preserve

2013-12-09 Thread Junio C Hamano
Thanks, will queue. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH] remote: fix status with branch...rebase=preserve

2013-12-09 Thread Junio C Hamano
Felipe Contreras writes: > Commit 66713ef (pull: allow pull to preserve merges when rebasing) > didn't include an update so 'git remote status' parses > branch..rebase=preserve > correctly, let's do that. > > Signed-off-by: Felipe Contreras > --- > builtin/remote.c | 9 +++-- > 1 file chan

[PATCH] remote: fix status with branch...rebase=preserve

2013-12-07 Thread Felipe Contreras
Commit 66713ef (pull: allow pull to preserve merges when rebasing) didn't include an update so 'git remote status' parses branch..rebase=preserve correctly, let's do that. Signed-off-by: Felipe Contreras --- builtin/remote.c | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff -