| 1 | |
| 2 | #How to work in the ffmpeg git (or in any other one actually) |
| 3 | #Create a new branch |
| 4 | git branch "BRANCHNAME" |
| 5 | git checkout "BRANCHNAME" |
| 6 | #do you stuff |
| 7 | git commit |
| 8 | #rebase to master such that your changes only against the master branch and can be squashed |
| 9 | git rebase -i master |
| 10 | #or if merged in between then |
| 11 | git log |
| 12 | # or to find original branch point: |
| 13 | diff -u <(git rev-list --first-parent BRANCHNAME) <(git rev-list --first-parent master) | sed -ne 's/^ //p' | head -1 |
| 14 | |
| 15 | git rebase -i 39423..... |
| 16 | |
| 17 | git format-patch -s 3969b4b861ce8152e3195e8f8c3437abd2.. |
| 18 | |
| 19 | |
| 20 | git branch -D bugfix |