Debian Codegraph @

debian/control

raw
1 Source: imediff
2 Section: text
3 Priority: optional
4 Maintainer: Osamu Aoki <[email protected]>
5 Build-Depends: debhelper-compat (= 13),
6 dh-python,
7 pybuild-plugin-pyproject,
8 python3-all,
9 python3-setuptools
10 Standards-Version: 4.7.0
11 VCS-Git: https://github.com/osamuaoki/imediff.git -b main
12 Vcs-Browser: https://github.com/osamuaoki/imediff
13 Homepage: https://github.com/osamuaoki/imediff
14
15 Package: imediff
16 Architecture: all
17 Depends: vim | emacs | editor, ${misc:Depends}, ${python3:Depends}
18 Recommends: git
19 Provides: imediff2
20 Breaks: imediff2 (<< 1.1.2.1-3)
21 Replaces: imediff2 (<< 1.1.2.1-3)
22 Description: interactive full screen 2/3-way merge tool
23 The imediff command helps you to merge 2 slightly different files with
24 an optional base file interactively using the in-place alternating
25 display of the changed content on a single-pane full screen terminal
26 user interface.
27 .
28 The source of line is clearly identified by the color of the line or the
29 identifier character at the first column.
30 .
31 The advantage of this user interface is the minimal movement of the line
32 of sight for the user.
33 .
34 The line matching logic of imediff has been improved to ignore whitespaces
35 and use partial line matches to provide the best presentation with small
36 chunk of lines.
37 .
38 The automatic 3 way merge logic of the imediff command operates not only on
39 the difference by line but on the difference by character. This is another
40 great feature of the imediff command. So for the non-overlapping changes,
41 it always yields the clean merge.
42 .
43 The "git ime" command helps you to unsquash 2 consecutive commits (`HEAD^`,
44 `HEAD`) of a git repository. The "git rebase -i <treeish>" and "gitk" can
45 be used to organize unsquashed changes.
46 .
47 If any staged changes or local uncommitted changes are found in the git
48 repository, "git ime" immediately exits without changes to be on the
49 safe side.
50 .
51 If the latest commit involves multiple files, "git ime" splits this big
52 commit by the file into multiple smaller commits involving a single file
53 for each commit.
54 .
55 If the latest commit involves only a single file, the commit is split
56 into multiple smaller commits involving a set of minimal partial
57 changes by imediff to be managed interactively later.
58 .
59 This "git ime" is not only useful at the checked out branch head but
60 also at "edit" prompt during the interactive execution of "git rebase -i
61 <treeish>". Execute "git ime" after committing the pending commit.