summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2007-12-20 14:05:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-21 01:11:20 (GMT)
commit8a82b133547a93e8bdc08fd199c237f540eb9249 (patch)
tree4426409a4eaef6eff97961d987f5f0e6f41337c5 /builtin-merge-ours.c
parentfeb7f38b01761a695ecf53f94237251c1d3aa650 (diff)
downloadgit-8a82b133547a93e8bdc08fd199c237f540eb9249.zip
git-8a82b133547a93e8bdc08fd199c237f540eb9249.tar.gz
git-8a82b133547a93e8bdc08fd199c237f540eb9249.tar.bz2
everyday: replace 'prune' and 'repack' with 'gc'
In everyday tasks, "repack -a -d -f" won't be used, so there is not much point mentioning "repack". By showing the --prune option to "gc", we can do without mentioning "git prune", too. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions