Skip to content

Commit

Permalink
Version 0.003001
Browse files Browse the repository at this point in the history
  • Loading branch information
torbiak committed Nov 25, 2020
1 parent 0d2eb90 commit 206e282
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
8 changes: 8 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# 0.003001

- Fix bug where the index would be left out-of-sync with `HEAD` after
autofixing unstaged hunks due to a temporary index being used. If you're
running v0.003000 and hit this, `git restore --staged` can be used to read
the new `HEAD`'s tree into the index. Thanks to Johannes Altmanninger for
finding and fixing this.

# 0.003000

The most important change to the interface is that now, if there are any hunks
Expand Down
2 changes: 1 addition & 1 deletion README.pod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ App::Git::Autofixup - create fixup commits for topic branches

=head1 DESCRIPTION

F<git-autofixup> parses hunks of changes in the working directory out of C<git diff> output and uses C<git blame> to assign those hunks to commits in C<E<lt>revisionE<gt>..HEAD>, which will typically represent a topic branch, and then creates fixup commits to be used with C<git rebase --interactive --autosquash>. [See C<git help revisions> for information about git revision specification syntax.] It is assumed that hunks near changes that were previously committed to the topic branch are related.
F<git-autofixup> parses hunks of changes in the working directory out of C<git diff> output and uses C<git blame> to assign those hunks to commits in C<E<lt>revisionE<gt>..HEAD>, which will typically represent a topic branch, and then creates fixup commits to be used with C<git rebase --interactive --autosquash>. It is assumed that hunks near changes that were previously committed to the topic branch are related.

C<@{upstream}> or C<@{u}> is likely a convenient value to use for C<E<lt>revisionE<gt>> if the current branch has a tracking branch. See C<git help revisions> for other ways to specify revisions.

Expand Down
2 changes: 1 addition & 1 deletion git-autofixup
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Getopt::Long qw(:config bundling);
use File::Temp;
use File::Spec ();

our $VERSION = 0.003000; # X.YYYZZZ
our $VERSION = 0.003001; # X.YYYZZZ

my $VERBOSE;
my @GIT_OPTIONS;
Expand Down
2 changes: 1 addition & 1 deletion lib/App/Git/Autofixup.pm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package App::Git::Autofixup;
use strict;
use warnings FATAL => 'all';

our $VERSION = 0.003000;
our $VERSION = 0.003001;

=head1 NAME
Expand Down

0 comments on commit 206e282

Please sign in to comment.