summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-10 04:53:54 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-12 05:18:18 (GMT)
commite433705dd4dc52c45e5d82b615f07b5a4b27f185 (patch)
treef77e638ad72563e19fd597259d7f70acfc5d086f /git-merge-one-file.sh
parentcb93c19365760d939f05d9a3c2ef4499f0d5ce16 (diff)
downloadgit-e433705dd4dc52c45e5d82b615f07b5a4b27f185.zip
git-e433705dd4dc52c45e5d82b615f07b5a4b27f185.tar.gz
git-e433705dd4dc52c45e5d82b615f07b5a4b27f185.tar.bz2
Documentation: git-apply --no-add
This is a specialized hack to help no-base merges, but other people might find it useful, so let's document it. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions