diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-01-31 10:37:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-31 10:37:44 -0800 |
| commit | 09e0be130d83ceedb3653d9a41768c6a13457ac5 (patch) | |
| tree | 466600cb071233316506ff31a3e9966679fb2908 /Documentation/merge-options.txt | |
| parent | The first batch to start the current cycle (diff) | |
| parent | branch,checkout: fix --track documentation (diff) | |
| download | tgif-09e0be130d83ceedb3653d9a41768c6a13457ac5.tar.xz | |
Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules
* js/branch-track-inherit:
branch,checkout: fix --track documentation
branch,checkout: fix --track usage strings
config: require lowercase for branch.*.autosetupmerge
branch: add flags and config to inherit tracking
branch: accept multiple upstream branches for tracking
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions