Ramkumar Ramachandra wrote:
> Junio C Hamano wrote:
>> Ramkumar Ramachandra writes:
>>
> + elif test "$autostash" = false
> + then
> require_clean_work_tree "pull with rebase" "Please commit
> or stash them."
> fi
A safety net, after you r
Junio C Hamano wrote:
> Ramkumar Ramachandra writes:
>
+ elif test "$autostash" = false
+ then
require_clean_work_tree "pull with rebase" "Please commit or
stash them."
fi
>>>
>>> A safety net, after you run "git stash", to validate that the
>>
Ramkumar Ramachandra writes:
>>> + elif test "$autostash" = false
>>> + then
>>> require_clean_work_tree "pull with rebase" "Please commit or
>>> stash them."
>>> fi
>>
>> A safety net, after you run "git stash", to validate that the
>> added "git stash" indeed made t
Junio C Hamano wrote:
> Ramkumar Ramachandra writes:
>
>> @@ -1786,6 +1786,11 @@ pull.rebase::
>> of merging the default branch from the default remote when "git
>> pull" is run. See "branch..rebase" for setting this on a
>> per-branch basis.
>> +
>> +pull.autostash::
>> + Wh
Ramkumar Ramachandra writes:
> @@ -1786,6 +1786,11 @@ pull.rebase::
> of merging the default branch from the default remote when "git
> pull" is run. See "branch..rebase" for setting this on a
> per-branch basis.
> +
> +pull.autostash::
> + When true, automatically stash all
This new configuration variable executes 'git stash' before attempting
to merge/rebase, and 'git stash pop' after a successful merge/rebase.
It makes it convenient for people to pull with dirty worktrees.
Signed-off-by: Ramkumar Ramachandra
---
Documentation/config.txt | 5
Documentation
6 matches
Mail list logo
