Add .tmux.conf
Add .tmux/plugins/tmux-sensible/CHANGELOG.md Add .tmux/plugins/tmux-sensible/LICENSE.md Add .tmux/plugins/tmux-sensible/README.md Add .tmux/plugins/tmux-sensible/.git/HEAD Add .tmux/plugins/tmux-sensible/.git/config Add .tmux/plugins/tmux-sensible/.git/description Add .tmux/plugins/tmux-sensible/.git/hooks/applypatch-msg.sample Add .tmux/plugins/tmux-sensible/.git/hooks/commit-msg.sample Add .tmux/plugins/tmux-sensible/.git/hooks/fsmonitor-watchman.sample Add .tmux/plugins/tmux-sensible/.git/hooks/post-update.sample Add .tmux/plugins/tmux-sensible/.git/hooks/pre-applypatch.sample Add .tmux/plugins/tmux-sensible/.git/hooks/pre-commit.sample Add .tmux/plugins/tmux-sensible/.git/hooks/pre-merge-commit.sample Add .tmux/plugins/tmux-sensible/.git/hooks/pre-push.sample Add .tmux/plugins/tmux-sensible/.git/hooks/pre-rebase.sample Add .tmux/plugins/tmux-sensible/.git/hooks/pre-receive.sample Add .tmux/plugins/tmux-sensible/.git/hooks/prepare-commit-msg.sample Add .tmux/plugins/tmux-sensible/.git/hooks/push-to-checkout.sample Add .tmux/plugins/tmux-sensible/.git/hooks/update.sample Add .tmux/plugins/tmux-sensible/.git/index Add .tmux/plugins/tmux-sensible/.git/info/exclude Add .tmux/plugins/tmux-sensible/.git/logs/HEAD Add .tmux/plugins/tmux-sensible/.git/logs/refs/heads/master Add .tmux/plugins/tmux-sensible/.git/logs/refs/remotes/origin/HEAD Add .tmux/plugins/tmux-sensible/.git/objects/info/.keep Add .tmux/plugins/tmux-sensible/.git/objects/pack/pack-2a598c9f31f588f92fc2a83b1ab7a1ae38767c16.idx Add .tmux/plugins/tmux-sensible/.git/objects/pack/pack-2a598c9f31f588f92fc2a83b1ab7a1ae38767c16.pack Add .tmux/plugins/tmux-sensible/.git/packed-refs Add .tmux/plugins/tmux-sensible/.git/refs/heads/master Add .tmux/plugins/tmux-sensible/.git/refs/remotes/origin/HEAD Add .tmux/plugins/tmux-sensible/.git/refs/tags/v1.0.0 Add .tmux/plugins/tmux-sensible/.git/refs/tags/v1.1.0 Add .tmux/plugins/tmux-sensible/.git/refs/tags/v2.0.0 Add .tmux/plugins/tmux-sensible/.git/refs/tags/v2.1.0 Add .tmux/plugins/tmux-sensible/.git/refs/tags/v2.2.0 Add .tmux/plugins/tmux-sensible/.git/refs/tags/v2.3.0 Add .tmux/plugins/tmux-sensible/.git/refs/tags/v3.0.0 Add .tmux/plugins/tmux-sensible/.gitattributes Add .tmux/plugins/tmux-sensible/sensible.tmux Add .tmux/plugins/tmux/LICENSE Add .tmux/plugins/tmux/README.md Add .tmux/plugins/tmux/assets/frappe.webp Add .tmux/plugins/tmux/assets/latte.webp Add .tmux/plugins/tmux/assets/macchiato.webp Add .tmux/plugins/tmux/assets/mocha.webp Add .tmux/plugins/tmux/assets/preview.webp Add .tmux/plugins/tmux/catppuccin-frappe.tmuxtheme Add .tmux/plugins/tmux/catppuccin-latte.tmuxtheme Add .tmux/plugins/tmux/catppuccin-macchiato.tmuxtheme Add .tmux/plugins/tmux/catppuccin-mocha.tmuxtheme Add .tmux/plugins/tmux/.editorconfig Add .tmux/plugins/tmux/.git/HEAD Add .tmux/plugins/tmux/.git/config Add .tmux/plugins/tmux/.git/description Add .tmux/plugins/tmux/.git/hooks/applypatch-msg.sample Add .tmux/plugins/tmux/.git/hooks/commit-msg.sample Add .tmux/plugins/tmux/.git/hooks/fsmonitor-watchman.sample Add .tmux/plugins/tmux/.git/hooks/post-update.sample Add .tmux/plugins/tmux/.git/hooks/pre-applypatch.sample Add .tmux/plugins/tmux/.git/hooks/pre-commit.sample Add .tmux/plugins/tmux/.git/hooks/pre-merge-commit.sample Add .tmux/plugins/tmux/.git/hooks/pre-push.sample Add .tmux/plugins/tmux/.git/hooks/pre-rebase.sample Add .tmux/plugins/tmux/.git/hooks/pre-receive.sample Add .tmux/plugins/tmux/.git/hooks/prepare-commit-msg.sample Add .tmux/plugins/tmux/.git/hooks/push-to-checkout.sample Add .tmux/plugins/tmux/.git/hooks/sendemail-validate.sample Add .tmux/plugins/tmux/.git/hooks/update.sample Add .tmux/plugins/tmux/.git/index Add .tmux/plugins/tmux/.git/info/exclude Add .tmux/plugins/tmux/.git/logs/HEAD Add .tmux/plugins/tmux/.git/logs/refs/heads/main Add .tmux/plugins/tmux/.git/logs/refs/remotes/origin/HEAD Add .tmux/plugins/tmux/.git/objects/info/.keep Add .tmux/plugins/tmux/.git/objects/pack/pack-ca2499aaebdbbc41d6409686c32c5c7e0d6988c8.idx Add .tmux/plugins/tmux/.git/objects/pack/pack-ca2499aaebdbbc41d6409686c32c5c7e0d6988c8.pack Add .tmux/plugins/tmux/.git/objects/pack/pack-ca2499aaebdbbc41d6409686c32c5c7e0d6988c8.rev Add .tmux/plugins/tmux/.git/packed-refs Add .tmux/plugins/tmux/.git/refs/heads/main Add .tmux/plugins/tmux/.git/refs/remotes/origin/HEAD Add .tmux/plugins/tmux/.git/refs/tags/.keep Add .tmux/plugins/tmux/.gitignore Add .tmux/plugins/tmux/catppuccin.tmux Add .tmux/plugins/tpm/CHANGELOG.md Add .tmux/plugins/tpm/HOW_TO_PLUGIN.md Add .tmux/plugins/tpm/LICENSE.md Add .tmux/plugins/tpm/README.md Add .tmux/plugins/tpm/bin/clean_plugins Add .tmux/plugins/tpm/bin/install_plugins Add .tmux/plugins/tpm/bin/update_plugins Add .tmux/plugins/tpm/bindings/clean_plugins Add .tmux/plugins/tpm/bindings/install_plugins Add .tmux/plugins/tpm/bindings/update_plugins Add .tmux/plugins/tpm/docs/automatic_tpm_installation.md Add .tmux/plugins/tpm/docs/changing_plugins_install_dir.md Add .tmux/plugins/tpm/docs/how_to_create_plugin.md Add .tmux/plugins/tpm/docs/managing_plugins_via_cmd_line.md Add .tmux/plugins/tpm/docs/tpm_not_working.md Add .tmux/plugins/tpm/.git/HEAD Add .tmux/plugins/tpm/.git/config Add .tmux/plugins/tpm/.git/description Add .tmux/plugins/tpm/.git/hooks/applypatch-msg.sample Add .tmux/plugins/tpm/.git/hooks/commit-msg.sample Add .tmux/plugins/tpm/.git/hooks/fsmonitor-watchman.sample Add .tmux/plugins/tpm/.git/hooks/post-update.sample Add .tmux/plugins/tpm/.git/hooks/pre-applypatch.sample Add .tmux/plugins/tpm/.git/hooks/pre-commit.sample Add .tmux/plugins/tpm/.git/hooks/pre-merge-commit.sample Add .tmux/plugins/tpm/.git/hooks/pre-push.sample Add .tmux/plugins/tpm/.git/hooks/pre-rebase.sample Add .tmux/plugins/tpm/.git/hooks/pre-receive.sample Add .tmux/plugins/tpm/.git/hooks/prepare-commit-msg.sample Add .tmux/plugins/tpm/.git/hooks/push-to-checkout.sample Add .tmux/plugins/tpm/.git/hooks/update.sample Add .tmux/plugins/tpm/.git/index Add .tmux/plugins/tpm/.git/info/exclude Add .tmux/plugins/tpm/.git/logs/HEAD Add .tmux/plugins/tpm/.git/logs/refs/heads/master Add .tmux/plugins/tpm/.git/logs/refs/remotes/origin/HEAD Add .tmux/plugins/tpm/.git/objects/info/.keep Add .tmux/plugins/tpm/.git/objects/pack/pack-17625ffcf71a446997741831332005307218a33a.idx Add .tmux/plugins/tpm/.git/objects/pack/pack-17625ffcf71a446997741831332005307218a33a.pack Add .tmux/plugins/tpm/.git/packed-refs Add .tmux/plugins/tpm/.git/refs/heads/master Add .tmux/plugins/tpm/.git/refs/remotes/origin/HEAD Add .tmux/plugins/tpm/.git/refs/tags/.keep Add .tmux/plugins/tpm/.gitattributes Add .tmux/plugins/tpm/.gitignore Add .tmux/plugins/tpm/.gitmodules Add .tmux/plugins/tpm/.travis.yml Add .tmux/plugins/tpm/tpm Add .tmux/plugins/tpm/lib/tmux-test/.keep Add .tmux/plugins/tpm/scripts/check_tmux_version.sh Add .tmux/plugins/tpm/scripts/clean_plugins.sh Add .tmux/plugins/tpm/scripts/install_plugins.sh Add .tmux/plugins/tpm/scripts/source_plugins.sh Add .tmux/plugins/tpm/scripts/update_plugin.sh Add .tmux/plugins/tpm/scripts/update_plugin_prompt_handler.sh Add .tmux/plugins/tpm/scripts/helpers/plugin_functions.sh Add .tmux/plugins/tpm/scripts/helpers/shell_echo_functions.sh Add .tmux/plugins/tpm/scripts/helpers/tmux_echo_functions.sh Add .tmux/plugins/tpm/scripts/helpers/tmux_utils.sh Add .tmux/plugins/tpm/scripts/helpers/utility.sh Add .tmux/plugins/tpm/scripts/variables.sh Add .tmux/plugins/tpm/tests/expect_failed_plugin_download Add .tmux/plugins/tpm/tests/expect_successful_clean_plugins Add .tmux/plugins/tpm/tests/expect_successful_multiple_plugins_download Add .tmux/plugins/tpm/tests/expect_successful_plugin_download Add .tmux/plugins/tpm/tests/expect_successful_update_of_a_single_plugin Add .tmux/plugins/tpm/tests/expect_successful_update_of_all_plugins Add .tmux/plugins/tpm/tests/test_plugin_clean.sh Add .tmux/plugins/tpm/tests/test_plugin_installation.sh Add .tmux/plugins/tpm/tests/test_plugin_installation_legacy.sh Add .tmux/plugins/tpm/tests/test_plugin_sourcing.sh Add .tmux/plugins/tpm/tests/test_plugin_update.sh Add .tmux/plugins/tpm/tests/helpers/tpm.sh Add .tmux/plugins/vim-tmux-navigator/License.md Add .tmux/plugins/vim-tmux-navigator/README.md Add .tmux/plugins/vim-tmux-navigator/doc/tmux-navigator.txt Add .tmux/plugins/vim-tmux-navigator/.git/HEAD Add .tmux/plugins/vim-tmux-navigator/.git/config Add .tmux/plugins/vim-tmux-navigator/.git/description Add .tmux/plugins/vim-tmux-navigator/.git/hooks/applypatch-msg.sample Add .tmux/plugins/vim-tmux-navigator/.git/hooks/commit-msg.sample Add .tmux/plugins/vim-tmux-navigator/.git/hooks/fsmonitor-watchman.sample Add .tmux/plugins/vim-tmux-navigator/.git/hooks/post-update.sample Add .tmux/plugins/vim-tmux-navigator/.git/hooks/pre-applypatch.sample Add .tmux/plugins/vim-tmux-navigator/.git/hooks/pre-commit.sample Add .tmux/plugins/vim-tmux-navigator/.git/hooks/pre-merge-commit.sample Add .tmux/plugins/vim-tmux-navigator/.git/hooks/pre-push.sample Add .tmux/plugins/vim-tmux-navigator/.git/hooks/pre-rebase.sample Add .tmux/plugins/vim-tmux-navigator/.git/hooks/pre-receive.sample Add .tmux/plugins/vim-tmux-navigator/.git/hooks/prepare-commit-msg.sample Add .tmux/plugins/vim-tmux-navigator/.git/hooks/push-to-checkout.sample Add .tmux/plugins/vim-tmux-navigator/.git/hooks/update.sample Add .tmux/plugins/vim-tmux-navigator/.git/index Add .tmux/plugins/vim-tmux-navigator/.git/info/exclude Add .tmux/plugins/vim-tmux-navigator/.git/logs/HEAD Add .tmux/plugins/vim-tmux-navigator/.git/logs/refs/heads/master Add .tmux/plugins/vim-tmux-navigator/.git/logs/refs/remotes/origin/HEAD Add .tmux/plugins/vim-tmux-navigator/.git/objects/info/.keep Add .tmux/plugins/vim-tmux-navigator/.git/objects/pack/pack-d18103c902c90ca8df5435292ec0cf5b50bd3683.idx Add .tmux/plugins/vim-tmux-navigator/.git/objects/pack/pack-d18103c902c90ca8df5435292ec0cf5b50bd3683.pack Add .tmux/plugins/vim-tmux-navigator/.git/packed-refs Add .tmux/plugins/vim-tmux-navigator/.git/refs/heads/master Add .tmux/plugins/vim-tmux-navigator/.git/refs/remotes/origin/HEAD Add .tmux/plugins/vim-tmux-navigator/.git/refs/tags/v1.0 Add .tmux/plugins/vim-tmux-navigator/.gitignore Add .tmux/plugins/vim-tmux-navigator/vim-tmux-navigator.tmux Add .tmux/plugins/vim-tmux-navigator/pattern-check Add .tmux/plugins/vim-tmux-navigator/plugin/tmux_navigator.vim Add revive.toml
This commit is contained in:
@@ -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
|
Reference in New Issue
Block a user