Re: [Dorset] Some git pointers
Thanks Tim
I looked at tig as you suggested. Looks like I can get rid of another nasty
gui yey. I just got to figure out how to get it the work under gits mingwin
install in windows (for work)
Regards Chad
On 5 March 2014 16:35, Tim Waugh twa...@redhat.com wrote:
For the benefit of Chad and Charles, and anyone else:
* Git PS1 decoration:
Git comes with some nice command line decoration, which you can activate
by putting this definition in .bashrc and running git-prompt in new
shells:
git-prompt() {
git_prompt_dir=/usr/share/git-core/contrib/completion
git_integration=$git_prompt_dir/git-prompt.sh
test -e $git_integration ||
git_integration=$git_prompt_dir/git-completion.bash
if test -e $git_integration; then
source $git_integration
export PS1='[\u@\h \W$(__git_ps1 (%s))]\$ '
export GIT_PS1_SHOWDIRTYSTATE=1
export GIT_PS1_SHOWUNTRACKEDFILES=1
fi
}
(the location and name of the file was changed, hence the test)
This decorations your prompt (PS1) so that it contains the branch name
and state in parentheses. State characters are:
* unstaged changes
+ staged changes
$ stashed changes
% untracked files
You can also set GIT_PS1_SHOWUPSTREAM=auto if you'd like these:
you are behind upstream
you are ahead of upstream
diverged
= at upstream head
* Git command line completion
Fedora's git package comes with a file in /etc/bash_completion.d/ so
that command line completion is automatic -- I'm not sure if this is
straight from the tarball or not.
Branch names and tags will auto-complete; so will options and of course
filenames when appropriate.
* Terminal-mode history viewer
Use 'tig' to see a nice navigable view of the project history.
Use 'tig blame file' to see a navigable version of 'git blame file'. As
well as showing the entire file with each line annotated to describe the
last commit that changed it, pressing Enter on any line will show you
that commit message and the changes it introduced. Obviously, '/' will
search forward etc.
* Finally, the killer feature: bisect
Run 'git help bisect' to find out more about git's killer feature.
Operating entirely off-line, you tell git:
* the last-known-good version of the project,
* the version that is known to be broken, and
* a test script to check for the breakage
and it will perform a binary search to narrow down the exact commit that
broke it.
Tim.
*/
--
Next meeting: Bournemouth, Tuesday, 2014-04-01 20:00
Meets, Mailing list, IRC, LinkedIn, ... http://dorset.lug.org.uk/
New thread on mailing list: mailto:dorset@mailman.lug.org.uk
How to Report Bugs Effectively: http://goo.gl/4Xue
--
Next meeting: Bournemouth, Tuesday, 2014-04-01 20:00
Meets, Mailing list, IRC, LinkedIn, ... http://dorset.lug.org.uk/
New thread on mailing list: mailto:dorset@mailman.lug.org.uk
How to Report Bugs Effectively: http://goo.gl/4Xue
[Dorset] Mega Help Needed - Can't Boot into Kubuntu 13.10
Hi, Yesterday I (belatedly) realised that my desktop PC with Kubuntu 13.10 installed hadn't put any updates in since way before Christmas. Assuming that the Muon Updater had stopped alerting me, I ran it and found that around 300 + packages needed updating, including the kernel. Unfortunately, after the update, the machine froze at the boot message stage. Having no idea what had gone wrong, I did a clean install from the original CD and reapplied all of the updates. After the reboot all seemed well until I installed the Nvidia driver and got exactly the same symptoms. I then concluded that the problem is a mismatch between the new kernel and the old nvidia driver (it worked OK before the new kernel was installed. So now I've booted into Recovery Mode and am sitting in a root prompt. How do I remove the nvidia driver from the system and reinstall the old driver (presumably noveau)? I can see that apt-get allows me to remove the offending package, but I can't remember how to list the installed and available packages that I can access. Are there any other things that I need to do? Terry Coles -- Next meeting: Bournemouth, Tuesday, 2014-04-01 20:00 Meets, Mailing list, IRC, LinkedIn, ... http://dorset.lug.org.uk/ New thread on mailing list: mailto:dorset@mailman.lug.org.uk How to Report Bugs Effectively: http://goo.gl/4Xue
Re: [Dorset] Mega Help Needed - Can't Boot into Kubuntu 13.10
On 06/03/14 16:51, d-...@hadrian-way.co.uk wrote: Hi, Yesterday I (belatedly) realised that my desktop PC with Kubuntu 13.10 installed hadn't put any updates in since way before Christmas. Assuming that the Muon Updater had stopped alerting me, I ran it and found that around 300 + packages needed updating, including the kernel. Unfortunately, after the update, the machine froze at the boot message stage. Having no idea what had gone wrong, I did a clean install from the original CD and reapplied all of the updates. After the reboot all seemed well until I installed the Nvidia driver and got exactly the same symptoms. I then concluded that the problem is a mismatch between the new kernel and the old nvidia driver (it worked OK before the new kernel was installed. So now I've booted into Recovery Mode and am sitting in a root prompt. How do I remove the nvidia driver from the system and reinstall the old driver (presumably noveau)? I can see that apt-get allows me to remove the offending package, but I can't remember how to list the installed and available packages that I can access. Are there any other things that I need to do? Terry Coles Assuming you have access to another PC this might help http://askubuntu.com/questions/352093/need-to-deactivate-nvidia-driver-from-recovery-mode-or-using-ubuntu-12-04-instal Hope it helps Tim -- Next meeting: Bournemouth, Tuesday, 2014-04-01 20:00 Meets, Mailing list, IRC, LinkedIn, ... http://dorset.lug.org.uk/ New thread on mailing list: mailto:dorset@mailman.lug.org.uk How to Report Bugs Effectively: http://goo.gl/4Xue
Re: [Dorset] Mega Help Needed - Can't Boot into Kubuntu 13.10
On 06/03/14 18:11, Terry Coles wrote: On Thursday 06 Mar 2014 17:45:19 Tim wrote: Assuming you have access to another PC this might help http://askubuntu.com/questions/352093/need-to-deactivate-nvidia-driver-from- recovery-mode-or-using-ubuntu-12-04-instal Yes it did thanks, I'm now using my kubuntu box again. Yeah me, I supplied a correct answer even if it was somebody else's!! Glad you are back up and running Terry. Tim -- Next meeting: Bournemouth, Tuesday, 2014-04-01 20:00 Meets, Mailing list, IRC, LinkedIn, ... http://dorset.lug.org.uk/ New thread on mailing list: mailto:dorset@mailman.lug.org.uk How to Report Bugs Effectively: http://goo.gl/4Xue
