{"id":20976880,"url":"https://github.com/aghabeiki/gitdiffer","last_synced_at":"2025-08-02T11:34:35.633Z","repository":{"id":78673784,"uuid":"89599547","full_name":"Aghabeiki/gitdiffer","owner":"Aghabeiki","description":"Visual Studio Code extension for running git difftool through context menu","archived":false,"fork":false,"pushed_at":"2017-04-28T13:47:42.000Z","size":6,"stargazers_count":1,"open_issues_count":6,"forks_count":4,"subscribers_count":2,"default_branch":"master","last_synced_at":"2025-04-12T02:32:03.442Z","etag":null,"topics":["diffmerge","git","vscode-extension"],"latest_commit_sha":null,"homepage":null,"language":"JavaScript","has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":"mit","status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/Aghabeiki.png","metadata":{"files":{"readme":"README.md","changelog":null,"contributing":null,"funding":null,"license":"LICENSE","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}},"created_at":"2017-04-27T13:17:48.000Z","updated_at":"2021-07-07T15:11:08.000Z","dependencies_parsed_at":"2023-03-09T16:30:21.382Z","dependency_job_id":null,"html_url":"https://github.com/Aghabeiki/gitdiffer","commit_stats":null,"previous_names":[],"tags_count":0,"template":false,"template_full_name":null,"purl":"pkg:github/Aghabeiki/gitdiffer","repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/Aghabeiki%2Fgitdiffer","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/Aghabeiki%2Fgitdiffer/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/Aghabeiki%2Fgitdiffer/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/Aghabeiki%2Fgitdiffer/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/Aghabeiki","download_url":"https://codeload.github.com/Aghabeiki/gitdiffer/tar.gz/refs/heads/master","sbom_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/Aghabeiki%2Fgitdiffer/sbom","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":268378979,"owners_count":24240912,"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-08-02T02:00:12.353Z","response_time":74,"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":["diffmerge","git","vscode-extension"],"created_at":"2024-11-19T04:56:15.039Z","updated_at":"2025-08-02T11:34:35.587Z","avatar_url":"https://github.com/Aghabeiki.png","language":"JavaScript","funding_links":[],"categories":[],"sub_categories":[],"readme":"# Gitdiffer\n\nVisual Studio Code extension for running git difftool and git mergetools to resolve merge conflict.\n\n\n### Some tips:\n* I tried to use an other [extention](https://github.com/narekmal/vscode-run-git-difftool) but it didn't work for me, so I created my own . \n* just tested on Arch Linux.\n* for running git difftools, use source control toolbox in vscode, right click on file and select \"Launch Difftool for ...\" \n* for running git mergetool, use sorce control toolbox in vscode, beside the title menu (...), select the \"Launch Mergetool\" or simple open the command plate and run \"Launch Mergetool\" \n\n### Installation Steps : \n* First install [diffmerge](https://sourcegear.com/diffmerge/).\n* Add this configuration to your git global config :\n\n    ```\n    git config --global  diff.tool diffmerge\n    git config --global difftool.diffmerge.cmd diffmerge \"$LOCAL\" \"$REMOTE\"\n    git config --global merge.tool diffmerge\n    git config --global mergetool.diffmerge.cmd diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\"\n    git config --global mergetool.diffmerge.trustexitcode true\n    ```\n\n* install the extention.\n\n###### Final note:\n* This extention should work with other [diffmerge](https://sourcegear.com/diffmerge/) tools.\n* git configurations depends on the used tools. \n\n[Bug Reports](https://github.com/RaianRaika/gitdiffer/issues)\u003cbr\u003e\n[Repo](https://github.com/RaianRaika/gitdiffer)","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Faghabeiki%2Fgitdiffer","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Faghabeiki%2Fgitdiffer","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Faghabeiki%2Fgitdiffer/lists"}