Advertisement
Guest User

git_branch_bug

a guest
Jan 9th, 2013
117
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 2.45 KB | None | 0 0
  1. agallego@agallego-macpro.local] /tmp
  2. $ git clone git@bitbucket.org/agallego/gitbug
  3. Cloning into 'gitbug'...
  4. warning: You appear to have cloned an empty repository.
  5.  
  6. [agallego@agallego-macpro.local] /tmp
  7. $ cd gitbug
  8.  
  9. [agallego@agallego-macpro.local] /tmp/gitbug
  10. $ ls
  11.  
  12. [agallego@agallego-macpro.local] /tmp/gitbug
  13. $ echo "Trying to reproduce a bug" > README
  14.  
  15. [agallego@agallego-macpro.local] /tmp/gitbug
  16. $ ls
  17. README
  18.  
  19. [agallego@agallego-macpro.local] /tmp/gitbug
  20. $ git add .
  21.  
  22. [agallego@agallego-macpro.local] /tmp/gitbug
  23. $ git commit -am "adding readme"
  24. [master (root-commit) 0bfd62a] adding readme
  25.  1 files changed, 1 insertions(+), 0 deletions(-)
  26.  create mode 100644 README
  27.  
  28. [agallego@agallego-macpro.local] /tmp/gitbug
  29. $ git push origin master
  30. Counting objects: 3, done.
  31. Writing objects: 100% (3/3), 230 bytes, done.
  32. Total 3 (delta 0), reused 0 (delta 0)
  33. remote: bb/acl: agallego is allowed. accepted payload.
  34. To git@bitbucket.org:agallego/gitbug
  35.  * [new branch]      master -> master
  36.  
  37. [agallego@agallego-macpro.local] /tmp/gitbug
  38. $ git checkout imp_fix
  39. error: pathspec 'imp_fix' did not match any file(s) known to git.
  40.  
  41. [agallego@agallego-macpro.local] /tmp/gitbug
  42. $ git branch imp_fix
  43.  
  44. [agallego@agallego-macpro.local] /tmp/gitbug
  45. $ git checkout imp_fix
  46. Switched to branch 'imp_fix'
  47.  
  48. [agallego@agallego-macpro.local] /tmp/gitbug
  49. $ echo "imp_fix" >> README
  50.  
  51. [agallego@agallego-macpro.local] /tmp/gitbug
  52. $ git commit -am "step 2, create an imp_fix branch and then merge"
  53. [imp_fix 178c8f3] step 2, create an imp_fix branch and then merge
  54.  1 files changed, 1 insertions(+), 0 deletions(-)
  55.  
  56. [agallego@agallego-macpro.local] /tmp/gitbug
  57. $ ls
  58. README
  59.  
  60. [agallego@agallego-macpro.local] /tmp/gitbug
  61. $ git rebase master
  62. Current branch imp_fix is up to date.
  63.  
  64. [agallego@agallego-macpro.local] /tmp/gitbug
  65. $ git checkout master
  66. Switched to branch 'master'
  67.  
  68. [agallego@agallego-macpro.local] /tmp/gitbug
  69. $ git merge imp_Fix
  70. Merge made by the 'recursive' strategy.
  71.  README |    1 +
  72.  1 files changed, 1 insertions(+), 0 deletions(-)
  73.  
  74. [agallego@agallego-macpro.local] /tmp/gitbug
  75. $ git push origin master
  76. Counting objects: 6, done.
  77. Delta compression using up to 4 threads.
  78. Compressing objects: 100% (2/2), done.
  79. Writing objects: 100% (4/4), 392 bytes, done.
  80. Total 4 (delta 1), reused 0 (delta 0)
  81. remote: bb/acl: agallego is allowed. accepted payload.
  82. To git@bitbucket.org:agallego/gitbug
  83.    0bfd62a..f99f8a1  master -> master
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement