Re: [git-users] Help with warning about using "--preserve-merges"

2019-12-19 Thread Brendan Leber
That was it!  Sometime in the past I must have added "rebase = preserve" to my global .gitconfig. Thank you, Philip! --  C++ tries to guard against Murphy, not Machiavelli.  — Damian Conway - Original Message - From: git-users@googlegroups.com To:, "Brendan Leber"

[git-users] Help with warning about using "--preserve-merges"

2019-12-19 Thread Brendan Leber
I upgraded git on my MacBook and now when I use `git pull` to update my local repository I get the following error: warning: git rebase --preserve-merges is deprecated. Use --rebase-merges instead. The problem is I'm not using `--preserve-merges` in my command.  I'm guessing there's a setting som

Re: [git-users] Struggling with cleanly "resetting" a local repo

2016-10-25 Thread Brendan Leber
I would use "git clean --interactive" to remove dead files and directories from my local repository. B On Tue, Oct 25, 2016 at 2:11 PM, David Karr wrote: > When I first cloned a remote repo, it had several subdirectories, and I had > Eclipse create projects automatically. > > Since that time, al