mirror of
https://github.com/git/git.git
synced 2024-11-18 21:43:58 +01:00
8cc633286a
A single-word "unsigned flags" in the diff options is being split into a structure with many bitfields. * bw/diff-opt-impl-to-bitfields: diff: make struct diff_flags members lowercase diff: remove DIFF_OPT_CLR macro diff: remove DIFF_OPT_SET macro diff: remove DIFF_OPT_TST macro diff: remove touched flags diff: add flag to indicate textconv was set via cmdline diff: convert flags to be stored in bitfields add, reset: use DIFF_OPT_SET macro to set a diff flag
33 lines
820 B
C
33 lines
820 B
C
/*
|
|
* Implementation of git-merge-ours.sh as builtin
|
|
*
|
|
* Copyright (c) 2007 Thomas Harning Jr
|
|
* Original:
|
|
* Original Copyright (c) 2005 Junio C Hamano
|
|
*
|
|
* Pretend we resolved the heads, but declare our tree trumps everybody else.
|
|
*/
|
|
#include "git-compat-util.h"
|
|
#include "builtin.h"
|
|
#include "diff.h"
|
|
|
|
static const char builtin_merge_ours_usage[] =
|
|
"git merge-ours <base>... -- HEAD <remote>...";
|
|
|
|
int cmd_merge_ours(int argc, const char **argv, const char *prefix)
|
|
{
|
|
if (argc == 2 && !strcmp(argv[1], "-h"))
|
|
usage(builtin_merge_ours_usage);
|
|
|
|
/*
|
|
* The contents of the current index becomes the tree we
|
|
* commit. The index must match HEAD, or this merge cannot go
|
|
* through.
|
|
*/
|
|
if (read_cache() < 0)
|
|
die_errno("read_cache failed");
|
|
if (index_differs_from("HEAD", NULL, 0))
|
|
exit(2);
|
|
exit(0);
|
|
}
|