Re: [PATCH v7 2/3] submodule update: add --remote for submodule's upstream changes

2012-12-12 Thread Phil Hord
Thanks for looking after this. On Tue, Dec 11, 2012 at 1:58 PM, W. Trevor King wk...@tremily.us wrote: From: W. Trevor King wk...@tremily.us The current `update` command incorporates the superproject's gitlinked SHA-1 ($sha1) into the submodule HEAD ($subsha1). Depending on the options you

Re: [PATCH v7 2/3] submodule update: add --remote for submodule's upstream changes

2012-12-12 Thread Junio C Hamano
Phil Hord phil.h...@gmail.com writes: + if test -n $remote + then + if test -z $nofetch + then + # Fetch remote before determining tracking $sha1 +

Re: [PATCH v7 2/3] submodule update: add --remote for submodule's upstream changes

2012-12-12 Thread W. Trevor King
On Wed, Dec 12, 2012 at 12:43:23PM -0500, Phil Hord wrote: On Tue, Dec 11, 2012 at 1:58 PM, W. Trevor King wk...@tremily.us wrote: diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt … +--remote:: [snip some --remote documentation] +In order to ensure a

[PATCH v7 2/3] submodule update: add --remote for submodule's upstream changes

2012-12-11 Thread W. Trevor King
From: W. Trevor King wk...@tremily.us The current `update` command incorporates the superproject's gitlinked SHA-1 ($sha1) into the submodule HEAD ($subsha1). Depending on the options you use, it may checkout $sha1, rebase the $subsha1 onto $sha1, or merge $sha1 into $subsha1. This helps you