| commit | 0c9b5e01fc839d76be28f2b6e4fa1fd1d936a61d | |
| author | David Aguilar <davvid@gmail.com> | |
| Tue, 24 Jun 2008 06:50:53 +0000 (23 23:50 -0700) | ||
| committer | David Aguilar <davvid@gmail.com> | |
| Tue, 24 Jun 2008 06:51:36 +0000 (23 23:51 -0700) | ||
| tree | a8f78e221a590faba1cfb479631396ad98ddd8ed | treesnapshot (tar.gz zip) |
| parent | b9343825c7743726ad5a22bbe02cd67d2e214c26 | commitdiff |
| parent | a29d12d0b28bb8120db280cc7f26c90d2b870d37 | commitdiff |
Merge branch 'master' into release
* master:
controllers: generalized the diff gui for 'Apply Diff From Branch'
stash: update to the latest GitPython API
models: add an 'apply_diff_to_worktree' function
utils: generalize the diff parser
ui: add an Apply Diffs From.. option to the branch menu
models: update to the latest GitPython API
utils: add branch/rev support to the DiffParser class
models: add branch/rev support to diff_helper
GitPython: updated to use Govind's latest GitPython changes
* master:
controllers: generalized the diff gui for 'Apply Diff From Branch'
stash: update to the latest GitPython API
models: add an 'apply_diff_to_worktree' function
utils: generalize the diff parser
ui: add an Apply Diffs From.. option to the branch menu
models: update to the latest GitPython API
utils: add branch/rev support to the DiffParser class
models: add branch/rev support to diff_helper
GitPython: updated to use Govind's latest GitPython changes