chiark
/
gitweb
/
~mdw
/
stgit
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'stable'
[stgit]
/
stgit
/
git.py
2008-07-24
Karl Hasselström
Merge branch 'stable'
blob
|
commitdiff
|
raw
2008-07-08
Karl Hasselström
Merge branch 'stable'
blob
|
commitdiff
|
raw
2008-07-08
Karl Hasselström
Don't allow extra diff options with "stg status"
blob
|
commitdiff
|
raw
|
diff to current
2008-06-29
Karl Hasselström
Merge branch 'stable' into stable-master-merge
blob
|
commitdiff
|
raw
|
diff to current
2008-06-08
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-03
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-03
Karl Hasselström
Merge branch 'stable' into stable-master-merge
blob
|
commitdiff
|
raw
|
diff to current
2008-06-03
Karl Hasselström
Handle refresh of changed files with non-ASCII names
blob
|
commitdiff
|
raw
|
diff to current
2008-06-02
Karl Hasselström
Handle changed files with non-ASCII names
blob
|
commitdiff
|
raw
|
diff to current
2008-05-27
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2008-05-27
Catalin Marinas
Fix "refresh" failure with moved files (bug 11661)
blob
|
commitdiff
|
raw
|
diff to current
2008-05-19
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2008-04-17
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2008-04-14
Karl Hasselström
Merge branch 'stable' into stable-master-merge
blob
|
commitdiff
|
raw
|
diff to current
2008-03-25
Catalin Marinas
Merge branch 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2008-01-29
Karl Hasselström
Let the caller supply the diff text to diffstat()
blob
|
commitdiff
|
raw
|
diff to current
2007-12-19
Catalin Marinas
Remove unused git functions like add, rm, copy
blob
|
commitdiff
|
raw
|
diff to current
2007-12-19
Catalin Marinas
Remove multiple stages returned by git.ls_files
blob
|
commitdiff
|
raw
|
diff to current
2007-12-19
Catalin Marinas
Don't assume there is always a stage 2 in git.get_conflicts
blob
|
commitdiff
|
raw
|
diff to current
2007-12-19
Catalin Marinas
Re-add the interactive merge
blob
|
commitdiff
|
raw
|
diff to current
2007-12-19
David Kågedal
Ask git about unmerged files
blob
|
commitdiff
|
raw
|
diff to current
2007-12-19
Karl Hasselström
Nicer conflict markers
blob
|
commitdiff
|
raw
|
diff to current
2007-12-19
David Kågedal
Use the output from merge-recursive to list conflicts
blob
|
commitdiff
|
raw
|
diff to current
2007-12-19
David Kågedal
Simplify merge_recursive
blob
|
commitdiff
|
raw
|
diff to current
2007-12-19
David Kågedal
Leave working dir and index alone after failed (conflic...
blob
|
commitdiff
|
raw
|
diff to current
2007-12-19
David Kågedal
Split git.merge into two functions
blob
|
commitdiff
|
raw
|
diff to current
2007-12-09
Catalin Marinas
Better handling of binary files (bug #8495)
blob
|
commitdiff
|
raw
|
diff to current
2007-12-07
Catalin Marinas
git.pretty_commit() re-implemented with "git show"...
blob
|
commitdiff
|
raw
|
diff to current
2007-12-04
Catalin Marinas
Clean-up if the branch creation fails (bug #10015)
blob
|
commitdiff
|
raw
|
diff to current
2007-12-01
Catalin Marinas
Check for disappeared newborn files in git.tree_status...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-14
Catalin Marinas
Execute the 'git ...' rather than 'git-...'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-14
Catalin Marinas
'stg pop --keep' doesn't update the index
blob
|
commitdiff
|
raw
|
diff to current
2007-10-23
Catalin Marinas
Allow StGIT commands to run correctly in subdirectories
blob
|
commitdiff
|
raw
|
diff to current
2007-10-17
Catalin Marinas
Do not raise an exception if no FETCH_HEAD
blob
|
commitdiff
|
raw
|
diff to current
2007-10-08
Karl Hasselström
Properly detect that HEAD is detached
blob
|
commitdiff
|
raw
|
diff to current
2007-10-07
Karl Hasselström
Discard stderr output from git-rev-parse
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-10-07
Yann Dirson
Better diagnostic for wrong branch configuration.
blob
|
commitdiff
|
raw
|
diff to current
2007-09-28
Catalin Marinas
Fix the rebasing with an external command
blob
|
commitdiff
|
raw
|
diff to current
2007-09-23
David Kågedal
Moved that status function to the status command file
blob
|
commitdiff
|
raw
|
diff to current
2007-09-23
David Kågedal
Clear up semantics of tree_status
blob
|
commitdiff
|
raw
|
diff to current
2007-09-14
Catalin Marinas
Add patch editing command
blob
|
commitdiff
|
raw
|
diff to current
2007-09-11
Karl Hasselström
Include summary of added/deleted files in diffstat
blob
|
commitdiff
|
raw
|
diff to current
2007-09-11
Karl Hasselström
Discard stderr when determining if a patch is already...
blob
|
commitdiff
|
raw
|
diff to current
2007-09-05
Pavel Roskin
git.__remotes_from_dir() should only return lists
blob
|
commitdiff
|
raw
|
diff to current
2007-09-04
Karl Hasselström
Use the builtin set() instead of sets.Set()
blob
|
commitdiff
|
raw
|
diff to current
2007-08-31
Karl Hasselström
Let "stg status" ignore empty directories
blob
|
commitdiff
|
raw
|
diff to current
2007-08-31
David Kågedal
Cleanup tree_status and use -z
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-08-26
Karl Hasselström
Compile regexp just once
blob
|
commitdiff
|
raw
|
diff to current
2007-08-23
Karl Hasselström
Don't touch ref files manually
blob
|
commitdiff
|
raw
|
diff to current
2007-08-20
Karl Hasselström
Teach StGIT about core.excludesfile
blob
|
commitdiff
|
raw
|
diff to current
2007-07-16
Catalin Marinas
Do not call 'refresh' when creating a patch (bug #8872)
blob
|
commitdiff
|
raw
|
diff to current
2007-06-25
Yann Dirson
Revert part of the reverted commit that we want to...
blob
|
commitdiff
|
raw
|
diff to current
2007-06-22
Catalin Marinas
Modify the 'patches' command to use the locally modifie...
blob
|
commitdiff
|
raw
|
diff to current
2007-06-15
Yann Dirson
Revert 'Changed rebasing safety check to look for reach...
blob
|
commitdiff
|
raw
|
diff to current
2007-06-12
Catalin Marinas
Show a joined string rather than list when reporting...
blob
|
commitdiff
|
raw
|
diff to current
2007-06-12
Yann Dirson
Changed rebasing safety check to look for reachability...
blob
|
commitdiff
|
raw
|
diff to current
2007-06-02
Yann Dirson
Add new --diff-opts/-O flag to diff- and status-related...
blob
|
commitdiff
|
raw
|
diff to current
2007-06-02
Yann Dirson
Make diff flags handling more modular.
blob
|
commitdiff
|
raw
|
diff to current
2007-06-02
Yann Dirson
Call external commands without a shell where possible.
blob
|
commitdiff
|
raw
|
diff to current
2007-05-21
Karl Hasselström
Refactor message printing
blob
|
commitdiff
|
raw
|
diff to current
2007-05-21
Karl Hasselström
Add --binary flag to commands that generate diffs
blob
|
commitdiff
|
raw
|
diff to current
2007-05-14
Karl Hasselström
Fix popping on non-active branches
blob
|
commitdiff
|
raw
|
diff to current
2007-04-17
Catalin Marinas
Failed recursive merging can silently lose date in...
blob
|
commitdiff
|
raw
|
diff to current
2007-03-12
Yann Dirson
Make 'stg cp' 2nd form safe.
blob
|
commitdiff
|
raw
|
diff to current
2007-03-12
Yann Dirson
Add 'stg cp' command.
blob
|
commitdiff
|
raw
|
diff to current
2007-02-23
Catalin Marinas
Add --branch option to 'patches'
blob
|
commitdiff
|
raw
|
diff to current
2007-02-21
Yann Dirson
Rework of the 'stg pull' policy.
blob
|
commitdiff
|
raw
|
diff to current
2007-02-13
Catalin Marinas
Fix the behaviour when there is no user information...
blob
|
commitdiff
|
raw
|
diff to current
2007-02-05
Yann Dirson
Use branch.*.stgit.parentbranch for authoritative paren...
blob
|
commitdiff
|
raw
|
diff to current
2007-02-03
Yann Dirson
Use FETCH_HEAD to know where to rebase to after pull.
master
blob
|
commitdiff
|
raw
|
diff to current
2007-02-02
Pavel Roskin
Allow .git/branches and .git/remotes to be missing
blob
|
commitdiff
|
raw
|
diff to current
2007-02-02
Yann Dirson
Rebase to parent branch after git-fetch in "stg pull".
blob
|
commitdiff
|
raw
|
diff to current
2007-02-01
Catalin Marinas
set() is not a builtin function in Python 2.3
blob
|
commitdiff
|
raw
|
diff to current
2007-01-31
Yann Dirson
Make 'stg pull' use git-fetch and not git-pull.
blob
|
commitdiff
|
raw
|
diff to current
2007-01-31
Yann Dirson
Allows extraction of information about remotes.
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-21
Catalin Marinas
Fix the displaying of unknown files for 'stg status'
blob
|
commitdiff
|
raw
|
diff to current
2007-01-04
Catalin Marinas
Fix the branch renaming to also rename the reflogs
blob
|
commitdiff
|
raw
|
diff to current
2006-12-08
Catalin Marinas
Don't always use git-merge-recursive because of speed
blob
|
commitdiff
|
raw
|
diff to current
2006-12-07
Catalin Marinas
Add the 'sync' command
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-12-05
Karl Hasselström
Ask git for author and committer name
blob
|
commitdiff
|
raw
|
diff to current
2006-12-05
Catalin Marinas
Only print the progress message if on a TTY
blob
|
commitdiff
|
raw
|
diff to current
2006-11-16
Karl Hasselström
Print progress message to stderr, not stdout
blob
|
commitdiff
|
raw
|
diff to current
2006-11-09
Catalin Marinas
Add file renaming support
blob
|
commitdiff
|
raw
|
diff to current
2006-11-08
Chuck Lever
Optionally repack the object repository after every...
blob
|
commitdiff
|
raw
|
diff to current
2006-11-08
Chuck Lever
Print a message while checking for changes in the worki...
blob
|
commitdiff
|
raw
|
diff to current
2006-11-08
Catalin Marinas
Add mbox support to "import"
blob
|
commitdiff
|
raw
|
diff to current
2006-11-07
Catalin Marinas
Add support for multipart messages to import
blob
|
commitdiff
|
raw
|
diff to current
2006-10-25
Karl Hasselström
New stg command: assimilate
blob
|
commitdiff
|
raw
|
diff to current
2006-10-20
Catalin Marinas
Allow the git-pull command to be configurable
blob
|
commitdiff
|
raw
|
diff to current
2006-09-15
Catalin Marinas
Add patch history support
blob
|
commitdiff
|
raw
|
diff to current
2006-09-15
Catalin Marinas
Allow empty commit messages
blob
|
commitdiff
|
raw
|
diff to current
2006-09-10
Catalin Marinas
Add --keep option to pop
blob
|
commitdiff
|
raw
|
diff to current
2006-09-10
Catalin Marinas
Use get-ref-list to get the commit parents
blob
|
commitdiff
|
raw
|
diff to current
2006-07-05
Catalin Marinas
Add '--' to git-diff-index calls
blob
|
commitdiff
|
raw
|
diff to current
2006-06-11
Catalin Marinas
Show the stderr for failed GIT commands
blob
|
commitdiff
|
raw
|
diff to current
next