diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:29 -0700 |
| commit | 2516b4711f6e180516162c384b7e94832e7189f6 (patch) | |
| tree | 313a9be8723be077ed423d32822bdc61d8c4132a /Documentation/merge-options.txt | |
| parent | Merge branch 'pw/rebase-i-keep-reword-after-conflict' (diff) | |
| parent | format-patch: clear UNINTERESTING flag before prepare_bases (diff) | |
| download | tgif-2516b4711f6e180516162c384b7e94832e7189f6.tar.xz | |
Merge branch 'xy/format-patch-prereq-patch-id-fix'
Recently added "--base" option to "git format-patch" command did
not correctly generate prereq patch ids.
* xy/format-patch-prereq-patch-id-fix:
format-patch: clear UNINTERESTING flag before prepare_bases
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions