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.
547 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%
1e0a92fdf7
Go to file
Shawn O. Pearce 1e0a92fdf7 git-gui: Don't kill modified commit message buffer with merge templates 
If the user is in the middle of a merge and has already started to
modify their commit message we were losing the user's changes when
they pressed 'Rescan' after resolving issues or making changes in
the working directory.

The problem here was our background timer that saves the commit
message buffer.  It marks the commit message buffer as not being
modified when it writes it out to disk, so during the rescan we
assumed the buffer should be replaced with what we read from the
MERGE_MSG file.  So we now only read these files from .git if we
have a valid backup file.  Since we clear it on commit this will
only have an impact while the user is actively editing the current
commit.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-07-27 02:30:15 -04:00
lib git-gui: Remove usernames from absolute SSH urls during merging 2007-07-25 05:02:38 -04:00
.gitignore
git-gui.sh git-gui: Don't kill modified commit message buffer with merge templates 2007-07-27 02:30:15 -04:00
GIT-VERSION-GEN
Makefile Merge branch 'maint' 2007-06-27 00:36:38 -04:00