imediff 2.6-1 source package in Ubuntu

Changelog

imediff (2.6-1) unstable; urgency=medium

  * Fix bug in git-ime for diff split a file into many files ( >8)

 -- Osamu Aoki <email address hidden>  Sun, 06 Feb 2022 08:25:12 +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
Mantic release universe misc
Lunar release universe misc
Jammy release universe misc

Builds

Jammy: [FULLYBUILT] amd64

Downloads

File Size SHA-256 Checksum
imediff_2.6-1.dsc 1.9 KiB d471bfe3e856ee1849787b6086420388cf38b5c280d1deba45851b314e9c8140
imediff_2.6.orig.tar.xz 46.5 KiB 0d3dcdbf32f0aa53b6aa10e46b342d30fa2ae5978c4f6e6e09e115c12cf23267
imediff_2.6-1.debian.tar.xz 5.4 KiB 98b12c8f054065c421dfc6661475076c0c736beb99eb20626b31b3dab1a9aab2

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.