To modify latest commit string:
git commit --amend
To delete the latest 5 remote commits in the master branch:
git push -f origin HEAD~5:master
To commit with a different datetime:
git commit --date="Mon Jun 25 16:00 +0100"
To install git p4 command:
wget http://git.kernel.org/cgit/git/git.git/plain/git-p4.py?id=master -O git-p4 && chmod +x git-p4
sudo mv git-p4 /usr/lib/git-core/
To setup git-p4:
git config --global git-p4.user <your_p4_user>
git config --global git-p4.password <your_p4_password>
git config --global git-p4.port <your_p4_port>
To create a workspace:
p4 -u <your_p4_user> -P <your_p4_password> -c <my_workspace> .
git config --local git-p4.client <my_workspace>
To clone a depot locally:
git p4 clone //depot/mydepot
To submit modifications on repo:
# do your modifications + add/commit
git p4 submit # --shelve if needed
To update the current repo:
git p4 sync
Create the SSH keys. You may like to change myuser@myhostname as you wish:
ssh-keygen -C "myuser@myhostname" -f ~/.ssh/gitolite
chmod 0600 ~/.ssh/gitolite* # SSH doesn't accept 0640 permissions
Then configure SSH to reach the gitolite server using the right credentials:
# add this in ~/.ssh/config
hostname gitolite_server
user myuser
hostname gitolite_server_ip
identityfile ~/.ssh/gitolite
To create a patch, commit changes and use the following command:
git format-patch HEAD~
To apply the patch:
git apply --stat fix_empty_poster.patch # check validity
git apply fix_empty_poster.patch # apply patch