https://quicktasks.ismael.casimpan.com/tags/version-control/Recent content in version-control on IT QuicktasksHugo -- gohugo.ioCopyright © 2018–2022, Ismael Casimpan Jr.; All Rights ReservedFri, 01 Apr 2022 06:03:11 +0800https://quicktasks.ismael.casimpan.com/post/git-rebase/Fri, 01 Apr 2022 06:03:11 +0800https://quicktasks.ismael.casimpan.com/post/git-rebase/ Rebase is used in merging two or more commits into one. Per experience, you can only rebase to an older commit. Say, in these commits 1~$ git log -2 --pretty=oneline 2a0dd6b55000399c5f8b5f0f55286e167725e51c2 (HEAD -> v0.2.x_wip, origin/v0.2.x_wip) docktie_cli getx: Tested working implementation for #17. 3fb8f1de0cf1af7b447dfc9275878c516384f3a0d docktie_cli getx: initial implementation wip for #17 Older one is fb8f1de0cf1af7b447dfc9275878c516384f3a0d Run: 1~$ git rebase --interactive HEAD~2 You'll be in an interactive mode (in an editor) 1pick fb8f1de docktie_cli getx: Implementation for #17.https://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/cloning-repo-with-submodules/Wed, 26 Feb 2020 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/cloning-repo-with-submodules/ Submodules is quite a pain to manage. To make it easy, just use this command: 1git clone --recursive <repo_full_path> Failure to use --recursive would mean using a lot of commands later. See detailed git submodules commands in https://www.vogella.com/tutorials/GitSubmodules/article.htmlhttps://quicktasks.ismael.casimpan.com/post/check-modified-files/Wed, 19 Feb 2020 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/check-modified-files/ Get the commit-hash (e.g. of last commit) 1git log -1 Show the files changed only in commit 1git show --stat <commit-hash> See details in https://stackoverflow.com/questions/424071/how-to-list-all-the-files-in-a-commithttps://quicktasks.ismael.casimpan.com/post/merge-remote-branch-to-local/Mon, 08 Apr 2019 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/merge-remote-branch-to-local/ If you need to merge a remote repo's (e.g. acquia) branch to your local branch: 1git pull acquia masterhttps://quicktasks.ismael.casimpan.com/post/checking-remote-tags/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/checking-remote-tags/ 1git ls-remote --tagshttps://quicktasks.ismael.casimpan.com/post/configure-email-username/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/configure-email-username/ 1git config user.name "Your Name Here" 2git config user.email "name@email.com"https://quicktasks.ismael.casimpan.com/post/fix-identity-used-in-commit/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/fix-identity-used-in-commit/ 1git commit --amend --reset-authorhttps://quicktasks.ismael.casimpan.com/post/ignore-permission-changes/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/ignore-permission-changes/ 1git config core.fileMode false details in https://stackoverflow.com/questions/1580596/how-do-i-make-git-ignore-file-mode-chmod-changeshttps://quicktasks.ismael.casimpan.com/post/pathspec-error-pn-tag-checkout/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/pathspec-error-pn-tag-checkout/ When you see error such as this 1bash-4.1$ git checkout Brick_Release_2018-06-19 2error: pathspec 'Brick_Release_2018-06-19' did not match any file(s) known to git. 'git fetch' first and retry to checkout. If it still fails, ensure you're using the correct branch name.https://quicktasks.ismael.casimpan.com/post/pull-but-no-push/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/pull-but-no-push/ 1$ git remote set-url --push origin no-pushing 2$ git push 3fatal: 'no-pushing' does not appear to be a git repository 4fatal: The remote end hung up unexpectedly See https://stackoverflow.com/questions/7556155/git-set-up-a-fetch-only-remotehttps://quicktasks.ismael.casimpan.com/post/reverting-a-commit/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/reverting-a-commit/ Scenario: A PR has been merged and further tests found out that it breaks the build. What do you do? 1git checkout -b to-revert-commits 2git revert <sha-to-remove> 3git push -u origin to-revert-commits 45## create a Pull Request and have it reviewed and merged by others.https://quicktasks.ismael.casimpan.com/post/undo-almost-anything-in-git/Sun, 08 Apr 2018 23:17:11 +0800https://quicktasks.ismael.casimpan.com/post/undo-almost-anything-in-git/ See https://github.com/blog/2019-how-to-undo-almost-anything-with-git