Merge branch 'nd/decorate-grafts'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2011 04:22:58 +0000 (21:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2011 04:22:58 +0000 (21:22 -0700)
* 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

1  2 
builtin/fetch-pack.c
commit.c
log-tree.c

Simple merge
diff --cc commit.c
Simple merge
diff --cc log-tree.c
Simple merge