Advertisement
dabbill

Untitled

Jun 23rd, 2016
120
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.86 KB | None | 0 0
  1. ~/git/darktable(branch:dabbill-Canon-80D) » git rebase upstream/master dabbill-Canon-80D -i dabbill@Hydra-Notebook
  2. You asked to amend the most recent commit, but doing so would make
  3. it empty. You can repeat your command with --allow-empty, or you can
  4. remove the commit entirely with "git reset HEAD^".
  5. interactive rebase in progress; onto d3f8ad5
  6. Last commands done (3 commands done):
  7. fixup 4fbdb91 Delete cameras.xml
  8. fixup 9de8b26 Delete adobe_coeff.c
  9. Next commands to do (37 remaining commands):
  10. fixup e0f0167 Canon 80D
  11. fixup 2012d20 Canon 80D
  12. You are currently rebasing branch 'dabbill-Canon-80D' on 'd3f8ad5'.
  13.  
  14. No changes
  15.  
  16. Could not apply 9de8b260bb153106085259e50f29c5da54920ce9... Delete adobe_coeff.c
  17.  
  18. ------------------------------------------------------------
  19. ~/git/darktable(branch:f82b937*) »
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement