git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: merge confusion

From
Alex Riesen <raa.lkml@gmail.com>
Date
Oct 28, 2009, 15:43 UTC
Message-ID
<81b0412b0910280843s53af2033y7e24400dca231385@mail.gmail.com>
In-Reply-To
<26093419.post@talk.nabble.com>
On Wed, Oct 28, 2009 at 13:01, Tim Mazid <timmazid@hotmail.com> wrote:
> You can just do a 'git branch branch-to-merge COMMIT' then 'git merge
> branch-to-merge' from your feature branch. Alternatively, you could just do
> a straight 'git merge COMMIT' from your feature branch. Though I'm not sure
> of the consequences of merging a commit instead of a branch.

The only consequence is that the merge commit message (if there will be any, fast-forward merges don't merge anything) will mention the SHA1 instead of branch name. You can provide your own merge commit message, of course (while merging and afterwards).

Previous: Tim Mazid
Message 5 of 5 in “merge confusion”
  1. thepurpleblobJul 31, 2009
  2. Allen JohnsonJul 31, 2009
  3. Sean EstabrooksJul 31, 2009
  4. Tim MazidOct 28, 2009
  5. Alex RiesenOct 28, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.