diff options
| author | Andreas Heiduk <asheiduk@gmail.com> | 2017-04-11 16:39:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-13 16:15:25 -0700 |
| commit | 47242cd1037483896bb2b042e6a02c66b65b07d6 (patch) | |
| tree | d2dedd59f558f3aa70238ed426eee64993d3959c /usage.c | |
| parent | 49800c940790cc7465d1b03e08d472ffd8684808 (diff) | |
| download | git-47242cd1037483896bb2b042e6a02c66b65b07d6.tar.gz git-47242cd1037483896bb2b042e6a02c66b65b07d6.tar.xz | |
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>
Diffstat (limited to 'usage.c')
0 files changed, 0 insertions, 0 deletions