| commit | 47242cd1037483896bb2b042e6a02c66b65b07d6 | |
| author | Andreas Heiduk <asheiduk@gmail.com> | |
| Tue, 11 Apr 2017 14:39:50 +0000 (11 16:39 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 13 Apr 2017 23:15:25 +0000 (13 16:15 -0700) | ||
| tree | d2dedd59f558f3aa70238ed426eee64993d3959c | treesnapshot (tar.gz zip) |
| parent | 49800c940790cc7465d1b03e08d472ffd8684808 | commitdiff |
diff-files: document --ours etc.
git-diff understands "--ours", "--theirs" and "--base" for files with
conflicts. But so far they were not documented for the central diff
command but only for diff-files.
Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-diff understands "--ours", "--theirs" and "--base" for files with
conflicts. But so far they were not documented for the central diff
command but only for diff-files.
Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-diff.txt | diffblobblamehistory |