- 23 Feb, 2022 1 commit
-
-
Edward Thomson committed
-
- 12 Feb, 2022 1 commit
-
-
We made the flags that enable recursive merge internal, on the assumption that nobody would want them and they're hard to reason about. (Giving people an option that nobody wants is just extra noise.) However, it made it hard for _us_ to reason about. There's no good reason to keep it private, let's just make it public and push that cognitive load onto our poor users. But they should expect it, they're dealing with git, after all.
Edward Thomson committed
-
- 07 Feb, 2022 2 commits
-
-
Allocate flags in git_merge_flag_t and git_merge_file_flag_t for internal usage to prevent accidental double allocation.
Peter Pettersson committed -
GIT_MERGE_FILE__CONFLICTED This is to avoid a possible problem where the value is set to the same as GIT_MERGE_FILE_SIMPLIFY_ALNUM in git_merge_file_flag_t
Peter Pettersson committed
-
- 15 Nov, 2021 1 commit
-
-
Peter Pettersson committed
-
- 27 Jul, 2021 1 commit
-
-
This change introduces a new API function `git_graph_reachable_from_any()`, that answers the question whether a commit is reachable from any of the provided commits through following parent edges. This function can take advantage of optimizations provided by the existence of a `commit-graph` file, since it makes it faster to know whether, given two commits X and Y, X cannot possibly be an reachable from Y. Part of: #5757
lhchavez committed
-
- 18 Jan, 2020 1 commit
-
-
libgit2 does not use `type_t` suffixes as it's redundant; thus, rename `git_merge_diff_type_t` to `git_merge_diff_t` for consistency.
Edward Thomson committed
-
- 03 Jul, 2017 1 commit
-
-
Next to including several files, our "common.h" header also declares various macros which are then used throughout the project. As such, we have to make sure to always include this file first in all implementation files. Otherwise, we might encounter problems or even silent behavioural differences due to macros or defines not being defined as they should be. So in fact, our header and implementation files should make sure to always include "common.h" first. This commit does so by establishing a common include pattern. Header files inside of "src" will now always include "common.h" as its first other file, separated by a newline from all the other includes to make it stand out as special. There are two cases for the implementation files. If they do have a matching header file, they will always include this one first, leading to "common.h" being transitively included as first file. If they do not have a matching header file, they instead include "common.h" as first file themselves. This fixes the outlined problems and will become our standard practice for header and source files inside of the "src/" from now on.
Patrick Steinhardt committed
-
- 17 Mar, 2016 4 commits
-
-
Since the `apply` callback can defer, the `check` callback is not necessary. Removing the `check` callback further makes the `payload` unnecessary along with the `cleanup` callback.
Edward Thomson committed -
Edward Thomson committed
-
Allow merge users to configure a custom default merge driver via `git_merge_options`. Similarly, honor the `merge.default` configuration option.
Edward Thomson committed -
Consumers can now register custom merged drivers with `git_merge_driver_register`. This allows consumers to support the merge drivers, as configured in `.gitattributes`. Consumers will be asked to perform the file-level merge when a custom driver is configured.
Edward Thomson committed
-
- 25 Nov, 2015 1 commit
-
-
Edward Thomson committed
-
- 11 May, 2015 1 commit
-
-
Edward Thomson committed
-
- 16 Mar, 2015 1 commit
-
-
Jeff Hostetler committed
-
- 27 Oct, 2014 1 commit
-
-
Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
Edward Thomson committed
-
- 01 Jul, 2014 1 commit
-
-
git_checkout_index can now check out other git_index's (that are not necessarily the repository index). This allows checkout_index to use the repository's index for stat cache information instead of the index data being checked out. git_merge and friends now check out their indexes directly instead of trying to blend it into the running index.
Edward Thomson committed
-
- 14 Apr, 2014 1 commit
-
-
Jacques Germishuys committed
-
- 20 Mar, 2014 3 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
Edward Thomson committed
-
- 20 Jan, 2014 1 commit
-
-
Edward Thomson committed
-
- 02 Dec, 2013 1 commit
-
-
Edward Thomson committed
-
- 05 Nov, 2013 2 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
- 17 May, 2013 1 commit
-
-
Edward Thomson committed
-
- 15 May, 2013 2 commits
- 30 Apr, 2013 1 commit
-
-
Edward Thomson committed
-
- 08 Jan, 2013 1 commit
-
-
Edward Thomson committed
-
- 04 Jan, 2013 2 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
- 03 Jan, 2013 2 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
- 27 Nov, 2012 1 commit
-
-
In so doing, promote commit_list to git_commit_list, with its own internal API header.
Ben Straub committed
-
- 25 Oct, 2012 1 commit
-
-
Edward Thomson committed
-