Thread (14 messages) 14 messages, 5 authors, 2016-06-15
STALE3635d
Revisions (5)
  1. rfc current
  2. v1 [diff vs current]
  3. v2 [diff vs current]
  4. v3 [diff vs current]
  5. v4 [diff vs current]

[RFC/PATCH 0/6] add --ff option to cherry-pick

From: Christian Couder <hidden>
Date: 2016-06-15 22:48:09

The goal of this series is to add a --ff fast forward otion to cherry-pick
and use it in "rebase -i".

There is no documentation yet and the commit messages are too short but
this will be improved if the series looks worthwhile.

The first patch in this series is a refactoring patch that is not really
needed, but as it looks like a good refactoring/cleanup anyway I left it in.

Christian Couder (5):
  reset: refactor updating heads into a static function
  reset: refactor reseting in its own function
  reset: make reset function non static and declare it in "reset.h"
  revert: add --ff option to allow fast forward when cherry-picking
  rebase -i: use new --ff cherry-pick option

Stephan Beyer (1):
  revert: libify cherry-pick and revert functionnality

 Makefile                   |    2 +
 builtin-reset.c            |  175 +++++++++++++++------------
 builtin-revert.c           |  293 ++++++++++----------------------------------
 git-rebase--interactive.sh |   15 +--
 pick.c                     |  218 ++++++++++++++++++++++++++++++++
 pick.h                     |   13 ++
 reset.h                    |   10 ++
 7 files changed, 407 insertions(+), 319 deletions(-)
 create mode 100644 pick.c
 create mode 100644 pick.h
 create mode 100644 reset.h
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help