Git - git-rerere Documentation
Reuse recorded resolution of conflicted merges.

you can also do rm -rf .git/rr-cache to clean rr cache completely.
git  rebase  commandline 
26 days ago
Cycle like the Danes to cut carbon emissions, says study | Environment | The Guardian
This came up with a total of 21g of carbon emissions per passenger kilometre travelled for a bike, as against 271g for people in a car and 101g for a bus. The impact of electric-assisted bicycles, a boon for older or infirm riders, was almost as low, at 22g.
electric_bike  carbonfootprint  guardian 
april 2018
« earlier      
*totest acceptancetesting activerecord agile ajax algorithm analytics android api app architecture archive arel article automate backend backup barcelona bdd benchmark berlin best_practices bike blog blogging blogpost book bootstrap browser btgeeks123 bundler caching capistrano capybara chart chat chef chrome ci clean_code cloud cms code coffeescript collaboration collaborative_consumption commandline communication company conference configuration console continuousintegration converter cool coworking css css3 cucumber dashboard data database date debug debugging dependencies deployment design designpatterns development devops diagram doc docker documentation donate download dropbox dry ebook ec2 ecommerce editor elixir email engine enum europe example excel exceptions extension fast filter fixtures framework france free freelance french friend functional funny gem generator git github gmail goodidea google graph grid gtd guard guide heroku hiring hosting howto html html5 http human i18n ide infographic java javascript jekyll job jobs jquery js json kanban keyboard kids lean_startup library linux log logging logs lyon mac macbook mail map markdown memory memoryleaks metrics microservice migration mobile model mongodb monitoring mvc mysql news ngo nice_design nicedesign node.js nosql online oop opensource optimization optimize organic osx pairprogramming parallel paris pattern payment pdf performance plugin pm10 postgres postgresql presentation privacy productivity programming pusher python quality queue rack rails rails3 refactoring reference regex remote remote_pair_programming reporting resources rest rspec ruby ruby1.9 rubyonrails saas screencast screenshot script search security sequence_diagram server service shell simple sinatra slides sms social socialnetwork socket software solar spain speed sql ssh standup_desk startup static sustainable sysadmin table tdd team template terminal testing textmate tmux tool toolbox tools training trick tricks tutorial twitter ubuntu uk uml upgrade usa validation video view vim virtualization visualization web web2.0 webapplication webapplicationservice whiteboard windows wordpress workflow wow

Copy this bookmark: