Skip to content

feat: compare a file in different branches #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: compare a file in different branches #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/data/primary-options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const options = [
{ value: 'show', label: 'show/view' },
{ value: 'delete', label: 'delete/remove' },
{ value: 'compareCommits', label: 'compare two commits' },
{ value: 'compareFileInDiffBranch', label: 'compare file in two branches' },
{ value: 'configure', label: 'configure' },
{ value: 'clone', label: 'clone' },
{ value: 'ignore', label: 'ignore' },
Expand Down
16 changes: 16 additions & 0 deletions src/data/secondary-options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,22 @@ export const secondaryOptions = {
}
],

compareFileInDiffBranch: [
{
value: 'terminal',
label: 'and output result in the terminal',
usage: 'git diff <master> -- fileNameWithPath',
nb: 'Your current checked out branch and master are the branches where you want to compare the same file. fileNameWithPath is the file with relative path.'
},
{
value: 'file',
label: 'and output result to a file',
usage: 'git diff <master> -- filenamewithpath > diff.txt',
nb:
'Your current checked out branch and master are the branches where you want to compare the same file. fileNameWithPath is the file with relative path. \n\ndiff.txt is the file you want to store the contents of the diff.'
}
],

clone: [
{
value: 'clone-repo-into-a-new-dir',
Expand Down