there is always merge --squash. Makes the master history dead simple on the theory that no one cares about the dev history of a feature branch.
On Mon, Jan 16, 2017 at 1:24 AM, Christian Schulte <[email protected]> wrote: > Am 16.01.2017 um 10:21 schrieb Stephen Connolly: >> or if you want less commands >> >> git checkout BRANCH >> git pull --rebase origin master >> git push origin BRANCH:master >> git push origin :BRANCH >> >> but personally I prefer to separate the fetch from the rebase as you have >> at least more of a feeling of control (e.g. you can check the git log >> origin/master locally first before doing the rebase > > Ok. Thanks. > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
