summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2011-08-25 17:09:30 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-25 19:47:24 -0700
commitb9ad500262843c6110968da1f4e7b6717bc71303 (patch)
treeb97b873eeb47c84c714d575837b9883d38b575e5 /resolve-undo.c
parentlog: decorate "replaced" on to replaced commits (diff)
downloadtgif-b9ad500262843c6110968da1f4e7b6717bc71303.tar.xz
log: Do not decorate replacements with --no-replace-objects
5267d29 (log: decorate "replaced" on to replaced commits, 2011-08-19) introduced textual decorations for replaced commits, based on the detection of refs/replace. Make it so that additionally the use of --no-replace-objects is detected: I.e. replaced commits are only decorated as replaced when they are actually replaced. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions