| Thread overview | |||||
|---|---|---|---|---|---|
|
January 23, 2015 github question | ||||
|---|---|---|---|---|
| ||||
I'm new to git and github, I read the "10 tips" posted earlier, and I dont understand the last one: Avoid thrashing. The story says, "Instead, remove the offending commits, and force push your modified branch". How would one do that? Is there doc's around that might explain that in a little more detail? Thanks, -Andy | ||||
January 23, 2015 Re: github question | ||||
|---|---|---|---|---|
| ||||
Posted in reply to AndyC | "AndyC" wrote in message news:afvimfdmrfevmcjuuyxq@forum.dlang.org... > I'm new to git and github, I read the "10 tips" posted earlier, and I dont understand the last one: Avoid thrashing. > > The story says, "Instead, remove the offending commits, and force push your modified branch". > > How would one do that? Is there doc's around that might explain that in a little more detail? Usually it's done with git's interactive rebase. You can easily reorder and combine commits, so if eg part of an earlier commit was reverted the original and the revert commit can be combined. Searching for "interactive rebase" will get you lots of tutorials. | |||
January 23, 2015 Re: github question | ||||
|---|---|---|---|---|
| ||||
Posted in reply to Daniel Murphy | On Friday, 23 January 2015 at 03:33:22 UTC, Daniel Murphy wrote: > "AndyC" wrote in message news:afvimfdmrfevmcjuuyxq@forum.dlang.org... > >> I'm new to git and github, I read the "10 tips" posted earlier, and I dont understand the last one: Avoid thrashing. >> >> The story says, "Instead, remove the offending commits, and force push your modified branch". >> >> How would one do that? Is there doc's around that might explain that in a little more detail? > > Usually it's done with git's interactive rebase. You can easily reorder and combine commits, so if eg part of an earlier commit was reverted the original and the revert commit can be combined. Searching for "interactive rebase" will get you lots of tutorials. Ah, thank you. I found this one pretty descriptive: http://robots.thoughtbot.com/git-interactive-rebase-squash-amend-rewriting-history -Andy | |||
Copyright © 1999-2021 by the D Language Foundation
Permalink
Reply