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