Permalink
Browse files

Resolved merg conflict

  • Loading branch information...
2 parents 45fa20f + 7033e26 commit a859b123650b16f2ccc089faf1ed749928b2f6b3 @jeffWelling jeffWelling committed Nov 10, 2011
Showing with 8 additions and 2 deletions.
  1. +7 −1 README.mkd
  2. +1 −1 lib/ticgit-ng/version.rb
View
@@ -59,7 +59,7 @@ After installing rubygems it is necessary to update the PATH environment variabl
While the version of rubygems available from the repositories on Debian 5.0.5 stable will work just fine for using the command line `ti` program, using `ticgitweb` requires some extra effort.
Older versions of rubygems, such as the one available on Debian 5.0.5, will not work out of the box with the new gem repositories because the .deb in stable relies on rubyforge rather than rubygems for its operations. See [this bug](http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=558251) for an example. If you are running an older version of rubygems, you may need to get the latest rubygems package from http://rubygems.org/ or [apt](http://jaqque.sbih.org/kplug/apt-pinning.html) [pinning](http://jeffwelling.github.com//2010/09/05/Apt-Pinning.html) before being able to properly install the git and ticgit gems.
-**A Note about the git gem**
+**A Note About The Git Gem**
The git gem requires a git version of 1.6.0.0 or later, but on Debian stable, git-core is currently (Sept 6th 2010) at 1.5.6.5. This isn't a fatal problem and we can continue using version 1.5.6.5 with the git gem, but you will see notices like this if you do
@@ -72,6 +72,12 @@ If these annoy you as they do me and you've set up [apt](http://jaqque.sbih.org/
And those notices should go away.
+**A Note About Coloured Git Output**
+
+If you use `[color] ui = always` instead of `[color] ui = true` then you will encounter a problem with the deprecated git gem parsing the color codes. Because it doesn't strip the color codes before parsing the output, it chokes and makes everything explode.
+
+Since time spent working on monkeypatching the git gem would soon be rendered fruitless by the eventual planned upgrade away from it, for the time being the suggested solution is to use `[color] ui = true`.
+
### Installing ##
Installation on a Debian stable system. Note that the command line interface for TicGit-ng can be run from Debian stable, but some of the gems required for the web interface may require you to use [apt](http://jaqque.sbih.org/kplug/apt-pinning.html) [pinning](http://jeffwelling.github.com//2010/09/05/Apt-Pinning.html) to run without errors. See below
View
@@ -1,3 +1,3 @@
module TicGitNG
- VERSION = '1.0.2.10'
+ VERSION = '1.0.2.11'
end

0 comments on commit a859b12

Please sign in to comment.