|
From: Ivo R. <iv...@iv...> - 2017-02-28 21:35:44
|
2017-02-28 22:16 GMT+01:00 Christian Borntraeger <bor...@de...>: > The given workflow requires that there is no other push between the pull > and the push. If for some reason somebody else pushes some update after > you have commited, you can recover with a rebase. There is a nice combine > of pull + rebase: > git pull --rebase > and I think we might just want to document that. Definitely yes. Would you mind suggesting something like docs/internals/git-HOWTO.txt, possibly taking into account existing docs/internals/svn-HOWTO.txt. Thank you, I. |