summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2009-02-14 23:10:10 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-14 21:14:07 -0800
commit58e9d9d472ff4dbc6cfbf7459878778c739395eb (patch)
tree6a09b2564916644ee5f0a18cf70d51936fe6802b /Documentation/git-merge.txt
parentsymbolic-ref: allow refs/<whatever> in HEAD (diff)
downloadtgif-58e9d9d472ff4dbc6cfbf7459878778c739395eb.tar.xz
gc: make --prune useful again by accepting an optional parameter
With this patch, "git gc --no-prune" will not prune any loose (and dangling) object, and "git gc --prune=5.minutes.ago" will prune all loose objects older than 5 minutes. This patch benefitted from suggestions by Thomas Rast and Jan Krï¿œger. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions