Advertisement
Guest User

Git binary merge

a guest
Jan 24th, 2013
53
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 0.45 KB | None | 0 0
  1. #!/bin/bash
  2.  
  3. git init foo
  4. cd foo
  5.  
  6. echo -n -e '\x00\x48\x69' > binary.dat
  7.  
  8. git add binary.dat
  9. git commit -m 'initial version - \0Hi'
  10.  
  11. git checkout -b foobranch
  12.  
  13. echo -n -e '\x00\x48\x65\x79' > binary.dat
  14. git commit -am 'Change \0Hi to \0Hey on foobranch'
  15.  
  16. git checkout master
  17.  
  18. echo -n -e '\x00\x48\x65\x6c\x70' > binary.dat
  19. git commit -am 'Change \0Hi to \0Help on master (most recent)'
  20.  
  21. git merge foobranch
  22.  
  23. git status
  24. git diff
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement