diff options
| author |  Avery Pennarun <apenwarr@gmail.com> | 2009-11-25 21:23:55 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-01-17 22:45:06 -0800 |
| commit | 8cc5b29065e19267cbc08b39c34674b02c2e3d59 (patch) | |
| tree | a7fc209fac5df7d2a9c9a5795fb4f58746ae3840 /builtin-log.c | |
| parent | git-merge-file --ours, --theirs (diff) | |
| download | tgif-8cc5b29065e19267cbc08b39c34674b02c2e3d59.tar.xz | |
git merge -X<option>
Teach "-X <option>" command line argument to "git merge" that is passed to
strategy implementations. "ours" and "theirs" autoresolution introduced
by the previous commit can be asked to the recursive strategy.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-log.c')
0 files changed, 0 insertions, 0 deletions