Git with broken hash generation to generate collisions between object IDs. Don't use this! https://undefinedbehavior.de/posts/commit-vandalism/
Go to file
Alexander Gavrilov ff515d81fa git-gui: Support conflict states _U & UT.
Support _U (local deleted, remote modified) and
UT (file type changed in conflict) modes.

Note that 'file type changed' does not refer to
changes in the executable bit, instead it denotes
replacing a file with a link, or vice versa.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-09-04 21:28:55 -07:00
lib git-gui: Support conflict states _U & UT. 2008-09-04 21:28:55 -07:00
macosx git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk 2008-07-25 15:08:33 -07:00
po git-gui: Fix string escaping in po2msg.sh 2008-09-01 15:39:11 -07:00
windows git-gui (Windows): Change wrapper to execdir 'libexec/git-core' 2008-07-29 22:43:37 -07:00
.gitignore git-gui: Honor a config.mak in git-gui's top level 2007-10-13 22:14:14 -04:00
git-gui.sh git-gui: Support conflict states _U & UT. 2008-09-04 21:28:55 -07:00
GIT-VERSION-GEN git-gui 0.11 2008-08-10 00:02:08 -07:00
Makefile git-gui (Windows): Switch to relative discovery of oguilib 2008-07-29 22:43:37 -07:00