Sun, 24 May 2020 00:47:43 -0500
housekeeping ftplugins
755 | 1 | #!/bin/sh |
2 | set -eu | |
3 | ||
4 | case ${1:-} in *help|-h) | |
5 | exec perldoc -T $0;; | |
6 | esac | |
7 | ||
798
d690f45fd713
simplify - there's no need to handle other branches or moves in this
Meredith Howard <mhoward@roomag.org>
parents:
759
diff
changeset
|
8 | BRANCH="$(git symbolic-ref --short -q HEAD)" |
d690f45fd713
simplify - there's no need to handle other branches or moves in this
Meredith Howard <mhoward@roomag.org>
parents:
759
diff
changeset
|
9 | BASE=$(git merge-base "@{u}" "$BRANCH") |
755 | 10 | |
798
d690f45fd713
simplify - there's no need to handle other branches or moves in this
Meredith Howard <mhoward@roomag.org>
parents:
759
diff
changeset
|
11 | exec git rebase --interactive --autosquash "$@" "$BASE" "$BRANCH" |
755 | 12 | |
13 | :<<=cut | |
14 | =head1 NAME | |
15 | ||
16 | git histedit | |
17 | ||
18 | =head1 SYNOPSIS | |
19 | ||
20 | $ git histedit | |
21 | ||
22 | =head1 DESCRIPTION | |
23 | ||
798
d690f45fd713
simplify - there's no need to handle other branches or moves in this
Meredith Howard <mhoward@roomag.org>
parents:
759
diff
changeset
|
24 | C<histedit> lets you edit the current branch using interactive rebase, but |
d690f45fd713
simplify - there's no need to handle other branches or moves in this
Meredith Howard <mhoward@roomag.org>
parents:
759
diff
changeset
|
25 | without actually I<moving> the fork point of your branch, avoiding the |
d690f45fd713
simplify - there's no need to handle other branches or moves in this
Meredith Howard <mhoward@roomag.org>
parents:
759
diff
changeset
|
26 | complications of fixing up your history and dealing with merge conflicts at the |
d690f45fd713
simplify - there's no need to handle other branches or moves in this
Meredith Howard <mhoward@roomag.org>
parents:
759
diff
changeset
|
27 | same time. |
755 | 28 | |
29 | See also: C<hg histedit> | |
30 | ||
31 | =cut |