-
Notifications
You must be signed in to change notification settings - Fork 25.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
builtin/pull.c: use config value of autostash
A bug in pull.c causes merge and rebase functions to ignore rebase.autostash if it is only set in the config. Move autostash to be file scoped, and use it in merge and rebase functions. Co-authored-by: "Tillman Vogel" <tilman.vogel@web.de> Co-authored-by: "Philippe Blain" <levraiphilippeblain@gmail.com> Signed-Off-By: "John Cai" <johncai86@gmail.com>
- Loading branch information
1 parent
194610f
commit fd8964d
Showing
2 changed files
with
57 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters