From 113807f27c34ed2694f3e437a6c472e0bca0bc53 Mon Sep 17 00:00:00 2001 From: anonymous Date: Mon, 17 Oct 2022 21:39:51 +0800 Subject: [PATCH 01/25] Feat squash (#5) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✅ Create readme.md + Update readme.md + Update readme.md --- src/readme.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/readme.md diff --git a/src/readme.md b/src/readme.md new file mode 100644 index 0000000..6fb4398 --- /dev/null +++ b/src/readme.md @@ -0,0 +1,5 @@ +# git merge + +## git squash + +### git rebase From 2e4926ff2dda9fe6c21bff4935dd864da5747f88 Mon Sep 17 00:00:00 2001 From: anonymous Date: Mon, 17 Oct 2022 16:49:41 +0800 Subject: [PATCH 02/25] Create index.ts --- test/index.ts | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 test/index.ts diff --git a/test/index.ts b/test/index.ts new file mode 100644 index 0000000..126a031 --- /dev/null +++ b/test/index.ts @@ -0,0 +1,2 @@ +# typescript test + From 149976fcb647ee3f4d02460102fa6d34d861d9d8 Mon Sep 17 00:00:00 2001 From: anonymous Date: Mon, 17 Oct 2022 16:52:37 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E6=98=A0=E5=B0=84=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/index.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/index.ts b/test/index.ts index 126a031..bce944b 100644 --- a/test/index.ts +++ b/test/index.ts @@ -1,2 +1,7 @@ -# typescript test +// typescript test + +// 映射类型 +type Record = { + [P in K]: T; +} From d44b33bd360cdf697c14bb2d6c0669b287583f79 Mon Sep 17 00:00:00 2001 From: anonymous Date: Mon, 17 Oct 2022 16:52:45 +0800 Subject: [PATCH 04/25] Update index.ts --- test/index.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/index.ts b/test/index.ts index bce944b..fdd4c0a 100644 --- a/test/index.ts +++ b/test/index.ts @@ -5,3 +5,7 @@ type Record = { [P in K]: T; } + +// keyof +// in +// Record From 5e7cab79bf87089fc84c9e24929b5d60073e594b Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Mon, 17 Oct 2022 23:31:57 +0800 Subject: [PATCH 05/25] git workflow --- git workflow/readme.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 git workflow/readme.md diff --git a/git workflow/readme.md b/git workflow/readme.md new file mode 100644 index 0000000..c2abd68 --- /dev/null +++ b/git workflow/readme.md @@ -0,0 +1,34 @@ +# git workflow + + +2.1 集中式工作流 ❌ + +2.2 功能分支工作流 👎 + +2.3 `Gitflow 工作流` ✅ + +2.4 Forking 工作流 ❓ + + +https://github.com/xirong/my-git/blob/master/git-workflow-tutorial.md#23-gitflow%E5%B7%A5%E4%BD%9C%E6%B5%81 + +master / develop, 维护 + +![](https://img2022.cnblogs.com/blog/740516/202210/740516-20221017232303551-1290743520.png) + +develop / features， 开发 +![](https://img2022.cnblogs.com/blog/740516/202210/740516-20221017232313146-1689526958.png) + +master / release / develop， 发布，灰度，测试 + +![](https://img2022.cnblogs.com/blog/740516/202210/740516-20221017232322835-1285219956.png) + +hotfix， 修复 + +![](https://img2022.cnblogs.com/blog/740516/202210/740516-20221017232333190-460975122.png) + + + +## refs + +https://www.cnblogs.com/xgqfrms/p/16800776.html From 7b617d5ff4b1319537886fc947a2835468511111 Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Mon, 17 Oct 2022 23:32:45 +0800 Subject: [PATCH 06/25] Update readme.md --- git workflow/readme.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/git workflow/readme.md b/git workflow/readme.md index c2abd68..5f97c7b 100644 --- a/git workflow/readme.md +++ b/git workflow/readme.md @@ -12,18 +12,20 @@ https://github.com/xirong/my-git/blob/master/git-workflow-tutorial.md#23-gitflow%E5%B7%A5%E4%BD%9C%E6%B5%81 -master / develop, 维护 +master / develop, 维护 ![](https://img2022.cnblogs.com/blog/740516/202210/740516-20221017232303551-1290743520.png) -develop / features， 开发 +develop / features， 开发 + ![](https://img2022.cnblogs.com/blog/740516/202210/740516-20221017232313146-1689526958.png) -master / release / develop， 发布，灰度，测试 +master / release / develop， 发布，灰度，测试 + ![](https://img2022.cnblogs.com/blog/740516/202210/740516-20221017232322835-1285219956.png) -hotfix， 修复 +hotfix， 修复 ![](https://img2022.cnblogs.com/blog/740516/202210/740516-20221017232333190-460975122.png) From 2c6387c1b8ebc5fc50c58c594269c2cfbd9e8a17 Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Mon, 17 Oct 2022 23:39:22 +0800 Subject: [PATCH 07/25] Update README.md --- README.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 457782d..65a6391 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,19 @@ # git -git squash vs git merge vs git rebase + + +> `git merge` vs `git rebase` vs `git squash` + + + + + + +## refs + +https://www.cnblogs.com/xgqfrms/p/16800776.html + +https://www.cnblogs.com/xgqfrms/p/16798792.html From 34193edb965da9af572e05e983b934fc8f94ef75 Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Mon, 24 Oct 2022 22:11:50 +0800 Subject: [PATCH 08/25] feat: git hooks --- git-hooks/pre-commit.sh | 49 +++++++++++++++++++++++++++++++++++ git-hooks/pre-merge-commit.sh | 13 ++++++++++ git-hooks/readme.md | 31 ++++++++++++++++++++++ 3 files changed, 93 insertions(+) create mode 100755 git-hooks/pre-commit.sh create mode 100755 git-hooks/pre-merge-commit.sh create mode 100644 git-hooks/readme.md diff --git a/git-hooks/pre-commit.sh b/git-hooks/pre-commit.sh new file mode 100755 index 0000000..e144712 --- /dev/null +++ b/git-hooks/pre-commit.sh @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/git-hooks/pre-merge-commit.sh b/git-hooks/pre-merge-commit.sh new file mode 100755 index 0000000..399eab1 --- /dev/null +++ b/git-hooks/pre-merge-commit.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/git-hooks/readme.md b/git-hooks/readme.md new file mode 100644 index 0000000..fce8999 --- /dev/null +++ b/git-hooks/readme.md @@ -0,0 +1,31 @@ +# git hooks + + +```sh + +$ cd ./.git && ls -al + +$ cd ./hooks && ls -al + +``` + +```sh + +$ code ./pre-commit.sample +# OR +$ cat ./pre-commit.sample + +$ vim ./pre-commit.sample +# ESC + :q, exit vim +# ESC + :!q, exit vim +$ vi ./pre-commit.sample +$ nano ./pre-commit.sample +# Control + X, exit nano + +``` + +## refs + +https://www.cnblogs.com/xgqfrms/p/16822322.html + +https://github.com/web-full-stack/git/tree/main/git%20hooks From 0c33c447414f3a918b14e30f730d562f00ac83b3 Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Mon, 24 Oct 2022 22:12:11 +0800 Subject: [PATCH 09/25] feat: git hooks templates --- git-hooks/hooks/applypatch-msg.sample | 15 ++ git-hooks/hooks/commit-msg.sample | 24 +++ git-hooks/hooks/fsmonitor-watchman.sample | 173 ++++++++++++++++++++++ git-hooks/hooks/post-update.sample | 8 + git-hooks/hooks/pre-applypatch.sample | 14 ++ git-hooks/hooks/pre-commit.sample | 49 ++++++ git-hooks/hooks/pre-merge-commit.sample | 13 ++ git-hooks/hooks/pre-push.sample | 53 +++++++ git-hooks/hooks/pre-rebase.sample | 169 +++++++++++++++++++++ git-hooks/hooks/pre-receive.sample | 24 +++ git-hooks/hooks/prepare-commit-msg.sample | 42 ++++++ git-hooks/hooks/push-to-checkout.sample | 78 ++++++++++ git-hooks/hooks/update.sample | 128 ++++++++++++++++ 13 files changed, 790 insertions(+) create mode 100755 git-hooks/hooks/applypatch-msg.sample create mode 100755 git-hooks/hooks/commit-msg.sample create mode 100755 git-hooks/hooks/fsmonitor-watchman.sample create mode 100755 git-hooks/hooks/post-update.sample create mode 100755 git-hooks/hooks/pre-applypatch.sample create mode 100755 git-hooks/hooks/pre-commit.sample create mode 100755 git-hooks/hooks/pre-merge-commit.sample create mode 100755 git-hooks/hooks/pre-push.sample create mode 100755 git-hooks/hooks/pre-rebase.sample create mode 100755 git-hooks/hooks/pre-receive.sample create mode 100755 git-hooks/hooks/prepare-commit-msg.sample create mode 100755 git-hooks/hooks/push-to-checkout.sample create mode 100755 git-hooks/hooks/update.sample diff --git a/git-hooks/hooks/applypatch-msg.sample b/git-hooks/hooks/applypatch-msg.sample new file mode 100755 index 0000000..a5d7b84 --- /dev/null +++ b/git-hooks/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/git-hooks/hooks/commit-msg.sample b/git-hooks/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/git-hooks/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/git-hooks/hooks/fsmonitor-watchman.sample b/git-hooks/hooks/fsmonitor-watchman.sample new file mode 100755 index 0000000..14ed0aa --- /dev/null +++ b/git-hooks/hooks/fsmonitor-watchman.sample @@ -0,0 +1,173 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + } + my $query = <<" END"; + ["query", "$git_work_tree", { + "since": $last_update_token, + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/git-hooks/hooks/post-update.sample b/git-hooks/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/git-hooks/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/git-hooks/hooks/pre-applypatch.sample b/git-hooks/hooks/pre-applypatch.sample new file mode 100755 index 0000000..4142082 --- /dev/null +++ b/git-hooks/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/git-hooks/hooks/pre-commit.sample b/git-hooks/hooks/pre-commit.sample new file mode 100755 index 0000000..e144712 --- /dev/null +++ b/git-hooks/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/git-hooks/hooks/pre-merge-commit.sample b/git-hooks/hooks/pre-merge-commit.sample new file mode 100755 index 0000000..399eab1 --- /dev/null +++ b/git-hooks/hooks/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/git-hooks/hooks/pre-push.sample b/git-hooks/hooks/pre-push.sample new file mode 100755 index 0000000..4ce688d --- /dev/null +++ b/git-hooks/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/git-hooks/hooks/pre-rebase.sample b/git-hooks/hooks/pre-rebase.sample new file mode 100755 index 0000000..6cbef5c --- /dev/null +++ b/git-hooks/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/git-hooks/hooks/pre-receive.sample b/git-hooks/hooks/pre-receive.sample new file mode 100755 index 0000000..a1fd29e --- /dev/null +++ b/git-hooks/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/git-hooks/hooks/prepare-commit-msg.sample b/git-hooks/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..10fa14c --- /dev/null +++ b/git-hooks/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/git-hooks/hooks/push-to-checkout.sample b/git-hooks/hooks/push-to-checkout.sample new file mode 100755 index 0000000..af5a0c0 --- /dev/null +++ b/git-hooks/hooks/push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 From 4a79e87a5a0690df12141278f97e24765f2a79c7 Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Mon, 24 Oct 2022 23:58:17 +0800 Subject: [PATCH 10/25] python script --- git-hooks/readme.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/git-hooks/readme.md b/git-hooks/readme.md index fce8999..45fa08b 100644 --- a/git-hooks/readme.md +++ b/git-hooks/readme.md @@ -24,6 +24,45 @@ $ nano ./pre-commit.sample ``` +## demo + +rename `pre-commit.sample` => `pre-commit.sh` OR `pre-commit` + +script 默认执行环境是 sh + +1. bash + +`pre-commit.sh` OR `pre-commit` + +```sh +#!/bin/sh +``` + +2. perl + +`pre-commit.perl` OR `pre-commit` + +```sh +#!/usr/bin/perl + +# 在 perl 的路径上可以加上 -w，可以显示程序中出现的一些警告 +#!/usr/bin/perl -w + +``` + +https://www.cnblogs.com/xgqfrms/p/16823456.html + +3. python + +`pre-commit.py` OR `pre-commit` + +```sh +#!/usr/bin/python3 +# OR +#!/usr/bin/python + +``` + ## refs https://www.cnblogs.com/xgqfrms/p/16822322.html From 3b0b0493bf57acc26803a014c06baa6bc72b3afc Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Tue, 25 Oct 2022 00:13:11 +0800 Subject: [PATCH 11/25] no file extension name --- git-hooks/readme.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/git-hooks/readme.md b/git-hooks/readme.md index 45fa08b..519a1db 100644 --- a/git-hooks/readme.md +++ b/git-hooks/readme.md @@ -63,6 +63,21 @@ https://www.cnblogs.com/xgqfrms/p/16823456.html ``` +> test + +```sh +$ git add git-hooks/readme.md + +$ gst +# -m ✅ +$ git commit -m"python script" + +# no message ❌ +$ git commit +# Aborting commit due to empty commit message. + +``` + ## refs https://www.cnblogs.com/xgqfrms/p/16822322.html From a728322e3b23f53b67352aa2c48b54211cc20891 Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Tue, 25 Oct 2022 02:19:22 +0800 Subject: [PATCH 12/25] =?UTF-8?q?perl=20.pl=20=F0=9F=90=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- git-hooks/fsmonitor-watchman.pl | 173 ++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) create mode 100755 git-hooks/fsmonitor-watchman.pl diff --git a/git-hooks/fsmonitor-watchman.pl b/git-hooks/fsmonitor-watchman.pl new file mode 100755 index 0000000..14ed0aa --- /dev/null +++ b/git-hooks/fsmonitor-watchman.pl @@ -0,0 +1,173 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + } + my $query = <<" END"; + ["query", "$git_work_tree", { + "since": $last_update_token, + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} From 7cdcab6ba78520b520ecbd81daf903edc55175a4 Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Tue, 25 Oct 2022 02:24:31 +0800 Subject: [PATCH 13/25] feat: git-hooks/prepare-commit-msg --- git-hooks/prepare-commit-msg | 50 ++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100755 git-hooks/prepare-commit-msg diff --git a/git-hooks/prepare-commit-msg b/git-hooks/prepare-commit-msg new file mode 100755 index 0000000..691ebe0 --- /dev/null +++ b/git-hooks/prepare-commit-msg @@ -0,0 +1,50 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +echo "\n🎉\$1 = $1" +echo "\$2 = $2" +echo "\$3 = $3" + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi + +echo "\n👻\$1 = $1" +echo "\$2 = $2" +echo "\$3 = $3" From 41c2218d81b5860da1f4ed992aae2ff7a4f1afc7 Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Tue, 25 Oct 2022 22:23:39 +0800 Subject: [PATCH 14/25] =?UTF-8?q?feat:=20EOF=20=E5=A4=9A=E8=A1=8C=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 12 +++ .gitattributes | 1 + .vscode/settings.json | 93 +++++++++++++++++++ .../Linux-Bash-Commands/multi-line-text.md | 10 ++ .../multi-line-text.template | 10 ++ .../Linux-Bash-Commands/multi-line-text.txt | 10 ++ 000-xyz/Linux-Bash-Commands/readme.md | 36 +++++++ .../Linux-Bash-Commands/sed-replace.bug.sh | 42 +++++++++ 000-xyz/Linux-Bash-Commands/sed-replace.ok.sh | 50 ++++++++++ 000-xyz/Linux-Bash-Commands/sed-replace.sh | 27 ++++++ git-hooks/pre-commit | 49 ++++++++++ git-hooks/pre-commit.py | 17 ++++ 12 files changed, 357 insertions(+) create mode 100644 .editorconfig create mode 100644 .gitattributes create mode 100644 .vscode/settings.json create mode 100644 000-xyz/Linux-Bash-Commands/multi-line-text.md create mode 100644 000-xyz/Linux-Bash-Commands/multi-line-text.template create mode 100644 000-xyz/Linux-Bash-Commands/multi-line-text.txt create mode 100644 000-xyz/Linux-Bash-Commands/readme.md create mode 100755 000-xyz/Linux-Bash-Commands/sed-replace.bug.sh create mode 100755 000-xyz/Linux-Bash-Commands/sed-replace.ok.sh create mode 100755 000-xyz/Linux-Bash-Commands/sed-replace.sh create mode 100755 git-hooks/pre-commit create mode 100755 git-hooks/pre-commit.py diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..5760be5 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +# http://editorconfig.org +root = true + +[*] +indent_style = space +indent_size = 2 +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..28cee3f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.html linguist-detectable=false diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..61e2178 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,93 @@ +{ + "files.exclude": { + "**/.git": true, + "**/.DS_Store": true, + "**/jspm_packages": true, + "**/node_modules": true, + "**/.zip": true, + "**/.sh": true + }, + "search.exclude": { + "**/node_modules": true, + "**/bower_components": true + }, + "files.watcherExclude": { + "**/.git/objects/**": true, + "**/.git/subtree-cache/**": true, + "**/node_modules/*/**": true + }, + // "eslint.autoFixOnSave": true, + "editor.formatOnSave": false, + "editor.renderWhitespace": "all", + "editor.fontSize": 16, + "editor.tabSize": 2, + "editor.multiCursorModifier": "alt", + "editor.wordWrap": "on", + "editor.insertSpaces": true, + "files.encoding": "utf8", + "[typescript]": { + "editor.formatOnSave": true, + "editor.formatOnPaste": true + }, + "[markdown]": { + "editor.formatOnSave": true, + "editor.renderWhitespace": "all", + "editor.acceptSuggestionOnEnter": "off" + }, + "files.associations": { + "*.jsx": "javascriptreact", + "*.js": "javascriptreact", + "*.json": "jsonc" + }, + "editor.snippetSuggestions": "top", + // When enabled, typing /** triggers documentation automatically. + "docthis.automaticForBlockComments": true, + // When enabled, type information is added to comment tags. + "docthis.includeTypes": true, + // When enabled, memberOf information is added to comment tags on class members. + "docthis.includeMemberOfOnClassMembers": true, + // When enabled, memberOf information is added to comment tags on interface members. + "docthis.includeMemberOfOnInterfaceMembers": true, + // When enabled, JSDoc comments for functions and methods will include @description. + "docthis.includeDescriptionTag": true, + // When enabled, hungarian notation will be used as a type hint. + "docthis.enableHungarianNotationEvaluation": true, + // When enabled, will use names of params & methods as type hints. + "docthis.inferTypesFromNames": true, + // When enabled, will add the @author tag. + "docthis.includeAuthorTag": true, + // When docthis.includeAuthorTag is enabled, will add @author tag with this value. + "docthis.authorName": "xgqfrms", + // HTML & overwrite User settings.json + "html.format.extraLiners": "", + "html.format.enable": false, + "html.format.contentUnformatted": "body, div, section, script, pre,code,textarea", + "workbench.colorCustomizations": { + "activityBar.background": "#1accff", + "activityBar.activeBorder": "#df00ad", + "activityBar.foreground": "#15202b", + "activityBar.inactiveForeground": "#15202b99", + "activityBarBadge.background": "#df00ad", + "activityBarBadge.foreground": "#e7e7e7", + "titleBar.activeBackground": "#00b3e6", + "titleBar.inactiveBackground": "#00b3e699", + "titleBar.activeForeground": "#15202b", + "titleBar.inactiveForeground": "#15202b99", + "statusBar.background": "#00b3e6", + "statusBarItem.hoverBackground": "#008bb3", + "statusBar.foreground": "#15202b", + "activityBar.activeBackground": "#1accff", + "sash.hoverBorder": "#1accff", + "statusBarItem.remoteBackground": "#00b3e6", + "statusBarItem.remoteForeground": "#15202b", + "commandCenter.border": "#15202b99" + }, + "peacock.color": "#00b3e6", + "editor.codeActionsOnSave": { + "source.fixAll.eslint": true + }, + "typescript.format.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces": false, + // This setting has been deprecated in favor of `js/ts.implicitProjectConfig.experimentalDecorators`.(2) + // "javascript.implicitProjectConfig.experimentalDecorators": true, + "js/ts.implicitProjectConfig.experimentalDecorators": true, +} diff --git a/000-xyz/Linux-Bash-Commands/multi-line-text.md b/000-xyz/Linux-Bash-Commands/multi-line-text.md new file mode 100644 index 0000000..8b82f5a --- /dev/null +++ b/000-xyz/Linux-Bash-Commands/multi-line-text.md @@ -0,0 +1,10 @@ +line 01 +line 02 +line 03 +line 04 +line 05 +line 06 +line 07 +line 08 +line 09 +line 10 diff --git a/000-xyz/Linux-Bash-Commands/multi-line-text.template b/000-xyz/Linux-Bash-Commands/multi-line-text.template new file mode 100644 index 0000000..eea8a21 --- /dev/null +++ b/000-xyz/Linux-Bash-Commands/multi-line-text.template @@ -0,0 +1,10 @@ +
line 01
+
line 02
+
line 03
+
line 04
+
line 05
+
line 06
+
line 07
+
line 08
+
line 09
+
line 10
diff --git a/000-xyz/Linux-Bash-Commands/multi-line-text.txt b/000-xyz/Linux-Bash-Commands/multi-line-text.txt new file mode 100644 index 0000000..eea8a21 --- /dev/null +++ b/000-xyz/Linux-Bash-Commands/multi-line-text.txt @@ -0,0 +1,10 @@ +
line 01
+
line 02
+
line 03
+
line 04
+
line 05
+
line 06
+
line 07
+
line 08
+
line 09
+
line 10
diff --git a/000-xyz/Linux-Bash-Commands/readme.md b/000-xyz/Linux-Bash-Commands/readme.md new file mode 100644 index 0000000..5b63ca0 --- /dev/null +++ b/000-xyz/Linux-Bash-Commands/readme.md @@ -0,0 +1,36 @@ +# Linux BashCommands + +## sed + +```sh +# sed options script file +$ sed -e script command +$ sed -f script file + +# chmod +x ./sed-replace.sh +``` + +```sh +#!/bin/bash +#!/bin/sh + +sed 's/
/👻' | 's/
/🎉' multi-line-text.txt => multi-line-text.md +``` + + diff --git a/000-xyz/Linux-Bash-Commands/sed-replace.bug.sh b/000-xyz/Linux-Bash-Commands/sed-replace.bug.sh new file mode 100755 index 0000000..89626da --- /dev/null +++ b/000-xyz/Linux-Bash-Commands/sed-replace.bug.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +# echo \n ❌ +# echo "sed test\n" + +# echo -e \n ✅ +echo -e "sed test\n" + +# echo $"双引号 ❌" +# echo $"sed test\n" + +# echo $'单引号 ✅' +echo $'sed test\n' + +# printf "sed test\nabc xyz\n" +# printf: usage: printf [-v var] format [arguments] ??? +# zsh: argument list too long: ./sed-replace.sh ??? + +# printf "sed test\nabc xyz" +# sed test +# abc xyz% +# printf % bug ❓ + +# multi lines comments `< xgqfrms ' | sed "s/div/XYZ" >> bug.md +# sed "s/div/XYZ" ./multi-line-text.txt >> bug.md +# sed "s/div/XYZ" ./multi-line-text.txt + +# /regexp/ 正则表达式后面少了一个 `/` ✅ +sed "s/div/XYZ/" ./multi-line-text.txt >> multi-line-text.md + +# echo ./multi-line-text.txt +# echo ./multi-line-text.txt | sed "s/div/XYZ" +# echo ./multi-line-text.txt | sed 's/div/XYZ' +# echo ./multi-line-text.txt | sed 's/div/👻' +# 正则表达式中的未终止替换 +# sed: 1: "s/div/👻": unterminated substitute in regular expression + +# echo ./multi-line-text.txt | sed 's/
/👻' | sed 's/
/🎉' + +# sed 's/
/👻' | sed 's/
/🎉' multi-line-text.txt => multi-line-text.md + +echo -e "sed finished" diff --git a/git-hooks/pre-commit b/git-hooks/pre-commit new file mode 100755 index 0000000..e144712 --- /dev/null +++ b/git-hooks/pre-commit @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/git-hooks/pre-commit.py b/git-hooks/pre-commit.py new file mode 100755 index 0000000..68affa7 --- /dev/null +++ b/git-hooks/pre-commit.py @@ -0,0 +1,17 @@ +#!/usr/bin/python3 + +# 这是一个单行注释 +print("Hello, World!"); + +''' +这是多行注释，用三个单引号 +这是多行注释，用三个单引号 +这是多行注释，用三个单引号 +''' + +""" +这是多行注释，用三个双引号 +这是多行注释，用三个双引号 +这是多行注释，用三个双引号 +""" + From 9f8d5ffffa517327b620d8bf7fa164118e0f0da3 Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Tue, 25 Oct 2022 22:57:43 +0800 Subject: [PATCH 15/25] =?UTF-8?q?Revert=20"feat:=20EOF=20=E5=A4=9A?= =?UTF-8?q?=E8=A1=8C=E6=B3=A8=E9=87=8A"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 41c2218d81b5860da1f4ed992aae2ff7a4f1afc7. --- .editorconfig | 12 --- .gitattributes | 1 - .vscode/settings.json | 93 ------------------- .../Linux-Bash-Commands/multi-line-text.md | 10 -- .../multi-line-text.template | 10 -- .../Linux-Bash-Commands/multi-line-text.txt | 10 -- 000-xyz/Linux-Bash-Commands/readme.md | 36 ------- .../Linux-Bash-Commands/sed-replace.bug.sh | 42 --------- 000-xyz/Linux-Bash-Commands/sed-replace.ok.sh | 50 ---------- 000-xyz/Linux-Bash-Commands/sed-replace.sh | 27 ------ git-hooks/pre-commit | 49 ---------- git-hooks/pre-commit.py | 17 ---- 12 files changed, 357 deletions(-) delete mode 100644 .editorconfig delete mode 100644 .gitattributes delete mode 100644 .vscode/settings.json delete mode 100644 000-xyz/Linux-Bash-Commands/multi-line-text.md delete mode 100644 000-xyz/Linux-Bash-Commands/multi-line-text.template delete mode 100644 000-xyz/Linux-Bash-Commands/multi-line-text.txt delete mode 100644 000-xyz/Linux-Bash-Commands/readme.md delete mode 100755 000-xyz/Linux-Bash-Commands/sed-replace.bug.sh delete mode 100755 000-xyz/Linux-Bash-Commands/sed-replace.ok.sh delete mode 100755 000-xyz/Linux-Bash-Commands/sed-replace.sh delete mode 100755 git-hooks/pre-commit delete mode 100755 git-hooks/pre-commit.py diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 5760be5..0000000 --- a/.editorconfig +++ /dev/null @@ -1,12 +0,0 @@ -# http://editorconfig.org -root = true - -[*] -indent_style = space -indent_size = 2 -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 28cee3f..0000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.html linguist-detectable=false diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 61e2178..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "files.exclude": { - "**/.git": true, - "**/.DS_Store": true, - "**/jspm_packages": true, - "**/node_modules": true, - "**/.zip": true, - "**/.sh": true - }, - "search.exclude": { - "**/node_modules": true, - "**/bower_components": true - }, - "files.watcherExclude": { - "**/.git/objects/**": true, - "**/.git/subtree-cache/**": true, - "**/node_modules/*/**": true - }, - // "eslint.autoFixOnSave": true, - "editor.formatOnSave": false, - "editor.renderWhitespace": "all", - "editor.fontSize": 16, - "editor.tabSize": 2, - "editor.multiCursorModifier": "alt", - "editor.wordWrap": "on", - "editor.insertSpaces": true, - "files.encoding": "utf8", - "[typescript]": { - "editor.formatOnSave": true, - "editor.formatOnPaste": true - }, - "[markdown]": { - "editor.formatOnSave": true, - "editor.renderWhitespace": "all", - "editor.acceptSuggestionOnEnter": "off" - }, - "files.associations": { - "*.jsx": "javascriptreact", - "*.js": "javascriptreact", - "*.json": "jsonc" - }, - "editor.snippetSuggestions": "top", - // When enabled, typing /** triggers documentation automatically. - "docthis.automaticForBlockComments": true, - // When enabled, type information is added to comment tags. - "docthis.includeTypes": true, - // When enabled, memberOf information is added to comment tags on class members. - "docthis.includeMemberOfOnClassMembers": true, - // When enabled, memberOf information is added to comment tags on interface members. - "docthis.includeMemberOfOnInterfaceMembers": true, - // When enabled, JSDoc comments for functions and methods will include @description. - "docthis.includeDescriptionTag": true, - // When enabled, hungarian notation will be used as a type hint. - "docthis.enableHungarianNotationEvaluation": true, - // When enabled, will use names of params & methods as type hints. - "docthis.inferTypesFromNames": true, - // When enabled, will add the @author tag. - "docthis.includeAuthorTag": true, - // When docthis.includeAuthorTag is enabled, will add @author tag with this value. - "docthis.authorName": "xgqfrms", - // HTML & overwrite User settings.json - "html.format.extraLiners": "", - "html.format.enable": false, - "html.format.contentUnformatted": "body, div, section, script, pre,code,textarea", - "workbench.colorCustomizations": { - "activityBar.background": "#1accff", - "activityBar.activeBorder": "#df00ad", - "activityBar.foreground": "#15202b", - "activityBar.inactiveForeground": "#15202b99", - "activityBarBadge.background": "#df00ad", - "activityBarBadge.foreground": "#e7e7e7", - "titleBar.activeBackground": "#00b3e6", - "titleBar.inactiveBackground": "#00b3e699", - "titleBar.activeForeground": "#15202b", - "titleBar.inactiveForeground": "#15202b99", - "statusBar.background": "#00b3e6", - "statusBarItem.hoverBackground": "#008bb3", - "statusBar.foreground": "#15202b", - "activityBar.activeBackground": "#1accff", - "sash.hoverBorder": "#1accff", - "statusBarItem.remoteBackground": "#00b3e6", - "statusBarItem.remoteForeground": "#15202b", - "commandCenter.border": "#15202b99" - }, - "peacock.color": "#00b3e6", - "editor.codeActionsOnSave": { - "source.fixAll.eslint": true - }, - "typescript.format.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces": false, - // This setting has been deprecated in favor of `js/ts.implicitProjectConfig.experimentalDecorators`.(2) - // "javascript.implicitProjectConfig.experimentalDecorators": true, - "js/ts.implicitProjectConfig.experimentalDecorators": true, -} diff --git a/000-xyz/Linux-Bash-Commands/multi-line-text.md b/000-xyz/Linux-Bash-Commands/multi-line-text.md deleted file mode 100644 index 8b82f5a..0000000 --- a/000-xyz/Linux-Bash-Commands/multi-line-text.md +++ /dev/null @@ -1,10 +0,0 @@ -line 01 -line 02 -line 03 -line 04 -line 05 -line 06 -line 07 -line 08 -line 09 -line 10 diff --git a/000-xyz/Linux-Bash-Commands/multi-line-text.template b/000-xyz/Linux-Bash-Commands/multi-line-text.template deleted file mode 100644 index eea8a21..0000000 --- a/000-xyz/Linux-Bash-Commands/multi-line-text.template +++ /dev/null @@ -1,10 +0,0 @@ -
line 01
-
line 02
-
line 03
-
line 04
-
line 05
-
line 06
-
line 07
-
line 08
-
line 09
-
line 10
diff --git a/000-xyz/Linux-Bash-Commands/multi-line-text.txt b/000-xyz/Linux-Bash-Commands/multi-line-text.txt deleted file mode 100644 index eea8a21..0000000 --- a/000-xyz/Linux-Bash-Commands/multi-line-text.txt +++ /dev/null @@ -1,10 +0,0 @@ -
line 01
-
line 02
-
line 03
-
line 04
-
line 05
-
line 06
-
line 07
-
line 08
-
line 09
-
line 10
diff --git a/000-xyz/Linux-Bash-Commands/readme.md b/000-xyz/Linux-Bash-Commands/readme.md deleted file mode 100644 index 5b63ca0..0000000 --- a/000-xyz/Linux-Bash-Commands/readme.md +++ /dev/null @@ -1,36 +0,0 @@ -# Linux BashCommands - -## sed - -```sh -# sed options script file -$ sed -e script command -$ sed -f script file - -# chmod +x ./sed-replace.sh -``` - -```sh -#!/bin/bash -#!/bin/sh - -sed 's/
/👻' | 's/
/🎉' multi-line-text.txt => multi-line-text.md -``` - - diff --git a/000-xyz/Linux-Bash-Commands/sed-replace.bug.sh b/000-xyz/Linux-Bash-Commands/sed-replace.bug.sh deleted file mode 100755 index 89626da..0000000 --- a/000-xyz/Linux-Bash-Commands/sed-replace.bug.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -# echo \n ❌ -# echo "sed test\n" - -# echo -e \n ✅ -echo -e "sed test\n" - -# echo $"双引号 ❌" -# echo $"sed test\n" - -# echo $'单引号 ✅' -echo $'sed test\n' - -# printf "sed test\nabc xyz\n" -# printf: usage: printf [-v var] format [arguments] ??? -# zsh: argument list too long: ./sed-replace.sh ??? - -# printf "sed test\nabc xyz" -# sed test -# abc xyz% -# printf % bug ❓ - -# multi lines comments `< xgqfrms ' | sed "s/div/XYZ" >> bug.md -# sed "s/div/XYZ" ./multi-line-text.txt >> bug.md -# sed "s/div/XYZ" ./multi-line-text.txt - -# /regexp/ 正则表达式后面少了一个 `/` ✅ -sed "s/div/XYZ/" ./multi-line-text.txt >> multi-line-text.md - -# echo ./multi-line-text.txt -# echo ./multi-line-text.txt | sed "s/div/XYZ" -# echo ./multi-line-text.txt | sed 's/div/XYZ' -# echo ./multi-line-text.txt | sed 's/div/👻' -# 正则表达式中的未终止替换 -# sed: 1: "s/div/👻": unterminated substitute in regular expression - -# echo ./multi-line-text.txt | sed 's/
/👻' | sed 's/
/🎉' - -# sed 's/
/👻' | sed 's/
/🎉' multi-line-text.txt => multi-line-text.md - -echo -e "sed finished" diff --git a/git-hooks/pre-commit b/git-hooks/pre-commit deleted file mode 100755 index e144712..0000000 --- a/git-hooks/pre-commit +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-commit". - -if git rev-parse --verify HEAD >/dev/null 2>&1 -then - against=HEAD -else - # Initial commit: diff against an empty tree object - against=$(git hash-object -t tree /dev/null) -fi - -# If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --type=bool hooks.allownonascii) - -# Redirect output to stderr. -exec 1>&2 - -# Cross platform projects tend to avoid non-ASCII filenames; prevent -# them from being added to the repository. We exploit the fact that the -# printable range starts at the space character and ends with tilde. -if [ "$allownonascii" != "true" ] && - # Note that the use of brackets around a tr range is ok here, (it's - # even required, for portability to Solaris 10's /usr/bin/tr), since - # the square bracket bytes happen to fall in the designated range. - test $(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -then - cat <<\EOF -Error: Attempt to add a non-ASCII file name. - -This can cause problems if you want to work with people on other platforms. - -To be portable it is advisable to rename the file. - -If you know what you are doing you can disable this check using: - - git config hooks.allownonascii true -EOF - exit 1 -fi - -# If there are whitespace errors, print the offending file names and fail. -exec git diff-index --check --cached $against -- diff --git a/git-hooks/pre-commit.py b/git-hooks/pre-commit.py deleted file mode 100755 index 68affa7..0000000 --- a/git-hooks/pre-commit.py +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/python3 - -# 这是一个单行注释 -print("Hello, World!"); - -''' -这是多行注释，用三个单引号 -这是多行注释，用三个单引号 -这是多行注释，用三个单引号 -''' - -""" -这是多行注释，用三个双引号 -这是多行注释，用三个双引号 -这是多行注释，用三个双引号 -""" - From 64b4bc4525470192a8d9595fe7896e2424101a7a Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Tue, 25 Oct 2022 22:58:41 +0800 Subject: [PATCH 16/25] =?UTF-8?q?Revert=20"Revert=20"feat:=20EOF=20?= =?UTF-8?q?=E5=A4=9A=E8=A1=8C=E6=B3=A8=E9=87=8A""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9f8d5ffffa517327b620d8bf7fa164118e0f0da3. --- .editorconfig | 12 +++ .gitattributes | 1 + .vscode/settings.json | 93 +++++++++++++++++++ .../Linux-Bash-Commands/multi-line-text.md | 10 ++ .../multi-line-text.template | 10 ++ .../Linux-Bash-Commands/multi-line-text.txt | 10 ++ 000-xyz/Linux-Bash-Commands/readme.md | 36 +++++++ .../Linux-Bash-Commands/sed-replace.bug.sh | 42 +++++++++ 000-xyz/Linux-Bash-Commands/sed-replace.ok.sh | 50 ++++++++++ 000-xyz/Linux-Bash-Commands/sed-replace.sh | 27 ++++++ git-hooks/pre-commit | 49 ++++++++++ git-hooks/pre-commit.py | 17 ++++ 12 files changed, 357 insertions(+) create mode 100644 .editorconfig create mode 100644 .gitattributes create mode 100644 .vscode/settings.json create mode 100644 000-xyz/Linux-Bash-Commands/multi-line-text.md create mode 100644 000-xyz/Linux-Bash-Commands/multi-line-text.template create mode 100644 000-xyz/Linux-Bash-Commands/multi-line-text.txt create mode 100644 000-xyz/Linux-Bash-Commands/readme.md create mode 100755 000-xyz/Linux-Bash-Commands/sed-replace.bug.sh create mode 100755 000-xyz/Linux-Bash-Commands/sed-replace.ok.sh create mode 100755 000-xyz/Linux-Bash-Commands/sed-replace.sh create mode 100755 git-hooks/pre-commit create mode 100755 git-hooks/pre-commit.py diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..5760be5 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +# http://editorconfig.org +root = true + +[*] +indent_style = space +indent_size = 2 +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..28cee3f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.html linguist-detectable=false diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..61e2178 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,93 @@ +{ + "files.exclude": { + "**/.git": true, + "**/.DS_Store": true, + "**/jspm_packages": true, + "**/node_modules": true, + "**/.zip": true, + "**/.sh": true + }, + "search.exclude": { + "**/node_modules": true, + "**/bower_components": true + }, + "files.watcherExclude": { + "**/.git/objects/**": true, + "**/.git/subtree-cache/**": true, + "**/node_modules/*/**": true + }, + // "eslint.autoFixOnSave": true, + "editor.formatOnSave": false, + "editor.renderWhitespace": "all", + "editor.fontSize": 16, + "editor.tabSize": 2, + "editor.multiCursorModifier": "alt", + "editor.wordWrap": "on", + "editor.insertSpaces": true, + "files.encoding": "utf8", + "[typescript]": { + "editor.formatOnSave": true, + "editor.formatOnPaste": true + }, + "[markdown]": { + "editor.formatOnSave": true, + "editor.renderWhitespace": "all", + "editor.acceptSuggestionOnEnter": "off" + }, + "files.associations": { + "*.jsx": "javascriptreact", + "*.js": "javascriptreact", + "*.json": "jsonc" + }, + "editor.snippetSuggestions": "top", + // When enabled, typing /** triggers documentation automatically. + "docthis.automaticForBlockComments": true, + // When enabled, type information is added to comment tags. + "docthis.includeTypes": true, + // When enabled, memberOf information is added to comment tags on class members. + "docthis.includeMemberOfOnClassMembers": true, + // When enabled, memberOf information is added to comment tags on interface members. + "docthis.includeMemberOfOnInterfaceMembers": true, + // When enabled, JSDoc comments for functions and methods will include @description. + "docthis.includeDescriptionTag": true, + // When enabled, hungarian notation will be used as a type hint. + "docthis.enableHungarianNotationEvaluation": true, + // When enabled, will use names of params & methods as type hints. + "docthis.inferTypesFromNames": true, + // When enabled, will add the @author tag. + "docthis.includeAuthorTag": true, + // When docthis.includeAuthorTag is enabled, will add @author tag with this value. + "docthis.authorName": "xgqfrms", + // HTML & overwrite User settings.json + "html.format.extraLiners": "", + "html.format.enable": false, + "html.format.contentUnformatted": "body, div, section, script, pre,code,textarea", + "workbench.colorCustomizations": { + "activityBar.background": "#1accff", + "activityBar.activeBorder": "#df00ad", + "activityBar.foreground": "#15202b", + "activityBar.inactiveForeground": "#15202b99", + "activityBarBadge.background": "#df00ad", + "activityBarBadge.foreground": "#e7e7e7", + "titleBar.activeBackground": "#00b3e6", + "titleBar.inactiveBackground": "#00b3e699", + "titleBar.activeForeground": "#15202b", + "titleBar.inactiveForeground": "#15202b99", + "statusBar.background": "#00b3e6", + "statusBarItem.hoverBackground": "#008bb3", + "statusBar.foreground": "#15202b", + "activityBar.activeBackground": "#1accff", + "sash.hoverBorder": "#1accff", + "statusBarItem.remoteBackground": "#00b3e6", + "statusBarItem.remoteForeground": "#15202b", + "commandCenter.border": "#15202b99" + }, + "peacock.color": "#00b3e6", + "editor.codeActionsOnSave": { + "source.fixAll.eslint": true + }, + "typescript.format.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces": false, + // This setting has been deprecated in favor of `js/ts.implicitProjectConfig.experimentalDecorators`.(2) + // "javascript.implicitProjectConfig.experimentalDecorators": true, + "js/ts.implicitProjectConfig.experimentalDecorators": true, +} diff --git a/000-xyz/Linux-Bash-Commands/multi-line-text.md b/000-xyz/Linux-Bash-Commands/multi-line-text.md new file mode 100644 index 0000000..8b82f5a --- /dev/null +++ b/000-xyz/Linux-Bash-Commands/multi-line-text.md @@ -0,0 +1,10 @@ +line 01 +line 02 +line 03 +line 04 +line 05 +line 06 +line 07 +line 08 +line 09 +line 10 diff --git a/000-xyz/Linux-Bash-Commands/multi-line-text.template b/000-xyz/Linux-Bash-Commands/multi-line-text.template new file mode 100644 index 0000000..eea8a21 --- /dev/null +++ b/000-xyz/Linux-Bash-Commands/multi-line-text.template @@ -0,0 +1,10 @@ +
line 01
+
line 02
+
line 03
+
line 04
+
line 05
+
line 06
+
line 07
+
line 08
+
line 09
+
line 10
diff --git a/000-xyz/Linux-Bash-Commands/multi-line-text.txt b/000-xyz/Linux-Bash-Commands/multi-line-text.txt new file mode 100644 index 0000000..eea8a21 --- /dev/null +++ b/000-xyz/Linux-Bash-Commands/multi-line-text.txt @@ -0,0 +1,10 @@ +
line 01
+
line 02
+
line 03
+
line 04
+
line 05
+
line 06
+
line 07
+
line 08
+
line 09
+
line 10
diff --git a/000-xyz/Linux-Bash-Commands/readme.md b/000-xyz/Linux-Bash-Commands/readme.md new file mode 100644 index 0000000..5b63ca0 --- /dev/null +++ b/000-xyz/Linux-Bash-Commands/readme.md @@ -0,0 +1,36 @@ +# Linux BashCommands + +## sed + +```sh +# sed options script file +$ sed -e script command +$ sed -f script file + +# chmod +x ./sed-replace.sh +``` + +```sh +#!/bin/bash +#!/bin/sh + +sed 's/
/👻' | 's/
/🎉' multi-line-text.txt => multi-line-text.md +``` + + diff --git a/000-xyz/Linux-Bash-Commands/sed-replace.bug.sh b/000-xyz/Linux-Bash-Commands/sed-replace.bug.sh new file mode 100755 index 0000000..89626da --- /dev/null +++ b/000-xyz/Linux-Bash-Commands/sed-replace.bug.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +# echo \n ❌ +# echo "sed test\n" + +# echo -e \n ✅ +echo -e "sed test\n" + +# echo $"双引号 ❌" +# echo $"sed test\n" + +# echo $'单引号 ✅' +echo $'sed test\n' + +# printf "sed test\nabc xyz\n" +# printf: usage: printf [-v var] format [arguments] ??? +# zsh: argument list too long: ./sed-replace.sh ??? + +# printf "sed test\nabc xyz" +# sed test +# abc xyz% +# printf % bug ❓ + +# multi lines comments `< xgqfrms ' | sed "s/div/XYZ" >> bug.md +# sed "s/div/XYZ" ./multi-line-text.txt >> bug.md +# sed "s/div/XYZ" ./multi-line-text.txt + +# /regexp/ 正则表达式后面少了一个 `/` ✅ +sed "s/div/XYZ/" ./multi-line-text.txt >> multi-line-text.md + +# echo ./multi-line-text.txt +# echo ./multi-line-text.txt | sed "s/div/XYZ" +# echo ./multi-line-text.txt | sed 's/div/XYZ' +# echo ./multi-line-text.txt | sed 's/div/👻' +# 正则表达式中的未终止替换 +# sed: 1: "s/div/👻": unterminated substitute in regular expression + +# echo ./multi-line-text.txt | sed 's/
/👻' | sed 's/
/🎉' + +# sed 's/
/👻' | sed 's/
/🎉' multi-line-text.txt => multi-line-text.md + +echo -e "sed finished" diff --git a/git-hooks/pre-commit b/git-hooks/pre-commit new file mode 100755 index 0000000..e144712 --- /dev/null +++ b/git-hooks/pre-commit @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/git-hooks/pre-commit.py b/git-hooks/pre-commit.py new file mode 100755 index 0000000..68affa7 --- /dev/null +++ b/git-hooks/pre-commit.py @@ -0,0 +1,17 @@ +#!/usr/bin/python3 + +# 这是一个单行注释 +print("Hello, World!"); + +''' +这是多行注释，用三个单引号 +这是多行注释，用三个单引号 +这是多行注释，用三个单引号 +''' + +""" +这是多行注释，用三个双引号 +这是多行注释，用三个双引号 +这是多行注释，用三个双引号 +""" + From 206f5dc7694d95a0ffa318f8e4a58d35f361c62b Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Tue, 25 Oct 2022 23:40:06 +0800 Subject: [PATCH 17/25] =?UTF-8?q?feat:=20sed=20=E5=90=8C=E6=97=B6=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=A4=9A=E4=B8=AA=E5=91=BD=E4=BB=A4=20`-e`,=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=8B=B1=E6=96=87=E7=9A=84=E5=88=86=E5=8F=B7?= =?UTF-8?q?=E5=88=86=E9=9A=94=20`;`=20=E2=9C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Linux-Bash-Commands/multi-line-text.md | 20 +++++++++---------- 000-xyz/Linux-Bash-Commands/sed-replace.sh | 19 +++++++++++++++++- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/000-xyz/Linux-Bash-Commands/multi-line-text.md b/000-xyz/Linux-Bash-Commands/multi-line-text.md index 8b82f5a..14a5843 100644 --- a/000-xyz/Linux-Bash-Commands/multi-line-text.md +++ b/000-xyz/Linux-Bash-Commands/multi-line-text.md @@ -1,10 +1,10 @@ -line 01 -line 02 -line 03 -line 04 -line 05 -line 06 -line 07 -line 08 -line 09 -line 10 +🎉line 01👻 +🎉line 02👻 +🎉line 03👻 +🎉line 04👻 +🎉line 05👻 +🎉line 06👻 +🎉line 07👻 +🎉line 08👻 +🎉line 09👻 +🎉line 10👻 diff --git a/000-xyz/Linux-Bash-Commands/sed-replace.sh b/000-xyz/Linux-Bash-Commands/sed-replace.sh index 72e2c39..e3499e4 100755 --- a/000-xyz/Linux-Bash-Commands/sed-replace.sh +++ b/000-xyz/Linux-Bash-Commands/sed-replace.sh @@ -11,7 +11,24 @@ echo -e "sed starting" # sed "s/div/XYZ" ./multi-line-text.txt # /regexp/ 正则表达式后面少了一个 `/` ✅ -sed "s/div/XYZ/" ./multi-line-text.txt >> multi-line-text.md +# sed "s/div/XYZ/" ./multi-line-text.txt >> multi-line-text.md +# sed "s/
//" | sed "s/
//" ./multi-line-text.txt >> multi-line-text.md +# sed "s/
//" "s/
//" ./multi-line-text.txt >> multi-line-text.md +# sed "s/
<\/div>//" ./multi-line-text.txt >> multi-line-text.md +# sed "s/
//" | sed "s/<\/div>//" ./multi-line-text.txt >> multi-line-text.md + +# ??? 正则 replace multi tags + +# sed 不会直接修改源文件, 只是返回一个 STDOUT ✅ +# sed "s/
/👻/" ./multi-line-text.txt + +# sed 同时执行多个命令 `-e`, 使用英文的分号分隔 `;` ✅ +# sed 的多个命令写在同一个双引号里面 +# sed -e "s/
//; s/<\/div>//" ./multi-line-text.txt >> multi-line-text.md +sed -e "s/
/🎉/; s/<\/div>/👻/" ./multi-line-text.txt >> multi-line-text.md + +# sed -e "s/
//"; "s/<\/div>//" ./multi-line-text.txt >> multi-line-text.md + # echo ./multi-line-text.txt # echo ./multi-line-text.txt | sed "s/div/XYZ" From 4cb00ff3a316370e3810a456ea487a16087aab64 Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Wed, 26 Oct 2022 00:26:59 +0800 Subject: [PATCH 18/25] feat: sed insert first line data with \n line break --- .../Linux-Bash-Commands/multi-line-text.md | 1 + .../Linux-Bash-Commands/multi-line-text.txt | 1 + 000-xyz/Linux-Bash-Commands/sed-replace.sh | 32 ++++++++++++++++++- 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/000-xyz/Linux-Bash-Commands/multi-line-text.md b/000-xyz/Linux-Bash-Commands/multi-line-text.md index 14a5843..be9ea34 100644 --- a/000-xyz/Linux-Bash-Commands/multi-line-text.md +++ b/000-xyz/Linux-Bash-Commands/multi-line-text.md @@ -1,3 +1,4 @@ +Perl 🐪 camel 🎉line 01👻 🎉line 02👻 🎉line 03👻 diff --git a/000-xyz/Linux-Bash-Commands/multi-line-text.txt b/000-xyz/Linux-Bash-Commands/multi-line-text.txt index eea8a21..03c327f 100644 --- a/000-xyz/Linux-Bash-Commands/multi-line-text.txt +++ b/000-xyz/Linux-Bash-Commands/multi-line-text.txt @@ -1,3 +1,4 @@ +Perl 🐪 camel
line 01
line 02
line 03
diff --git a/000-xyz/Linux-Bash-Commands/sed-replace.sh b/000-xyz/Linux-Bash-Commands/sed-replace.sh index e3499e4..b571f5c 100755 --- a/000-xyz/Linux-Bash-Commands/sed-replace.sh +++ b/000-xyz/Linux-Bash-Commands/sed-replace.sh @@ -19,7 +19,37 @@ echo -e "sed starting" # ??? 正则 replace multi tags -# sed 不会直接修改源文件, 只是返回一个 STDOUT ✅ +# clear first +rm -rf ./multi-line-text.md + +# 双引号，多行文本 ❌ +# sed -i '' "1i\ +# Perl 🐪 camel\ +# " ./multi-line-text.txt +# sed: 1: "1iPerl 🐪 camel": command i expects \ followed by text + +# 单引号，多行文本 ✅ 直接插入数据到原始文件 +# sed -i '' '1i\ +# Perl 🐪 camel\ +# ' ./multi-line-text.txt + +# 1s 正则插入, 单引号 ✅ +# sed -i '' '1s/^/Perl 🐪 camel\n/' ./multi-line-text.txt + +# 1s 正则插入, 单引号 + 双引号 ✅ +# sed -i "" '1s/^/Perl 🐪 camel\n/' ./multi-line-text.txt + +# 1s 正则插入, 双引号 ✅ +sed -i "" "1s/^/Perl 🐪 camel\n/" ./multi-line-text.txt + + +# sed -i '' "1i\Perl 🐪 camel" ./multi-line-text.txt +# sed: 1: "1i\Perl 🐪 camel": extra characters after \ at the end of i command + +# sed -i '' "1i Perl 🐪 camel" ./multi-line-text.txt +# sed: 1: "1i Perl 🐪 camel": command i expects \ followed by text + +# sed 默认不会直接修改源文件, 只是返回一个 STDOUT ✅ # sed "s/
/👻/" ./multi-line-text.txt # sed 同时执行多个命令 `-e`, 使用英文的分号分隔 `;` ✅ From 318139cb324385f5bb6532ef5a87b5d39abe4ed3 Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Wed, 26 Oct 2022 23:56:46 +0800 Subject: [PATCH 19/25] =?UTF-8?q?=E6=97=A0=E9=9C=80=E5=86=99=20sed=20?= =?UTF-8?q?=E5=92=8C=20=E6=96=87=E4=BB=B6=E5=90=8D=E4=BA=86=EF=BC=8C?= =?UTF-8?q?=E5=9B=A0=E4=B8=BA`.sed`=E6=89=A9=E5=B1=95=E5=90=8D=E7=9A=84?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=AD=E6=98=AF=E7=BA=AF=20sed=20=E5=91=BD?= =?UTF-8?q?=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 3 ++- 000-xyz/Linux-Bash-Commands/readme.md | 15 +++++++++++ 000-xyz/Linux-Bash-Commands/sed-replace.sh | 3 +++ 000-xyz/Linux-Bash-Commands/test.ok.sed | 5 ++++ 000-xyz/Linux-Bash-Commands/test.out.md | 6 +++++ 000-xyz/Linux-Bash-Commands/test.sed | 30 ++++++++++++++++++++++ 000-xyz/Linux-Bash-Commands/test.txt | 3 +++ 7 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 000-xyz/Linux-Bash-Commands/test.ok.sed create mode 100644 000-xyz/Linux-Bash-Commands/test.out.md create mode 100644 000-xyz/Linux-Bash-Commands/test.sed create mode 100644 000-xyz/Linux-Bash-Commands/test.txt diff --git a/.editorconfig b/.editorconfig index 5760be5..1e14630 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,7 +6,8 @@ indent_style = space indent_size = 2 charset = utf-8 trim_trailing_whitespace = true -insert_final_newline = true +insert_final_newline = false +# insert_final_newline = true [*.md] trim_trailing_whitespace = false diff --git a/000-xyz/Linux-Bash-Commands/readme.md b/000-xyz/Linux-Bash-Commands/readme.md index 5b63ca0..ea4dd6c 100644 --- a/000-xyz/Linux-Bash-Commands/readme.md +++ b/000-xyz/Linux-Bash-Commands/readme.md @@ -34,3 +34,18 @@ div*10{line 0$}
line 09
line 10
--> + +## sed `-f` + +```sh +# 执行 sed 脚本，sed 后面指定文件名写在命令行里 +$ sed -f test.sed ./test.txt + +$ sed -f test.sed ./test.txt >> ./test.out.md + +# ✅ -n +$ sed -f test.sed -n ./test.txt +# ❌ -n +$ sed -f -n test.sed ./test.txt + +``` \ No newline at end of file diff --git a/000-xyz/Linux-Bash-Commands/sed-replace.sh b/000-xyz/Linux-Bash-Commands/sed-replace.sh index b571f5c..7da4d53 100755 --- a/000-xyz/Linux-Bash-Commands/sed-replace.sh +++ b/000-xyz/Linux-Bash-Commands/sed-replace.sh @@ -72,3 +72,6 @@ sed -e "s/
/🎉/; s/<\/div>/👻/" ./multi-line-text.txt >> multi-line-text # sed 's/
/👻' | sed 's/
/🎉' multi-line-text.txt => multi-line-text.md echo -e "sed finished" + + +# echo "this is abc" | sed -e 's/abc/xyz/' diff --git a/000-xyz/Linux-Bash-Commands/test.ok.sed b/000-xyz/Linux-Bash-Commands/test.ok.sed new file mode 100644 index 0000000..04b35f3 --- /dev/null +++ b/000-xyz/Linux-Bash-Commands/test.ok.sed @@ -0,0 +1,5 @@ +# 注释: `.sed`扩展名的文件，是 sed 命令集合专用的，本质上还是一种 shell scirpt +# 无需写 sed 和 文件名了，因为`.sed`扩展名的文件中是纯 sed 命令 +s/abc/ABC/ +s/xyz/XYZ/ +s/ufo/UFO/ diff --git a/000-xyz/Linux-Bash-Commands/test.out.md b/000-xyz/Linux-Bash-Commands/test.out.md new file mode 100644 index 0000000..c44f22b --- /dev/null +++ b/000-xyz/Linux-Bash-Commands/test.out.md @@ -0,0 +1,6 @@ +this is 🎉 1 +this is 👻 2 +this is 🛸 3 +this is 🎉 1 +this is 👻 2 +this is 🛸 3 diff --git a/000-xyz/Linux-Bash-Commands/test.sed b/000-xyz/Linux-Bash-Commands/test.sed new file mode 100644 index 0000000..ddf9dc4 --- /dev/null +++ b/000-xyz/Linux-Bash-Commands/test.sed @@ -0,0 +1,30 @@ +# 注释: `.sed`扩展名的文件，是 sed 命令集合专用的，本质上还是一种 shell scirpt +# 无需写 sed 和 文件名了，因为`.sed`扩展名的文件中是纯 sed 命令 +s/abc/🎉/ +s/xyz/👻/ +s/ufo/🛸/ + + +# 执行 sed 脚本，sed 后面指定文件名写在命令行里 +# $ sed -f test.sed ./test.txt +# $ sed -f test.sed -n ./test.txt +# $ sed -f test.sed ./test.txt >> ./test.out.md + +# sed: 12: test.sed: invalid command code < +# < Date: Thu, 27 Oct 2022 17:58:12 +0800 Subject: [PATCH 20/25] Create git-no-fast-forward-merge.md --- git-no-fast-forward-merge.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 git-no-fast-forward-merge.md diff --git a/git-no-fast-forward-merge.md b/git-no-fast-forward-merge.md new file mode 100644 index 0000000..6ab5887 --- /dev/null +++ b/git-no-fast-forward-merge.md @@ -0,0 +1,3 @@ +# git merge + +no-fast-forward From 107211b6b329d0f485f27911d592df7843cf1717 Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Thu, 27 Oct 2022 17:59:19 +0800 Subject: [PATCH 21/25] man sed --- 000-xyz/Linux-Bash-Commands/readme.md | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/000-xyz/Linux-Bash-Commands/readme.md b/000-xyz/Linux-Bash-Commands/readme.md index ea4dd6c..19b4c43 100644 --- a/000-xyz/Linux-Bash-Commands/readme.md +++ b/000-xyz/Linux-Bash-Commands/readme.md @@ -48,4 +48,27 @@ $ sed -f test.sed -n ./test.txt # ❌ -n $ sed -f -n test.sed ./test.txt -``` \ No newline at end of file +``` + +```md +# man ✅ +$ man sed + +$ sed --version +sed: illegal option -- - +usage: sed script [-Ealnru] [-i extension] [file ...] + sed [-Ealnu] [-i extension] [-e script] ... [-f script_file] ... [file ...] + +$ sed -v +sed: illegal option -- v +usage: sed script [-Ealnru] [-i extension] [file ...] + sed [-Ealnu] [-i extension] [-e script] ... [-f script_file] ... [file ...] + +$ sed -V +sed: illegal option -- V +usage: sed script [-Ealnru] [-i extension] [file ...] + sed [-Ealnu] [-i extension] [-e script] ... [-f script_file] ... [file ...] + +``` + + From 1d5deb6c9048e3a14fa0f399e8b082411712bee5 Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Thu, 27 Oct 2022 18:19:39 +0800 Subject: [PATCH 22/25] Create git-fast-forward-merge.md --- git-fast-forward-merge.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 git-fast-forward-merge.md diff --git a/git-fast-forward-merge.md b/git-fast-forward-merge.md new file mode 100644 index 0000000..8c2c8e1 --- /dev/null +++ b/git-fast-forward-merge.md @@ -0,0 +1,3 @@ +# git merge + +fast-forward From f2b896a6a0dc9a860d3705300c7e17c22758f489 Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Thu, 27 Oct 2022 18:50:04 +0800 Subject: [PATCH 23/25] Create git-merge-conflict.md --- git-merge-conflict.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 git-merge-conflict.md diff --git a/git-merge-conflict.md b/git-merge-conflict.md new file mode 100644 index 0000000..d23c951 --- /dev/null +++ b/git-merge-conflict.md @@ -0,0 +1,3 @@ +# git merge + + From 2743d98f1a6cfb65723bc31291a008247392fd04 Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Thu, 27 Oct 2022 18:51:47 +0800 Subject: [PATCH 24/25] Update git-merge-conflict.md --- git-merge-conflict.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-merge-conflict.md b/git-merge-conflict.md index d23c951..2ca2e96 100644 --- a/git-merge-conflict.md +++ b/git-merge-conflict.md @@ -1,3 +1,3 @@ # git merge - +合并冲突 From 4881672ed5904bec8b8979e252f812a47869ccc8 Mon Sep 17 00:00:00 2001 From: xgqfrms Date: Thu, 27 Oct 2022 18:57:47 +0800 Subject: [PATCH 25/25] Update git-merge-conflict.md --- git-merge-conflict.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-merge-conflict.md b/git-merge-conflict.md index d23c951..07ca5dd 100644 --- a/git-merge-conflict.md +++ b/git-merge-conflict.md @@ -1,3 +1,3 @@ # git merge - +merge conflicts