summaryrefslogtreecommitdiff
path: root/Documentation/howto/revert-a-faulty-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-10-20 15:22:40 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-10-20 15:22:40 -0700
commitce555f38426e212ced5f2445bc6df1351af21cab (patch)
tree8aee761e69743957192889d3fff9b7c6fbaf88e2 /Documentation/howto/revert-a-faulty-merge.txt
parentMerge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint (diff)
parentDocumentation/gc: warn against --prune=<now> (diff)
downloadtgif-ce555f38426e212ced5f2445bc6df1351af21cab.tar.xz
Merge branch 'jc/doc-gc-prune-now' into maint
"git gc" is safe to run anytime only because it has the built-in grace period to protect young objects. In order to run with no grace period, the user must make sure that the repository is quiescent. * jc/doc-gc-prune-now: Documentation/gc: warn against --prune=<now>
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions