~mdw
/
stgit
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Track the files conflict history
[stgit]
/
stgit
/
gitmergeonefile.py
2007-01-12
Catalin Marinas
Track the files conflict history
blob
|
commitdiff
2007-01-10
Catalin Marinas
Add option to automatically invoke the interactive...
blob
|
commitdiff
|
diff to current
2006-12-07
Catalin Marinas
Fix a merge case with files added in both heads but...
blob
|
commitdiff
|
diff to current
2006-11-20
Catalin Marinas
Fix a bug in gitmergeonefile.py introduced recently
blob
|
commitdiff
|
diff to current
2006-11-17
Catalin Marinas
Only read the config files when running a command
blob
|
commitdiff
|
diff to current
2006-10-16
Catalin Marinas
Add the '--interactive' option to 'resolved'
blob
|
commitdiff
|
diff to current
2006-05-09
Catalin Marinas
Allow configurable file extensions for merge conflicts
blob
|
commitdiff
|
diff to current
2006-05-03
Catalin Marinas
Fix the added to both but different conflict
blob
|
commitdiff
|
diff to current
2006-03-28
Catalin Marinas
Create stgit/basedir.py for determining the .git directory
blob
|
commitdiff
|
diff to current
2006-03-28
Catalin Marinas
The gitmergeonefile config section is deprecated
blob
|
commitdiff
|
diff to current
2006-03-10
Catalin Marinas
Deal with merge conflicts directly
blob
|
commitdiff
|
diff to current
~mdw / stgit / history