summaryrefslogtreecommitdiff
path: root/diff-tree.c
diff options
context:
space:
mode:
authorLibravatar Linus Torvalds <torvalds@osdl.org>2005-11-29 21:06:10 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2005-11-30 00:14:18 -0800
commit10637b84d91cf8870d1db8609a10dc5e58722378 (patch)
tree3c9caf478abc60cb208e557ce0923505b28cb3cb /diff-tree.c
parentgit-diff: do not turn off -p/-M with any diff options. (diff)
downloadtgif-10637b84d91cf8870d1db8609a10dc5e58722378.tar.xz
diff-files: -1/-2/-3 to diff against unmerged stage.
While resolving conflicted merge, it was not easy to compare the working tree file with unmerged index entries. This commit introduces new options -1/-2/-3 (with synonyms --base, --ours, and --theirs) to compare working tree files with specified stages. When none of these options are given, the command defaults to -2 if the index file is unmerged, otherwise it acts as before. [jc: majorly butchered from the version Linus originally posted.] Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff-tree.c')
0 files changed, 0 insertions, 0 deletions