~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3bc4dc4 04b4421)
Merge branch 'stable'
authorKarl Hasselström <kha@treskal.com>
Tue, 26 Aug 2008 22:00:15 +0000 (00:00 +0200)
committerKarl Hasselström <kha@treskal.com>
Tue, 26 Aug 2008 22:00:15 +0000 (00:00 +0200)
commit850c3a89476ba8608b2deeba109fa7def2607655
treed6a574eb497d0e1449beb06043ad41f5f86fe84atree | snapshot (tar.gz zip)
parent3bc4dc4f9595df90d048f829dd9c0c5a387d05cbcommit | diff
parent04b442170d797b1cb80700838c41b7222040236ccommit | diff
Merge branch 'stable'

Conflicts:
stgit/commands/diff.py
stgit/commands/edit.py
stgit/commands/export.py
stgit/commands/files.py
stgit/commands/mail.py
stgit/gitmergeonefile.py
t/t1200-push-modified.sh
t/t1201-pull-trailing.sh
t/test-lib.sh
Documentation/tutorial.txt diff1 | diff2 | blob | history
examples/gitconfig diff1 | diff2 | blob | history
stgit/commands/pick.py diff1 | diff2 | blob | history
t/README diff1 | diff2 | blob | history
t/t1200-push-modified.sh diff1 | diff2 | blob | history
t/t1201-pull-trailing.sh diff1 | diff2 | blob | history
t/t1302-repair-interop.sh diff1 | diff2 | blob | history
t/t2702-refresh-rm.sh diff1 | | blob | history
GIT patch-maintenance porcelain (local modifications)