Timeline for How do I safely merge a Git branch into master?
Current License: CC BY-SA 4.0
9 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Nov 30, 2018 at 7:56 | history | edited | Martin Thoma | CC BY-SA 4.0 | added 210 characters in body |
| Sep 20, 2018 at 23:39 | comment | added | bkribbs | I think --first-parent seems to be the best solution. davidchudzicki.com/posts/first-parent | |
| Apr 12, 2018 at 13:31 | comment | added | Martin Thoma | Sure. But then simply don't squash the commits | |
| Apr 12, 2018 at 10:46 | comment | added | Cocowalla | "which should only be one commit in the master branch", well not necessarily; you may wekk want to keep the history | |
| May 23, 2017 at 12:34 | history | edited | URL Rewriter Bot | replaced http://stackoverflow.com/ with https://stackoverflow.com/ | |
| May 18, 2016 at 15:32 | history | edited | Martin Thoma | CC BY-SA 3.0 | added 151 characters in body |
| May 18, 2016 at 13:36 | history | edited | Martin Thoma | CC BY-SA 3.0 | added 767 characters in body |
| May 6, 2016 at 7:57 | history | edited | Martin Thoma | CC BY-SA 3.0 | added 239 characters in body |
| Apr 21, 2016 at 8:18 | history | answered | Martin Thoma | CC BY-SA 3.0 |