Advertisement
Guest User

Untitled

a guest
Jun 11th, 2016
102
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.81 KB | None | 0 0
  1.  
  2. git clone ssh://user@192.168.1.122:29418/tfg/TFG proyect_forked
  3. cd proyect_forked
  4. git remote add upstream https://github.com/user2/proyect.git
  5.  
  6. # git pull make git commit
  7. git pull upstream master
  8. remote: Counting objects: 29, done.
  9. remote: Compressing objects: 100% (3/3), done.
  10. remote: Total 29 (delta 11), reused 11 (delta 11), pack-reused 15
  11. Unpacking objects: 100% (29/29), done.
  12. De https://github.com/user2/proyect
  13. * branch master -> FETCH_HEAD
  14. * [new branch] master -> upstream/master
  15. Automezclado qqq.html
  16. Automezclado zrq
  17. Merge made by the 'recursive' strategy.
  18. zrq | 7 +------
  19. qqq.html | 2 +-
  20. 2 files changed, 2 insertions(+), 7 deletions(-)
  21.  
  22. gitdir=$(git rev-parse --git-dir); scp -p -P 29418 user@192.168.1.122:hooks/commit-msg ${gitdir}/hooks/
  23. git commit --amend
  24.  
  25. git log -n 1
  26. # Change-Id: I9bc83ab5aa7fe0511ee8d1e80d64333ba49758ac
  27.  
  28. git push ssh://user@192.168.1.122:29418/tfg/TFG HEAD:refs/for/master
  29. Counting objects: 49, done.
  30. Delta compression using up to 4 threads.
  31. Compressing objects: 100% (26/26), done.
  32. Writing objects: 100% (27/27), 3.22 KiB | 0 bytes/s, done.
  33. Total 27 (delta 18), reused 0 (delta 0)
  34. remote: Resolving deltas: 100% (18/18)
  35. remote: Processing changes: refs: 1, done
  36. remote: ERROR: missing Change-Id in commit message footer
  37. remote:
  38. remote: Hint: To automatically insert Change-Id, install the hook:
  39. remote: gitdir=$(git rev-parse --git-dir); scp -p -P 29418 user@192.168.1.122:hooks/commit-msg ${gitdir}/hooks/
  40. remote: And then amend the commit:
  41. remote: git commit --amend
  42. remote:
  43. To ssh://user@192.168.1.122:29418/tfg/TFG
  44. ! [remote rejected] HEAD -> refs/for/master (missing Change-Id in commit message footer)
  45. error: failed to push some refs to 'ssh://user@192.168.1.122:29418/tfg/TFG'
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement