summaryrefslogtreecommitdiff
path: root/diff-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-04-15 15:08:09 -0700
committerLibravatar Linus Torvalds <torvalds@ppc970.osdl.org>2005-04-15 15:08:09 -0700
commitca2a0798656aa1219c6ff4fa66cd0f3340ddd5be (patch)
treeb9be893a0014c33d0b825cd9588566825c129a4b /diff-tree.c
parent[PATCH] Add -z option to show-files (diff)
downloadtgif-ca2a0798656aa1219c6ff4fa66cd0f3340ddd5be.tar.xz
[PATCH] Add "-q" option to show-diff.c
This adds the '-q' option for show-diff.c to squelch complaints for missing files. It is handy if you want to run it in the merge temporary directory after running merge-trees with its minimum checkout mode, which is the default, because you would not find any files other than the ones that needs human validation after the merge there. It also fixes the argument parsing bug Paul Mackerras noticed in <16991.42305.118284.139777@cargo.ozlabs.ibm.com> but slightly differently. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff-tree.c')
0 files changed, 0 insertions, 0 deletions