]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 379484b) | patch
remote: fix status with branch...rebase=preserve
authorFelipe Contreras <felipe.contreras@gmail.com>
Sat, 7 Dec 2013 13:08:37 +0000 (07:08 -0600)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Dec 2013 22:12:24 +0000 (14:12 -0800)
commit0a54f709057729d0aa9f1e767e4f201834f14834
treebac3456c4c93bdc3b5b15cd83b1c29dd1120521ftree | snapshot
parent379484b55155d65d9e721b48aca29f6f3d24d95ecommit | diff
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>
builtin/remote.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.