summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Sean <seanlkml@sympatico.ca>2006-11-27 14:37:43 -0500
committerLibravatar Junio C Hamano <junkio@cox.net>2006-11-27 12:08:36 -0800
commitfde97d8ac63efa466dd48436d2178bd364b846de (patch)
tree1a758e58be9ad0419ca9a856680941d4468e992c /merge-recursive.c
parentMerge branch 'js/shortlog' (diff)
downloadtgif-fde97d8ac63efa466dd48436d2178bd364b846de.tar.xz
Update documentation to remove incorrect GIT_DIFF_OPTS example.
Git no longer calls an external diff program to generate patches. Remove the documentation which suggests that you can pass arbitrary diff options via the GIT_DIFF_OPTS environment variable. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions