In git, you can merge without committing. Merge your patch first, then do:
git diff --word-diff-regex=.
Note the dot after the equals sign.
More Related Contents:
- Git: How can I find a commit that most closely matches a directory?
- Viewing all `git diffs` with vimdiff
- How to apply `git diff` patch without Git installed?
- Highlight changed lines and changed bytes in each changed line
- How do I make git use the editor of my choice for commits?
- How can I see the changes in a Git commit?
- How to grep (search) committed code in the Git history
- How do I view ‘git diff’ output with my preferred diff tool/ viewer?
- How to compare a local Git branch with its remote branch
- Can I make git recognize a UTF-16 file as text?
- How to move certain commits to be based on another branch in git?
- How do I make git use the editor of my choice for editing commit messages?
- Can I use git diff on untracked files?
- How to see the changes between two commits without commits in-between?
- Filter git diff by type of change
- Where does the excerpt in the git diff hunk header come from?
- What does “@@ -1 +1 @@” mean in Git’s diff output?
- Can I split an already split hunk with git?
- How to apply a git patch from one repository to another?
- diff returning entire file for identical files
- Git Diff of same files in two directories always result in “renamed”
- How resolve multiple conflicts with “git mergetool” without having to close the editor between files?
- What does the “@@…@@” meta line with at signs in svn diff or git diff mean?
- How can I get a git submodule’s associated commit ID from a past commit in the parent clone?
- View differences of branches with meld?
- Git: How to create patches for a merge?
- Show both staged & working tree in git diff?
- Show git diff, ignoring file permission changes?
- How to perform a three-way diff in Git without merging?
- GnuTLS recv error (-110): The TLS connection was non-properly terminated