mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-30 00:51:19 +02:00
Code
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
396 Commits 6 Branches 954 Tags 460 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
48a81b7cda
Go to file
Paul Mackerras 48a81b7cda gitk: Cope with unmerged files in local changes 
This modifies gettreediffline so that it when we get both a "U" line
and an "M" line for the same file in the output from git diff-files
or git diff-index --cached (used when the user clicks on a fake commit)
we don't add the same filename to the treediff list twice.

This also makes getblobdiffline recognize the "* Unmerged path ..."
lines we get when we ask for the actual diffs, and makes a tiny
optimization in makediffhdr.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-11-04 21:09:00 +11:00
po gitk: Regenerate .po files 2008-10-18 22:23:33 +11:00
gitk gitk: Cope with unmerged files in local changes 2008-11-04 21:09:00 +11:00
Makefile gitk: Makefile/install: force permissions when installing files and dirs 2008-05-02 22:54:02 +10:00