~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: afddd62) | patch
Remove the resolved command
authorCatalin Marinas <catalin.marinas@arm.com>
Sat, 30 May 2009 12:13:26 +0000 (13:13 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Sat, 30 May 2009 12:13:26 +0000 (13:13 +0100)
commit9ab06b9858bbb0196867506724a8d74c8f39e113
treecc28aad91de3c9e2c15fb7188f4c1b806b41b981tree | snapshot (tar.gz zip)
parentafddd62b52567fc1834e658b968f5a62334ea63ccommit | diff
Remove the resolved command

This command simply duplicates the "git add" or "git mergetool" commands
for handling conflicts.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Karl Hasselström <kha@treskal.com>
Documentation/tutorial.txt diff | blob | blame | history
examples/gitconfig diff | blob | blame | history
stgit/commands/common.py diff | blob | blame | history
stgit/commands/push.py diff | blob | blame | history
stgit/commands/rebase.py diff | blob | blame | history
stgit/commands/resolved.py [deleted file] blob | blame | history
stgit/config.py diff | blob | blame | history
t/t0002-status.sh diff | blob | blame | history
t/t2000-sync.sh diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)