imediff 2.4-6 source package in Ubuntu

Changelog

imediff (2.4-6) unstable; urgency=medium

  * Disable automatic tagging during git-rebase.

 -- Osamu Aoki <email address hidden>  Tue, 14 Sep 2021 14:15:49 +0900

Upload details

Uploaded by:
osamu
Uploaded to:
Sid
Original maintainer:
osamu
Architectures:
all
Section:
misc
Urgency:
Medium Urgency

See full publishing history Publishing

Series Pocket Published Component Section

Builds

Jammy: [FULLYBUILT] amd64

Downloads

File Size SHA-256 Checksum
imediff_2.4-6.dsc 2.0 KiB a820bfad59406695a887797cabce21608e011710eea5a9438fbd38e3e9c2d0ff
imediff_2.4.orig.tar.xz 43.2 KiB 9526524b1bb15df27818fb8ab025f69df12c5242f06e0f7c56b1e805f01ac508
imediff_2.4-6.debian.tar.xz 9.8 KiB d9a7d5278f836caf543866eb4cb9e944ef9d3e4c83bf402a8d727d0e89136c19

Available diffs

No changes file available.

Binary packages built by this source

imediff: interactive full screen 2/3-way merge tool

 The imediff command helps you to merge 2 slightly different files with
 an optional base file interactively using the in-place alternating
 display of the changed content on a single-pane full screen terminal
 user interface.
 .
 The source of line is clearly identified by the color of the line or the
 identifier character at the first column.
 .
 The advantage of this user interface is the minimal movement of the line
 of sight for the user.
 .
 The line matching logic of imediff has been improved to ignore whitespaces
 and use partial line matches to provide the best presentation with small
 chunk of lines.
 .
 The automatic 3 way merge logic of the imediff command operates not only on
 the difference by line but on the difference by character. This is another
 great feature of the imediff command. So for the non-overlapping changes,
 it always yields the clean merge.
 .
 The "git ime" command helps you to unsquash 2 consecutive commits (`HEAD^`,
 `HEAD`) of a git repository. The "git rebase -i <treeish>" and "gitk" can
 be used to organize unsquashed changes.
 .
 If any staged changes or local uncommitted changes are found in the git
 repository, "git ime" immediately exits without changes to be on the
 safe side.
 .
 If the latest commit involves multiple files, "git ime" splits this big
 commit by the file into multiple smaller commits involving a single file
 for each commit.
 .
 If the latest commit involves only a single file, the commit is split
 into multiple smaller commits involving a set of minimal partial
 changes by imediff to be managed interactively later.
 .
 This "git ime" is not only useful at the checked out branch head but
 also at "edit" prompt during the interactive execution of "git rebase -i
 <treeish>". Execute "git ime" after committing the pending commit.