Skip to content
Snippets Groups Projects
Select Git revision
  • v1.0rc3
  • passt default
  • master
  • pu
  • todo
  • next
  • maint
  • v2.8.0-rc1
  • v2.8.0-rc0
  • v2.7.2
  • v2.7.1
  • v2.7.0
  • v2.6.5
  • v2.7.0-rc3
  • v2.7.0-rc2
  • v2.7.0-rc1
  • v2.7.0-rc0
  • v2.6.4
  • v2.6.3
  • v2.6.2
  • v2.6.1
  • v2.3.10
  • v2.5.4
  • v2.4.10
  • v2.6.0
  • v2.6.0-rc3
  • v2.5.3
27 results

git-fmt-merge-msg.perl

  • Junio C Hamano's avatar
    05dd8e2e
    Fix default pull not to do an unintended Octopus. · 05dd8e2e
    Junio C Hamano authored
    
    The refspecs specified in the .git/remotes/<remote> on the "Pull: "
    lines are for fetching multiple heads in one go, but most of the time
    making an Octopus out of them is not what is wanted.  Make git-fetch
    leave the marker in .git/FETCH_HEAD file so that later stages can
    tell which heads are for merging and which are not.
    
    Tom Prince made me realize how stupid the original behaviour was.
    
    Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
    05dd8e2e
    History
    Fix default pull not to do an unintended Octopus.
    Junio C Hamano authored
    
    The refspecs specified in the .git/remotes/<remote> on the "Pull: "
    lines are for fetching multiple heads in one go, but most of the time
    making an Octopus out of them is not what is wanted.  Make git-fetch
    leave the marker in .git/FETCH_HEAD file so that later stages can
    tell which heads are for merging and which are not.
    
    Tom Prince made me realize how stupid the original behaviour was.
    
    Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>