Package: git
Version: 1:1.7.1-1
Severity: minor
Tags: upstream
Strategy 'theirs' is described in help page for git merge:
$> git merge --help | grep -A1 '^\W*theirs$'
theirs
This is opposite of ours.
but isn't actually available:
$> git merge -s theirs MDP-2.6
Could not find merge strategy 'theirs'.
Available strategies are: octopus ours recursive resolve subtree.
so now I need to simulate it via some branch renames and -s ours
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (901, 'unstable'), (900, 'testing'), (300, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages git depends on:
ii libc6 2.10.2-7 Embedded GNU C Library: Shared lib
ii libcurl3-gnutls 7.20.1-1 Multi-protocol file transfer libra
ii libdigest-sha1-perl 2.12-1 NIST SHA-1 message digest algorith
ii liberror-perl 0.17-1 Perl module for error/exception ha
ii libexpat1 2.0.1-7 XML parsing C library - runtime li
ii perl-modules 5.10.1-12 Core Perl modules
ii zlib1g 1:1.2.3.5.dfsg-1 compression library - runtime
Versions of packages git recommends:
ii less 436-1 pager program similar to more
ii openssh-client [ssh-client] 1:5.5p1-2 secure shell (SSH) client, for sec
ii patch 2.6-2 Apply a diff file to an original
ii rsync 3.0.7-2 fast remote file copy program (lik
Versions of packages git suggests:
pn git-arch <none> (no description available)
ii git-cvs 1:1.7.1-1 fast, scalable, distributed revisi
pn git-daemon-run <none> (no description available)
ii git-doc 1:1.7.1-1 fast, scalable, distributed revisi
pn git-email <none> (no description available)
ii git-gui 1:1.7.1-1 fast, scalable, distributed revisi
ii git-svn 1:1.7.1-1 fast, scalable, distributed revisi
ii gitk 1:1.7.1-1 fast, scalable, distributed revisi
pn gitweb <none> (no description available)
-- no debconf information
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
