Thread (5 messages) flat view 5 messages, 1 author, 2016-06-15
DORMANTno replies

Revision v4 of 7 in this series.

Revisions (7)
  1. v1 [diff vs current]
  2. v2 [diff vs current]
  3. v3 [diff vs current]
  4. v4 current
  5. v5 [diff vs current]
  6. v6 [diff vs current]
  7. v7 [diff vs current]

[PATCH v4 0/4] Add --graft option to git replace

From: Christian Couder <hidden>
Date: 2016-06-15 23:01:32

Here is a small patch series to implement:

        git replace [-f] --graft <commit> [<parent>...]

This patch series goes on top of the patch series that
implements --edit.

The changes since v3, thanks to Junio, are:

- remove function read_sha1_commit() and its call as well as a
  call to parse_commit_buffer(), as lookup_commit_or_die()
  already reads the commit buffer and parses it (patch 1/4)

- source git-sh-setup and other small cosmetic changes in
  convert-grafts-to-replace-refs.sh (patch 4/4)

Christian Couder (4):
  replace: add --graft option
  replace: add test for --graft
  Documentation: replace: add --graft option
  contrib: add convert-grafts-to-replace-refs.sh

 Documentation/git-replace.txt             | 10 +++++
 builtin/replace.c                         | 62 ++++++++++++++++++++++++++++++-
 contrib/convert-grafts-to-replace-refs.sh | 28 ++++++++++++++
 t/t6050-replace.sh                        | 12 ++++++
 4 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100755 contrib/convert-grafts-to-replace-refs.sh

-- 
2.0.0.rc0.40.gd30ccc4
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help