On Mar 22, 11:23 am, apm <korja...@gmail.com> wrote: > How its possible do something like git diff second_branch -- shared_file > for merge? > > Another words , how merge exactly one file from different branches?
You can possibly feed the output of that command to `git apply` or `git am`. Note that this won't be a "merge" in its true sense as merging either results in fast-forward update or records a special commit which references both (or more) lines of history which had been merged. If you want to "really" merge but zap all the changes resulting from the merger except those made to one file, you can use the --no-commit to the merge command and then reset unwanted changes and commit. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
