summaryrefslogtreecommitdiff
path: root/t/t6029-merge-subtree.sh
diff options
context:
space:
mode:
authorLibravatar Stephen Boyd <bebarino@gmail.com>2009-06-13 11:20:00 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-06-13 12:44:41 -0700
commitc97038d1cfbd98ea258086c417fe4f0c094596d3 (patch)
treec50f3e9eaa93aa14b12febeb95f63024debd68e6 /t/t6029-merge-subtree.sh
parenthttp-push.c::remove_locks(): fix use after free (diff)
downloadtgif-c97038d1cfbd98ea258086c417fe4f0c094596d3.tar.xz
git-rerere.txt: grammatical fixups and cleanups
Rewrite the gc section using unresolved and resolved instead of "not recorded". Add plurals and missing articles. Make some sentences have consistent tense. Try and be more active by removing "that" and simplifying sentences. The terms "hand-resolve" and "hand resolve" were used, so just use "hand resolve" to be more consistent. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6029-merge-subtree.sh')
0 files changed, 0 insertions, 0 deletions