aboutsummaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-25 12:34:52 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-25 12:34:52 -0800
commitbb9aa109fd3df92cde642d67ba8a331c555d11ae (patch)
tree49ae97e9fcee83a65dcf5e2d9d6c7a81402dac45 /resolve-undo.c
parentbb9a69694f27aa299777c679979f75bdef75735d (diff)
parente510f2d610b30013675c9b08bae92a9cfc4b5907 (diff)
downloadgit-bb9aa109fd3df92cde642d67ba8a331c555d11ae.tar.gz
git-bb9aa109fd3df92cde642d67ba8a331c555d11ae.tar.xz
Merge branch 'jc/doc-maintainer'
Describe tools for automation that were invented since this document was originally written. * jc/doc-maintainer: howto/maintain: document "### match next" convention in jch/pu branch howto/maintain: mark titles for asciidoc Documentation: update "howto maintain git"
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions