H0llyW00dzZ/git: Git Source Code Mirror - This is a publish-only repository but pull requests can be turned into patches to the mailing list via GitGitGadget (https://gitgitgadget.github.io/). Please follow Documentation/SubmittingPatches procedure for any of your improvements. - git

mirror of https://github.com/git/git.git synced 2025-04-18 23:33:46 +00:00

Go to file

Johannes Sixt d3bcf55d67 git-gui: Do not automatically stage file after merge tool finishes

If a merge tool was invoked on a conflicted file and the tool completed,
then the conflicted file was staged automatically. However, the fact that
the user closed the merge tool cannot be understood as the unequivocal
sign that the conflict was completely resolved. For example, the user
could have decided to postpone the resolution of the conflict, or could
have accidentally closed the tool. We better leave the file unstaged and
let the user stage it explicitly.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

2008-09-30 11:40:48 -07:00

lib

git-gui: Do not automatically stage file after merge tool finishes

2008-09-30 11:40:48 -07:00

macosx

git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk

2008-07-25 15:08:33 -07:00

git-gui: Updated German translation.

2008-09-13 14:24:16 -07:00

windows

git-gui (Windows): Change wrapper to execdir 'libexec/git-core'

2008-07-29 22:43:37 -07:00