Create a git alias that will pull and fast-forward the current branch if there are no conflicts

git config --global --add alias.ff "pull --no-commit -v" ; git ff
This command will first add an alias known only to git, which will allow you to pull a remote and first-forward the current branch. However, if the remote/branch and your branch have diverged, it will stop before actually trying to merge the two, so you can back out the changes. http://www.kernel.org/pub/software/scm/git/docs/git-pull.html Tested on git 1.5.6.1, msysgit (Windows port) Actually this is not really the way I want it. I want it to attempt a fast-foward, but not attempt to merge or change my working copy. Unfortunately git pull doesn't have that functionality (yet?).
Sample Output
remote: Counting objects: 19, done.
remote: Compressing objects: 100% (13/13), done.
remote: Total 13 (delta 9), reused 0 (delta 0)
Unpacking objects: 100% (13/13), done.
From i:/rep/ap
   a8c4762..b7c6b0e  master     -> origin/master
Updating a8c4762..b7c6b0e
Fast forward
 piyo/smallscripts/{authkey.sh => authkey} |    0
 ssh/authkey.sh                            |   36 +++++++++++++++++------------
 2 files changed, 25 insertions(+), 15 deletions(-)  (truncated)

1
By: piyo
2009-02-13 15:30:46

What Others Think

I think what you actually want here is git pull --ff-only sadly it's not available yet, but will be soon: http://kerneltrap.org/index.php?q=mailarchive/git/2009/1/30/4853834
bartman · 720 weeks ago
Cool, thanks for the heads up. Now there's a reason to upgrade git!
piyo · 719 weeks and 6 days ago
Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir   Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir Seofox.ir
seofox · 54 weeks and 1 day ago
Pug Puppies for Sale Near Me pugs puppies for sale teacup pugs for sale pug puppies for sale by owner pug puppies ohio PUG PUPPY FOR SALE NEAR ME PUG PUPPIES FOR SALE pug puppies for sale in kentucky Pug Puppies for Sale Under $500 Near Me pug puppies for sale in texas pug puppies for sale $200 pugs for sale near me under $500 pugs for sale under $400 near me pugs for sale near me puppies for sale near me under $500 pug puppies for sale under $1,000 near me pug for sale pug puppies for sale under $300 Brindle Pug Pitbull Pug Mix Pugs for sale cheap Cheap pug affordable pug puppies for sale near me black pugs for sale near me White Pugs for sale pug dog for sale free pug puppies pug puppies for sale in my area mn pug breeders pug puppies indiana pugs for sale michigan PUG PUPPY ADOPTION Pug puppies for sale Pug puppies for sale near me Pug puppies near me Pug Puppies for Sale Under $500 Near Me Cute Pug Puppies Black pug puppies Black pug puppies for sale pug puppies for adoption black pug puppies for sale near me chihuahua pug mix puppies how much is a pug puppy teacup pug puppies baby pug puppies pictures of pug puppies pug puppies for sale in Ohio pug puppies price pug mix puppies teacup pug puppies for sale best food for pug puppy newborn pug puppies pug puppies craigslist pug puppies for sale craigslist adorable pug puppies how much does a pug puppy cost Pitbull pug mix puppies pug pit mix puppy pug puppies for sale $200 pug puppies for sale in NJ Pug puppies for sale in Wisconsin pug puppy cost pug puppy food royal canin pug puppy royal canin pug puppy food fawn pug puppy pug puppies for sale florida pug puppies for sale in Indiana pug puppies for sale in KY/A> pug puppies for sale in NC pug dog puppy AKC Registered Pug Puppies For sale cheap pug puppies for sale near me cheap pug puppies for sale in California cheap pug puppies for sale in nj Black Pug Puppies for sale pugs puppies for sale
AnthonyLewis9201 · 12 weeks and 5 days ago
Pug pups for sale are utterly gorgeous, affectionate, and intelligent. Excellent pedigrees, gorgeous coats, finely formed ears, a tight, curled tail, outstanding faces, and a superb conformation like their parents are all present in these puppies. The parents are both in wonderful health and are kind and devoted family members. They will arrive fully registered with the AKC, with pedigree papers, and with a one-year health guarantee. Pug Puppies for Sale Near Me pugs puppies for sale teacup pugs for sale pug puppies for sale by owner pug puppies ohio PUG PUPPY FOR SALE NEAR ME PUG PUPPIES FOR SALE pug puppies for sale in kentucky Pug Puppies for Sale Under $500 Near Me pug puppies for sale in texas pug puppies for sale $200 pugs for sale near me under $500 pugs for sale under $400 near me pugs for sale near me puppies for sale near me under $500 pug puppies for sale under $1,000 near me pug for sale pug puppies for sale under $300 Brindle Pug Pitbull Pug Mix Pugs for sale cheap Cheap pug affordable pug puppies for sale near me black pugs for sale near me White Pugs for sale pug dog for sale free pug puppies pug puppies for sale in my area mn pug breeders pug puppies indiana pugs for sale michigan PUG PUPPY ADOPTION Pug puppies for sale Pug puppies for sale near me Pug puppies near me Pug Puppies for Sale Under $500 Near Me Cute Pug Puppies Black pug puppies Black pug puppies for sale pug puppies for adoption black pug puppies for sale near me chihuahua pug mix puppies how much is a pug puppy teacup pug puppies baby pug puppies pictures of pug puppies pug puppies for sale in Ohio pug puppies price pug mix puppies teacup pug puppies for sale best food for pug puppy newborn pug puppies pug puppies craigslist pug puppies for sale craigslist adorable pug puppies how much does a pug puppy cost Pitbull pug mix puppies pug pit mix puppy pug puppies for sale $200 pug puppies for sale in NJ Pug puppies for sale in Wisconsin pug puppy cost pug puppy food royal canin pug puppy royal canin pug puppy food fawn pug puppy pug puppies for sale florida pug puppies for sale in Indiana pug puppies for sale in KY pug puppies for sale in NC pug dog puppy AKC Registered Pug Puppies For sale cheap pug puppies for sale near me cheap pug puppies for sale in California cheap pug puppies for sale in nj Black Pug Puppies for sale pugs puppies for sale
ExcellentHome · 11 weeks ago
Since 2008, Perfect House Pug Puppies has been the leading Pug puppy breeder in the US, providing premium Pug puppies for sale. Each puppy exhibits the professionalism and knowledge that have set Perfect House Pug puppies apart from other pug puppy breeders. The professionals at Perfect House Pug Puppies are dedicated about finding their puppies loving, beloved homes where they can enjoy long, healthy lives. A companion that has been produced for quality, health, and temperament that satisfies the breed standard is guaranteed by Perfect House Pug puppies, the pug breeder that has set the benchmark for exceptional customer satisfaction. If you are looking to buy a baby pug, Black and white pugs, Mini pug puppies for sale, Black and tan pug for sale, Teacup pug puppies for sale, Female pug puppies, pug puppies for sale, pug puppies for sale near me, pug puppies for sale under $500 near me. Pug Puppies for Sale Near Me pugs puppies for sale teacup pugs for sale pug puppies for sale by owner pug puppies ohio PUG PUPPY FOR SALE NEAR ME PUG PUPPIES FOR SALE pug puppies for sale in kentucky Pug Puppies for Sale Under $500 Near Me pug puppies for sale in texas pug puppies for sale $200 pugs for sale near me under $500 pugs for sale under $400 near me pugs for sale near me puppies for sale near me under $500 pug puppies for sale under $1,000 near me pug for sale pug puppies for sale under $300 Brindle Pug Pitbull Pug Mix Pugs for sale cheap Cheap pug affordable pug puppies for sale near me black pugs for sale near me White Pugs for sale pug dog for sale free pug puppies pug puppies for sale in my area mn pug breeders pug puppies indiana pugs for sale michigan PUG PUPPY ADOPTION Pug puppies for sale Pug puppies for sale near me Pug puppies near me Pug Puppies for Sale Under $500 Near Me Cute Pug Puppies Black pug puppies Black pug puppies for sale pug puppies for adoption black pug puppies for sale near me chihuahua pug mix puppies how much is a pug puppy teacup pug puppies baby pug puppies baby pug puppies for sale pictures of pug puppies pug puppies for sale in Ohio pug puppies price pug mix puppies teacup pug puppies for sale best food for pug puppy newborn pug puppies pug puppies craigslist pug puppies for sale craigslist adorable pug puppies how much does a pug puppy cost Pitbull pug mix puppies pug pit mix puppy pug puppies for sale $200 pug puppies for sale in NJ Pug puppies for sale in Wisconsin pug puppy cost pug puppy food royal canin pug puppy royal canin pug puppy food fawn pug puppy pug puppies for sale florida pug puppies for sale in Indiana pug puppies for sale in KY pug puppies for sale in NC pug dog puppy AKC Registered Pug Puppies For sale cheap pug puppies for sale near me cheap pug puppies for sale in California cheap pug puppies for sale in nj Black Pug Puppies for sale pugs puppies for sale
Perfecthomepugs · 4 weeks and 2 days ago

What do you think?

Any thoughts on this command? Does it work on your machine? Can you do the same thing with only 14 characters?

You must be signed in to comment.

What's this?

commandlinefu.com is the place to record those command-line gems that you return to again and again. That way others can gain from your CLI wisdom and you from theirs too. All commands can be commented on, discussed and voted up or down.

Share Your Commands



Stay in the loop…

Follow the Tweets.

Every new command is wrapped in a tweet and posted to Twitter. Following the stream is a great way of staying abreast of the latest commands. For the more discerning, there are Twitter accounts for commands that get a minimum of 3 and 10 votes - that way only the great commands get tweeted.

» http://twitter.com/commandlinefu
» http://twitter.com/commandlinefu3
» http://twitter.com/commandlinefu10

Subscribe to the feeds.

Use your favourite RSS aggregator to stay in touch with the latest commands. There are feeds mirroring the 3 Twitter streams as well as for virtually every other subset (users, tags, functions,…):

Subscribe to the feed for: