[vc_row css=”.vc_custom_1458037421091{margin-bottom: 20px !important;}”][vc_column width=”1/2″][vc_column_text]hg update -C .
git reset –hard[/vc_column_text][/vc_column][vc_column width=”1/2″][vc_column_text]Discard uncommitted changes[/vc_column_text][/vc_column][/vc_row][vc_row][vc_column][vc_separator][/vc_column][/vc_row][vc_row css=”.vc_custom_1458037454917{margin-bottom: 20px !important;}”][vc_column width=”1/2″][vc_column_text]hg clone git+ssh://user@server/directory [“Target directory”][/vc_column_text][/vc_column][vc_column width=”1/2″][vc_column_text]Clone a git repository into a mercurial one, only working with hg-git [1] extension[/vc_column_text][/vc_column][/vc_row][vc_row][vc_column][vc_separator][/vc_column][/vc_row][vc_row css=”.vc_custom_1458037465396{margin-bottom: 20px !important;}”][vc_column width=”1/2″][vc_column_text]git add -u .[/vc_column_text][/vc_column][vc_column width=”1/2″][vc_column_text]Add and remove files to prepare for commit. Same as “addremove” in mercurial[/vc_column_text][/vc_column][/vc_row][vc_row][vc_column][vc_separator][/vc_column][/vc_row][vc_row css=”.vc_custom_1458037480772{margin-bottom: 20px !important;}”][vc_column width=”1/2″][vc_column_text]git checkout .[/vc_column_text][/vc_column][vc_column width=”1/2″][vc_column_text]Revert to last commit, discard all changes since last commit.[/vc_column_text][/vc_column][/vc_row][vc_row][vc_column][vc_separator][/vc_column][/vc_row][vc_row css=”.vc_custom_1458037490478{margin-bottom: 20px !important;}”][vc_column width=”1/2″][vc_column_text]git commit -a -m “<Checkin comment>”[/vc_column_text][/vc_column][vc_column width=”1/2″][vc_column_text]Checkin all files, add and remove files[/vc_column_text][/vc_column][/vc_row][vc_row][vc_column][vc_separator][/vc_column][/vc_row][vc_row css=”.vc_custom_1458037490478{margin-bottom: 20px !important;}”][vc_column width=”1/2″][vc_column_text]git add -A && git commit -m “Your Message”[/vc_column_text][/vc_column][vc_column width=”1/2″][vc_column_text]Checkin all files including new and deleted files[/vc_column_text][/vc_column][/vc_row][vc_row][vc_column][vc_empty_space height=”10px”][/vc_column][/vc_row][vc_row css=”.vc_custom_1525694496210{margin-top: 10px !important;margin-bottom: 10px !important;}”][vc_column css=”.vc_custom_1525694539611{margin-top: 10px !important;margin-bottom: 10px !important;}”][vc_separator css=”.vc_custom_1525694438121{margin-top: 10px !important;margin-bottom: 10px !important;}”][/vc_column][/vc_row][vc_row][vc_column][vc_empty_space height=”10px”][/vc_column][/vc_row][vc_row][vc_column][vc_column_text]
Mercurial
If you have a problem with not trusted files, here is the solution:
- In the file /etc/mercurial/hgrc insert the trusted users
[trusted] users = user,[, user2...]
- In the file ~/.hgrc add the user who owns the files to the trusted users
[trusted] users = root
[/vc_column_text][vc_empty_space height=”10px”][vc_separator css=”.vc_custom_1525694438121{margin-top: 10px !important;margin-bottom: 10px !important;}”][vc_empty_space height=”10px”][vc_column_text]
Mercurial
End trunc and merge with other trunk
$ hg commit --close-branch -m 'Ready for merge'
$ hg update default
$ hg merge mybranch
$ hg commit -m 'Integrated mybranch'
Git
Hard reset local and remote repository
Hard reset local repository
- Find commit with git log .
- Hard reset git reset –hard <commit hash from log>
Hard reset remote repository
- git push -f <remote> <branch-name>
[/vc_column_text][/vc_column][/vc_row]