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 /t/t3404-rebase-interactive.sh | |
| parent | Prepare for 2.12.3 (diff) | |
| download | tgif-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 't/t3404-rebase-interactive.sh')
0 files changed, 0 insertions, 0 deletions