Tagged Questions

0
votes
1answer
16 views

Showing which files that match a specific pattern have changed between git branches

I want to merge two branches but before, I'd like to review the changes between the two branches on all files whose filename ends with .twig. Is it possible, or should I use some bash-magic like git ...
0
votes
1answer
58 views

What is the right way to merge branches when `git diff` shows changes but `git merge` does nothing

I get stumped when git diff other_branch shows differences and git merge other_branch does nothing. What's the right way to incorporate that "missing" code into my_branch? This SO answer diagramed a ...
0
votes
1answer
95 views

Must I exit my Git diff tool after each file in a merge?

I'm using a GUI difftool (p4merge, kdiff3, araxis, etc.) to view do my Git merges. This works great, but it seems that I need to quit the tool after editing each file in the merge in order for Git to ...
0
votes
1answer
68 views

How to apply diff between commits to current head in git?

I was working on some topic branch on project I participate in. I normally rebase my branches before making a pull request. This time however, due to changes in master, rebasing is a big pain. Lot ...
0
votes
1answer
269 views

Intellij Diff and Merge tool on Cygwin

How can I configure git to use cygwin for diff and merge tool. I can successfully call diff on command line at windows command prompt but not for cygwin.
3
votes
1answer
108 views

How to set difftool/mergetool for a specific file extension in Git?

Is it possible to set a custom tool for merging files with a specific extension in Git? Thanks for any pointers! Update I wasn't able to come up with any better solution than defining a custom ...
0
votes
0answers
90 views

git merge from master not bringing everything - need to create a git patch from diff between branches to apply

at this moment, we have a git branch feature and we have merged some new stuff from master into it with git checkout feature git merge master which was fine, but we noticed not everything was being ...
0
votes
1answer
59 views

inspect changes after a git pull merge

is it possible to play a git diff in the changes brought by the automatic merge after a git pull? Usually, if there are any conflicts i can check on those using normal git diff, but no idea how to ...
0
votes
1answer
215 views

Config: Fetch git data then merge it with git mergetool

I've successfully set up Kaleidoscope as my default git difftool, and works like a charm. But when I make a fetch then git difftool, I can see what has changed, yet I cannot choose or merge what I ...