aboutsummaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-12-29 01:21:45 -0800
committerJunio C Hamano <gitster@pobox.com>2008-12-29 01:21:45 -0800
commitc32f76f4d220e5d4d6a599d7a12a50b1e3ceceaf (patch)
treeffa6c4e6fd861ac3c77cbc5ff3f621f3e5f9c3f9 /builtin-apply.c
parent78d4096d573ae796f72e5b05bf1c332f038e54dd (diff)
parent1b5b465fbde9515e04bd1e8524a208c92af3555e (diff)
downloadgit-c32f76f4d220e5d4d6a599d7a12a50b1e3ceceaf.tar.gz
git-c32f76f4d220e5d4d6a599d7a12a50b1e3ceceaf.tar.xz
Merge branch 'lt/reset-merge'
* lt/reset-merge: Document "git-reset --merge" Add 'merge' mode to 'git reset'
Diffstat (limited to 'builtin-apply.c')
0 files changed, 0 insertions, 0 deletions