delta/libgit2.git/include/git2, branch hf/libgit2sharp_020_patch github.com: libgit2/libgit2.git Merge pull request #2661 from swisspol/2656 2014-11-03T14:10:14+00:00 Edward Thomson ethomson@edwardthomson.com 2014-11-03T14:10:14+00:00 0a629181881287fa9646a52b7249f03bd1b8cfc4 Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemitconf 
Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemitconf
 merge: talk about the merging state after git_merge() 2014-11-02T16:18:19+00:00 Carlos Martín Nieto cmn@dwim.me 2014-11-02T16:18:19+00:00 521c0cab7a02f718e4a7e3c2ae7ef81d6f16ffd1 Since it's not necessarily obvious, mention the merging state and how to clear it. 
Since it's not necessarily obvious, mention the merging state and how to
clear it.
Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemitconf 2014-10-27T16:17:01+00:00 Pierre-Olivier Latour pol@mac.com 2014-10-26T17:40:46+00:00 d88766c4e16c311ba8ce28e71a6545c5d0d7521f 






rebase: updates based on PR comments
2014-10-27T02:59:50+00:00

Edward Thomson
ethomson@microsoft.com

2014-10-05T00:17:26+00:00

979645a7195b8ce9895c18ee00c8913ea38f93eb












s/git_merge_head/git_annotated_commit
2014-10-27T02:59:48+00:00

Edward Thomson
ethomson@microsoft.com

2014-10-03T23:02:29+00:00

18b00406c6427eb8c9d96864448474e1d85017de

Rename git_merge_head to git_annotated_commit, as it becomes used
in more operations than just merge.





Rename git_merge_head to git_annotated_commit, as it becomes used
in more operations than just merge.







rebase: oid member of operation should be const
2014-10-27T02:59:43+00:00

Edward Thomson
ethomson@microsoft.com

2014-09-11T20:46:46+00:00

e69737d76098d67cd3ebf53b9c152cfc2675fc61












git_rebase: iterators for operations
2014-10-27T02:59:41+00:00

Edward Thomson
ethomson@microsoft.com

2014-09-11T20:47:20+00:00

ed2c06a6a1c8725483759782f60531d582d9ec46












rebase: preload all operations
2014-10-27T02:59:38+00:00

Edward Thomson
ethomson@microsoft.com

2014-08-26T21:18:46+00:00

f152f8ac0c6c20bf5e245e79629dc70a913496b1












rebase: init/open a git_rebase object
2014-10-27T02:59:36+00:00

Edward Thomson
ethomson@microsoft.com

2014-08-25T18:29:50+00:00

b6b636a7fad2d87067df4df47f37b57467ad6bb6












git_rebase_next: provide info about the operation
2014-10-27T02:59:34+00:00

Edward Thomson
ethomson@microsoft.com

2014-08-23T23:19:34+00:00

18b439b9beee050de0dbf2f4649609764a69fb3c