summaryloggraphiclog1graphiclog2commitcommitdifftreerefseditfork
rawcombined (merge: cbcde15 e337860)
rawcombined (merge: cbcde15 e337860)
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Aug 2025 18:27:13 +0000 (1 11:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Aug 2025 18:27:14 +0000 (1 11:27 -0700) |
"git pull" learned to pay attention to pull.autostash configuration
variable, which overrides rebase/merge.autostash.
* ly/pull-autostash:
pull: add pull.autoStash config option
variable, which overrides rebase/merge.autostash.
* ly/pull-autostash:
pull: add pull.autoStash config option
| 1 | 2 | |||
|---|---|---|---|---|
| builtin/pull.c | patch | diff1 | diff2 | blobhistory |
diff --cc builtin/pull.c
Simple merge