summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Valentin Haenel <valentin.haenel@gmx.de>2011-05-05 20:48:48 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-05 13:31:11 -0700
commita31538e273bbca23951fa70a0324ac49214d0f10 (patch)
tree389972d947ed21a749ddf5dd4f5caa88ebcaf8e1 /builtin/merge.c
parentgit-stash.txt: better docs for '--patch' (diff)
downloadtgif-a31538e273bbca23951fa70a0324ac49214d0f10.tar.xz
git-checkout.txt: better docs for '--patch'
Describe '-p' as a short form of '--patch' in synopsis and options. Also refer the reader to the patch mode description of git-add documentation. Helped-by: Jeff King <peff@peff.net> Mentored-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Valentin Haenel <valentin.haenel@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions