non port: devel/git-absorb/Makefile |
Number of commits found: 80 |
Tuesday, 10 Sep 2024
|
11:00 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.81.0
PR: 281300
89ab81d |
10:58 Mikael Urankar (mikael) Author: Siva Mahadevan
*/*: remove STRIP_CMD calls in rust based ports
This is not needed after bc4fedc1fec0d359365c04d43be9e32bf101a50e
PR: 246993
Differential Revision: https://reviews.freebsd.org/D46503
c0d07f1 |
Monday, 26 Aug 2024
|
08:08 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.80.1
PR: 280490
7a55f95 |
Monday, 8 Jul 2024
|
09:00 Nuno Teixeira (eduardo)
devel/git-absorb: Update to 0.6.15
- Pet Q/A check: remove unneeded lib dependency
- Install manual page
ChangeLog: https://github.com/tummychow/git-absorb/compare/0.6.13...0.6.15
ba6a935d |
Tuesday, 18 Jun 2024
|
10:59 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.79.0
PR: 279707
21476ca |
Monday, 13 May 2024
|
11:03 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.78.0
PR: 278834
2322b66 |
Thursday, 4 Apr 2024
|
14:17 Nuno Teixeira (eduardo)
devel/git-absorb: Update to 0.6.13
- Remove powerpc patch as it is included in libc-0.2.153 crate.
ChangeLog: https://github.com/tummychow/git-absorb/compare/0.6.12...0.6.13
1979410 |
Saturday, 23 Mar 2024
|
09:41 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.77.0
PR: 277786
d632fbe |
Saturday, 24 Feb 2024
|
10:42 Nuno Teixeira (eduardo)
devel/git-absorb: Update to 0.6.12
ChangeLog: https://github.com/tummychow/git-absorb/compare/0.6.11...0.6.12
31bd6d3 |
Monday, 19 Feb 2024
|
11:59 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.76.0
PR: 276920
7f5a7b0 |
Tuesday, 9 Jan 2024
|
12:15 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.75.0
PR: 276033
109c3d4 |
Friday, 8 Dec 2023
|
15:04 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.74.1
PR: 275243
b2afd89 |
Thursday, 30 Nov 2023
|
13:39 Nuno Teixeira (eduardo)
devel/git-absorb: Update to 0.6.11
ChangeLog: https://github.com/tummychow/git-absorb/compare/0.6.10...0.6.11
d324a50 |
Monday, 13 Nov 2023
|
13:10 Matthias Fechner (mfechner)
devel/libgit2: bump all ports depending on libgit2 for 1.7.1 upgrade
1bb0876 |
Tuesday, 24 Oct 2023
|
10:22 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.73.0
PR: 274499
dd10dc8 |
Friday, 8 Sep 2023
|
13:50 Matthias Fechner (mfechner)
Bump ports with dependency to libgit2
See f11ed41604723ab3c75c6a108850858b7efd4f10
482248a |
09:06 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.72.0
PR: 273331
aba8da2 |
Monday, 17 Jul 2023
|
15:58 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.71.0
PR: 272449
cdf2861 |
Friday, 9 Jun 2023
|
11:38 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.70.0
PR: 271797
e1d1045 |
Sunday, 23 Apr 2023
|
13:14 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.69.0
PR: 270953
3db55c4 |
Friday, 7 Apr 2023
|
10:30 Nuno Teixeira (eduardo)
devel/git-absorb: Update to 0.6.10
ChangeLog: https://github.com/tummychow/git-absorb/compare/0.6.9...0.6.10
980b208 |
Thursday, 16 Mar 2023
|
11:11 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.68.0
PR: 270080
ebf29ac |
Monday, 13 Feb 2023
|
14:52 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.67.1
PR: 269336
109e35f |
Saturday, 7 Jan 2023
|
19:24 Daniel Engberg (diizzy)
*/*: Bump rust (cargo) ports to reflect on WITH_LTO
Bump ports in tree so they get rebuilt with new default settings
for cargo ports
12f1c62 |
Tuesday, 20 Dec 2022
|
17:37 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.66.0
PR: 268415
ba14e01 |
Saturday, 19 Nov 2022
|
15:21 Nuno Teixeira (eduardo)
devel/git-absorb: Adopt/Update to 0.6.9
ChangeLog: https://github.com/tummychow/git-absorb/compare/0.6.6...0.6.9
24332da |
Thursday, 17 Nov 2022
|
07:06 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.65.0
PR: 267622
9bf6a99 |
Sunday, 30 Oct 2022
|
12:07 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.64.0
PR: 267173
afe651c |
Sunday, 9 Oct 2022
|
11:56 Fernando Apesteguía (fernape)
*/*: Release ports from maintainership
Maintainer releases all his ports.
PR: 266871
Reported by: unrelentingtech <greg@unrelenting.technology>
f57221a |
Wednesday, 7 Sep 2022
|
21:10 Stefan Eßer (se)
Add WWW entries to port Makefiles
It has been common practice to have one or more URLs at the end of the
ports' pkg-descr files, one per line and prefixed with "WWW:". These
URLs should point at a project website or other relevant resources.
Access to these URLs required processing of the pkg-descr files, and
they have often become stale over time. If more than one such URL was
present in a pkg-descr file, only the first one was tarnsfered into
the port INDEX, but for many ports only the last line did contain the
port specific URL to further information.
There have been several proposals to make a project URL available as
a macro in the ports' Makefiles, over time.
This commit implements such a proposal and moves one of the WWW: entries
of each pkg-descr file into the respective port's Makefile. A heuristic
attempts to identify the most relevant URL in case there is more than
one WWW: entry in some pkg-descr file. URLs that are not moved into the
Makefile are prefixed with "See also:" instead of "WWW:" in the pkg-descr
files in order to preserve them.
There are 1256 ports that had no WWW: entries in pkg-descr files. These
ports will not be touched in this commit.
The portlint port has been adjusted to expect a WWW entry in each port
Makefile, and to flag any remaining "WWW:" lines in pkg-descr files as
deprecated.
Approved by: portmgr (tcberner)
b7f0544 |
Thursday, 25 Aug 2022
|
14:49 Baptiste Daroussin (bapt)
rust: bring back update to 1.63
Revert back the revert of the update of rust and related commits
This revert was drive by beside validation by portmgr via exp-run
and not respectful of the etiquette we have between committers
This reverts commit 8ecb1f8141144c1603eb4026122d2e60eeaccd64.
This reverts commit 04d257baa182926cff158f32cf459e560426add0.
This reverts commit 2757c63bd0e6d01f9f0657fe03bb3a7b49adcae2.
This reverts commit 75f4713de5e3fbd1c6a0cb572e08121814a4072e.
This reverts commit e88e592111c86fdd1c0ac8717dbef9342e15e27c.
This reverts commit 783c056d7d681d66e2c5c59251c275d65274028e.
With hat: portmgr
b9b250f |
10:49 Piotr Kubaj (pkubaj)
Revert "lang/rust: Bump revisions after 1.63.0"
This reverts commit c7912d97754bb7aa9a18eb33df53f91cba4cd82d.
PR: 265915
783c056 |
08:51 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.63.0
c7912d9 |
Saturday, 2 Jul 2022
|
13:47 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.62.0
a50372b |
Tuesday, 31 May 2022
|
13:06 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.61.0
e9a35a1c |
Tuesday, 3 May 2022
|
08:00 Tobias Kortkamp (tobik)
lang/rust: Relink ports after the Rust 1.60.0 update
57c3caa |
Tuesday, 15 Mar 2022
|
09:51 Mikael Urankar (mikael)
lang/rust: Bump revisions after 1.59.0
e255ac5 |
Thursday, 3 Feb 2022
|
14:02 Tobias Kortkamp (tobik)
lang/rust: Relink consumers
PR: 261449
Security: ee26f513-826e-11ec-8be6-d4c9ef517024
d64a2a3 |
Monday, 17 Jan 2022
|
11:57 Tobias Kortkamp (tobik)
lang/rust: Bump revisions after 1.58.0
835bd57 |
Sunday, 5 Dec 2021
|
12:35 Tobias Kortkamp (tobik)
lang/rust: Rebuild consumers for Rust 1.57.0
5a7f23c |
Saturday, 4 Dec 2021
|
12:07 Matthias Fechner (mfechner)
*/*: bump ports depending on libgit2
83af587 |
Monday, 22 Nov 2021
|
19:54 Neel Chauhan (nc) Author: Evgeniy Khramtsov
devel/git-absorb: update to 0.6.6
Approved by: Greg V <greg@unrelenting.technology> (maintainer)
Changes: https://github.com/tummychow/git-absorb/compare/0.5.0..0.6.6
PR: 259681
4cde87e |
Monday, 25 Oct 2021
|
08:55 Tobias Kortkamp (tobik)
*: Rebuild for Rust 1.56.0
ad90fc6 |
Sunday, 19 Sep 2021
|
09:03 Tobias Kortkamp (tobik)
*: Rebuild lang/rust consumers after the 1.55.0 update
7059b43 |
Saturday, 28 Aug 2021
|
13:42 Mikael Urankar (mikael)
lang/rust: Rebuild consumers for 1.54.0
70f1b06 |
Sunday, 27 Jun 2021
|
05:39 Tobias Kortkamp (tobik)
lang/rust: Rebuild consumers for 1.53.0
06dbc12 |
Tuesday, 11 May 2021
|
18:33 Tobias Kortkamp (tobik)
Rebuild lang/rust consumers after d8837418ea743776
28e7a93 |
Wednesday, 7 Apr 2021
|
08:09 Mathieu Arnold (mat)
One more small cleanup, forgotten yesterday.
Reported by: lwhsu
cf118cc |
Tuesday, 6 Apr 2021
|
14:31 Mathieu Arnold (mat)
Remove # $FreeBSD$ from Makefiles.
305f148 |
07:51 Matthias Fechner (mfechner)
Update libgit2 to 1.1.0.
This update is also required for www/gitlab-ce 13.10 upgrade.
Changelog:
https://github.com/libgit2/libgit2/releases/tag/v1.1.0
PR: 252098
e7d94d4 |
Monday, 29 Mar 2021
|
18:10 tobik
Rebuild lang/rust consumers after r569489
|
Sunday, 14 Feb 2021
|
15:45 mikael
lang/rust: Update to 1.50.0
- Use bundled libgit/libssh, the versions in ports are too old
- Update lang/rust-nightly to 2021-02-12
- Update devel/racer to 2.1.41
- Import upstream patch to fix build issue for Firefox and related ports
(https://bugzilla.mozilla.org/show_bug.cgi?id=1684261)
Changes: https://github.com/rust-lang/rust/releases/tag/1.50.0
Tested by: mikael, pkubaj
Differential Revision: https://reviews.freebsd.org/D28616
|
Wednesday, 6 Jan 2021
|
10:13 mikael
lang/rust: Update to 1.49.0
Changes: https://github.com/rust-lang/rust/releases/tag/1.49.0
Tested by: mikael, pkubaj
Differential Revision: https://reviews.freebsd.org/D27940
|
Tuesday, 24 Nov 2020
|
12:48 mikael
lang/rust: Update to 1.48.0
Changes: https://github.com/rust-lang/rust/releases/tag/1.48.0
Reviewed by: jbeich
Tested by: bdragon, jbeich, mikael
Differential Revision: https://reviews.freebsd.org/D27293
|
Tuesday, 13 Oct 2020
|
08:36 mikael
lang/rust: Update to 1.47.0
- Add powerpc64le arch (submitted by bdragon in D26711)
- Disable DOCS, same problem fixed in r546048
- Update devel/racer to 2.1.36
- Import upstream patch to fix www/firefox
(https://hg.mozilla.org/integration/autoland/rev/e2cede25c027)
- Import gentoo patches to fix www/firefox-esr, www/cliqz and mail/thunderbird
(https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-esr-78-patches-03.tar.xz
: 0036, 0037 and 0038)
- Force rebuild all consumers to catch regressions
Changelog:
https://github.com/rust-lang/rust/releases/tag/1.47.0
Differential Revision: https://reviews.freebsd.org/D26721
|
Sunday, 30 Aug 2020
|
18:36 tobik
lang/rust: Update to 1.46.0
- Force rebuild all consumers to catch regressions early
Changes: https://blog.rust-lang.org/2020/08/27/Rust-1.46.0.html
With hat: rust
Differential Revision: https://reviews.freebsd.org/D26176
|
Monday, 3 Aug 2020
|
15:18 tobik
lang/rust: Update to 1.45.2
Changes: https://blog.rust-lang.org/2020/08/03/Rust-1.45.2.html
|
Thursday, 30 Jul 2020
|
18:26 tobik
lang/rust: Update to 1.45.1
- Apply the "hard links break `env::current_exe()`" workaround from
r543251 to lang/rust too
- Force rebuild all consumers for the soundness bug in 1.45.0
Changes: https://blog.rust-lang.org/2020/07/30/Rust-1.45.1.html
With hat: rust
Differential Revision: https://reviews.freebsd.org/D25835
|
Friday, 17 Jul 2020
|
06:44 tobik
lang/rust: Update to 1.45.0
- This Rust release comes with LLVM 10. Drop the LLVM patches we
no longer need.
- On FreeBSD 13.0 powerpc64 set the elfv2 ABI explicitly in the
Rust target instead of patching LLVM.
- Build LLVM with Ninja. It can shorten the build time slightly.
- Force rebuild all consumers to catch regressions early
Changes: https://blog.rust-lang.org/2020/07/16/Rust-1.45.0.html
Tested by: mikael, pkubaj, tobik
With hat: rust
Differential Revision: https://reviews.freebsd.org/D25658
|
Thursday, 4 Jun 2020
|
18:08 tobik
lang/rust: Update to 1.44.0
- Remove devel/cargo-tree since it is now integrated into cargo
- Add patch to fix build with LibreSSL 3.1.x and 3.2.0 [1]
- Force rebuild all consumers to catch regressions early
Changes: https://blog.rust-lang.org/2020/06/04/Rust-1.44.0.html
PR: 246332 [1]
Tested by: mikael, tobik
With hat: rust
Differential Revision: https://reviews.freebsd.org/D25099
|
Thursday, 23 Apr 2020
|
15:32 tobik
lang/rust: Update to 1.43.0
- Add workaround to fix build when CC/CXX have "clang" in them [1]
- Respect AR to fix build with external toolchains [2]
- Force rebuild all consumers to catch regressions early
Changes: https://blog.rust-lang.org/2020/04/23/Rust-1.43.0.html
PR: 238556 [1], 245583 [2]
Reported by: Matthias Apitz <guru@unixarea.de> [1], Greg V
<greg@unrelenting.technology> [2]
Tested by: mikael, pkubaj, tobik
With hat: rust
Differential Revision: https://reviews.freebsd.org/D24521
|
Sunday, 19 Apr 2020
|
03:55 tobik
devel/libgit2: Update to 1.0.0
Changes: https://github.com/libgit2/libgit2/releases/tag/v1.0.0
ABI: https://abi-laboratory.pro/tracker/timeline/libgit2
Approved by: mfechner (maintainer)
Differential Revision: https://reviews.freebsd.org/D24471
|
Thursday, 19 Mar 2020
|
05:47 tobik
devel/libgit2: Update to 0.99.0
- Switch to the release tarballs libgit2 now publishes
- Drop CURL option since it is no longer used
- Use system libpcre instead of the bundled one
- Hook up tests
- Bump consumers for ABI changes
Changes: https://github.com/libgit2/libgit2/releases/tag/v0.99.0
ABI: https://abi-laboratory.pro/tracker/timeline/libgit2/
|
Thursday, 12 Mar 2020
|
19:39 tobik
lang/rust: Update to 1.42.0
- Force rebuild all consumers to catch regressions early
Changes: https://blog.rust-lang.org/2020/03/12/Rust-1.42.html
Tested by: mikael, tobik
With hat: rust
Differential Revision: https://reviews.freebsd.org/D24020
|
Thursday, 27 Feb 2020
|
15:22 tobik
lang/rust: Update to 1.41.1
- Force rebuild all consumers to fix potential miscompilations with
1.41.0
- Enable SOURCES by default. The sources are indexed by RLS and
required for it to function properly, so they should be available
by default. This also makes sure we test the option properly.
- Remove implied --config=config.toml from x.py args
- Switch to the upstreamed backtrace crate patches like rust-nightly
- Enable WASM by default [0]
- Strip libraries (D23650) [1]
- Simplify plist generation (D23735) [2]
Changes: https://blog.rust-lang.org/2020/02/27/Rust-1.41.1.html
Submitted by: mikael [0,1,2]
With hat: rust
Differential Revision: https://reviews.freebsd.org/D23835
|
Thursday, 30 Jan 2020
|
20:00 tobik
lang/rust: Update to 1.41.0
- Force rebuild all consumers to catch regressions early
- Switch to cross-compiled (from amd64) bootstraps for all
architectures generated with the incoming lang/rust-bootstrap
- Update cargo-c to 0.5.2 to unbreak librav1e build
- Make use of regular MAKE_ENV/TEST_ENV in lang/rust
- Turn on RUST_BACKTRACE in lang/rust and USES=cargo to hopefully
produce more useful failure logs when something panics during
builds
Changes: https://blog.rust-lang.org/2020/01/30/Rust-1.41.0.html
Tested by: mikael, tobik
With hat: rust
Differential Revision: https://reviews.freebsd.org/D23385
|
Thursday, 19 Dec 2019
|
16:14 tobik
lang/rust: Update to 1.40.0
- Force rebuild all consumers to catch regressions early
Thanks to Mikael Urankar for providing updated bootstraps for
aarch64, armv6, armv7, powerpc64.
Changes: https://blog.rust-lang.org/2019/12/19/Rust-1.40.0.html
Tested by: mikael.urankar@gmail.com, tobik
With hat: rust
Differential Revision: https://reviews.freebsd.org/D22843
|
Thursday, 7 Nov 2019
|
18:07 tobik
lang/rust: Update to 1.39.0
- Force rebuild all consumers to catch regressions early
- Partially apply D20792 in preparation for PPC_ABI support
- Add LibreSSL 3.0.x support [1]
Thanks to Mikael Urankar for providing updated bootstraps for
aarch64, armv6, armv7, powerpc64.
Changes: https://blog.rust-lang.org/2019/11/07/Rust-1.39.0.html
PR: 241411 [1]
Tested by: mikael.urankar@gmail.com, tobik
With hat: rust
Differential Revision: https://reviews.freebsd.org/D22240
|
Friday, 27 Sep 2019
|
09:35 tobik
lang/rust: Update to 1.38.0
- Force rebuild all consumers to catch regressions early
Thanks to Mikael Urankar for providing updated bootstraps for
aarch64, armv6, armv7, powerpc64.
Changes: https://blog.rust-lang.org/2019/09/26/Rust-1.38.0.html
Tested by: jbeich, mikael.urankar@gmail.com, tobik
With hat: rust
Differential Revision: https://reviews.freebsd.org/D21778
|
Thursday, 15 Aug 2019
|
14:30 tobik
lang/rust: Update to 1.37.0
- Force rebuild all consumers to catch regressions early
Thanks to Mikael Urankar for providing updated bootstraps for
aarch64, armv6, armv7, powerpc64.
Changes: https://blog.rust-lang.org/2019/08/15/Rust-1.37.0.html
Tested by: jbeich, tobik, greg@unrelenting.technology (aarch64)
With hat: rust
Differential Revision: https://reviews.freebsd.org/D21247
|
Monday, 12 Aug 2019
|
13:57 mat
Update to 0.5.0.
PR: 239778
Submitted by: mat
Reviewed by: maintainer
|
Thursday, 4 Jul 2019
|
14:41 tobik
lang/rust: Update to 1.36.0
- Force rebuild all consumers to catch regressions early
Thanks to Mikael Urankar for providing updated bootstraps for
aarch64, armv6, armv7, powerpc64.
Changes: https://blog.rust-lang.org/2019/07/04/Rust-1.36.0.html
Tested by: jbeich, mikael.urankar@gmail.com
With hat: rust
Differential Revision: https://reviews.freebsd.org/D20810
|
Friday, 24 May 2019
|
03:25 tobik
lang/rust: Update to 1.35.0
- Force rebuild all consumers to catch regressions early
Thanks to Mikael Urankar for providing updated bootstraps for
aarch64, armv6, armv7, powerpc64.
Changes: https://blog.rust-lang.org/2019/05/23/Rust-1.35.0.html
Reviewed by: jbeich
Tested by: pkubaj (powerpc64), mikael.urankar@gmail.com (aarch64)
With hat: rust
Differential Revision: https://reviews.freebsd.org/D20332
|
Wednesday, 15 May 2019
|
03:12 tobik
lang/rust: Update to 1.34.2
- While here add patches from [1] for LibreSSL 2.9.1 support
[1] https://github.com/sfackler/rust-openssl/pull/1097
Changes: https://blog.rust-lang.org/2019/05/13/Security-advisory.html
Changes: https://blog.rust-lang.org/2019/05/14/Rust-1.34.2.html
PR: 237495 [1]
Security: 37528379-76a8-11e9-a4fd-00012e582166
|
Wednesday, 17 Apr 2019
|
07:33 tobik
Mk/Uses/cargo.mk: Push lib dependencies back down into ports
Some crates are optional via Cargo features or are only used during
tests, however the framework has no way to discriminate between
test or run dependencies using just CARGO_CRATES leading to more
run dependencies than necessary for some packages. With more ported
Rust applications it's time to let individual ports make that
decision now.
The environmental setup to use dependencies from ports instead of
bundled ones and implied build dependencies (cmake, gmake, pkgconf)
are left in place for now.
Assign cargo.mk to rust@ while here.
|
Thursday, 11 Apr 2019
|
19:39 tobik
lang/rust: Update to 1.34.0
- Update devel/racer to latest version that can build with 1.34.0
- Drop no longer needed patch from textproc/ripgrep
- Force rebuild all consumers to catch regressions early
Thanks to Mikael Urankar for providing updated bootstraps for
aarch64, armv6, armv7, powerpc64.
Changes: https://blog.rust-lang.org/2019/04/11/Rust-1.34.0.html
Reviewed by: jbeich
With hat: rust
Differential Revision: https://reviews.freebsd.org/D19850
|
Thursday, 28 Mar 2019
|
09:43 mfechner
Bump revision to use new libgit2 version 0.28.1.
Reported by: jbeich
|
Thursday, 28 Feb 2019
|
18:51 jbeich
lang/rust: update to 1.33.0
- www/firefox temporarily loses SIMD in charset conversion, see
https://bugzilla.mozilla.org/show_bug.cgi?id=1521249
- Force rebuild all consumers to catch regressions early
Changes: https://blog.rust-lang.org/2019/02/28/Rust-1.33.0.html
Tested by: Mikael Urankar (aarch64, armv6, armv7, powerpc64), Piotr Kubaj
(powerpc64)
Approved by: rust (tobik)
Differential Revision: https://reviews.freebsd.org/D19354
|
18:47 jbeich
USES=cargo to update libc to 0.2.49 for Tier2
PR: 235063
Differential Revision: https://reviews.freebsd.org/D19309
|
Saturday, 9 Feb 2019
|
09:20 tcberner
New port: devel/git-absorb: Git command for automating fixup/autosquash commits
You have a feature branch with a few commits. Your teammate reviewed the branch
and pointed out a few bugs. You have fixes for the bugs, but you don't want to
shove them all into an opaque commit that says fixes, because you believe in
atomic commits. Instead of manually finding commit SHAs for git commit --fixup,
or running a manual interactive rebase, do this:
> git add $FILES_YOU_FIXED
> git absorb
> git rebase -i --autosquash master
git absorb will automatically identify which commits are safe to modify, and
which indexed changes belong to each of those commits. It will then write
fixup! commits for each of those changes. You can check its output manually if
you don't trust it, and then fold the fixups into your feature branch with
git's built-in autosquash functionality.
PR: 235436
Submitted by: Greg V <greg@unrelenting.technology>
|
Number of commits found: 80 |