Lines Matching +full:one +full:- +full:to +full:- +full:one

3 FreeBSD imports awk from the one true awk github project. This is the blessed
4 successor to Brian Kernighan's efforts to maintain awk after he left Lucent.
8 We also track the bsd-features branch. This is a branch that takes the
9 traditional one true awk and adds features that the BSD projects have added over
14 (1) Create a work tree for the vendor/one-true-awk branch
15 	% cd freebsd-main
16 	% git worktree create ../ota vendor/one-true-awk
19 	% git pull --rebase
20 	% git branch --show-current
21 	bsd-features
22 	% git show-ref HEAD
24 (3) Copy that to the vendor branch and push upstream
25 	% rm -rf ../ota/*	# trailing /* is important
26 	% cp -a * ../ota
29 	% git commit -m"Import awk YYYYMMDD hash f9affa922c5e" # 12 places
30 	% git commit --amend
32 	% diff -ur ../awk .
33 	# Sanity check to make sure it looks good. The vendor branch should
35 	# again (for a while we were importing submitted patches to the
37 	% git tag -a -s vendor/one-true-awk/f9affa92		# 8 places
39 	% git push --follow-tags freebsd vendor/one-true-awk
41 	% git subtree merge -P contrib/one-true-awk vendor/one-true-awk
43 	# Be sure to use the same or similar commit message as you did for
44 	# the import. If you import multiple versions before merging to head
45 	# you may need to combine the messages. Also, if there's more than
46 	# a screen of changes, you may want to abstract them down into an
47 	# easy to digest summary.
56 (5) Oops, lost the race to push while testing, the following will rebase things
58 	% git rebase --rebase-merges -i freebsd/main