Merge branch 'nd/decorate-grafts'
commit3400c222d9a2dfe8a63684fd47ad5ee7f5d6c4c4
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2011 04:22:58 +0000 (28 21:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2011 04:22:58 +0000 (28 21:22 -0700)
treef041c784ac07013cbf8783800ad046bf5da7efe9
parent2730f55527143d3476c159cebbdb63d5e6a5c2a8
parentb9ad500262843c6110968da1f4e7b6717bc71303
Merge branch 'nd/decorate-grafts'

* nd/decorate-grafts:
  log: Do not decorate replacements with --no-replace-objects
  log: decorate "replaced" on to replaced commits
  log: decorate grafted commits with "grafted"
  Move write_shallow_commits to fetch-pack.c
  Add for_each_commit_graft() to iterate all grafts
  decoration: do not mis-decorate refs with same prefix
builtin/fetch-pack.c
commit.c
log-tree.c