branch에서 작업한 commit을 master에 합치기
git checkout -b workbranch master
git add files
git commit
git checkout master
git merge --squash workbranch
git commit
git push
rebase 하는 방법...
1)git clone
2)해당 codereview 를 checkout 하면 (no branch) 생김
3)git rebase master
4)conflict난 file 해결
> git add file
5)git rebase --continue
> git commit --amend
6)git checkout master
7)git reflog
8)git merge commitID_num
9)git push origin master:refs/for/master
-----------------삼바 서버 설정------------------
sudo apt-get install samba samba-tools system-config-samba
sudo smbpasswd -a username
sudo vi /etc/samba/smb.conf
Add
[Pictures]
path = /home/username/<folder_to_be_shared>
sudo /etc/init.d/smbd restart
----------------- NFS 서버 설정 --------------------------
$ sudo mkdir -p /share/platform/sub_folder
$ sudo apt-get install nfs-kernel-server
$ sudo sh -c 'echo "/share/platform/sub_folder *(rw,sync,nohide,no_root_squash,no_subtree_check)" >> /etc/exports'
$ sudo /etc/init.d/nfs-kernel-server restart
target에서 nfsroot 설정
------------------------------------------------------------------------------------------------------
In Synology management UI
1) Enable NFS.
2) Go to shared folders - privileges setup and for the folder you wish to share enable the guest account under local users to have read/write access.
3) Go to NFS privileges and select;
Hostname or IP = *
Privilege = Read/Write
Root Squash = Map to guest
4) With the changes made reboot your NAS.
5) In your WDTV NET.mounts file add the line (video being the name of the shared folder with the privileges set)
xmount 192.168.1.100:/volume1/video volume1 nfs