File: git-workflow.txt

package info (click to toggle)
libvidstab 1.1.0-2.1
  • links: PTS
  • area: main
  • in suites: forky, sid
  • size: 648 kB
  • sloc: ansic: 6,094; makefile: 19; sh: 14
file content (20 lines) | stat: -rw-r--r-- 589 bytes parent folder | download | duplicates (2) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
 

#How to work in the ffmpeg git (or in any other one actually)
#Create a new branch
git branch "BRANCHNAME"
git checkout "BRANCHNAME"
#do you stuff
git commit
#rebase to master such that your changes only against the master branch and can be squashed
git rebase -i master
#or if merged in between then
git log
# or to find original branch point:
diff -u <(git rev-list --first-parent BRANCHNAME)              <(git rev-list --first-parent master) |      sed -ne 's/^ //p' | head -1

git rebase -i 39423.....

git format-patch -s 3969b4b861ce8152e3195e8f8c3437abd2..


git branch -D bugfix