chiark - git - mdw - stgit/history - stgit/gitmergeonefile.py

~mdw / stgit / history

2007-02-28	Catalin Marinas	Add an interractive 2-way merge option	blob \| commitdiff \| raw
2007-01-31	Yann Dirson	Make stgit.config use git-repo-config.	blob \| commitdiff \| raw \| diff to current
2007-01-12	Catalin Marinas	Track the files conflict history	blob \| commitdiff \| raw \| diff to current
2007-01-10	Catalin Marinas	Add option to automatically invoke the interactive...	blob \| commitdiff \| raw \| diff to current
2006-12-07	Catalin Marinas	Fix a merge case with files added in both heads but...	blob \| commitdiff \| raw \| diff to current
2006-11-20	Catalin Marinas	Fix a bug in gitmergeonefile.py introduced recently	blob \| commitdiff \| raw \| diff to current
2006-11-17	Catalin Marinas	Only read the config files when running a command	blob \| commitdiff \| raw \| diff to current
2006-10-16	Catalin Marinas	Add the '--interactive' option to 'resolved'	blob \| commitdiff \| raw \| diff to current
2006-05-09	Catalin Marinas	Allow configurable file extensions for merge conflicts	blob \| commitdiff \| raw \| diff to current
2006-05-03	Catalin Marinas	Fix the added to both but different conflict	blob \| commitdiff \| raw \| diff to current
2006-03-28	Catalin Marinas	Create stgit/basedir.py for determining the .git directory	blob \| commitdiff \| raw \| diff to current
2006-03-28	Catalin Marinas	The gitmergeonefile config section is deprecated	blob \| commitdiff \| raw \| diff to current
2006-03-10	Catalin Marinas	Deal with merge conflicts directly	blob \| commitdiff \| raw \| diff to current

GIT patch-maintenance porcelain (local modifications)