Bug #15871: Make sure that "make up" does the right thing for git

• Status: Closed
• Assignee: nobu (Nobuyoshi Nakada)
• Target version: -
• ruby -v: ruby 2.7.0dev (2019-04-05 trunk 67440) [x86_64-cygwin]
• Backport: 2.4: UNKNOWN, 2.5: UNKNOWN, 2.6: UNKNOWN

[duerst (Martin Dürst)]

With svn, I have been using "make up" to get my local version up to date.

This works with git, except that it seems to just use git pull rather than git pull --rebase.

There is an environment variable GITPULLOPTIONS, which is used in Makefile, but this is apparently not set.

I hope we can set this to the most useful value for people who are not top experts for git. People who know better can always change this to whatever suits them.

[nobu (Nobuyoshi Nakada)]

• Status changed from Open to Closed

Applied in changeset git|7f2f56b2f51269f42f822ecf346375b040267595.

---

Define GITPULLOPTION to rebase [Bug #15871]