diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-08-24 09:32:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-08-24 09:32:33 -0700 |
| commit | aaf0a421e2c8a71e2d804f359f4005320ed6d916 (patch) | |
| tree | 0a6f4d851ed79668f9825eeaddc5e4b3e9cd2ad6 /Documentation | |
| parent | 84d79009d98d68aa811a210fa980c91e195c716f (diff) | |
| parent | ac300bda10a137be06b7ac7c41452dbf8864f134 (diff) | |
| download | git-aaf0a421e2c8a71e2d804f359f4005320ed6d916.tar.xz | |
Merge branch 'mp/rebase-label-length-limit'
Overly long label names used in the sequencer machinery are now
chopped to fit under filesystem limitation.
* mp/rebase-label-length-limit:
rebase: allow overriding the maximal length of the generated labels
sequencer: truncate labels to accommodate loose refs
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/rebase.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt index afaf6dad99..9c248accec 100644 --- a/Documentation/config/rebase.txt +++ b/Documentation/config/rebase.txt @@ -77,3 +77,9 @@ rebase.rebaseMerges:: equivalent to `--no-rebase-merges`. Passing `--rebase-merges` on the command line, with or without an argument, overrides any `rebase.rebaseMerges` configuration. + +rebase.maxLabelLength:: + When generating label names from commit subjects, truncate the names to + this length. By default, the names are truncated to a little less than + `NAME_MAX` (to allow e.g. `.lock` files to be written for the + corresponding loose refs). |