~mdw
/
stgit
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Add mergetool support to the classic StGit infrastructure
[stgit]
/
stgit
/
commands
/
resolved.py
2009-04-09
Catalin Marinas
Add mergetool support to the classic StGit infrastructure
blob
|
commitdiff
2009-01-28
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
diff to current
2009-01-22
Karl Hasselström
Merge branch 'stable'
blob
|
commitdiff
|
diff to current
2008-09-28
Karl Hasselström
Merge branch 'stable'
blob
|
commitdiff
|
diff to current
2008-09-21
Karl Hasselström
Automatic bash completion
blob
|
commitdiff
|
diff to current
2008-09-21
Karl Hasselström
Write to a stack log when stack is modified
blob
|
commitdiff
|
diff to current
2008-09-21
Karl Hasselström
Generate command lists automatically
blob
|
commitdiff
|
diff to current
2008-09-21
Karl Hasselström
Auto-generate man pages for all StGit commands
blob
|
commitdiff
|
diff to current
2008-09-19
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
diff to current
2008-09-09
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
diff to current
2008-08-26
Karl Hasselström
Merge branch 'stable'
blob
|
commitdiff
|
diff to current
2008-07-24
Karl Hasselström
Merge branch 'stable'
blob
|
commitdiff
|
diff to current
2008-07-08
Karl Hasselström
Merge branch 'stable'
blob
|
commitdiff
|
diff to current
2008-06-29
Karl Hasselström
Merge branch 'stable' into stable-master-merge
blob
|
commitdiff
|
diff to current
2008-06-08
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
diff to current
2008-06-03
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
diff to current
2008-06-03
Karl Hasselström
Merge branch 'stable' into stable-master-merge
blob
|
commitdiff
|
diff to current
2008-05-27
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
diff to current
2008-05-19
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
diff to current
2008-04-17
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
diff to current
2008-04-14
Karl Hasselström
Merge branch 'stable' into stable-master-merge
blob
|
commitdiff
|
diff to current
2008-03-25
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
diff to current
2007-12-19
Catalin Marinas
Re-add the interactive merge
blob
|
commitdiff
|
diff to current
2007-12-19
Karl Hasselström
We keep the different stages of a conflict in the index now
blob
|
commitdiff
|
diff to current
2007-12-19
Karl Hasselström
Refactoring: pass more than one file to resolved()
blob
|
commitdiff
|
diff to current
2007-12-19
Karl Hasselström
Fix "stg resolved" to work with new conflict representation
blob
|
commitdiff
|
diff to current
2007-11-08
Karl Hasselström
Let some commands work with detached HEAD
blob
|
commitdiff
|
diff to current
2007-11-07
Catalin Marinas
Fix more commands to run correctly in subdirectories
blob
|
commitdiff
|
diff to current
2007-10-07
Karl Hasselström
Infrastructure for current directory handling
blob
|
commitdiff
|
diff to current
2007-01-10
Catalin Marinas
Add option to automatically invoke the interactive...
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-03-28
Catalin Marinas
Create stgit/basedir.py for determining the .git directory
blob
|
commitdiff
|
diff to current
2005-11-30
Chuck Lever
Use git-rev-parse to find the local GIT repository
blob
|
commitdiff
|
diff to current
2005-10-05
Catalin Marinas
Add a --reset option to resolved
blob
|
commitdiff
|
diff to current
2005-07-24
Catalin Marinas
Improve the help message for commands
blob
|
commitdiff
|
diff to current
2005-07-12
Catalin Marinas
Separate the commands in stgit/commands/* files
blob
|
commitdiff
|
diff to current
~mdw / stgit / history