[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Recording the date at which a change was pushed to Savannah
From: |
Yuri Khan |
Subject: |
Re: Recording the date at which a change was pushed to Savannah |
Date: |
Thu, 4 Dec 2014 09:52:17 +0700 |
On Thu, Dec 4, 2014 at 3:10 AM, Stefan Monnier <address@hidden> wrote:
>>> git commit
>>> git pull
>>> <merge&commit>
>>> git push
Assuming you’re doing this on local master and the pull brings in new
commits from the remote master, this, indeed, introduces a backwards
merge.
>> That's why we recommend "git pull --rebase" in this case (and I
>> actually pull.rebase = preserve in my .gitconfig).
+1.
> There might also be a way to ask Git to generate the "merge commit" with
> its two parent swapped.
Yes and it’s called $ git branch temp; git checkout master; A: git
fetch; git reset --hard origin/master; git merge temp; git push origin
master || goto A; git branch --delete temp (retroactively create a
local feature branch and merge that into fully up-to-date master).
- Re: Recording the date at which a change was pushed to Savannah, (continued)
- Re: Recording the date at which a change was pushed to Savannah, Eli Zaretskii, 2014/12/03
- Re: Recording the date at which a change was pushed to Savannah, Stefan Monnier, 2014/12/03
- Re: Recording the date at which a change was pushed to Savannah, Eli Zaretskii, 2014/12/03
- Re: Recording the date at which a change was pushed to Savannah, Stefan Monnier, 2014/12/03
- Re: Recording the date at which a change was pushed to Savannah, Eli Zaretskii, 2014/12/03
- Re: Recording the date at which a change was pushed to Savannah, Stefan Monnier, 2014/12/03
- Re: Recording the date at which a change was pushed to Savannah,
Yuri Khan <=
- Re: Recording the date at which a change was pushed to Savannah, Eli Zaretskii, 2014/12/04
- Re: Recording the date at which a change was pushed to Savannah, Glenn Morris, 2014/12/03
- Re: Recording the date at which a change was pushed to Savannah, Stefan Monnier, 2014/12/03