chiark
/
gitweb
/
~mdw
/
stgit
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Prevent most commands from running when there are conflicts
[stgit]
/
stgit
/
gitmergeonefile.py
2008-05-19
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
raw
2008-04-17
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
raw
2008-04-14
Karl Hasselström
Merge branch 'stable' into stable-master-merge
blob
|
commitdiff
|
raw
2008-03-25
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
raw
2007-12-19
Catalin Marinas
Re-add the interactive merge
blob
|
commitdiff
|
raw
2007-12-19
Karl Hasselström
Fix "stg resolved" to work with new conflict representation
blob
|
commitdiff
|
raw
|
diff to current
2007-11-14
Catalin Marinas
Execute the 'git ...' rather than 'git-...'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-07
Karl Hasselström
Make a common superclass for all StGit exceptions
blob
|
commitdiff
|
raw
|
diff to current
2007-08-26
Karl Hasselström
Refactor subprocess creation
blob
|
commitdiff
|
raw
|
diff to current
2007-08-26
Karl Hasselström
Refactor output handling to break circular dependency
blob
|
commitdiff
|
raw
|
diff to current
2007-06-21
Catalin Marinas
Pass a string rather than an exception object in gitmer...
blob
|
commitdiff
|
raw
|
diff to current
2007-05-21
Karl Hasselström
Refactor message printing
blob
|
commitdiff
|
raw
|
diff to current
2007-02-28
Catalin Marinas
Use and..or as a ternary operator rather than a dictionary
blob
|
commitdiff
|
raw
|
diff to current
2007-02-28
Catalin Marinas
Add an interractive 2-way merge option
blob
|
commitdiff
|
raw
|
diff to current
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
~mdw / stgit / history