Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Feb 13, 2012
  1. @torvalds @gitster

    "git pull" doesn't know "--edit"

    torvalds authored gitster committed
    Ok, so now "git merge" defaults to editing when interactive - lovely. But
    when testing that, I noticed that while you can say
    
       git merge --[no-]edit ..branch..
    
    that does not work with "git pull". You get a message like
    
      error: unknown option `no-edit'
      usage: git fetch [<options>] [<repository> [<refspec>...]]
         or: git fetch [<options>] <group>
         or: git fetch --multiple [<options>] [(<repository> | <group>)...]
         or: git fetch --all [<options>]
    
          -v, --verbose         be more verbose
          -q, --quiet           be more quiet
          --all                 fetch from all remotes
      ...
    
    which is because that stupid shell script doesn't know about the new
    flags, and just passes it to "git fetch" instead.
    
    Now, I really wanted to just make "git pull" a built-in instead of that
    nasty shell script, but I'm lazy. So here's the trivial updates to
    git-pull.sh to at least teach it about -e/--edit/--no-edit.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.