]> git.proxmox.com Git - libgit2.git/history - src/merge.c
Merge branch 'development' into clar2
[libgit2.git] / src / merge.c
2012-12-03 Vicent MartíMerge pull request #1112 from barrbrain/odb-pack-read...
2012-11-30 Russell BelferMerge pull request #1108 from libgit2/ahead-behind...
2012-11-30 Russell BelferFix function name and add real error check
2012-11-29 Vicent MartíMerge pull request #1090 from arrbee/ignore-invalid...
2012-11-29 Scott J. GoldmanRename git_count_ahead_behind -> git_graph_ahead_behind
2012-11-29 Scott J. Goldmanfix coding style: while( -> while (
2012-11-29 Scott J. GoldmanAdd initial implementation of ahead-behind count
2012-11-28 Ben StraubMerge pull request #1087 from libgit2/great-renaming
2012-11-27 Ben StraubMove merge functions to merge.c
2012-11-22 Philip KelleyMerge pull request #1095 from martinwoodward/authors
2012-11-02 Vicent MartíMerge pull request #1014 from arrbee/diff-rename-detection
2012-10-30 Vicent MartíMerge pull request #1017 from arrbee/diff-patch-to-str
2012-10-25 Vicent MartíMerge pull request #1021 from ethomson/cmake_vs
2012-10-25 Vicent MartíMerge pull request #990 from ben/clone-callbacks
2012-10-25 Vicent MartíMerge pull request #1013 from ethomson/reset_merge
2012-10-25 Edward Thomsonreset changes for merge