Useful post on git by Yehuda Katz. inter alia, strongly suggests using the --rebase flag when merging
git pull –rebase
July 10th, 2010 § 0 comments
What's this?
You are currently reading git pull –rebase at Dan O'Huiginn.
meta
- Author: lute
- Comments: No Comments
- Categories: Uncategorized
-
Blogroll
- Github
- Livejournal
- Panama corporate database
-
Meta
- Log in
- Entries RSS
- Comments RSS
- WordPress.org
-
Archives
- May 2017
- January 2017
- December 2016
- November 2016
- October 2016
- September 2016
- August 2016
- July 2016
- May 2016
- February 2016
- October 2015
- August 2015
- July 2015
- June 2015
- May 2015
- April 2015
- March 2015
- February 2015
- January 2015
- December 2014
- November 2014
- October 2014
- September 2014
- August 2014
- July 2014
- June 2014
- May 2014
- April 2014
- February 2014
- January 2014
- December 2013
- September 2013
- August 2013
- July 2013
- June 2013
- May 2013
- April 2013
- March 2013
- January 2013
- August 2012
- July 2012
- June 2012
- May 2012
- April 2012
- March 2012
- February 2012
- January 2012
- December 2011
- November 2011
- October 2011
- September 2011
- August 2011
- July 2011
- June 2011
- May 2011
- April 2011
- March 2011
- February 2011
- January 2011
- December 2010
- November 2010
- October 2010
- September 2010
- August 2010
- July 2010
- June 2010
- May 2010
- April 2010
- March 2010
- February 2010
- January 2010
- December 2009
- November 2009
- October 2009
- September 2009
- August 2009
- July 2009
- June 2009
- May 2009
- April 2009
- March 2009
- February 2009
- January 2009
- December 2008
- November 2008
- October 2008
- September 2008
- August 2008
- July 2008
- June 2008
- May 2008
- April 2008
- March 2008
- February 2008
- January 2008
- December 2007
- November 2007
- October 2007
- September 2007
- August 2007
- July 2007
- June 2007
- May 2007
- April 2007
- March 2007
- February 2007
- January 2007
- December 2006
- November 2006
- October 2006
- September 2006
- August 2006
- July 2006
- June 2006
- May 2006
- April 2006
- March 2006
- February 2006
- January 2006
- December 2005
- November 2005
- October 2005
- September 2005
- August 2005
- July 2005
- June 2005
- May 2005
- April 2005
- March 2005
- February 2005
- January 2005
- December 2004
- November 2004
- October 2004
-
Categories
- 2009
- academia
- academic idiocy
- acceleration
- acta
- adam curtis
- adam curtis history
- aesthetics
- afghanistan
- amazon
- americana
- anger
- angry
- anonymous
- apathy
- aphex twin
- arab2011
- armenia
- armstrade
- art
- art history
- Art, books, music, film
- ashton
- asiatimes
- asylum
- atemporality
- b-t
- BAE
- banks
- baselinescenario
- bash
- bbc
- bdsm
- belarus
- berlin
- blade runner
- blogs
- books
- bookstoread
- boredom
- bracewell
- brazil
- brecht
- bruce sterling
- business
- byatt
- cablegate
- capitalism
- censorship
- centralasia
- China
- cis
- cities
- civil liberties
- cliimatechange
- climatechange
- clothing
- coal fires
- collage
- comics
- communism
- concentration
- confession
- controlled extravagence
- copenhagen
- corporatism
- coupland
- crooked timber
- ct
- culture
- cuts
- cynicism
- debian
- dedication
- definitions
- depression
- design
- digital rights
- disappointment
- dmca
- dn
- drabble
- e-voting
- economics
- education
- egypt
- electronic music
- emotion
- entertainment
- enthusiasm
- environment
- erdos
- esr
- estonia
- eu
- euobserver
- Eurasia
- Europe
- excess
- extra3
- faff
- fantasy
- fear
- feminism
- fiction
- film
- films
- firefox
- food
- france
- frenchleft
- friendship
- frivolity
- futurism
- futurology
- gambling
- gartonash
- gender
- generation
- Georgia
- german
- Germany
- germany mgiration
- germany politics guttenberg netzpolitik
- gfc
- goth
- greece
- greenwash
- gripes
- grumbles
- grumbling
- guardian
- haiti
- happy
- hari
- hedonia
- heidegger
- heinlein
- hersh
- history
- hope
- howto
- humor
- hunting
- hysteria
- idealism
- ideas
- ideology
- important
- independent
- india
- intellectual fuckwittery
- intellectual history
- intensity
- Internet
- internets
- Iraq
- irc
- islam
- islamophobia
- israel
- italy
- jane grey
- jargon
- jobs
- journalism
- juno reactor
- k-punk
- Kazakhstan
- kgz
- kircher
- kirgizia
- kleist
- kpmg
- kyrgyzstan
- language
- languages
- laughter
- le monde
- left
- legal
- libya
- lifetracking
- links
- linux
- literature
- loathing
- logic
- love
- macedonia
- macleod
- manu chao
- maths
- media
- medieval
- meditation
- memes
- middle east
- military
- military-industrial complex
- minaretban
- mongodb
- mongols
- moods
- mplayer
- music
- My life
- mythologies
- names
- naomi klein
- networking
- new york times
- new yorker
- news
- nina power
- nobel
- northkorea
- nosql
- notes to self
- npa
- nuclear
- nytimes
- obama
- obituaries
- objects of emulation
- obsession
- obsessives
- open source
- opendata
- pakistan
- panic
- paris
- patches
- pedantry
- people
- phantom MEPs
- philosophy
- Places
- poetry
- Politics
- politics identity
- polls
- post-piracy
- productivity
- programming
- protest
- PS
- psychiatry
- psychology
- psytrance
- publishing
- pullman
- pundits
- pymongo
- pynchon
- python
- quickies
- rage
- range
- rants
- rebellion
- reference
- religion
- reviews
- rilke
- robert fisk
- romanticism
- Russia
- s3
- safety
- sans-papiers
- sanskrit
- sash
- satire
- saudi arabia
- scary
- science
- screen
- secrecy
- security
- self-tracking
- server
- sex
- sf
- shell
- shock doctrine
- simon reynolds
- snippets
- snippets html apache sysadmin
- socialism
- society
- South Asia
- space
- spain
- speed
- spiegel
- spirits
- statelogs
- statistics
- stats
- steampunk
- sterling
- stories
- storytelling
- street art
- stross
- stupidity
- supermarkets
- surveillance
- switzerland
- taxhavens optimism futurism world
- tech
- Technology
- telecom
- telegraph
- television
- terminology
- terrorism
- theatre
- thekids
- theory
- therapy
- tolkein
- too tired to think straight
- tools
- tragedy
- transparency
- tricks
- trivia
- trust
- tucholsky
- tudor
- tunisia
- turkey
- tw
- twilight
- ubuntu
- UK
- un
- Uncategorized
- Unclassified
- urbanism
- us
- USA
- video
- vim
- vim snippets
- vim tech quickies
- violence
- wang hui
- we're all screwed
- web
- webmontag
- weimar
- whimsy
- whitman
- why yes I am 13
- widows
- wikileaks
- words
- wordsworth
- workaholics
- world
- yak-shaving
- yorkshireranter
- youth
- zero books
- zsh