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

[PATCH v2 0/3] Add option to change order of parents in merge commit

From
Kacper Kornet <draenog@pld-linux.org>
Date
Nov 27, 2012, 23:00 UTC
Message-ID
<1354057217-65886-1-git-send-email-draenog@pld-linux.org>

The second version of patches introducing option to change order of parents in merge commits. The changes in respect to the previous version:

- I have divided the changes to the preparatory ones, which
  only refactore the code without introducing new functionality, and
  the commit which introduces the new option
- The documentation for the new options has been added

This is not yet a final version, as the tests are missing. But maybe while I'm working on them there will be some comments.

Kacper Kornet (3):
  Process MERGE_MODE before MERGE_HEAD
  Allow for MERGE_MODE to specify more then one mode
  Add option to transpose parents of merge commit
 Documentation/merge-options.txt |  7 +++++++
 builtin/commit.c                | 22 ++++++++++++++--------
 builtin/merge.c                 | 16 ++++++++++++----
 commit.c                        | 11 +++++++++++
 commit.h                        |  2 ++
 git-pull.sh                     |  4 +++-
 6 files changed, 49 insertions(+), 13 deletions(-)
-- 
1.8.0.1
Next: Kacper Kornet
Message 1 of 11 in “Add option to change order of parents in merge commit”
  1. 0/3 Add option to change order of parents in merge commitKacper Kornet, Nov 27, 2012
  2. 1/3 Process MERGE_MODE before MERGE_HEADKacper Kornet, Nov 27, 2012
  3. 2/3 Allow for MERGE_MODE to specify more then one modeKacper Kornet, Nov 27, 2012
  4. Junio C HamanoNov 28, 2012
  5. Kacper KornetNov 28, 2012
  6. Junio C HamanoNov 28, 2012
  7. 3/3 Add option to transpose parents of merge commitKacper Kornet, Nov 27, 2012
  8. Junio C HamanoNov 28, 2012
  9. Kacper KornetNov 28, 2012
  10. Johannes SixtNov 28, 2012
  11. Junio C HamanoNov 28, 2012

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.