chiark
/
gitweb
/
~mdw
/
stgit
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
We keep the different stages of a conflict in the index now
[stgit]
/
stgit
/
commands
/
resolved.py
2007-12-19
Karl Hasselström
We keep the different stages of a conflict in the index now
blob
|
commitdiff
|
raw
2007-12-19
Karl Hasselström
Refactoring: pass more than one file to resolved()
blob
|
commitdiff
|
raw
|
diff to current
2007-12-19
Karl Hasselström
Fix "stg resolved" to work with new conflict representation
blob
|
commitdiff
|
raw
|
diff to current
2007-11-08
Karl Hasselström
Let some commands work with detached HEAD
blob
|
commitdiff
|
raw
|
diff to current
2007-11-07
Catalin Marinas
Fix more commands to run correctly in subdirectories
blob
|
commitdiff
|
raw
|
diff to current
2007-10-07
Karl Hasselström
Infrastructure for current directory handling
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-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-03-28
Catalin Marinas
Create stgit/basedir.py for determining the .git directory
blob
|
commitdiff
|
raw
|
diff to current
2005-11-30
Chuck Lever
Use git-rev-parse to find the local GIT repository
blob
|
commitdiff
|
raw
|
diff to current
2005-10-05
Catalin Marinas
Add a --reset option to resolved
blob
|
commitdiff
|
raw
|
diff to current
2005-07-24
Catalin Marinas
Improve the help message for commands
blob
|
commitdiff
|
raw
|
diff to current
2005-07-12
Catalin Marinas
Separate the commands in stgit/commands/* files
blob
|
commitdiff
|
raw
|
diff to current
~mdw / stgit / history