From: Jari Aalto <jari.aalto@cante.net>
To: git@vger.kernel.org
Subject: FEATURE REQUEST: Announce branch name with merge comamnd
Date: Fri, 11 Dec 2009 20:55:50 +0200 [thread overview]
Message-ID: <87zl5p1gsp.fsf@jondo.cante.net> (raw)
Doing octopus merge results:
$ git merge ...
Trying simple merge with c87c49b1e413e5dc378d7e6b16951761a1e82f6d
Trying simple merge with b650c8c8809ef493ad4128fc941ed6b520c82f28
Trying simple merge with 047f83d6c8a08c4016004780e94257d9e487b7e6
Simple merge did not work, trying automatic merge.
Auto-merging example.jwmrc
Trying simple merge with 16860b016e198acd0814492092e2ad5ea88fb219
Simple merge did not work, trying automatic merge.
Auto-merging example.jwmrc
Trying simple merge with 9a397ff24a381ce49dd093c4f51c06c4c62f3ce7
Simple merge did not work, trying automatic merge.
...
SUGGESTION
Please announce the branch name being merged so that the listing is
easier to follow (possibly only with --verbose, -v option). Add
"Branch: <name>" just before the merge is attempted. somethiglike this
Branch: bug--manpage-fix-hyphen
Trying simple merge with c87c49b1e413e5dc378d7e6b16951761a1e82f6d
Branch: bug--manpage-fix-TH
Trying simple merge with b650c8c8809ef493ad4128fc941ed6b520c82f28
Branch: bug-manpage-change-binary-name
Trying simple merge with 047f83d6c8a08c4016004780e94257d9e487b7e6
Branch: feature--example.jwmrc-change-browser
Simple merge did not work, trying automatic merge.
Auto-merging example.jwmrc
Branch: feature--example.jwmrc-change-clock
Trying simple merge with 16860b016e198acd0814492092e2ad5ea88fb219
Simple merge did not work, trying automatic merge.
Auto-merging example.jwmrc
Branch: feature--example.jwmrc-change-font
Trying simple merge with 9a397ff24a381ce49dd093c4f51c06c4c62f3ce7
Simple merge did not work, trying automatic merge.
...
next reply other threads:[~2009-12-11 18:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-11 18:55 Jari Aalto [this message]
2009-12-11 19:33 ` FEATURE REQUEST: Announce branch name with merge comamnd Junio C Hamano
2009-12-12 0:38 ` [PATCH 1/3] octopus: make merge process simpler to follow Stephen Boyd
2009-12-12 8:53 ` Junio C Hamano
2009-12-12 19:56 ` Johannes Sixt
2009-12-12 20:46 ` Junio C Hamano
2009-12-15 6:49 ` [PATCH] " Stephen Boyd
2009-12-15 7:32 ` Junio C Hamano
2009-12-15 7:35 ` Stephen Boyd
2009-12-12 0:38 ` [PATCH 2/3] octopus: reenable fast-forward merges Stephen Boyd
2009-12-12 0:38 ` [PATCH 3/3] octopus: remove dead code Stephen Boyd
2009-12-12 1:01 ` Junio C Hamano
2009-12-12 1:35 ` FEATURE REQUEST: Announce branch name with merge comamnd Alex Riesen
2009-12-12 8:35 ` Jari Aalto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zl5p1gsp.fsf@jondo.cante.net \
--to=jari.aalto@cante.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).