git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 49800c9)
diff-files: document --ours etc.
authorAndreas Heiduk <redacted>
Tue, 11 Apr 2017 14:39:50 +0000 (16:39 +0200)
committerJunio C Hamano <redacted>
Thu, 13 Apr 2017 23:15:25 +0000 (16:15 -0700)
commit47242cd1037483896bb2b042e6a02c66b65b07d6
treed2dedd59f558f3aa70238ed426eee64993d3959ctree | snapshot
parent49800c940790cc7465d1b03e08d472ffd8684808commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/git-diff.txt diff | blob | history
git clone https://git.99rst.org/PROJECT