~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0eff9b8) | patch
Update the tutorial for the conflict situations
authorCatalin Marinas <catalin.marinas@gmail.com>
Thu, 3 Dec 2009 22:35:10 +0000 (22:35 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Thu, 3 Dec 2009 22:35:10 +0000 (22:35 +0000)
commit814d59e31b173fe687d26f073a8cc57fd4485c84
treeaf2bcc1b319f0cd6e521353df3497e8132099288tree | snapshot (tar.gz zip)
parent0eff9b85622b9e80502911431aaab9e8dc4c1bb8commit | diff
Update the tutorial for the conflict situations

This is a fix for bug #14672.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Documentation/tutorial.txt diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)