On Thu, Sep 19, 2013 at 11:10:39AM -0700, Junio C Hamano wrote:
Matthieu Moy matthieu@grenoble-inp.fr writes:
Junio C Hamano gits...@pobox.com writes:
* mm/rebase-continue-freebsd-WB (2013-09-09) 1 commit
(merged to 'next' on 2013-09-13 at 82e8b91)
+ rebase: fix
On Mon, Sep 16, 2013 at 01:18:48PM +0200, Matthieu Moy wrote:
Patrick Welche pr...@cam.ac.uk writes:
$ git diff
ESC[1mdiff --cc glib/gmain.cESC[m
ESC[1mindex 738e69c,5aaebd0..000ESC[m
ESC[1m--- a/glib/gmain.cESC[m
ESC[1m+++ b/glib/gmain.cESC[m
ESC[36m@@@ -4953,32 -4921,32
On Tue, Sep 17, 2013 at 09:15:43AM +0200, Matthieu Moy wrote:
Matthieu Moy matthieu@grenoble-inp.fr writes:
Patrick Welche pr...@cam.ac.uk writes:
$ git diff
ESC[1mdiff --cc glib/gmain.cESC[m
ESC[1mindex 738e69c,5aaebd0..000ESC[m
ESC[1m--- a/glib/gmain.cESC[m
ESC[1m+++ b
On Tue, Sep 17, 2013 at 11:23:51AM +0200, Matthieu Moy wrote:
Patrick Welche pr...@cam.ac.uk writes:
Got it: the change between 1.8.3.4 and 1.8.4 is that colour is on by
default. If I take 1.8.3.4 and git -c color.ui=always log, I see
the same ESC codes = not a regression! I'll just have
On Mon, Sep 16, 2013 at 09:52:35AM +0200, Matthieu Moy wrote:
Patrick Welche pr...@cam.ac.uk writes:
I just upgraded (via pkgsrc) from git 1.8.3.4 to 1.8.4. With 1.8.4, I had
local changes in glib, did a git pull --rebase. Some of my changes
conflicted, but
$ git rebase --abort
I just upgraded (via pkgsrc) from git 1.8.3.4 to 1.8.4. With 1.8.4, I had
local changes in glib, did a git pull --rebase. Some of my changes
conflicted, but
$ git rebase --abort
No rebase in progress?
so somehow the usual process of amending the edit, or skipping the patch
no longer works.
I
6 matches
Mail list logo
