Re: [PATCH 4/6] rebase: --rewrite-{refs,heads,tags} to pull refs along with branch
On 11/18/2009 06:51 PM, Greg Price wrote:
Show 21 quoted lines
> diff --git a/git-rebase.sh b/git-rebase.sh
> index 1bfe6a8..7c365ab 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -38,6 +38,9 @@ git-rebase [-i] --continue | --abort | --skip
> v,verbose! display a diffstat of what changed upstream
> q,quiet! be quiet. implies --no-stat
> onto=! rebase onto given branch instead of upstream
> +rewrite-heads! rewrite intermediate heads on branch
> +rewrite-tags! rewrite intermediate tags on branch
> +rewrite-refs=! rewrite intermediate refs matching pattern
> p,preserve-merges! try to recreate merges instead of ignoring them
> s,strategy=! use the given merge strategy
> no-ff! cherry-pick all commits, even if unchanged
> @@ -96,6 +99,7 @@ state_dir=
> # One of {'', continue, skip, abort}, as parsed from command line
> action=
> preserve_merges=
> +rebase_refs=
> autosquash=
> test "$(git config --bool rebase.autosquash)" = "true" && autosquash=tI think you meant to spell that "rewrite_refs=" instead of "rebase_refs=".
Show 21 quoted lines
>
> @@ -246,6 +250,19 @@ do
> strategy="$1"
> do_merge=t
> ;;
> + --rewrite-refs)
> + shift
> + rewrite_refs="$rewrite_refs $1"
> + test -z "$interactive_rebase" && interactive_rebase=implied
> + ;;
> + --rewrite-heads)
> + rewrite_refs="$rewrite_refs refs/heads"
> + test -z "$interactive_rebase" && interactive_rebase=implied
> + ;;
> + --rewrite-tags)
> + rewrite_refs="$rewrite_refs refs/tags"
> + test -z "$interactive_rebase" && interactive_rebase=implied
> + ;;
> -n)
> diffstat=
> ;;
Then it matches the rest of the commit.
Phil