https://quicktasks.ismael.casimpan.com/series/version-control/Recent content in version-control on IT QuicktasksHugo -- gohugo.ioCopyright © 2018–2022, Ismael Casimpan Jr.; All Rights ReservedSun, 27 Mar 2022 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/git-latest-hash/Sun, 27 Mar 2022 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/git-latest-hash/ Sometimes, for automation purposes, you would like to get the latest commit in a working copy. Below is how you do it. 1~$ git rev-parse --short HEAD Remove the --short HEAD if you need the longer version.https://quicktasks.ismael.casimpan.com/post/remove-large-files-committed-in-git/Sun, 21 Mar 2021 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/remove-large-files-committed-in-git/ It's quite annoying when you committed large files to git specially if it's something that's something confidential. We'll relatively easy to do that. Just use the 'filter-branch' command in git as follows: 1git filter-branch --force --index-filter \ 2> 'git rm --cached --ignore-unmatch path/to/huge-file.mp4' \ 3> --prune-empty --tag-name-filter cat -- --all You should be seeing something like below: 1~$ git filter-branch --force --index-filter \ 2> 'git rm --cached --ignore-unmatch content/sync/files/public/2020-04/Bad_Luck.mp4' \ 3> --prune-empty --tag-name-filter cat -- --all 4Rewrite 8dfc744d18880f14dbc8fcd09f50c4bc3ede71 (1049/1091)rm 'content/sync/files/public/2020-04/Bad_Luck.https://quicktasks.ismael.casimpan.com/post/pull-request-via-github-api/Tue, 08 Sep 2020 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/pull-request-via-github-api/ From the example in https://docs.github.com/en/rest/reference/pulls#create-a-pull-request, it seems quite easy: 1curl \ 2-X POST \ 3-H "Accept: application/vnd.github.v3+json" \ 4https://api.github.com/repos/octocat/hello-world/pulls \ 5-d '{"title":"title","head":"head","base":"base"}' The above means, create a pull request with title "title" with code in branch "head" against the branch in "base" for the repo https://github.com/octocat/hello-world.git In case you need to authenticate, add 1-u <user>:<GITHUB_TOKEN> before the -H 1curl \ 2-X POST \ 3-u your_user:DEFINED_GITHUB_TOKEN_HERE 4-H "Accept: application/vnd.github.v3+json" \ 5https://api.github.com/repos/octocat/hello-world/pulls \ 6-d '{"title":"title","head":"head","base":"base"}' You can also use a payload json file for this value:https://quicktasks.ismael.casimpan.com/post/ssl-connect-error-on-git-fetch/Fri, 12 Jun 2020 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/ssl-connect-error-on-git-fetch/ 1~$ git fetch 2fatal: unable to access 'https://github.com/icasimpan/example.git/': SSL connect error Fixed by: 1yum update -y nss curl libcurlhttps://quicktasks.ismael.casimpan.com/post/telling-git-to-use-specific-private-key/Fri, 29 May 2020 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/telling-git-to-use-specific-private-key/ Sometimes, you need to use specific keys. To do it, use ssh config, something like below in ~/.ssh/config 1host github.com 2HostName github.com 3IdentityFile ~/.ssh/id_rsa_github 4User git See details in https://superuser.com/questions/232373/how-to-tell-git-which-private-key-to-usehttps://quicktasks.ismael.casimpan.com/post/git-with-latest-commit-log-only/Tue, 26 May 2020 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/git-with-latest-commit-log-only/ In some situations, you only need the latest commit log, saving space in the process. You have to do it as follows: 1git clone --depth=1 REPOhttps://quicktasks.ismael.casimpan.com/post/quickly-work-git-code/Mon, 08 Apr 2019 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/quickly-work-git-code/ If you need less keystrokes in updating your git code specially if it's very minimal change, do the following: 1git clone https://<github_token_here>@github.com/icasimpan/quicktasks-git 2cd quicktasks-git 3git config user.name "Ismael Casimpan" 4git config user.email "ismael.angelo@casimpan.com"https://quicktasks.ismael.casimpan.com/post/git-cherrypick/Fri, 23 Nov 2018 06:03:11 +0800https://quicktasks.ismael.casimpan.com/post/git-cherrypick/ Cherry Picking in Git is quite easy: For single commit 1git checkout <destination_branch> 2git cherry-pick <hash-here> See https://swsblog.stanford.edu/blog/cherry-picking-small-git-lesson Multiple commit NOTE: only the commits between 'initial_commit_hash' and 'terminal_commit_hash' are merged. 1git checkout <destination_branch> 2git cherry-pick <initial_commit_hash>..<terminal_commit_hash> To include the 'initial_commit_hash' and 'terminal_commit_hash', use the following: 1git cherry-pick <initial_commit_hash>^..<terminal_commit_hash> Note that conflicts would pause cherry-picking and ask to resolve the conflict. You can then continue as follows: 1git cherry-pick --continue See details in https://medium.https://quicktasks.ismael.casimpan.com/post/compare-tag-contents-github/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/compare-tag-contents-github/ Example https://github.com/icasimpan/shcf/compare/shcf-v0.2.0...shcf-v0.3.0https://quicktasks.ismael.casimpan.com/post/deleting-local-git-tag/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/deleting-local-git-tag/ 1me@mysite:/var/www/sites/mysite.local$ git tag --delete origin :v1.56 2To git@git-server:mysite.git 3Deleted tag 'v1.56' (was f346d287f)https://quicktasks.ismael.casimpan.com/post/deleting-remote-git-repo/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/deleting-remote-git-repo/ 1me@mysite:/var/www/sites/mysite.local$ git push origin :release-redesign 2To git@git-server:mysite.git 3- [deleted] release-redesignhttps://quicktasks.ismael.casimpan.com/post/deleting-remote-git-tag/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/deleting-remote-git-tag/ 1me@mysite:/var/www/sites/mysite.local$ git push origin :v1.56 2To git@git-server:mysite.git 3- [deleted] v1.56https://quicktasks.ismael.casimpan.com/post/duplicating-git-repo/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/duplicating-git-repo/ 1git clone --bare https://example.com/repo.git 2cd repo.git 3git push --mirror https://remote-example.com/repo.git See https://help.github.com/articles/duplicating-a-repository/https://quicktasks.ismael.casimpan.com/post/git-log-ci-graph/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/git-log-ci-graph/ 1git log --graph --oneline --decorate --allhttps://quicktasks.ismael.casimpan.com/post/git-patch-creation-apply/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/git-patch-creation-apply/ See https://www.devroom.io/2009/10/26/how-to-create-and-apply-a-patch-with-git/https://quicktasks.ismael.casimpan.com/post/git-submodules/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/git-submodules/ See https://chrisjean.com/git-submodules-adding-using-removing-and-updating/https://quicktasks.ismael.casimpan.com/post/move-directory-in-git-to-another-repo/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/move-directory-in-git-to-another-repo/ See http://gbayer.com/development/moving-files-from-one-git-repository-to-another-preserving-history/https://quicktasks.ismael.casimpan.com/post/negating-contents-of-gitignore/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/negating-contents-of-gitignore/ See https://stackoverflow.com/questions/5533050/gitignore-exclude-folder-but-include-specific-subfolderhttps://quicktasks.ismael.casimpan.com/post/rename-git-branch/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/rename-git-branch/ If on a branch you want renamed 1git branch -m new-name If on a different branch 1git branch -m old-name new-name