projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bb21cbd
)
gitlive.js
author
Alan Knowles
<alan@akbkhome.com>
Wed, 30 Mar 2011 11:12:17 +0000
(19:12 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Wed, 30 Mar 2011 11:12:17 +0000
(19:12 +0800)
gitlive.js
patch
|
blob
|
history
diff --git
a/gitlive.js
b/gitlive.js
index
c857d76
..
894e4be
100644
(file)
--- a/
gitlive.js
+++ b/
gitlive.js
@@
-48,10
+48,12
@@
* Change to new bug number..
* cd featuredir
* git checkout -b master origin/master
-* git pull origin gitlive
+* git checkout master <<< make sure
+* git pull --squash origin gitlive
+* git commit -m 'done with old bug number'
+* git push
* cd gitlive
* git push
-*
* cd featuredir
* git push origin origin:refs/heads/feature_XXX
* git checkout feature_XXX