summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Ramkumar Ramachandra <artagnon@gmail.com>2013-06-19 13:07:09 +0530
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-19 11:03:22 -0700
commiteb4be1cbe2e50c9bfaa09839564723de257869fc (patch)
treefbf9d8234e9002e32fa432524fc9bb8bed840ea4 /builtin/merge-recursive.c
parentMerge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui (diff)
downloadtgif-eb4be1cbe2e50c9bfaa09839564723de257869fc.tar.xz
sequencer: write useful reflog message for fast-forward
The following command $ git cherry-pick --ff b8bb3f writes the following uninformative message to the reflog cherry-pick Improve it to cherry-pick: fast-forward Avoid hard-coding "cherry-pick" in fast_forward_to(), so the sequencer is generic enough to support future actions. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions