{"id":16847195,"url":"https://github.com/othree/git-practice-base","last_synced_at":"2026-06-25T12:31:39.451Z","repository":{"id":66786619,"uuid":"84175980","full_name":"othree/git-practice-base","owner":"othree","description":null,"archived":false,"fork":false,"pushed_at":"2017-03-23T07:00:13.000Z","size":10,"stargazers_count":0,"open_issues_count":0,"forks_count":3,"subscribers_count":1,"default_branch":"readme","last_synced_at":"2025-10-09T01:16:19.830Z","etag":null,"topics":["git"],"latest_commit_sha":null,"homepage":null,"language":"TeX","has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":null,"status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/othree.png","metadata":{"files":{"readme":"README.md","changelog":null,"contributing":null,"funding":null,"license":null,"code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null,"governance":null,"roadmap":null,"authors":null,"dei":null,"publiccode":null,"codemeta":null,"zenodo":null,"notice":null,"maintainers":null,"copyright":null,"agents":null,"dco":null,"cla":null}},"created_at":"2017-03-07T08:46:12.000Z","updated_at":"2017-03-23T06:30:48.000Z","dependencies_parsed_at":null,"dependency_job_id":"edd38032-8bee-4d2c-a87a-718bf852fd47","html_url":"https://github.com/othree/git-practice-base","commit_stats":null,"previous_names":[],"tags_count":0,"template":false,"template_full_name":null,"purl":"pkg:github/othree/git-practice-base","repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/othree%2Fgit-practice-base","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/othree%2Fgit-practice-base/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/othree%2Fgit-practice-base/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/othree%2Fgit-practice-base/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/othree","download_url":"https://codeload.github.com/othree/git-practice-base/tar.gz/refs/heads/readme","sbom_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/othree%2Fgit-practice-base/sbom","scorecard":null,"host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":279000722,"owners_count":26082894,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2022-07-04T15:15:14.044Z","status":"online","status_checked_at":"2025-10-08T02:00:06.501Z","response_time":56,"last_error":null,"robots_txt_status":"success","robots_txt_updated_at":"2025-07-24T06:49:26.215Z","robots_txt_url":"https://github.com/robots.txt","online":true,"can_crawl_api":true,"host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":["git"],"created_at":"2024-10-13T13:07:00.157Z","updated_at":"2025-10-09T01:16:20.832Z","avatar_url":"https://github.com/othree.png","language":"TeX","funding_links":[],"categories":[],"sub_categories":[],"readme":"# git-practice-base\n\nA git repositorey to practice some git controls.\n\n\n## Before Start\n\nFork this repo to your account.\n\n\n## Basic\n\nClone this repo:\n\n    git clone https://github.com/othree/git-practice-base.git\n\nReplace `othree` with your account id.\n\nEdit `README.md`. Then commit.\n\n### Edit commit message\n\n    git commit --amend\n\nor by `reset`\n\n    git reset --soft HEAD^\n\nzsh:\n\n    git reset --soft HEAD\\^\n\nGit reset can used to edit entire commit.\n\n\n## Merge\n\nFecth and track all branches: \u003chttps://gist.github.com/othree/d9cefd1c4b5bb667d2690330231d5fff\u003e\n\nOr `checkout` before merge/rebase...\n\n\tgit co for-fast-forward\n\nCheckout `master`\n\n    git co master\n\nFast forward merge:\n\n    git merge for-fast-forward\n\nNone fast forward merge:\n\n    git merge for-no-fast-forward --no-ff\n\n\n## Rebase\n\nCheckout `master`\n\n    git co master\n\nRebase without any conflict:\n\n    git rebase for-rebase\n\nRebase and will have conflict:\n\n    git rebase for-rebase-conflict\n\nSolve conflicts then:\n\n\tgit add src/es2015-script.js\n\tgit rebase --continue\n\nTry `rebase continue --skip`:\n\n    git rebase for-rebase-conflict-skip\n\nSaw conflicts, and skip changes(Use HEAD reversion, a.k.a master):\n\n    git rebase --skip\n\nUndo a rebase\n\n    git reset --hard ORIG_HEAD\n\n## Remove Sensitive Data\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fothree%2Fgit-practice-base","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fothree%2Fgit-practice-base","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fothree%2Fgit-practice-base/lists"}