git note

note: from source folder of HTML-Renderer

1. to push source from one local repo to remote repo

   git push [email protected]:prepare/LayoutFarm +v1.7:master

2. to delete previous push

   git push [email protected]:prepare/LayoutFarm +first_7_digit_of_commit_id^:master

3. to branch from specific commit

   git checkout -b new_branch_name specific_commit_id

4. to disable fast forward merge

   git config --global merge.ff false

5. To delete a local branch

   git branch -d the_local_branch

---

from http://nvie.com/posts/a-successful-git-branching-model/

Incorporating a finished feature on develop

Finished features may be merged into the develop branch definitely add them to the upcoming release:

Switched to branch 'develop'

 $ git checkout develop

merge,left 'tracking history' behind, (not 'plain' merge)

 $ git merge --no-ff myfeature

delete merged branch

 $ git branch -d myfeature

push

 $ git push origin develop

---

from http://stackoverflow.com/questions/9589814/how-do-i-force-git-pull-to-overwrite-everything-on-every-pull

Force sync with server

  git fetch origin master
  git reset --hard $FETCH_HEAD
  git clean -df

where 'master' is a branch name you want to sync

---

force clone specific commit

  git clone  $URL
  cd  $PROJECT_NAME
  git reset --hard  $SHA1

---

http://prepare.github.io/HTML-Renderer/