Feth Arezki comments

Results 13 comments of


                                            Feth Arezki

charset

Pourquoi pas «jeu de caractères» ? On gagne une syllabe

Gitbuster special mode doesn't work after git pull --rebase conflicts

How to reproduce : ``` bash git add remote other git pull --rebase other [get conflicts] ``` At this point, to enter conflict mode, gitbuster is looking for .git/rebase-merge, that...

Field class doesn't take connection and prepared arguments

I propose this : https://github.com/feth/django-ratings/commit/3c73f2b9e860f778bed348ed8748ccc1826285b5 But as I am fairly new to django, I'm not sure if it is sufficient (ie. does not cause another problem).

a --help option

needs to use argparse

a --help option

oops, didn't want to close

Crash while stashing in the middle of a conflict

I have a rebase-apply dir in .git but no rebase-merge dir in my .git directory.

Crash while stashing in the middle of a conflict

Then I add the "3rd party" tag.

Crash while stashing in the middle of a conflict

I also crashed after clicking [yes] when in a conflict. TypeError: HEAD is a detached symbolic reference as it points to '4c85c7c0978485c40874d51f980f3dcdbf561b7e' stash -> git.exc.GitCommandError: 'git stash' returned exit status...

handle mercurial as well as git

Yes, -> gitbuster v3

handle mercurial as well as git

tonthon suggests http://hg-git.github.com/