ttn pushed a commit to branch master
in repository elpa.

commit 6270a7195575d634b498abecf717cae55be803ae
Author: Thien-Thi Nguyen <t...@gnu.org>
Date:   Mon Feb 3 18:42:58 2014 +0100

    [gnugo maint] Update a musing item in HACKING; nfc.
    
    Although it would be nice to avoid a "merge commit" through constant
    rebase (such that the final merge can be a fast-forward operation),
    that makes it painful / difficult for others to follow.
---
 packages/gnugo/HACKING |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packages/gnugo/HACKING b/packages/gnugo/HACKING
index 21d1860..80556a8 100644
--- a/packages/gnugo/HACKING
+++ b/packages/gnugo/HACKING
@@ -23,7 +23,7 @@ This file is both a guide for newcomers and a todo list for 
oldstayers.
 ******* fulminate-gnugo-xpms.el
 ******* gnugo-extra.el
 ******* mokuxpms.tar.gz / mokuxpms-2.tar.gz / mokuxpms-3.tar.gz
-***** Fast-forward merge (rebase + push) OK?
+***** Fast-forward merge (rebase + push) OK? [no]
 *** TODO Finish [[file:NEWS][NEWS]] archeology.
 * fix bugs
 *** [[file:gnugo.el::defun.gnugo-toggle-dead-group][gnugo-toggle-dead-group]] 
only half-complete

Reply via email to