{"thread":{"id":"24077","subject":"[RFH] specifying rebase options when branch.<name>.rebase = true","startedAt":"2010-06-10T19:01:34Z","lastAt":"2010-06-10T21:52:21Z","messageCount":2,"participants":["Eric Raible"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"143472","messageId":"AANLkTimbBZVWk2EzXIngSV6Kblap1k8mPbfEa8OOGxUh@mail.gmail.com","threadId":"24077","inReplyTo":null,"subject":"[RFH] specifying rebase options when branch.<name>.rebase = true","fromName":"Eric Raible","fromEmail":"raible@gmail.com","sentAt":"2010-06-10T19:01:34Z","receivedAt":"2010-06-10T19:01:34Z","isPatch":false,"sender":{"key":"raible@gmail.com","avatar":null},"body":"In setting up our rebase-based workflow I'd like people\nto simply use \"git pull\".  But \"branch.<name>.rebase=true\"\ngets me only halfway there.\n\nThe problem is that I'd like to rebase local merges as well,\nbut have not seen a was to specify the --preserve-merges flag.\n\nAm I missing something obvious?\n"},{"id":"143479","messageId":"loom.20100610T235100-317@post.gmane.org","threadId":"24077","inReplyTo":"AANLkTimbBZVWk2EzXIngSV6Kblap1k8mPbfEa8OOGxUh@mail.gmail.com","subject":"Re: [RFH] specifying rebase options when branch.&lt;name&gt;.rebase = true","fromName":"Eric Raible","fromEmail":"raible@gmail.com","sentAt":"2010-06-10T21:52:21Z","receivedAt":"2010-06-10T21:52:21Z","isPatch":false,"sender":{"key":"raible@gmail.com","avatar":null},"body":"s/not seen a was/not seen a way/\n"}]}