chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 79df2f0) | patch
Add option to automatically invoke the interactive merger
authorCatalin Marinas <catalin.marinas@gmail.com>
Wed, 10 Jan 2007 19:38:26 +0000 (19:38 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 10 Jan 2007 19:38:26 +0000 (19:38 +0000)
commitf7ed76a9b6158888e8efe2faef9c095802fd93fe
tree7049d43d1148441bb132f28b0c986f889e2a64betree | snapshot
parent79df2f0df89f382b63e4122aa15099a257a06463commit | diff
Add option to automatically invoke the interactive merger

The 'autoimerge' option was added (defaulting to 'no') to
automatically invoke the interactive merging tool when a conflict
occurs.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
examples/gitconfig diff | blob | blame | history
stgit/commands/resolved.py diff | blob | blame | history
stgit/config.py diff | blob | blame | history
stgit/gitmergeonefile.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)