Timeline for Squash all my commits into one for GitHub pull request
Current License: CC BY-SA 3.0
15 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Jun 14, 2023 at 4:54 | comment | added | Niklas Rosencrantz | This is pathologically wrong with git | |
| Aug 5, 2022 at 20:05 | comment | added | Anna Leonenko |
It's a great discussion but it does not answer the question what one should actually do. error: invalid line 3: s/pick/squash/g does not seem to be a successful execution
|
|
| Jan 15, 2017 at 20:50 | comment | added | Fisher Coder | This is a very helpful answer! Thanks! | |
| Sep 15, 2016 at 8:40 | comment | added | Amedee Van Gasse |
It's sed syntax (Stream EDitor), a very powerful but arcane Linux tool. The s command stands for "switch" (or replace), followed by a search string and a replacement string, separated by slashes. Usually followed by "g", which means "global", or "do this replacement not just once but everywhere". So s/pick/squash/g means: "replace every instance of pick with squash".
|
|
| Dec 26, 2015 at 20:46 | comment | added | Léo Lam | "s/pick/squash" means "replace pick with squash". | |
| Aug 27, 2015 at 13:57 | comment | added | AlanSE | when you write "s/pick/squash/", what is the "s" option? | |
| May 6, 2014 at 6:10 | vote | accept | omerjerk | ||
| May 14, 2014 at 3:24 | |||||
| May 6, 2014 at 6:10 | vote | accept | omerjerk | ||
| May 6, 2014 at 6:10 | |||||
| Jan 25, 2014 at 15:50 | vote | accept | omerjerk | ||
| May 6, 2014 at 6:10 | |||||
| Jan 26, 2013 at 7:26 | comment | added | omerjerk | ok I got it. and squashed all the changes into a new commit . but when clicked on sync then those commits again came. should i do something else after squashing ? | |
| Jan 26, 2013 at 7:06 | comment | added | Cong Wang |
git rebase -i is followed by a branch name, make sure you have read the last sentence in my answer.
|
|
| Jan 26, 2013 at 6:20 | history | edited | Cong Wang | CC BY-SA 3.0 |
added 230 characters in body
|
| Jan 26, 2013 at 6:20 | comment | added | Cong Wang |
git rebase -i will show you an interactive editor with the list of commits you are rebasing. The default command before each commit is "pick", so you just need to s/pick/squash/ for all the commits you want to squash.
|
|
| Jan 26, 2013 at 6:16 | comment | added | omerjerk | I didn't get it.. I already said I know nothing of these things. | |
| Jan 26, 2013 at 6:13 | history | answered | Cong Wang | CC BY-SA 3.0 |