~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2ac4969) | patch
Allow git.checkout() to work on unmerged indexes
authorCatalin Marinas <catalin.marinas@gmail.com>
Wed, 3 May 2006 19:34:18 +0000 (20:34 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 3 May 2006 19:34:18 +0000 (20:34 +0100)
commit774fc1e90859cc68926f4357347b0624d43f746f
tree398b39e792dba06ab527440ed06d6671f8b3625atree | snapshot (tar.gz zip)
parent2ac49695d699a49f70bc2a899889d723797c6e12commit | diff
Allow git.checkout() to work on unmerged indexes

If the index has unmerged entries, the current checkout implementation
fails because of the -m option. This patch removes the option since it is
not needed on tree_id is specified. This also allows "stg status --reset"
to work on unmerged indexes.

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