summaryrefslogtreecommitdiff
path: root/PROJECTS.md
diff options
context:
space:
mode:
authorSun He <sunheehnus@gmail.com>2014-03-06 11:16:36 +0800
committerSun He <sunheehnus@gmail.com>2014-03-06 11:16:36 +0800
commit6246de93b65fc74cba2e17ab031402adff84433f (patch)
tree676fbb35641726736b0cc8053f73ec9f1ed03d0e /PROJECTS.md
parent8384a50a2171f57cc1b8158777b124d2022db94e (diff)
parenta064dc2d0b6206116a35be4b62c58c3c1170d5de (diff)
downloadlibgit2-6246de93b65fc74cba2e17ab031402adff84433f.tar.gz
Merge completed: resolve the conflict with the upstream
Diffstat (limited to 'PROJECTS.md')
-rw-r--r--PROJECTS.md4
1 files changed, 0 insertions, 4 deletions
diff --git a/PROJECTS.md b/PROJECTS.md
index 1e2b5db6f..d97c3329a 100644
--- a/PROJECTS.md
+++ b/PROJECTS.md
@@ -28,10 +28,6 @@ These are good small projects to get started with libgit2.
core Git command and add a missing command-line option. There are many
gaps right now and this helps demonstrate how to use the library. Here
are some specific ideas:
- * Add the `--minimal` flag to `examples/diff.c` since the `libgit2`
- diff API now has a flag to support it
- * Add the `--patience` flag to `examples/diff.c` since it is also now
- supported.
* Fix the `examples/diff.c` implementation of the `-B`
(a.k.a. `--break-rewrites`) command line option to actually look for
the optional `[<n>][/<m>]` configuration values. There is an