1611 shaares
17 private links
17 private links
2 results
tagged
diff
Use magit-ediff or 'e' on an unmerged item to resolve merge conflicts with ediff. Magit will set up an ediff with three buffers A, B and C. A and B are the original (conflicting) files, and C is the conflicted merge.
git archive -o f83a9df9.tar.gz HEAD $(git diff-tree -r --no-commit-id --name-only --diff-filter=ACMRT f83a9df9 bd1773dd)