Re: [git-users] Pushing a rebased branch without --force

2015-09-03 Thread Ram Rachum
I read the documentation a few more times and now I understand. It's not a complete solution but a partial one, but it's still helpful I guess that's the best I can get right now. Thanks for your help Konstantin. On Thu, Sep 3, 2015 at 8:10 PM, Konstantin Khomoutov < flatw...@users.sourceforge.net

Re: [git-users] Pushing a rebased branch without --force

2015-09-03 Thread Konstantin Khomoutov
On Thu, 3 Sep 2015 19:45:11 +0300 Ram Rachum wrote: [...] > I'm really lost in your reply. I had a problem: I want to have a push > command that (1) works even after a rebase and (2) refuses to push > when there's a new commit in the remote branch that doesn't exist in > the local branch. I thoug

Re: [git-users] Pushing a rebased branch without --force

2015-09-03 Thread Ram Rachum
On Thu, Sep 3, 2015 at 7:37 PM, Konstantin Khomoutov < flatw...@users.sourceforge.net> wrote: > On Thu, 3 Sep 2015 19:16:23 +0300 > Ram Rachum wrote: > > [...] > > > Yes, since some version `git push` learned the --force-with-lease > > > command-line option which does just what you want: makes su

Re: [git-users] Pushing a rebased branch without --force

2015-09-03 Thread Konstantin Khomoutov
On Thu, 3 Sep 2015 19:16:23 +0300 Ram Rachum wrote: [...] > > Yes, since some version `git push` learned the --force-with-lease > > command-line option which does just what you want: makes sure the > > tip of the existing branch is exactly what you expect it to be. > > I was very happy to see th

Re: [git-users] Pushing a rebased branch without --force

2015-09-03 Thread Ram Rachum
On Thu, Sep 3, 2015 at 6:58 PM, Konstantin Khomoutov < flatw...@users.sourceforge.net> wrote: > On Thu, 3 Sep 2015 05:17:34 -0700 (PDT) > Ram Rachum wrote: > > > Is there a way to avoid this? (Aside from pre-checking manually on > > the repo using `git fetch`.) I want something like `push --force

Re: [git-users] Pushing a rebased branch without --force

2015-09-03 Thread Konstantin Khomoutov
On Thu, 3 Sep 2015 05:17:34 -0700 (PDT) Ram Rachum wrote: > I've been using Git for years, but only recently I started working > for a big company where they use `git rebase` to maintain a linear > history. > > One problem I have with this is that when I rebase a branch, I can't > push it to the

[git-users] Pushing a rebased branch without --force

2015-09-03 Thread Ram Rachum
Hi, I've been using Git for years, but only recently I started working for a big company where they use `git rebase` to maintain a linear history. One problem I have with this is that when I rebase a branch, I can't push it to the remote again, I have to use `--force` because the remote has a