Thank you for providing the context. I have set pull.rebase=true in .gitconfig for years, so should not be affected by it. But the warning message is really bad enough. It blamed users, but it should admit git had made a mistake for the default in the past and ask users to explicitly set the option and recommend rebase=true.
On Sun, Jun 7, 2020 at 9:22 AM ethiejiesa via Source <[email protected]> wrote: > FWIW, this is a new warning in git as of 2.27.0, released about a week ago: > https://github.com/git/git/commit/d18c950a69f3a24e1e3add3d9fc427641f53e12b > which likely explains why you are suddenly seeing this. > > The issue is that, when pulling, you might have local commits not on the > upstream branch: > > - A -- B -- C <upstream branch> > - A -- B -- C' <local branch> > > so git needs to know what to do with your commit C'. The default is to > merge: > > C > / \ > - A -- B -- D > \ / > C' > > creating a new commit D with the combined changes of C and C'. However, a > common workflow is simply work *on top of upstream* in which case we simply > want C' to be applied on top of C: > > - A -- B -- C -- C' > > This latter case is called "rebasing" in the sense that the "base" of C' > gets > switched from B to C. Rebasing is a generic operation you can perform on > commits, and the `pull.rebase' git option lets you tell git to use it in > case > of conflicts when pulling. The default is to merge, and the new warning is > essentially just to let users know about the covnience of `pull.rebase'. > > Similarly, the `pull.ff' option tells git to use a "fast-forward" strategy > when > pulling, which is git's terminology for "simply update the branch to look > like > upstream." By default git fast-forwards when there are no local conflicts > with > the upstream branch and merges otherwise; however, if you don't want to > manually take care of pull conflicts, without git trying to merge or rebase > automatically, setting the `pull.ff' option to `only' has your back. > > Hope that helps, > > > Akakima <[email protected]> wrote: > > Tried this in the fresh jsource cloned, and it worked. No more message. > > > > Then tried it in my previous jsource (after some renaming to restore > > it). And it worked too. No more message ... > > > > Many thanks to all for the help. > > > > Now, guess i should study Git ... > > But seems to me, it is a bit complex. > > > > On 2020-06-06 19:56, bill lam wrote: > > > looks like the tree is clean, not sure what's wrong with your git > global > > > setting. perhaps you follow anyone of the suggestion, eg > > > > > > git config pull.rebase false > > > > > > and then git pull > > > > > > > > > On Sun, Jun 7, 2020, 7:48 AM Akakima <[email protected]> wrote: > > > > > >> E:\gitdev\Jsource-J902\jsource>git status > > >> On branch master > > >> Your branch is up to date with 'origin/master'. > > >> > > >> nothing to commit, working tree clean > > >> > > >> E:\gitdev\Jsource-J902\jsource> > > >> > > >> On 2020-06-06 19:30, bill lam wrote: > > >>> what's the output of git status ? > > >>> > > >> ---------------------------------------------------------------------- > > >> For information about J forums see > http://www.jsoftware.com/forums.htm > > >> > > > ---------------------------------------------------------------------- > > > For information about J forums see http://www.jsoftware.com/forums.htm > > > > > ---------------------------------------------------------------------- > > For information about J forums see http://www.jsoftware.com/forums.htm > > > ---------------------------------------------------------------------- > For information about J forums see http://www.jsoftware.com/forums.htm > ---------------------------------------------------------------------- For information about J forums see http://www.jsoftware.com/forums.htm
