diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-18 16:03:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-18 16:03:24 -0800 |
| commit | 761e8566cb072047e836f1d7f50d3c0f67d7eb00 (patch) | |
| tree | 688ad260cda974c7d4f32557c6f84b032eaf557b /builtin-fmt-merge-msg.c | |
| parent | e6cb314c087661a535b8873502b6d40cef1bbd57 (diff) | |
| parent | 7dc0fe3be5c949e83e96a1b829be0e72eafffb47 (diff) | |
| download | git-761e8566cb072047e836f1d7f50d3c0f67d7eb00.tar.gz git-761e8566cb072047e836f1d7f50d3c0f67d7eb00.tar.xz | |
Merge branch 'lt/rev-list-interactive'
* lt/rev-list-interactive:
Fix parent rewriting in --early-output
revision walker: mini clean-up
Enhance --early-output format
Add "--early-output" log flag for interactive GUI use
Simplify topo-sort logic
Diffstat (limited to 'builtin-fmt-merge-msg.c')
| -rw-r--r-- | builtin-fmt-merge-msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c index 8a3c962f8..6163bd497 100644 --- a/builtin-fmt-merge-msg.c +++ b/builtin-fmt-merge-msg.c @@ -176,7 +176,7 @@ static void shortlog(const char *name, unsigned char *sha1, struct commit *commit; struct object *branch; struct list subjects = { NULL, NULL, 0, 0 }; - int flags = UNINTERESTING | TREECHANGE | SEEN | SHOWN | ADDED; + int flags = UNINTERESTING | TREESAME | SEEN | SHOWN | ADDED; branch = deref_tag(parse_object(sha1), sha1_to_hex(sha1), 40); if (!branch || branch->type != OBJ_COMMIT) |